From 004baaef4b2ee5ea288550c16e69b5a1e0b7a39d Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Wed, 3 May 2023 15:21:59 -0700 Subject: [PATCH 01/33] Convert algod responses to typed --- src/client/v2/algod/accountApplicationInformation.ts | 3 ++- src/client/v2/algod/accountAssetInformation.ts | 3 ++- src/client/v2/algod/accountInformation.ts | 3 ++- src/client/v2/algod/block.ts | 5 +++-- src/client/v2/algod/compile.ts | 3 ++- src/client/v2/algod/disassemble.ts | 3 ++- src/client/v2/algod/dryrun.ts | 3 ++- src/client/v2/algod/getApplicationByID.ts | 3 ++- src/client/v2/algod/getAssetByID.ts | 3 ++- src/client/v2/algod/getBlockHash.ts | 3 ++- src/client/v2/algod/getTransactionProof.ts | 3 ++- src/client/v2/algod/lightBlockHeaderProof.ts | 3 ++- src/client/v2/algod/pendingTransactionInformation.ts | 5 +++-- src/client/v2/algod/pendingTransactions.ts | 5 +++-- src/client/v2/algod/pendingTransactionsByAddress.ts | 7 ++++--- src/client/v2/algod/sendRawTransaction.ts | 3 ++- src/client/v2/algod/stateproof.ts | 3 ++- src/client/v2/algod/status.ts | 3 ++- src/client/v2/algod/statusAfterBlock.ts | 3 ++- src/client/v2/algod/supply.ts | 3 ++- src/client/v2/algod/versions.ts | 3 ++- 21 files changed, 47 insertions(+), 26 deletions(-) diff --git a/src/client/v2/algod/accountApplicationInformation.ts b/src/client/v2/algod/accountApplicationInformation.ts index 26ec531c5..9638415ef 100644 --- a/src/client/v2/algod/accountApplicationInformation.ts +++ b/src/client/v2/algod/accountApplicationInformation.ts @@ -1,8 +1,9 @@ import JSONRequest from '../jsonrequest'; import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; +import { AccountApplicationResponse } from './models/types'; -export default class AccountApplicationInformation extends JSONRequest { +export default class AccountApplicationInformation extends JSONRequest { constructor( c: HTTPClient, intDecoding: IntDecoding, diff --git a/src/client/v2/algod/accountAssetInformation.ts b/src/client/v2/algod/accountAssetInformation.ts index f05e2f8da..c3293c01e 100644 --- a/src/client/v2/algod/accountAssetInformation.ts +++ b/src/client/v2/algod/accountAssetInformation.ts @@ -1,8 +1,9 @@ import JSONRequest from '../jsonrequest'; import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; +import { AccountAssetResponse } from './models/types'; -export default class AccountAssetInformation extends JSONRequest { +export default class AccountAssetInformation extends JSONRequest { constructor( c: HTTPClient, intDecoding: IntDecoding, diff --git a/src/client/v2/algod/accountInformation.ts b/src/client/v2/algod/accountInformation.ts index bbff87182..07aa4e1a2 100644 --- a/src/client/v2/algod/accountInformation.ts +++ b/src/client/v2/algod/accountInformation.ts @@ -1,8 +1,9 @@ import JSONRequest from '../jsonrequest'; import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; +import { AccountResponse } from '../indexer/models/types'; -export default class AccountInformation extends JSONRequest { +export default class AccountInformation extends JSONRequest { constructor( c: HTTPClient, intDecoding: IntDecoding, diff --git a/src/client/v2/algod/block.ts b/src/client/v2/algod/block.ts index 24dc2e271..8e75562f6 100644 --- a/src/client/v2/algod/block.ts +++ b/src/client/v2/algod/block.ts @@ -1,11 +1,12 @@ import * as encoding from '../../../encoding/encoding'; import JSONRequest from '../jsonrequest'; import HTTPClient from '../../client'; +import { BlockResponse } from './models/types'; /** * block gets the block info for the given round. this call may block */ -export default class Block extends JSONRequest { +export default class Block extends JSONRequest { private round: number; constructor(c: HTTPClient, roundNumber: number) { @@ -23,7 +24,7 @@ export default class Block extends JSONRequest { // eslint-disable-next-line class-methods-use-this prepare(body: Uint8Array) { if (body && body.byteLength > 0) { - return encoding.decode(body) as Record; + return encoding.decode(body) as BlockResponse; } return undefined; } diff --git a/src/client/v2/algod/compile.ts b/src/client/v2/algod/compile.ts index db8769c0e..94f4d2390 100644 --- a/src/client/v2/algod/compile.ts +++ b/src/client/v2/algod/compile.ts @@ -1,6 +1,7 @@ import { Buffer } from 'buffer'; import JSONRequest from '../jsonrequest'; import HTTPClient from '../../client'; +import { CompileResponse } from './models/types'; /** * Sets the default header (if not previously set) @@ -18,7 +19,7 @@ export function setHeaders(headers = {}) { /** * Executes compile */ -export default class Compile extends JSONRequest { +export default class Compile extends JSONRequest { constructor(c: HTTPClient, private source: string | Uint8Array) { super(c); this.source = source; diff --git a/src/client/v2/algod/disassemble.ts b/src/client/v2/algod/disassemble.ts index 552e8c622..0ffe7e895 100644 --- a/src/client/v2/algod/disassemble.ts +++ b/src/client/v2/algod/disassemble.ts @@ -1,6 +1,7 @@ import { Buffer } from 'buffer'; import JSONRequest from '../jsonrequest'; import HTTPClient from '../../client'; +import { DisassembleResponse } from './models/types'; /** * Sets the default header (if not previously set) @@ -18,7 +19,7 @@ export function setHeaders(headers = {}) { /** * Executes disassemble */ -export default class Disassemble extends JSONRequest { +export default class Disassemble extends JSONRequest { constructor(c: HTTPClient, private source: string | Uint8Array) { super(c); this.source = source; diff --git a/src/client/v2/algod/dryrun.ts b/src/client/v2/algod/dryrun.ts index 98b2fb463..72d6e27fb 100644 --- a/src/client/v2/algod/dryrun.ts +++ b/src/client/v2/algod/dryrun.ts @@ -4,8 +4,9 @@ import HTTPClient from '../../client'; import * as modelsv2 from './models/types'; import * as encoding from '../../../encoding/encoding'; import { setHeaders } from './compile'; +import { DryrunResponse } from './models/types'; -export default class Dryrun extends JSONRequest { +export default class Dryrun extends JSONRequest { private blob: Uint8Array; constructor(c: HTTPClient, dr: modelsv2.DryrunRequest) { diff --git a/src/client/v2/algod/getApplicationByID.ts b/src/client/v2/algod/getApplicationByID.ts index 91e1c12e1..e11e50dea 100644 --- a/src/client/v2/algod/getApplicationByID.ts +++ b/src/client/v2/algod/getApplicationByID.ts @@ -1,8 +1,9 @@ import JSONRequest from '../jsonrequest'; import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; +import { Application } from './models/types'; -export default class GetApplicationByID extends JSONRequest { +export default class GetApplicationByID extends JSONRequest { constructor(c: HTTPClient, intDecoding: IntDecoding, private index: number) { super(c, intDecoding); this.index = index; diff --git a/src/client/v2/algod/getAssetByID.ts b/src/client/v2/algod/getAssetByID.ts index 3abb5696d..4010b8b5b 100644 --- a/src/client/v2/algod/getAssetByID.ts +++ b/src/client/v2/algod/getAssetByID.ts @@ -1,8 +1,9 @@ import JSONRequest from '../jsonrequest'; import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; +import { Asset } from './models/types'; -export default class GetAssetByID extends JSONRequest { +export default class GetAssetByID extends JSONRequest { constructor(c: HTTPClient, intDecoding: IntDecoding, private index: number) { super(c, intDecoding); this.index = index; diff --git a/src/client/v2/algod/getBlockHash.ts b/src/client/v2/algod/getBlockHash.ts index 40d01b499..2f5d4dcb2 100644 --- a/src/client/v2/algod/getBlockHash.ts +++ b/src/client/v2/algod/getBlockHash.ts @@ -1,8 +1,9 @@ import JSONRequest from '../jsonrequest'; import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; +import { BlockHashResponse } from './models/types'; -export default class GetBlockHash extends JSONRequest { +export default class GetBlockHash extends JSONRequest { round: number; constructor(c: HTTPClient, intDecoding: IntDecoding, roundNumber: number) { diff --git a/src/client/v2/algod/getTransactionProof.ts b/src/client/v2/algod/getTransactionProof.ts index 398039a43..e8add2b40 100644 --- a/src/client/v2/algod/getTransactionProof.ts +++ b/src/client/v2/algod/getTransactionProof.ts @@ -1,8 +1,9 @@ import JSONRequest from '../jsonrequest'; import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; +import { TransactionProofResponse } from './models/types'; -export default class GetTransactionProof extends JSONRequest { +export default class GetTransactionProof extends JSONRequest { constructor( c: HTTPClient, intDecoding: IntDecoding, diff --git a/src/client/v2/algod/lightBlockHeaderProof.ts b/src/client/v2/algod/lightBlockHeaderProof.ts index ac3794c36..16c45de4c 100644 --- a/src/client/v2/algod/lightBlockHeaderProof.ts +++ b/src/client/v2/algod/lightBlockHeaderProof.ts @@ -1,8 +1,9 @@ import JSONRequest from '../jsonrequest'; import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; +import { LightBlockHeaderProof as LBHP } from './models/types'; -export default class LightBlockHeaderProof extends JSONRequest { +export default class LightBlockHeaderProof extends JSONRequest { constructor(c: HTTPClient, intDecoding: IntDecoding, private round: number) { super(c, intDecoding); diff --git a/src/client/v2/algod/pendingTransactionInformation.ts b/src/client/v2/algod/pendingTransactionInformation.ts index 75d2527ee..21ab9f8f8 100644 --- a/src/client/v2/algod/pendingTransactionInformation.ts +++ b/src/client/v2/algod/pendingTransactionInformation.ts @@ -1,11 +1,12 @@ import JSONRequest from '../jsonrequest'; import HTTPClient from '../../client'; import * as encoding from '../../../encoding/encoding'; +import { PendingTransactionResponse } from './models/types'; /** * returns the transaction information for a specific txid of a pending transaction */ -export default class PendingTransactionInformation extends JSONRequest { +export default class PendingTransactionInformation extends JSONRequest { constructor(c: HTTPClient, private txid: string) { super(c); this.txid = txid; @@ -15,7 +16,7 @@ export default class PendingTransactionInformation extends JSONRequest { // eslint-disable-next-line class-methods-use-this prepare(body: Uint8Array) { if (body && body.byteLength > 0) { - return encoding.decode(body) as Record; + return encoding.decode(body) as PendingTransactionResponse; } return undefined; } diff --git a/src/client/v2/algod/pendingTransactions.ts b/src/client/v2/algod/pendingTransactions.ts index bf8754812..a93efe84d 100644 --- a/src/client/v2/algod/pendingTransactions.ts +++ b/src/client/v2/algod/pendingTransactions.ts @@ -1,11 +1,12 @@ import JSONRequest from '../jsonrequest'; import HTTPClient from '../../client'; import * as encoding from '../../../encoding/encoding'; +import { PendingTransactionsResponse } from './models/types'; /** * pendingTransactionsInformation returns transactions that are pending in the pool */ -export default class PendingTransactions extends JSONRequest { +export default class PendingTransactions extends JSONRequest { constructor(c: HTTPClient) { super(c); this.query.format = 'msgpack'; @@ -18,7 +19,7 @@ export default class PendingTransactions extends JSONRequest { prepare(body: Uint8Array) { if (body && body.byteLength > 0) { - return encoding.decode(body) as Record; + return encoding.decode(body) as PendingTransactionsResponse; } return undefined; } diff --git a/src/client/v2/algod/pendingTransactionsByAddress.ts b/src/client/v2/algod/pendingTransactionsByAddress.ts index b9710ccb7..fb1460e33 100644 --- a/src/client/v2/algod/pendingTransactionsByAddress.ts +++ b/src/client/v2/algod/pendingTransactionsByAddress.ts @@ -1,11 +1,12 @@ import JSONRequest from '../jsonrequest'; import HTTPClient from '../../client'; import * as encoding from '../../../encoding/encoding'; +import { PendingTransactionsResponse } from './models/types'; /** * returns all transactions for a PK [addr] in the [first, last] rounds range. */ -export default class PendingTransactionsByAddress extends JSONRequest { +export default class PendingTransactionsByAddress extends JSONRequest { constructor(c: HTTPClient, private address: string) { super(c); this.address = address; @@ -13,9 +14,9 @@ export default class PendingTransactionsByAddress extends JSONRequest { } // eslint-disable-next-line class-methods-use-this - prepare(body: Uint8Array): Record { + prepare(body: Uint8Array): PendingTransactionsResponse { if (body && body.byteLength > 0) { - return encoding.decode(body) as Record; + return encoding.decode(body) as PendingTransactionsResponse; } return undefined; } diff --git a/src/client/v2/algod/sendRawTransaction.ts b/src/client/v2/algod/sendRawTransaction.ts index 8977c1c5f..8079bcd23 100644 --- a/src/client/v2/algod/sendRawTransaction.ts +++ b/src/client/v2/algod/sendRawTransaction.ts @@ -2,6 +2,7 @@ import { Buffer } from 'buffer'; import JSONRequest from '../jsonrequest'; import HTTPClient from '../../client'; import { concatArrays } from '../../../utils/utils'; +import { PostTransactionsResponse } from './models/types'; /** * Sets the default header (if not previously set) for sending a raw @@ -24,7 +25,7 @@ function isByteArray(array: any): array is Uint8Array { /** * broadcasts the passed signed txns to the network */ -export default class SendRawTransaction extends JSONRequest { +export default class SendRawTransaction extends JSONRequest { private txnBytesToPost: Uint8Array; constructor(c: HTTPClient, stxOrStxs: Uint8Array | Uint8Array[]) { diff --git a/src/client/v2/algod/stateproof.ts b/src/client/v2/algod/stateproof.ts index 98bab12a7..47550101d 100644 --- a/src/client/v2/algod/stateproof.ts +++ b/src/client/v2/algod/stateproof.ts @@ -1,8 +1,9 @@ import JSONRequest from '../jsonrequest'; import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; +import { StateProof as SP } from './models/types'; -export default class StateProof extends JSONRequest { +export default class StateProof extends JSONRequest { constructor(c: HTTPClient, intDecoding: IntDecoding, private round: number) { super(c, intDecoding); diff --git a/src/client/v2/algod/status.ts b/src/client/v2/algod/status.ts index c8dcd4524..7752e74b8 100644 --- a/src/client/v2/algod/status.ts +++ b/src/client/v2/algod/status.ts @@ -1,6 +1,7 @@ import JSONRequest from '../jsonrequest'; +import { NodeStatusResponse } from './models/types'; -export default class Status extends JSONRequest { +export default class Status extends JSONRequest { // eslint-disable-next-line class-methods-use-this path() { return '/v2/status'; diff --git a/src/client/v2/algod/statusAfterBlock.ts b/src/client/v2/algod/statusAfterBlock.ts index 5d340c6fd..80c0e42ca 100644 --- a/src/client/v2/algod/statusAfterBlock.ts +++ b/src/client/v2/algod/statusAfterBlock.ts @@ -1,8 +1,9 @@ import JSONRequest from '../jsonrequest'; import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; +import { NodeStatusResponse } from './models/types'; -export default class StatusAfterBlock extends JSONRequest { +export default class StatusAfterBlock extends JSONRequest { constructor(c: HTTPClient, intDecoding: IntDecoding, private round: number) { super(c, intDecoding); if (!Number.isInteger(round)) throw Error('round should be an integer'); diff --git a/src/client/v2/algod/supply.ts b/src/client/v2/algod/supply.ts index 0e30f56e2..49f432ae9 100644 --- a/src/client/v2/algod/supply.ts +++ b/src/client/v2/algod/supply.ts @@ -1,6 +1,7 @@ import JSONRequest from '../jsonrequest'; +import { SupplyResponse } from './models/types'; -export default class Supply extends JSONRequest { +export default class Supply extends JSONRequest { // eslint-disable-next-line class-methods-use-this path() { return '/v2/ledger/supply'; diff --git a/src/client/v2/algod/versions.ts b/src/client/v2/algod/versions.ts index 31bcabb16..3093af8e1 100644 --- a/src/client/v2/algod/versions.ts +++ b/src/client/v2/algod/versions.ts @@ -1,9 +1,10 @@ import JSONRequest from '../jsonrequest'; +import { Version } from './models/types'; /** * retrieves the VersionResponse from the running node */ -export default class Versions extends JSONRequest { +export default class Versions extends JSONRequest { // eslint-disable-next-line class-methods-use-this path() { return '/versions'; From 23133b5ef38b987527a8e5ea8e9d1f3e8a71e715 Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Fri, 5 May 2023 11:53:11 -0700 Subject: [PATCH 02/33] Update eslint, fix lint errors --- package-lock.json | 3122 +++++++++++++++++++------------- package.json | 10 +- src/client/client.ts | 2 +- src/client/v2/serviceClient.ts | 8 +- src/dryrun.ts | 39 +- src/makeTxn.ts | 10 +- tests/cucumber/steps/steps.js | 5 +- 7 files changed, 1876 insertions(+), 1320 deletions(-) diff --git a/package-lock.json b/package-lock.json index a456db510..368aa9f97 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,18 +23,18 @@ "devDependencies": { "@types/json-bigint": "^1.0.0", "@types/mocha": "^8.2.2", - "@typescript-eslint/eslint-plugin": "^4.26.1", - "@typescript-eslint/parser": "^4.26.1", + "@typescript-eslint/eslint-plugin": "^5.59.2", + "@typescript-eslint/parser": "^5.59.2", "assert": "^2.0.0", "chromedriver": "^108.0.0", "concurrently": "^6.2.0", "coveralls": "^3.1.0", "cucumber": "^5.1.0", "es-abstract": "^1.18.3", - "eslint": "^7.21.0", - "eslint-config-airbnb-base": "^14.2.1", + "eslint": "8.22.0", + "eslint-config-airbnb-base": "^15.0.0", "eslint-config-prettier": "^8.1.0", - "eslint-plugin-import": "^2.22.1", + "eslint-plugin-import": "^2.25.2", "eslint-plugin-tsdoc": "^0.2.11", "express": "^4.17.1", "geckodriver": "^3.0.1", @@ -185,26 +185,118 @@ "node": ">=10.0.0" } }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz", + "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==", + "dev": true, + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, "node_modules/@eslint/eslintrc": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz", - "integrity": "sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz", + "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==", "dev": true, "dependencies": { "ajv": "^6.12.4", - "debug": "^4.1.1", - "espree": "^7.3.0", - "globals": "^13.9.0", - "ignore": "^4.0.6", + "debug": "^4.3.2", + "espree": "^9.4.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", "import-fresh": "^3.2.1", - "js-yaml": "^3.13.1", - "minimatch": "^3.0.4", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", "strip-json-comments": "^3.1.1" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/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 + }, + "node_modules/@eslint/eslintrc/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/@eslint/eslintrc/node_modules/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, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.10.7", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz", + "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==", + "dev": true, + "dependencies": { + "@humanwhocodes/object-schema": "^1.2.1", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=10.10.0" } }, + "node_modules/@humanwhocodes/gitignore-to-minimatch": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz", + "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@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 + }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", @@ -317,9 +409,9 @@ } }, "node_modules/@nodelib/fs.walk": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz", - "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", "dev": true, "dependencies": { "@nodelib/fs.scandir": "2.1.5", @@ -442,7 +534,7 @@ "node_modules/@types/json5": { "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", - "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", "dev": true }, "node_modules/@types/keyv": { @@ -487,6 +579,12 @@ "@types/node": "*" } }, + "node_modules/@types/semver": { + "version": "7.3.13", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz", + "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==", + "dev": true + }, "node_modules/@types/yauzl": { "version": "2.9.1", "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz", @@ -498,30 +596,32 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.1.tgz", - "integrity": "sha512-aoIusj/8CR+xDWmZxARivZjbMBQTT9dImUtdZ8tVCVRXgBUuuZyM5Of5A9D9arQPxbi/0rlJLcuArclz/rCMJw==", - "dev": true, - "dependencies": { - "@typescript-eslint/experimental-utils": "4.26.1", - "@typescript-eslint/scope-manager": "4.26.1", - "debug": "^4.3.1", - "functional-red-black-tree": "^1.0.1", - "lodash": "^4.17.21", - "regexpp": "^3.1.0", - "semver": "^7.3.5", + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.2.tgz", + "integrity": "sha512-yVrXupeHjRxLDcPKL10sGQ/QlVrA8J5IYOEWVqk0lJaSZP7X5DfnP7Ns3cc74/blmbipQ1htFNVGsHX6wsYm0A==", + "dev": true, + "dependencies": { + "@eslint-community/regexpp": "^4.4.0", + "@typescript-eslint/scope-manager": "5.59.2", + "@typescript-eslint/type-utils": "5.59.2", + "@typescript-eslint/utils": "5.59.2", + "debug": "^4.3.4", + "grapheme-splitter": "^1.0.4", + "ignore": "^5.2.0", + "natural-compare-lite": "^1.4.0", + "semver": "^7.3.7", "tsutils": "^3.21.0" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^4.0.0", - "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0" + "@typescript-eslint/parser": "^5.0.0", + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -529,50 +629,43 @@ } } }, - "node_modules/@typescript-eslint/experimental-utils": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.1.tgz", - "integrity": "sha512-sQHBugRhrXzRCs9PaGg6rowie4i8s/iD/DpTB+EXte8OMDfdCG5TvO73XlO9Wc/zi0uyN4qOmX9hIjQEyhnbmQ==", + "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "dependencies": { - "@types/json-schema": "^7.0.7", - "@typescript-eslint/scope-manager": "4.26.1", - "@typescript-eslint/types": "4.26.1", - "@typescript-eslint/typescript-estree": "4.26.1", - "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0" + "ms": "2.1.2" }, "engines": { - "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "node": ">=6.0" }, - "peerDependencies": { - "eslint": "*" + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, "node_modules/@typescript-eslint/parser": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.1.tgz", - "integrity": "sha512-q7F3zSo/nU6YJpPJvQveVlIIzx9/wu75lr6oDbDzoeIRWxpoc/HQ43G4rmMoCc5my/3uSj2VEpg/D83LYZF5HQ==", + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.2.tgz", + "integrity": "sha512-uq0sKyw6ao1iFOZZGk9F8Nro/8+gfB5ezl1cA06SrqbgJAt0SRoFhb9pXaHvkrxUpZaoLxt8KlovHNk8Gp6/HQ==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "4.26.1", - "@typescript-eslint/types": "4.26.1", - "@typescript-eslint/typescript-estree": "4.26.1", - "debug": "^4.3.1" + "@typescript-eslint/scope-manager": "5.59.2", + "@typescript-eslint/types": "5.59.2", + "@typescript-eslint/typescript-estree": "5.59.2", + "debug": "^4.3.4" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0" + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -580,30 +673,91 @@ } } }, + "node_modules/@typescript-eslint/parser/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, "node_modules/@typescript-eslint/scope-manager": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.1.tgz", - "integrity": "sha512-TW1X2p62FQ8Rlne+WEShyd7ac2LA6o27S9i131W4NwDSfyeVlQWhw8ylldNNS8JG6oJB9Ha9Xyc+IUcqipvheQ==", + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.2.tgz", + "integrity": "sha512-dB1v7ROySwQWKqQ8rEWcdbTsFjh2G0vn8KUyvTXdPoyzSL6lLGkiXEV5CvpJsEe9xIdKV+8Zqb7wif2issoOFA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.59.2", + "@typescript-eslint/visitor-keys": "5.59.2" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils": { + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.2.tgz", + "integrity": "sha512-b1LS2phBOsEy/T381bxkkywfQXkV1dWda/z0PhnIy3bC5+rQWQDS7fk9CSpcXBccPY27Z6vBEuaPBCKCgYezyQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "4.26.1", - "@typescript-eslint/visitor-keys": "4.26.1" + "@typescript-eslint/typescript-estree": "5.59.2", + "@typescript-eslint/utils": "5.59.2", + "debug": "^4.3.4", + "tsutils": "^3.21.0" }, "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/type-utils/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, "node_modules/@typescript-eslint/types": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.1.tgz", - "integrity": "sha512-STyMPxR3cS+LaNvS8yK15rb8Y0iL0tFXq0uyl6gY45glyI7w0CsyqyEXl/Fa0JlQy+pVANeK3sbwPneCbWE7yg==", + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.2.tgz", + "integrity": "sha512-LbJ/HqoVs2XTGq5shkiKaNTuVv5tTejdHgfdjqRUGdYhjW1crm/M7og2jhVskMt8/4wS3T1+PfFvL1K3wqYj4w==", "dev": true, "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { "type": "opencollective", @@ -611,21 +765,21 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.1.tgz", - "integrity": "sha512-l3ZXob+h0NQzz80lBGaykdScYaiEbFqznEs99uwzm8fPHhDjwaBFfQkjUC/slw6Sm7npFL8qrGEAMxcfBsBJUg==", + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.2.tgz", + "integrity": "sha512-+j4SmbwVmZsQ9jEyBMgpuBD0rKwi9RxRpjX71Brr73RsYnEr3Lt5QZ624Bxphp8HUkSKfqGnPJp1kA5nl0Sh7Q==", "dev": true, "dependencies": { - "@typescript-eslint/types": "4.26.1", - "@typescript-eslint/visitor-keys": "4.26.1", - "debug": "^4.3.1", - "globby": "^11.0.3", - "is-glob": "^4.0.1", - "semver": "^7.3.5", + "@typescript-eslint/types": "5.59.2", + "@typescript-eslint/visitor-keys": "5.59.2", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.3.7", "tsutils": "^3.21.0" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { "type": "opencollective", @@ -637,17 +791,60 @@ } } }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.2.tgz", + "integrity": "sha512-kSuF6/77TZzyGPhGO4uVp+f0SBoYxCDf+lW3GKhtKru/L8k/Hd7NFQxyWUeY7Z/KGB2C6Fe3yf2vVi4V9TsCSQ==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@types/json-schema": "^7.0.9", + "@types/semver": "^7.3.12", + "@typescript-eslint/scope-manager": "5.59.2", + "@typescript-eslint/types": "5.59.2", + "@typescript-eslint/typescript-estree": "5.59.2", + "eslint-scope": "^5.1.1", + "semver": "^7.3.7" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.1.tgz", - "integrity": "sha512-IGouNSSd+6x/fHtYRyLOM6/C+QxMDzWlDtN41ea+flWuSF9g02iqcIlX8wM53JkfljoIjP0U+yp7SiTS1onEkw==", + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.2.tgz", + "integrity": "sha512-EEpsO8m3RASrKAHI9jpavNv9NlEUebV4qmF1OWxSTtKSFBpC1NCmWazDQHFivRf0O1DV11BA645yrLEVQ0/Lig==", "dev": true, "dependencies": { - "@typescript-eslint/types": "4.26.1", - "eslint-visitor-keys": "^2.0.0" + "@typescript-eslint/types": "5.59.2", + "eslint-visitor-keys": "^3.3.0" }, "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { "type": "opencollective", @@ -882,9 +1079,9 @@ } }, "node_modules/acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", + "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -894,9 +1091,9 @@ } }, "node_modules/acorn-jsx": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", - "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" @@ -1081,6 +1278,19 @@ "sprintf-js": "~1.0.2" } }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", + "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "is-array-buffer": "^3.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -1088,16 +1298,16 @@ "dev": true }, "node_modules/array-includes": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz", - "integrity": "sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", + "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2", - "get-intrinsic": "^1.1.1", - "is-string": "^1.0.5" + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "get-intrinsic": "^1.1.3", + "is-string": "^1.0.7" }, "engines": { "node": ">= 0.4" @@ -1116,14 +1326,33 @@ } }, "node_modules/array.prototype.flat": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz", - "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", + "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", "dev": true, "dependencies": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1" + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flatmap": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz", + "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "es-shim-unscopables": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -1189,9 +1418,9 @@ "dev": true }, "node_modules/available-typed-arrays": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz", - "integrity": "sha512-SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", + "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", "dev": true, "engines": { "node": ">= 0.4" @@ -2208,15 +2437,19 @@ } }, "node_modules/define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", + "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", "dev": true, "dependencies": { - "object-keys": "^1.0.12" + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/delayed-stream": { @@ -2392,27 +2625,45 @@ } }, "node_modules/es-abstract": { - "version": "1.18.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz", - "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==", + "version": "1.21.2", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz", + "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==", "dev": true, "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", + "es-set-tostringtag": "^2.0.1", "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "get-intrinsic": "^1.1.1", + "function.prototype.name": "^1.1.5", + "get-intrinsic": "^1.2.0", + "get-symbol-description": "^1.0.0", + "globalthis": "^1.0.3", + "gopd": "^1.0.1", "has": "^1.0.3", - "has-symbols": "^1.0.2", - "is-callable": "^1.2.3", - "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.3", - "is-string": "^1.0.6", - "object-inspect": "^1.10.3", + "has-property-descriptors": "^1.0.0", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.5", + "is-array-buffer": "^3.0.2", + "is-callable": "^1.2.7", + "is-negative-zero": "^2.0.2", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.2", + "is-string": "^1.0.7", + "is-typed-array": "^1.1.10", + "is-weakref": "^1.0.2", + "object-inspect": "^1.12.3", "object-keys": "^1.1.1", - "object.assign": "^4.1.2", - "string.prototype.trimend": "^1.0.4", - "string.prototype.trimstart": "^1.0.4", - "unbox-primitive": "^1.0.1" + "object.assign": "^4.1.4", + "regexp.prototype.flags": "^1.4.3", + "safe-regex-test": "^1.0.0", + "string.prototype.trim": "^1.2.7", + "string.prototype.trimend": "^1.0.6", + "string.prototype.trimstart": "^1.0.6", + "typed-array-length": "^1.0.4", + "unbox-primitive": "^1.0.2", + "which-typed-array": "^1.1.9" }, "engines": { "node": ">= 0.4" @@ -2427,6 +2678,29 @@ "integrity": "sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==", "dev": true }, + "node_modules/es-set-tostringtag": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", + "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.3", + "has": "^1.0.3", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-shim-unscopables": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", + "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", + "dev": true, + "dependencies": { + "has": "^1.0.3" + } + }, "node_modules/es-to-primitive": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", @@ -2507,48 +2781,48 @@ } }, "node_modules/eslint": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz", - "integrity": "sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g==", + "version": "8.22.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz", + "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==", "dev": true, "dependencies": { - "@babel/code-frame": "7.12.11", - "@eslint/eslintrc": "^0.4.2", + "@eslint/eslintrc": "^1.3.0", + "@humanwhocodes/config-array": "^0.10.4", + "@humanwhocodes/gitignore-to-minimatch": "^1.0.2", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", - "debug": "^4.0.1", + "debug": "^4.3.2", "doctrine": "^3.0.0", - "enquirer": "^2.3.5", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^2.0.0", - "espree": "^7.3.1", + "eslint-scope": "^7.1.1", + "eslint-utils": "^3.0.0", + "eslint-visitor-keys": "^3.3.0", + "espree": "^9.3.3", "esquery": "^1.4.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.1.2", - "globals": "^13.6.0", - "ignore": "^4.0.6", + "glob-parent": "^6.0.1", + "globals": "^13.15.0", + "globby": "^11.1.0", + "grapheme-splitter": "^1.0.4", + "ignore": "^5.2.0", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", - "js-yaml": "^3.13.1", + "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", - "minimatch": "^3.0.4", + "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.1", - "progress": "^2.0.0", - "regexpp": "^3.1.0", - "semver": "^7.2.1", - "strip-ansi": "^6.0.0", + "regexpp": "^3.2.0", + "strip-ansi": "^6.0.1", "strip-json-comments": "^3.1.0", - "table": "^6.0.9", "text-table": "^0.2.0", "v8-compile-cache": "^2.0.3" }, @@ -2556,28 +2830,38 @@ "eslint": "bin/eslint.js" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { "url": "https://opencollective.com/eslint" } }, "node_modules/eslint-config-airbnb-base": { - "version": "14.2.1", - "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz", - "integrity": "sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA==", + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz", + "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==", "dev": true, "dependencies": { "confusing-browser-globals": "^1.0.10", "object.assign": "^4.1.2", - "object.entries": "^1.1.2" + "object.entries": "^1.1.5", + "semver": "^6.3.0" }, "engines": { - "node": ">= 6" + "node": "^10.12.0 || >=12.0.0" }, "peerDependencies": { - "eslint": "^5.16.0 || ^6.8.0 || ^7.2.0", - "eslint-plugin-import": "^2.22.1" + "eslint": "^7.32.0 || ^8.2.0", + "eslint-plugin-import": "^2.25.2" + } + }, + "node_modules/eslint-config-airbnb-base/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" } }, "node_modules/eslint-config-prettier": { @@ -2593,41 +2877,40 @@ } }, "node_modules/eslint-import-resolver-node": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz", - "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==", + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz", + "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==", "dev": true, "dependencies": { - "debug": "^2.6.9", - "resolve": "^1.13.1" + "debug": "^3.2.7", + "is-core-module": "^2.11.0", + "resolve": "^1.22.1" } }, "node_modules/eslint-import-resolver-node/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "dependencies": { - "ms": "2.0.0" + "ms": "^2.1.1" } }, - "node_modules/eslint-import-resolver-node/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, "node_modules/eslint-module-utils": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz", - "integrity": "sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", + "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", "dev": true, "dependencies": { - "debug": "^3.2.7", - "pkg-dir": "^2.0.0" + "debug": "^3.2.7" }, "engines": { "node": ">=4" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } } }, "node_modules/eslint-module-utils/node_modules/debug": { @@ -2640,41 +2923,41 @@ } }, "node_modules/eslint-plugin-import": { - "version": "2.23.4", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz", - "integrity": "sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ==", + "version": "2.27.5", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz", + "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==", "dev": true, "dependencies": { - "array-includes": "^3.1.3", - "array.prototype.flat": "^1.2.4", - "debug": "^2.6.9", + "array-includes": "^3.1.6", + "array.prototype.flat": "^1.3.1", + "array.prototype.flatmap": "^1.3.1", + "debug": "^3.2.7", "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.4", - "eslint-module-utils": "^2.6.1", - "find-up": "^2.0.0", + "eslint-import-resolver-node": "^0.3.7", + "eslint-module-utils": "^2.7.4", "has": "^1.0.3", - "is-core-module": "^2.4.0", - "minimatch": "^3.0.4", - "object.values": "^1.1.3", - "pkg-up": "^2.0.0", - "read-pkg-up": "^3.0.0", - "resolve": "^1.20.0", - "tsconfig-paths": "^3.9.0" + "is-core-module": "^2.11.0", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.values": "^1.1.6", + "resolve": "^1.22.1", + "semver": "^6.3.0", + "tsconfig-paths": "^3.14.1" }, "engines": { "node": ">=4" }, "peerDependencies": { - "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0" + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" } }, "node_modules/eslint-plugin-import/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "dependencies": { - "ms": "2.0.0" + "ms": "^2.1.1" } }, "node_modules/eslint-plugin-import/node_modules/doctrine": { @@ -2689,11 +2972,14 @@ "node": ">=0.10.0" } }, - "node_modules/eslint-plugin-import/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "node_modules/eslint-plugin-import/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } }, "node_modules/eslint-plugin-tsdoc": { "version": "0.2.14", @@ -2736,7 +3022,7 @@ "eslint": ">=5" } }, - "node_modules/eslint-visitor-keys": { + "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", @@ -2745,6 +3031,24 @@ "node": ">=10" } }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz", + "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/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 + }, "node_modules/eslint/node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -2759,6 +3063,23 @@ "node": ">= 8" } }, + "node_modules/eslint/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, "node_modules/eslint/node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -2771,28 +3092,123 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint/node_modules/eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "node_modules/eslint/node_modules/eslint-scope": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz", + "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==", "dev": true, "dependencies": { - "eslint-visitor-keys": "^1.1.0" + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" }, "engines": { - "node": ">=6" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { - "url": "https://github.com/sponsors/mysticatea" + "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint/node_modules/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "node_modules/eslint/node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, "engines": { - "node": ">=4" + "node": ">=4.0" + } + }, + "node_modules/eslint/node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/eslint/node_modules/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, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/eslint/node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/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, + "engines": { + "node": ">=8" } }, "node_modules/eslint/node_modules/path-key": { @@ -2841,26 +3257,20 @@ } }, "node_modules/espree": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", - "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", + "version": "9.5.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz", + "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==", "dev": true, "dependencies": { - "acorn": "^7.4.0", - "acorn-jsx": "^5.3.1", - "eslint-visitor-keys": "^1.3.0" + "acorn": "^8.8.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.0" }, "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/espree/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "engines": { - "node": ">=4" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/esprima": { @@ -2877,9 +3287,9 @@ } }, "node_modules/esquery": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", - "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", + "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", "dev": true, "dependencies": { "estraverse": "^5.1.0" @@ -2889,9 +3299,9 @@ } }, "node_modules/esquery/node_modules/estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, "engines": { "node": ">=4.0" @@ -3227,20 +3637,19 @@ "dev": true }, "node_modules/fast-glob": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz", - "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==", + "version": "3.2.12", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", + "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.0", + "glob-parent": "^5.1.2", "merge2": "^1.3.0", - "micromatch": "^4.0.2", - "picomatch": "^2.2.1" + "micromatch": "^4.0.4" }, "engines": { - "node": ">=8" + "node": ">=8.6.0" } }, "node_modules/fast-json-stable-stringify": { @@ -3265,9 +3674,9 @@ } }, "node_modules/fastq": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz", - "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", + "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", "dev": true, "dependencies": { "reusify": "^1.0.4" @@ -3351,18 +3760,6 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, - "node_modules/find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "dependencies": { - "locate-path": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/find-versions": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-4.0.0.tgz", @@ -3426,11 +3823,14 @@ } } }, - "node_modules/foreach": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", - "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", - "dev": true + "node_modules/for-each": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", + "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "dev": true, + "dependencies": { + "is-callable": "^1.1.3" + } }, "node_modules/forever-agent": { "version": "0.6.1", @@ -3511,12 +3911,39 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, + "node_modules/function.prototype.name": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", + "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "es-abstract": "^1.19.0", + "functions-have-names": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/functional-red-black-tree": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, + "node_modules/functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/geckodriver": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/geckodriver/-/geckodriver-3.2.0.tgz", @@ -3547,14 +3974,14 @@ } }, "node_modules/get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", + "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", "dev": true, "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", - "has-symbols": "^1.0.1" + "has-symbols": "^1.0.3" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3581,6 +4008,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/get-symbol-description": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", + "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/getpass": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", @@ -3639,9 +4082,9 @@ "dev": true }, "node_modules/globals": { - "version": "13.9.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz", - "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==", + "version": "13.20.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", + "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -3653,17 +4096,32 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/globalthis": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", + "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/globby": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz", - "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", "dev": true, "dependencies": { "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" }, "engines": { @@ -3673,13 +4131,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/globby/node_modules/ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", "dev": true, - "engines": { - "node": ">= 4" + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/got": { @@ -3713,6 +4174,12 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, + "node_modules/grapheme-splitter": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", + "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "dev": true + }, "node_modules/growl": { "version": "1.10.5", "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", @@ -3758,9 +4225,9 @@ } }, "node_modules/has-bigints": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", - "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3775,10 +4242,34 @@ "node": ">=8" } }, + "node_modules/has-property-descriptors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", + "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/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==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "dev": true, "engines": { "node": ">= 0.4" @@ -3787,6 +4278,21 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/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, + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -4050,9 +4556,9 @@ ] }, "node_modules/ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", + "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", "dev": true, "engines": { "node": ">= 4" @@ -4215,6 +4721,20 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "dev": true }, + "node_modules/internal-slot": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", + "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.0", + "has": "^1.0.3", + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/interpret": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz", @@ -4257,6 +4777,20 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-array-buffer": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", + "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.0", + "is-typed-array": "^1.1.10" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", @@ -4264,10 +4798,13 @@ "dev": true }, "node_modules/is-bigint": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz", - "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", "dev": true, + "dependencies": { + "has-bigints": "^1.0.1" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -4285,12 +4822,13 @@ } }, "node_modules/is-boolean-object": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz", - "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", "dev": true, "dependencies": { - "call-bind": "^1.0.2" + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -4300,9 +4838,9 @@ } }, "node_modules/is-callable": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz", - "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", "dev": true, "engines": { "node": ">= 0.4" @@ -4312,9 +4850,9 @@ } }, "node_modules/is-core-module": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz", - "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==", + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz", + "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==", "dev": true, "dependencies": { "has": "^1.0.3" @@ -4372,9 +4910,9 @@ } }, "node_modules/is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, "dependencies": { "is-extglob": "^2.1.1" @@ -4400,9 +4938,9 @@ } }, "node_modules/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==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", + "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", "dev": true, "engines": { "node": ">= 0.4" @@ -4421,10 +4959,13 @@ } }, "node_modules/is-number-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz", - "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", + "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, "engines": { "node": ">= 0.4" }, @@ -4463,13 +5004,13 @@ } }, "node_modules/is-regex": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz", - "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==", + "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, "dependencies": { "call-bind": "^1.0.2", - "has-symbols": "^1.0.2" + "has-tostringtag": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -4487,6 +5028,18 @@ "node": ">=0.10.0" } }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", + "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", @@ -4497,10 +5050,13 @@ } }, "node_modules/is-string": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz", - "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, "engines": { "node": ">= 0.4" }, @@ -4524,16 +5080,16 @@ } }, "node_modules/is-typed-array": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.5.tgz", - "integrity": "sha512-S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug==", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", + "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.2", + "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", - "es-abstract": "^1.18.0-next.2", - "foreach": "^2.0.5", - "has-symbols": "^1.0.1" + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-tostringtag": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -4566,6 +5122,18 @@ "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==", "dev": true }, + "node_modules/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, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is2": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.7.tgz", @@ -4681,12 +5249,6 @@ "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", "dev": true }, - "node_modules/json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", - "dev": true - }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -4894,34 +5456,6 @@ "enquirer": ">= 2.3.0 < 3" } }, - "node_modules/load-json-file": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", - "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/load-json-file/node_modules/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dev": true, - "dependencies": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/loader-runner": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz", @@ -4931,43 +5465,18 @@ "node": ">=6.11.5" } }, - "node_modules/locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "dependencies": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, - "node_modules/lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "node_modules/lodash.truncate": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=", - "dev": true - }, "node_modules/log-driver": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", @@ -5582,6 +6091,12 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, + "node_modules/natural-compare-lite": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", + "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", + "dev": true + }, "node_modules/negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", @@ -5725,9 +6240,9 @@ } }, "node_modules/object-inspect": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz", - "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==", + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5759,14 +6274,14 @@ } }, "node_modules/object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", + "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "has-symbols": "^1.0.3", "object-keys": "^1.1.1" }, "engines": { @@ -5777,28 +6292,28 @@ } }, "node_modules/object.entries": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.4.tgz", - "integrity": "sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz", + "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.2" + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" }, "engines": { "node": ">= 0.4" } }, "node_modules/object.values": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz", - "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", + "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.2" + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" }, "engines": { "node": ">= 0.4" @@ -5878,30 +6393,6 @@ "node": ">=8" } }, - "node_modules/p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "dependencies": { - "p-try": "^1.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "dependencies": { - "p-limit": "^1.1.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/p-map": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", @@ -5917,15 +6408,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/pad-right": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/pad-right/-/pad-right-0.2.2.tgz", @@ -5983,15 +6465,6 @@ "node": ">= 0.8" } }, - "node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", @@ -6040,52 +6513,19 @@ "node_modules/performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true - }, - "node_modules/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, - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true, - "engines": { - "node": ">=4" - } + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", + "dev": true }, - "node_modules/pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", + "node_modules/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, - "dependencies": { - "find-up": "^2.1.0" - }, "engines": { - "node": ">=4" - } - }, - "node_modules/pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz", - "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=", - "dev": true, - "dependencies": { - "find-up": "^2.1.0" + "node": ">=8.6" }, - "engines": { - "node": ">=4" + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" } }, "node_modules/please-upgrade-node": { @@ -6281,45 +6721,6 @@ "node": ">=8" } }, - "node_modules/read-pkg-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", - "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=", - "dev": true, - "dependencies": { - "find-up": "^2.0.0", - "read-pkg": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/read-pkg-up/node_modules/path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "dev": true, - "dependencies": { - "pify": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/read-pkg-up/node_modules/read-pkg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", - "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", - "dev": true, - "dependencies": { - "load-json-file": "^4.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/read-pkg/node_modules/type-fest": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", @@ -6374,10 +6775,27 @@ "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==", "dev": true }, + "node_modules/regexp.prototype.flags": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", + "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "functions-have-names": "^1.2.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/regexpp": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", - "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", "dev": true, "engines": { "node": ">=8" @@ -6445,23 +6863,18 @@ "node": ">=0.10.0" } }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/resolve": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", - "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "version": "1.22.2", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz", + "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==", "dev": true, "dependencies": { - "is-core-module": "^2.2.0", - "path-parse": "^1.0.6" + "is-core-module": "^2.11.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6594,6 +7007,20 @@ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, + "node_modules/safe-regex-test": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", + "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.3", + "is-regex": "^1.1.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -6639,9 +7066,9 @@ } }, "node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", + "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -7135,27 +7562,46 @@ "node": ">=4" } }, + "node_modules/string.prototype.trim": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", + "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/string.prototype.trimend": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", - "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", + "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3" + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/string.prototype.trimstart": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", - "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", + "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3" + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -7176,12 +7622,12 @@ } }, "node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "dependencies": { - "ansi-regex": "^5.0.0" + "ansi-regex": "^5.0.1" }, "engines": { "node": ">=8" @@ -7190,7 +7636,7 @@ "node_modules/strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", "dev": true, "engines": { "node": ">=4" @@ -7232,74 +7678,16 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/table": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz", - "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==", - "dev": true, - "dependencies": { - "ajv": "^8.0.1", - "lodash.clonedeep": "^4.5.0", - "lodash.truncate": "^4.4.2", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/table/node_modules/ajv": { - "version": "8.6.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz", - "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/table/node_modules/json-schema-traverse": { + "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "node_modules/table/node_modules/slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - }, "engines": { - "node": ">=10" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, - "node_modules/table/node_modules/string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/tapable": { @@ -7409,18 +7797,6 @@ "randombytes": "^2.1.0" } }, - "node_modules/terser/node_modules/acorn": { - "version": "8.8.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", - "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -7586,18 +7962,6 @@ } } }, - "node_modules/ts-node/node_modules/acorn": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", - "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/ts-node/node_modules/diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -7608,14 +7972,14 @@ } }, "node_modules/tsconfig-paths": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz", - "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==", + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz", + "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==", "dev": true, "dependencies": { "@types/json5": "^0.0.29", - "json5": "^1.0.1", - "minimist": "^1.2.0", + "json5": "^1.0.2", + "minimist": "^1.2.6", "strip-bom": "^3.0.0" } }, @@ -7700,6 +8064,20 @@ "node": ">= 0.6" } }, + "node_modules/typed-array-length": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", + "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "is-typed-array": "^1.1.9" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/typedoc": { "version": "0.23.8", "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.23.8.tgz", @@ -7786,14 +8164,14 @@ } }, "node_modules/unbox-primitive": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz", - "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", + "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", "dev": true, "dependencies": { - "function-bind": "^1.1.1", - "has-bigints": "^1.0.1", - "has-symbols": "^1.0.2", + "call-bind": "^1.0.2", + "has-bigints": "^1.0.2", + "has-symbols": "^1.0.3", "which-boxed-primitive": "^1.0.2" }, "funding": { @@ -8143,18 +8521,6 @@ "node": ">=10.13.0" } }, - "node_modules/webpack/node_modules/acorn": { - "version": "8.8.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", - "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/webpack/node_modules/acorn-import-assertions": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", @@ -8208,18 +8574,17 @@ "dev": true }, "node_modules/which-typed-array": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.4.tgz", - "integrity": "sha512-49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA==", + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", + "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.2", - "call-bind": "^1.0.0", - "es-abstract": "^1.18.0-next.1", - "foreach": "^2.0.5", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.1", - "is-typed-array": "^1.1.3" + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-tostringtag": "^1.0.0", + "is-typed-array": "^1.1.10" }, "engines": { "node": ">= 0.4" @@ -8523,23 +8888,87 @@ "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==", "dev": true }, + "@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^3.3.0" + } + }, + "@eslint-community/regexpp": { + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz", + "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==", + "dev": true + }, "@eslint/eslintrc": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz", - "integrity": "sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz", + "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==", "dev": true, "requires": { "ajv": "^6.12.4", - "debug": "^4.1.1", - "espree": "^7.3.0", - "globals": "^13.9.0", - "ignore": "^4.0.6", + "debug": "^4.3.2", + "espree": "^9.4.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", "import-fresh": "^3.2.1", - "js-yaml": "^3.13.1", - "minimatch": "^3.0.4", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", "strip-json-comments": "^3.1.1" + }, + "dependencies": { + "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 + }, + "debug": { + "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" + } + }, + "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" + } + } + } + }, + "@humanwhocodes/config-array": { + "version": "0.10.7", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz", + "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==", + "dev": true, + "requires": { + "@humanwhocodes/object-schema": "^1.2.1", + "debug": "^4.1.1", + "minimatch": "^3.0.4" } }, + "@humanwhocodes/gitignore-to-minimatch": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz", + "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==", + "dev": true + }, + "@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 + }, "@jridgewell/gen-mapping": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", @@ -8636,9 +9065,9 @@ "dev": true }, "@nodelib/fs.walk": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz", - "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", "dev": true, "requires": { "@nodelib/fs.scandir": "2.1.5", @@ -8749,7 +9178,7 @@ "@types/json5": { "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", - "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", "dev": true }, "@types/keyv": { @@ -8794,6 +9223,12 @@ "@types/node": "*" } }, + "@types/semver": { + "version": "7.3.13", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz", + "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==", + "dev": true + }, "@types/yauzl": { "version": "2.9.1", "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz", @@ -8805,86 +9240,146 @@ } }, "@typescript-eslint/eslint-plugin": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.1.tgz", - "integrity": "sha512-aoIusj/8CR+xDWmZxARivZjbMBQTT9dImUtdZ8tVCVRXgBUuuZyM5Of5A9D9arQPxbi/0rlJLcuArclz/rCMJw==", - "dev": true, - "requires": { - "@typescript-eslint/experimental-utils": "4.26.1", - "@typescript-eslint/scope-manager": "4.26.1", - "debug": "^4.3.1", - "functional-red-black-tree": "^1.0.1", - "lodash": "^4.17.21", - "regexpp": "^3.1.0", - "semver": "^7.3.5", + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.2.tgz", + "integrity": "sha512-yVrXupeHjRxLDcPKL10sGQ/QlVrA8J5IYOEWVqk0lJaSZP7X5DfnP7Ns3cc74/blmbipQ1htFNVGsHX6wsYm0A==", + "dev": true, + "requires": { + "@eslint-community/regexpp": "^4.4.0", + "@typescript-eslint/scope-manager": "5.59.2", + "@typescript-eslint/type-utils": "5.59.2", + "@typescript-eslint/utils": "5.59.2", + "debug": "^4.3.4", + "grapheme-splitter": "^1.0.4", + "ignore": "^5.2.0", + "natural-compare-lite": "^1.4.0", + "semver": "^7.3.7", "tsutils": "^3.21.0" + }, + "dependencies": { + "debug": { + "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" + } + } } }, - "@typescript-eslint/experimental-utils": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.1.tgz", - "integrity": "sha512-sQHBugRhrXzRCs9PaGg6rowie4i8s/iD/DpTB+EXte8OMDfdCG5TvO73XlO9Wc/zi0uyN4qOmX9hIjQEyhnbmQ==", + "@typescript-eslint/parser": { + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.2.tgz", + "integrity": "sha512-uq0sKyw6ao1iFOZZGk9F8Nro/8+gfB5ezl1cA06SrqbgJAt0SRoFhb9pXaHvkrxUpZaoLxt8KlovHNk8Gp6/HQ==", "dev": true, "requires": { - "@types/json-schema": "^7.0.7", - "@typescript-eslint/scope-manager": "4.26.1", - "@typescript-eslint/types": "4.26.1", - "@typescript-eslint/typescript-estree": "4.26.1", - "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0" + "@typescript-eslint/scope-manager": "5.59.2", + "@typescript-eslint/types": "5.59.2", + "@typescript-eslint/typescript-estree": "5.59.2", + "debug": "^4.3.4" + }, + "dependencies": { + "debug": { + "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" + } + } } }, - "@typescript-eslint/parser": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.1.tgz", - "integrity": "sha512-q7F3zSo/nU6YJpPJvQveVlIIzx9/wu75lr6oDbDzoeIRWxpoc/HQ43G4rmMoCc5my/3uSj2VEpg/D83LYZF5HQ==", + "@typescript-eslint/scope-manager": { + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.2.tgz", + "integrity": "sha512-dB1v7ROySwQWKqQ8rEWcdbTsFjh2G0vn8KUyvTXdPoyzSL6lLGkiXEV5CvpJsEe9xIdKV+8Zqb7wif2issoOFA==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "4.26.1", - "@typescript-eslint/types": "4.26.1", - "@typescript-eslint/typescript-estree": "4.26.1", - "debug": "^4.3.1" + "@typescript-eslint/types": "5.59.2", + "@typescript-eslint/visitor-keys": "5.59.2" } }, - "@typescript-eslint/scope-manager": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.1.tgz", - "integrity": "sha512-TW1X2p62FQ8Rlne+WEShyd7ac2LA6o27S9i131W4NwDSfyeVlQWhw8ylldNNS8JG6oJB9Ha9Xyc+IUcqipvheQ==", + "@typescript-eslint/type-utils": { + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.2.tgz", + "integrity": "sha512-b1LS2phBOsEy/T381bxkkywfQXkV1dWda/z0PhnIy3bC5+rQWQDS7fk9CSpcXBccPY27Z6vBEuaPBCKCgYezyQ==", "dev": true, "requires": { - "@typescript-eslint/types": "4.26.1", - "@typescript-eslint/visitor-keys": "4.26.1" + "@typescript-eslint/typescript-estree": "5.59.2", + "@typescript-eslint/utils": "5.59.2", + "debug": "^4.3.4", + "tsutils": "^3.21.0" + }, + "dependencies": { + "debug": { + "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" + } + } } }, "@typescript-eslint/types": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.1.tgz", - "integrity": "sha512-STyMPxR3cS+LaNvS8yK15rb8Y0iL0tFXq0uyl6gY45glyI7w0CsyqyEXl/Fa0JlQy+pVANeK3sbwPneCbWE7yg==", + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.2.tgz", + "integrity": "sha512-LbJ/HqoVs2XTGq5shkiKaNTuVv5tTejdHgfdjqRUGdYhjW1crm/M7og2jhVskMt8/4wS3T1+PfFvL1K3wqYj4w==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.1.tgz", - "integrity": "sha512-l3ZXob+h0NQzz80lBGaykdScYaiEbFqznEs99uwzm8fPHhDjwaBFfQkjUC/slw6Sm7npFL8qrGEAMxcfBsBJUg==", + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.2.tgz", + "integrity": "sha512-+j4SmbwVmZsQ9jEyBMgpuBD0rKwi9RxRpjX71Brr73RsYnEr3Lt5QZ624Bxphp8HUkSKfqGnPJp1kA5nl0Sh7Q==", "dev": true, "requires": { - "@typescript-eslint/types": "4.26.1", - "@typescript-eslint/visitor-keys": "4.26.1", - "debug": "^4.3.1", - "globby": "^11.0.3", - "is-glob": "^4.0.1", - "semver": "^7.3.5", + "@typescript-eslint/types": "5.59.2", + "@typescript-eslint/visitor-keys": "5.59.2", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.3.7", "tsutils": "^3.21.0" + }, + "dependencies": { + "debug": { + "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" + } + } + } + }, + "@typescript-eslint/utils": { + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.2.tgz", + "integrity": "sha512-kSuF6/77TZzyGPhGO4uVp+f0SBoYxCDf+lW3GKhtKru/L8k/Hd7NFQxyWUeY7Z/KGB2C6Fe3yf2vVi4V9TsCSQ==", + "dev": true, + "requires": { + "@eslint-community/eslint-utils": "^4.2.0", + "@types/json-schema": "^7.0.9", + "@types/semver": "^7.3.12", + "@typescript-eslint/scope-manager": "5.59.2", + "@typescript-eslint/types": "5.59.2", + "@typescript-eslint/typescript-estree": "5.59.2", + "eslint-scope": "^5.1.1", + "semver": "^7.3.7" } }, "@typescript-eslint/visitor-keys": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.1.tgz", - "integrity": "sha512-IGouNSSd+6x/fHtYRyLOM6/C+QxMDzWlDtN41ea+flWuSF9g02iqcIlX8wM53JkfljoIjP0U+yp7SiTS1onEkw==", + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.2.tgz", + "integrity": "sha512-EEpsO8m3RASrKAHI9jpavNv9NlEUebV4qmF1OWxSTtKSFBpC1NCmWazDQHFivRf0O1DV11BA645yrLEVQ0/Lig==", "dev": true, "requires": { - "@typescript-eslint/types": "4.26.1", - "eslint-visitor-keys": "^2.0.0" + "@typescript-eslint/types": "5.59.2", + "eslint-visitor-keys": "^3.3.0" } }, "@ungap/promise-all-settled": { @@ -9089,15 +9584,15 @@ } }, "acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", + "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", "dev": true }, "acorn-jsx": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", - "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, "requires": {} }, @@ -9233,6 +9728,16 @@ "sprintf-js": "~1.0.2" } }, + "array-buffer-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", + "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "is-array-buffer": "^3.0.1" + } + }, "array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -9240,16 +9745,16 @@ "dev": true }, "array-includes": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz", - "integrity": "sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", + "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2", - "get-intrinsic": "^1.1.1", - "is-string": "^1.0.5" + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "get-intrinsic": "^1.1.3", + "is-string": "^1.0.7" } }, "array-union": { @@ -9259,14 +9764,27 @@ "dev": true }, "array.prototype.flat": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz", - "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", + "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", "dev": true, "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1" + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "es-shim-unscopables": "^1.0.0" + } + }, + "array.prototype.flatmap": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz", + "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "es-shim-unscopables": "^1.0.0" } }, "asn1": { @@ -9320,9 +9838,9 @@ "dev": true }, "available-typed-arrays": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz", - "integrity": "sha512-SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", + "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", "dev": true }, "aws-sign2": { @@ -10097,12 +10615,13 @@ "dev": true }, "define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", + "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", "dev": true, "requires": { - "object-keys": "^1.0.12" + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" } }, "delayed-stream": { @@ -10244,27 +10763,45 @@ } }, "es-abstract": { - "version": "1.18.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz", - "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==", + "version": "1.21.2", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz", + "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==", "dev": true, "requires": { + "array-buffer-byte-length": "^1.0.0", + "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", + "es-set-tostringtag": "^2.0.1", "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "get-intrinsic": "^1.1.1", + "function.prototype.name": "^1.1.5", + "get-intrinsic": "^1.2.0", + "get-symbol-description": "^1.0.0", + "globalthis": "^1.0.3", + "gopd": "^1.0.1", "has": "^1.0.3", - "has-symbols": "^1.0.2", - "is-callable": "^1.2.3", - "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.3", - "is-string": "^1.0.6", - "object-inspect": "^1.10.3", + "has-property-descriptors": "^1.0.0", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.5", + "is-array-buffer": "^3.0.2", + "is-callable": "^1.2.7", + "is-negative-zero": "^2.0.2", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.2", + "is-string": "^1.0.7", + "is-typed-array": "^1.1.10", + "is-weakref": "^1.0.2", + "object-inspect": "^1.12.3", "object-keys": "^1.1.1", - "object.assign": "^4.1.2", - "string.prototype.trimend": "^1.0.4", - "string.prototype.trimstart": "^1.0.4", - "unbox-primitive": "^1.0.1" + "object.assign": "^4.1.4", + "regexp.prototype.flags": "^1.4.3", + "safe-regex-test": "^1.0.0", + "string.prototype.trim": "^1.2.7", + "string.prototype.trimend": "^1.0.6", + "string.prototype.trimstart": "^1.0.6", + "typed-array-length": "^1.0.4", + "unbox-primitive": "^1.0.2", + "which-typed-array": "^1.1.9" } }, "es-module-lexer": { @@ -10273,6 +10810,26 @@ "integrity": "sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==", "dev": true }, + "es-set-tostringtag": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", + "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", + "dev": true, + "requires": { + "get-intrinsic": "^1.1.3", + "has": "^1.0.3", + "has-tostringtag": "^1.0.0" + } + }, + "es-shim-unscopables": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", + "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + }, "es-to-primitive": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", @@ -10341,52 +10898,58 @@ "dev": true }, "eslint": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz", - "integrity": "sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g==", + "version": "8.22.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz", + "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==", "dev": true, "requires": { - "@babel/code-frame": "7.12.11", - "@eslint/eslintrc": "^0.4.2", + "@eslint/eslintrc": "^1.3.0", + "@humanwhocodes/config-array": "^0.10.4", + "@humanwhocodes/gitignore-to-minimatch": "^1.0.2", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", - "debug": "^4.0.1", + "debug": "^4.3.2", "doctrine": "^3.0.0", - "enquirer": "^2.3.5", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^2.0.0", - "espree": "^7.3.1", + "eslint-scope": "^7.1.1", + "eslint-utils": "^3.0.0", + "eslint-visitor-keys": "^3.3.0", + "espree": "^9.3.3", "esquery": "^1.4.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.1.2", - "globals": "^13.6.0", - "ignore": "^4.0.6", + "glob-parent": "^6.0.1", + "globals": "^13.15.0", + "globby": "^11.1.0", + "grapheme-splitter": "^1.0.4", + "ignore": "^5.2.0", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", - "js-yaml": "^3.13.1", + "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", - "minimatch": "^3.0.4", + "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.1", - "progress": "^2.0.0", - "regexpp": "^3.1.0", - "semver": "^7.2.1", - "strip-ansi": "^6.0.0", + "regexpp": "^3.2.0", + "strip-ansi": "^6.0.1", "strip-json-comments": "^3.1.0", - "table": "^6.0.9", "text-table": "^0.2.0", "v8-compile-cache": "^2.0.3" }, "dependencies": { + "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 + }, "cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -10398,29 +10961,98 @@ "which": "^2.0.1" } }, + "debug": { + "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" + } + }, "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-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "eslint-scope": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz", + "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==", "dev": true, "requires": { - "eslint-visitor-keys": "^1.1.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true - } + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + } + }, + "estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true + }, + "find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "requires": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + } + }, + "glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "requires": { + "is-glob": "^4.0.3" + } + }, + "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" + } + }, + "locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "requires": { + "p-locate": "^5.0.0" } }, + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "requires": { + "yocto-queue": "^0.1.0" + } + }, + "p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "requires": { + "p-limit": "^3.0.2" + } + }, + "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 + }, "path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", @@ -10454,14 +11086,23 @@ } }, "eslint-config-airbnb-base": { - "version": "14.2.1", - "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz", - "integrity": "sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA==", + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz", + "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==", "dev": true, "requires": { "confusing-browser-globals": "^1.0.10", "object.assign": "^4.1.2", - "object.entries": "^1.1.2" + "object.entries": "^1.1.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 + } } }, "eslint-config-prettier": { @@ -10472,40 +11113,34 @@ "requires": {} }, "eslint-import-resolver-node": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz", - "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==", + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz", + "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==", "dev": true, "requires": { - "debug": "^2.6.9", - "resolve": "^1.13.1" + "debug": "^3.2.7", + "is-core-module": "^2.11.0", + "resolve": "^1.22.1" }, "dependencies": { "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { - "ms": "2.0.0" + "ms": "^2.1.1" } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true } } }, "eslint-module-utils": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz", - "integrity": "sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", + "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", "dev": true, "requires": { - "debug": "^3.2.7", - "pkg-dir": "^2.0.0" + "debug": "^3.2.7" }, "dependencies": { "debug": { @@ -10520,35 +11155,35 @@ } }, "eslint-plugin-import": { - "version": "2.23.4", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz", - "integrity": "sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ==", + "version": "2.27.5", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz", + "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==", "dev": true, "requires": { - "array-includes": "^3.1.3", - "array.prototype.flat": "^1.2.4", - "debug": "^2.6.9", + "array-includes": "^3.1.6", + "array.prototype.flat": "^1.3.1", + "array.prototype.flatmap": "^1.3.1", + "debug": "^3.2.7", "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.4", - "eslint-module-utils": "^2.6.1", - "find-up": "^2.0.0", + "eslint-import-resolver-node": "^0.3.7", + "eslint-module-utils": "^2.7.4", "has": "^1.0.3", - "is-core-module": "^2.4.0", - "minimatch": "^3.0.4", - "object.values": "^1.1.3", - "pkg-up": "^2.0.0", - "read-pkg-up": "^3.0.0", - "resolve": "^1.20.0", - "tsconfig-paths": "^3.9.0" + "is-core-module": "^2.11.0", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.values": "^1.1.6", + "resolve": "^1.22.1", + "semver": "^6.3.0", + "tsconfig-paths": "^3.14.1" }, "dependencies": { "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { - "ms": "2.0.0" + "ms": "^2.1.1" } }, "doctrine": { @@ -10560,10 +11195,10 @@ "esutils": "^2.0.2" } }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true } } @@ -10595,31 +11230,31 @@ "dev": true, "requires": { "eslint-visitor-keys": "^2.0.0" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true + } } }, "eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz", + "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==", "dev": true }, "espree": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", - "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", + "version": "9.5.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz", + "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==", "dev": true, "requires": { - "acorn": "^7.4.0", - "acorn-jsx": "^5.3.1", - "eslint-visitor-keys": "^1.3.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true - } + "acorn": "^8.8.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.0" } }, "esprima": { @@ -10629,18 +11264,18 @@ "dev": true }, "esquery": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", - "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", + "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", "dev": true, "requires": { "estraverse": "^5.1.0" }, "dependencies": { "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true } } @@ -10898,17 +11533,16 @@ "dev": true }, "fast-glob": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz", - "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==", + "version": "3.2.12", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", + "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.0", + "glob-parent": "^5.1.2", "merge2": "^1.3.0", - "micromatch": "^4.0.2", - "picomatch": "^2.2.1" + "micromatch": "^4.0.4" } }, "fast-json-stable-stringify": { @@ -10930,9 +11564,9 @@ "dev": true }, "fastq": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz", - "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", + "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", "dev": true, "requires": { "reusify": "^1.0.4" @@ -11006,15 +11640,6 @@ } } }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, "find-versions": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-4.0.0.tgz", @@ -11052,11 +11677,14 @@ "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", "dev": true }, - "foreach": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", - "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", - "dev": true + "for-each": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", + "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "dev": true, + "requires": { + "is-callable": "^1.1.3" + } }, "forever-agent": { "version": "0.6.1", @@ -11115,12 +11743,30 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, + "function.prototype.name": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", + "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "es-abstract": "^1.19.0", + "functions-have-names": "^1.2.2" + } + }, "functional-red-black-tree": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, + "functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true + }, "geckodriver": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/geckodriver/-/geckodriver-3.2.0.tgz", @@ -11141,14 +11787,14 @@ "dev": true }, "get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", + "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", "dev": true, "requires": { "function-bind": "^1.1.1", "has": "^1.0.3", - "has-symbols": "^1.0.1" + "has-symbols": "^1.0.3" } }, "get-own-enumerable-property-symbols": { @@ -11166,6 +11812,16 @@ "pump": "^3.0.0" } }, + "get-symbol-description": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", + "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + } + }, "getpass": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", @@ -11211,34 +11867,44 @@ "dev": true }, "globals": { - "version": "13.9.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz", - "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==", + "version": "13.20.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", + "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", "dev": true, "requires": { "type-fest": "^0.20.2" } }, + "globalthis": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", + "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", + "dev": true, + "requires": { + "define-properties": "^1.1.3" + } + }, "globby": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz", - "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==", + "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" - }, - "dependencies": { - "ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true - } + } + }, + "gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dev": true, + "requires": { + "get-intrinsic": "^1.1.3" } }, "got": { @@ -11266,6 +11932,12 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, + "grapheme-splitter": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", + "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "dev": true + }, "growl": { "version": "1.10.5", "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", @@ -11298,9 +11970,9 @@ } }, "has-bigints": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", - "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", "dev": true }, "has-flag": { @@ -11309,12 +11981,36 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, + "has-property-descriptors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", + "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "dev": true, + "requires": { + "get-intrinsic": "^1.1.1" + } + }, + "has-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "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==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "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" + } + }, "he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -11495,9 +12191,9 @@ "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" }, "ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", + "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", "dev": true }, "immediate": { @@ -11614,6 +12310,17 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "dev": true }, + "internal-slot": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", + "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", + "dev": true, + "requires": { + "get-intrinsic": "^1.2.0", + "has": "^1.0.3", + "side-channel": "^1.0.4" + } + }, "interpret": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz", @@ -11641,6 +12348,17 @@ "call-bind": "^1.0.0" } }, + "is-array-buffer": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", + "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.0", + "is-typed-array": "^1.1.10" + } + }, "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", @@ -11648,10 +12366,13 @@ "dev": true }, "is-bigint": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz", - "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==", - "dev": true + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "dev": true, + "requires": { + "has-bigints": "^1.0.1" + } }, "is-binary-path": { "version": "2.1.0", @@ -11663,24 +12384,25 @@ } }, "is-boolean-object": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz", - "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", "dev": true, "requires": { - "call-bind": "^1.0.2" + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" } }, "is-callable": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz", - "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", "dev": true }, "is-core-module": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz", - "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==", + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz", + "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==", "dev": true, "requires": { "has": "^1.0.3" @@ -11717,9 +12439,9 @@ "dev": true }, "is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, "requires": { "is-extglob": "^2.1.1" @@ -11736,9 +12458,9 @@ } }, "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==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", + "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", "dev": true }, "is-number": { @@ -11748,10 +12470,13 @@ "dev": true }, "is-number-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz", - "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==", - "dev": true + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", + "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "dev": true, + "requires": { + "has-tostringtag": "^1.0.0" + } }, "is-obj": { "version": "1.0.1", @@ -11775,13 +12500,13 @@ } }, "is-regex": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz", - "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==", + "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-symbols": "^1.0.2" + "has-tostringtag": "^1.0.0" } }, "is-regexp": { @@ -11790,6 +12515,15 @@ "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=", "dev": true }, + "is-shared-array-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", + "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2" + } + }, "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", @@ -11797,10 +12531,13 @@ "dev": true }, "is-string": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz", - "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==", - "dev": true + "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", @@ -11812,16 +12549,16 @@ } }, "is-typed-array": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.5.tgz", - "integrity": "sha512-S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug==", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", + "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", "dev": true, "requires": { - "available-typed-arrays": "^1.0.2", + "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", - "es-abstract": "^1.18.0-next.2", - "foreach": "^2.0.5", - "has-symbols": "^1.0.1" + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-tostringtag": "^1.0.0" } }, "is-typedarray": { @@ -11842,6 +12579,15 @@ "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==", "dev": true }, + "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": { + "call-bind": "^1.0.2" + } + }, "is2": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.7.tgz", @@ -11945,12 +12691,6 @@ "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", "dev": true }, - "json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", - "dev": true - }, "json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -12127,70 +12867,24 @@ "wrap-ansi": "^7.0.0" } }, - "load-json-file": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", - "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" - }, - "dependencies": { - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dev": true, - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } - } - } - }, "loader-runner": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz", "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==", "dev": true }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, "lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, - "lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, "lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "lodash.truncate": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=", - "dev": true - }, "log-driver": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", @@ -12630,6 +13324,12 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, + "natural-compare-lite": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", + "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", + "dev": true + }, "negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", @@ -12739,9 +13439,9 @@ "dev": true }, "object-inspect": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz", - "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==", + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", "dev": true }, "object-is": { @@ -12761,37 +13461,37 @@ "dev": true }, "object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", + "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", "dev": true, "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "has-symbols": "^1.0.3", "object-keys": "^1.1.1" } }, "object.entries": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.4.tgz", - "integrity": "sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz", + "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.2" + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" } }, "object.values": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz", - "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", + "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.2" + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" } }, "on-finished": { @@ -12847,24 +13547,6 @@ "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", "dev": true }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, "p-map": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", @@ -12874,12 +13556,6 @@ "aggregate-error": "^3.0.0" } }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - }, "pad-right": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/pad-right/-/pad-right-0.2.2.tgz", @@ -12922,12 +13598,6 @@ "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "dev": true }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true - }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", @@ -12976,30 +13646,6 @@ "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", "dev": true }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - }, - "pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", - "dev": true, - "requires": { - "find-up": "^2.1.0" - } - }, - "pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz", - "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=", - "dev": true, - "requires": { - "find-up": "^2.1.0" - } - }, "please-upgrade-node": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz", @@ -13145,38 +13791,6 @@ } } }, - "read-pkg-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", - "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=", - "dev": true, - "requires": { - "find-up": "^2.0.0", - "read-pkg": "^3.0.0" - }, - "dependencies": { - "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "dev": true, - "requires": { - "pify": "^3.0.0" - } - }, - "read-pkg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", - "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", - "dev": true, - "requires": { - "load-json-file": "^4.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^3.0.0" - } - } - } - }, "readable-stream": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", @@ -13216,10 +13830,21 @@ "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==", "dev": true }, + "regexp.prototype.flags": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", + "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "functions-have-names": "^1.2.3" + } + }, "regexpp": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", - "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", "dev": true }, "repeat-string": { @@ -13270,20 +13895,15 @@ "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", "dev": true }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "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.2", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz", + "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==", "dev": true, "requires": { - "is-core-module": "^2.2.0", - "path-parse": "^1.0.6" + "is-core-module": "^2.11.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" } }, "resolve-alpn": { @@ -13373,6 +13993,17 @@ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, + "safe-regex-test": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", + "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.3", + "is-regex": "^1.1.4" + } + }, "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -13408,9 +14039,9 @@ } }, "semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", + "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -13820,24 +14451,37 @@ } } }, + "string.prototype.trim": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", + "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" + } + }, "string.prototype.trimend": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", - "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", + "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3" + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" } }, "string.prototype.trimstart": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", - "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", + "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3" + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" } }, "stringify-object": { @@ -13852,18 +14496,18 @@ } }, "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "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.0" + "ansi-regex": "^5.0.1" } }, "strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", "dev": true }, "strip-final-newline": { @@ -13887,61 +14531,11 @@ "has-flag": "^4.0.0" } }, - "table": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz", - "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==", - "dev": true, - "requires": { - "ajv": "^8.0.1", - "lodash.clonedeep": "^4.5.0", - "lodash.truncate": "^4.4.2", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "ajv": { - "version": "8.6.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz", - "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - } - }, - "json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - } - }, - "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - } - } + "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 }, "tapable": { "version": "2.2.1", @@ -13983,14 +14577,6 @@ "acorn": "^8.5.0", "commander": "^2.20.0", "source-map-support": "~0.5.20" - }, - "dependencies": { - "acorn": { - "version": "8.8.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", - "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", - "dev": true - } } }, "terser-webpack-plugin": { @@ -14145,12 +14731,6 @@ "yn": "3.1.1" }, "dependencies": { - "acorn": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", - "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", - "dev": true - }, "diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -14160,14 +14740,14 @@ } }, "tsconfig-paths": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz", - "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==", + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz", + "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==", "dev": true, "requires": { "@types/json5": "^0.0.29", - "json5": "^1.0.1", - "minimist": "^1.2.0", + "json5": "^1.0.2", + "minimist": "^1.2.6", "strip-bom": "^3.0.0" } }, @@ -14231,6 +14811,17 @@ "mime-types": "~2.1.24" } }, + "typed-array-length": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", + "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "is-typed-array": "^1.1.9" + } + }, "typedoc": { "version": "0.23.8", "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.23.8.tgz", @@ -14293,14 +14884,14 @@ } }, "unbox-primitive": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz", - "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", + "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", "dev": true, "requires": { - "function-bind": "^1.1.1", - "has-bigints": "^1.0.1", - "has-symbols": "^1.0.2", + "call-bind": "^1.0.2", + "has-bigints": "^1.0.2", + "has-symbols": "^1.0.3", "which-boxed-primitive": "^1.0.2" } }, @@ -14472,12 +15063,6 @@ "webpack-sources": "^3.2.3" }, "dependencies": { - "acorn": { - "version": "8.8.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", - "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", - "dev": true - }, "acorn-import-assertions": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", @@ -14617,18 +15202,17 @@ "dev": true }, "which-typed-array": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.4.tgz", - "integrity": "sha512-49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA==", + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", + "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", "dev": true, "requires": { - "available-typed-arrays": "^1.0.2", - "call-bind": "^1.0.0", - "es-abstract": "^1.18.0-next.1", - "foreach": "^2.0.5", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.1", - "is-typed-array": "^1.1.3" + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-tostringtag": "^1.0.0", + "is-typed-array": "^1.1.10" } }, "wildcard": { diff --git a/package.json b/package.json index 640f0ad52..ad6dcdb78 100644 --- a/package.json +++ b/package.json @@ -35,18 +35,18 @@ "devDependencies": { "@types/json-bigint": "^1.0.0", "@types/mocha": "^8.2.2", - "@typescript-eslint/eslint-plugin": "^4.26.1", - "@typescript-eslint/parser": "^4.26.1", + "@typescript-eslint/eslint-plugin": "^5.59.2", + "@typescript-eslint/parser": "^5.59.2", "assert": "^2.0.0", "chromedriver": "^108.0.0", "concurrently": "^6.2.0", "coveralls": "^3.1.0", "cucumber": "^5.1.0", "es-abstract": "^1.18.3", - "eslint": "^7.21.0", - "eslint-config-airbnb-base": "^14.2.1", + "eslint": "8.22.0", + "eslint-config-airbnb-base": "^15.0.0", "eslint-config-prettier": "^8.1.0", - "eslint-plugin-import": "^2.22.1", + "eslint-plugin-import": "^2.25.2", "eslint-plugin-tsdoc": "^0.2.11", "express": "^4.17.1", "geckodriver": "^3.0.1", diff --git a/src/client/client.ts b/src/client/client.ts index 6a2036632..f54c18f05 100644 --- a/src/client/client.ts +++ b/src/client/client.ts @@ -256,8 +256,8 @@ export default class HTTPClient { async post( relativePath: string, data: any, - requestHeaders: Record = {}, query?: Query, + requestHeaders: Record = {}, parseBody: boolean = true ): Promise { const fullHeaders = { diff --git a/src/client/v2/serviceClient.ts b/src/client/v2/serviceClient.ts index 0a11fcc70..f72a68613 100644 --- a/src/client/v2/serviceClient.ts +++ b/src/client/v2/serviceClient.ts @@ -15,8 +15,8 @@ export type TokenHeaderIdentifier = * @param headerIdentifier - An identifier for the token header */ function convertTokenStringToTokenHeader( - token: string = '', - headerIdentifier: TokenHeaderIdentifier + headerIdentifier: TokenHeaderIdentifier, + token: string = '' ): TokenHeader { const tokenHeader = {}; tokenHeader[headerIdentifier] = token; @@ -54,8 +54,8 @@ export default abstract class ServiceClient { let tokenHeader: TokenHeader; if (typeof tokenHeaderOrStrOrBaseClient === 'string') { tokenHeader = convertTokenStringToTokenHeader( - tokenHeaderOrStrOrBaseClient, - tokenHeaderIdentifier + tokenHeaderIdentifier, + tokenHeaderOrStrOrBaseClient ); } else { tokenHeader = tokenHeaderOrStrOrBaseClient; diff --git a/src/dryrun.ts b/src/dryrun.ts index ce9739bc5..0d81a14c5 100644 --- a/src/dryrun.ts +++ b/src/dryrun.ts @@ -17,32 +17,6 @@ import { encodeAddress, getApplicationAddress } from './encoding/address'; const defaultAppId = 1380011588; const defaultMaxWidth = 30; -// When writing the DryrunRequest object as msgpack the output needs to be the byte arrays not b64 string -interface AppParamsWithPrograms { - ['approval-program']: string | Uint8Array; - ['clear-state-program']: string | Uint8Array; - ['creator']: string; -} - -interface AppWithAppParams { - ['params']: AppParamsWithPrograms; -} - -function decodePrograms(ap: AppWithAppParams): AppWithAppParams { - // eslint-disable-next-line no-param-reassign - ap.params['approval-program'] = Buffer.from( - ap.params['approval-program'].toString(), - 'base64' - ); - // eslint-disable-next-line no-param-reassign - ap.params['clear-state-program'] = Buffer.from( - ap.params['clear-state-program'].toString(), - 'base64' - ); - - return ap; -} - /** * createDryrun takes an Algod Client (from algod.AlgodV2Client) and an array of Signed Transactions * from (transaction.SignedTransaction) and creates a DryrunRequest object with relevant balances @@ -50,6 +24,8 @@ function decodePrograms(ap: AppWithAppParams): AppWithAppParams { * @param txns - the array of SignedTransaction to use for generating the DryrunRequest object * @param protocolVersion - the string representing the protocol version to use * @param latestTimestamp - the timestamp + * @param round - the round available to some TEAL scripts. Defaults to the current round on the network. + * @param sources - TEAL source text that gets uploaded, compiled, and inserted into transactions or application state. * @returns the DryrunRequest object constructed from the SignedTransactions passed */ export async function createDryrun({ @@ -140,9 +116,8 @@ export async function createDryrun({ .getApplicationByID(appId) .do() .then((appInfo) => { - const ai = decodePrograms(appInfo as AppWithAppParams); - appInfos.push(ai); - accts.push(ai.params.creator); + appInfos.push(appInfo); + accts.push(appInfo.params.creator); }) ); } @@ -155,12 +130,6 @@ export async function createDryrun({ .accountInformation(acct) .do() .then((acctInfo) => { - if ('created-apps' in acctInfo) { - // eslint-disable-next-line no-param-reassign - acctInfo['created-apps'] = acctInfo['created-apps'].map((app) => - decodePrograms(app) - ); - } acctInfos.push(acctInfo); }) ); diff --git a/src/makeTxn.ts b/src/makeTxn.ts index 9814989f9..632684bc3 100644 --- a/src/makeTxn.ts +++ b/src/makeTxn.ts @@ -350,7 +350,6 @@ export function makeAssetCreateTxnWithSuggestedParamsFromObject( * @param reserve - string representation of new reserve Algorand address * @param freeze - string representation of new freeze manager Algorand address * @param clawback - string representation of new revocation manager Algorand address - * @param strictEmptyAddressChecking - boolean - throw an error if any of manager, reserve, freeze, or clawback are undefined. optional, defaults to true. * @param suggestedParams - a dict holding common-to-all-txns args: * fee - integer fee per byte, in microAlgos. for a flat fee, set flatFee to true * flatFee - bool optionally set this to true to specify fee as microalgos-per-txn @@ -360,6 +359,7 @@ export function makeAssetCreateTxnWithSuggestedParamsFromObject( * genesisHash - string specifies hash genesis block of network in use * genesisID - string specifies genesis ID of network in use * @param rekeyTo - rekeyTo address, optional + * @param strictEmptyAddressChecking - boolean - throw an error if any of manager, reserve, freeze, or clawback are undefined. optional, defaults to true. */ export function makeAssetConfigTxnWithSuggestedParams( from: AssetConfigTxn['from'], @@ -370,8 +370,8 @@ export function makeAssetConfigTxnWithSuggestedParams( freeze: AssetConfigTxn['assetFreeze'], clawback: AssetConfigTxn['assetClawback'], suggestedParams: MustHaveSuggestedParams['suggestedParams'], - strictEmptyAddressChecking = true, - rekeyTo?: AssetConfigTxn['reKeyTo'] + rekeyTo?: AssetConfigTxn['reKeyTo'], + strictEmptyAddressChecking = true ) { if ( strictEmptyAddressChecking && @@ -436,8 +436,8 @@ export function makeAssetConfigTxnWithSuggestedParamsFromObject( o.freeze, o.clawback, o.suggestedParams, - o.strictEmptyAddressChecking, - o.rekeyTo + o.rekeyTo, + o.strictEmptyAddressChecking ); } diff --git a/tests/cucumber/steps/steps.js b/tests/cucumber/steps/steps.js index f894fcbb2..f9f019b01 100644 --- a/tests/cucumber/steps/steps.js +++ b/tests/cucumber/steps/steps.js @@ -4521,7 +4521,10 @@ module.exports = function getSteps(options) { Then( 'I sleep for {int} milliseconds for indexer to digest things down.', async (milliseconds) => { - const sleep = (ms) => new Promise((r) => setTimeout(r, ms)); + const sleep = (ms) => + new Promise((r) => { + setTimeout(r, ms); + }); await sleep(milliseconds); } ); From 67cd0d666a838b7ca45bdac51e6287162736d6a7 Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Fri, 5 May 2023 12:06:45 -0700 Subject: [PATCH 03/33] Fix test --- tests/5.Transaction.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/5.Transaction.js b/tests/5.Transaction.js index 7069d4b1a..0cc6238f5 100644 --- a/tests/5.Transaction.js +++ b/tests/5.Transaction.js @@ -1367,8 +1367,8 @@ describe('Sign', () => { freeze, clawback, suggestedParams, - true, - rekeyTo + rekeyTo, + true ); assert.deepStrictEqual(expectedTxn, actualTxn); }); From 4f648d5d9d6092b70ca12f1aad4b41ecbb8c44ec Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Fri, 5 May 2023 13:37:14 -0700 Subject: [PATCH 04/33] Fix some tests due to changes in put signature --- src/client/v2/algod/compile.ts | 4 ++-- src/client/v2/algod/disassemble.ts | 4 ++-- src/client/v2/algod/dryrun.ts | 1 + src/client/v2/algod/sendRawTransaction.ts | 1 + src/client/v2/algod/setBlockOffsetTimestamp.ts | 2 +- src/client/v2/algod/setSyncRound.ts | 2 +- src/client/v2/algod/simulateTransaction.ts | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/client/v2/algod/compile.ts b/src/client/v2/algod/compile.ts index 94f4d2390..9b5cd3919 100644 --- a/src/client/v2/algod/compile.ts +++ b/src/client/v2/algod/compile.ts @@ -44,8 +44,8 @@ export default class Compile extends JSONRequest { const res = await this.c.post( this.path(), Buffer.from(this.source), - txHeaders, - this.query + this.query, + txHeaders ); return res.body; } diff --git a/src/client/v2/algod/disassemble.ts b/src/client/v2/algod/disassemble.ts index 0ffe7e895..951edde5c 100644 --- a/src/client/v2/algod/disassemble.ts +++ b/src/client/v2/algod/disassemble.ts @@ -39,8 +39,8 @@ export default class Disassemble extends JSONRequest { const res = await this.c.post( this.path(), Buffer.from(this.source), - txHeaders, - this.query + this.query, + txHeaders ); return res.body; } diff --git a/src/client/v2/algod/dryrun.ts b/src/client/v2/algod/dryrun.ts index 72d6e27fb..cb907ae5a 100644 --- a/src/client/v2/algod/dryrun.ts +++ b/src/client/v2/algod/dryrun.ts @@ -28,6 +28,7 @@ export default class Dryrun extends JSONRequest { const res = await this.c.post( this.path(), Buffer.from(this.blob), + null, txHeaders ); return res.body; diff --git a/src/client/v2/algod/sendRawTransaction.ts b/src/client/v2/algod/sendRawTransaction.ts index 8079bcd23..25a33e138 100644 --- a/src/client/v2/algod/sendRawTransaction.ts +++ b/src/client/v2/algod/sendRawTransaction.ts @@ -54,6 +54,7 @@ export default class SendRawTransaction extends JSONRequest Date: Fri, 5 May 2023 14:27:57 -0700 Subject: [PATCH 05/33] Fix examples, block response --- examples/block_fetcher/index.ts | 6 +++--- examples/overview.ts | 2 +- src/client/v2/algod/block.ts | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/examples/block_fetcher/index.ts b/examples/block_fetcher/index.ts index 695c732fc..0943ec329 100644 --- a/examples/block_fetcher/index.ts +++ b/examples/block_fetcher/index.ts @@ -29,11 +29,11 @@ function removeNulls(obj) { while (true) { // Get latest round number - let lastRound = status['last-round']; + let { lastRound } = status; console.log(`Round: ${lastRound}`); // Fetch block - const round = await client.block(lastRound).do(); + const round = await client.block(lastRound as number).do(); const { block } = round; const { txns } = block; @@ -79,7 +79,7 @@ function removeNulls(obj) { } // Wait for next round - status = await client.statusAfterBlock(lastRound).do(); + status = await client.statusAfterBlock(lastRound as number).do(); lastRound = status['last-round']; } })(); diff --git a/examples/overview.ts b/examples/overview.ts index 0bec40744..b7590ac21 100644 --- a/examples/overview.ts +++ b/examples/overview.ts @@ -45,7 +45,7 @@ async function main() { // example: ALGOD_FETCH_ACCOUNT_INFO const acctInfo = await algodClient.accountInformation(acct.addr).do(); - console.log(`Account balance: ${acctInfo.amount} microAlgos`); + console.log(`Account balance: ${acctInfo.account.amount} microAlgos`); // example: ALGOD_FETCH_ACCOUNT_INFO } main(); diff --git a/src/client/v2/algod/block.ts b/src/client/v2/algod/block.ts index 8e75562f6..24dc2e271 100644 --- a/src/client/v2/algod/block.ts +++ b/src/client/v2/algod/block.ts @@ -1,12 +1,11 @@ import * as encoding from '../../../encoding/encoding'; import JSONRequest from '../jsonrequest'; import HTTPClient from '../../client'; -import { BlockResponse } from './models/types'; /** * block gets the block info for the given round. this call may block */ -export default class Block extends JSONRequest { +export default class Block extends JSONRequest { private round: number; constructor(c: HTTPClient, roundNumber: number) { @@ -24,7 +23,7 @@ export default class Block extends JSONRequest { // eslint-disable-next-line class-methods-use-this prepare(body: Uint8Array) { if (body && body.byteLength > 0) { - return encoding.decode(body) as BlockResponse; + return encoding.decode(body) as Record; } return undefined; } From 85e6196258c01a85f3acd9d9fa5ad3d4fd38f12d Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Mon, 8 May 2023 11:05:58 -0700 Subject: [PATCH 06/33] Fix test errors --- examples/overview.ts | 2 +- src/client/v2/algod/accountInformation.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/overview.ts b/examples/overview.ts index b7590ac21..0bec40744 100644 --- a/examples/overview.ts +++ b/examples/overview.ts @@ -45,7 +45,7 @@ async function main() { // example: ALGOD_FETCH_ACCOUNT_INFO const acctInfo = await algodClient.accountInformation(acct.addr).do(); - console.log(`Account balance: ${acctInfo.account.amount} microAlgos`); + console.log(`Account balance: ${acctInfo.amount} microAlgos`); // example: ALGOD_FETCH_ACCOUNT_INFO } main(); diff --git a/src/client/v2/algod/accountInformation.ts b/src/client/v2/algod/accountInformation.ts index 07aa4e1a2..dcd5d1198 100644 --- a/src/client/v2/algod/accountInformation.ts +++ b/src/client/v2/algod/accountInformation.ts @@ -1,9 +1,9 @@ import JSONRequest from '../jsonrequest'; import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; -import { AccountResponse } from '../indexer/models/types'; +import { Account } from './models/types'; -export default class AccountInformation extends JSONRequest { +export default class AccountInformation extends JSONRequest { constructor( c: HTTPClient, intDecoding: IntDecoding, From bc272cb8048e9cf1ae3b311e2ac17da2ae35ff0f Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Wed, 26 Jul 2023 09:17:01 -0700 Subject: [PATCH 07/33] Update prepare method for typed responses --- .../v2/algod/accountApplicationInformation.ts | 5 + .../v2/algod/accountAssetInformation.ts | 5 + src/client/v2/algod/accountInformation.ts | 5 + src/client/v2/algod/compile.ts | 5 + src/client/v2/algod/disassemble.ts | 5 + src/client/v2/algod/dryrun.ts | 5 + src/client/v2/algod/getApplicationByID.ts | 5 + src/client/v2/algod/getAssetByID.ts | 5 + src/client/v2/algod/getBlockHash.ts | 5 + src/client/v2/algod/getTransactionProof.ts | 5 + src/client/v2/algod/lightBlockHeaderProof.ts | 5 + src/client/v2/algod/sendRawTransaction.ts | 5 + src/client/v2/algod/stateproof.ts | 5 + src/client/v2/algod/status.ts | 5 + src/client/v2/algod/statusAfterBlock.ts | 5 + src/client/v2/algod/supply.ts | 5 + src/client/v2/algod/versions.ts | 5 + tests/cucumber/steps/steps.js | 158 +++++++++++------- 18 files changed, 180 insertions(+), 63 deletions(-) diff --git a/src/client/v2/algod/accountApplicationInformation.ts b/src/client/v2/algod/accountApplicationInformation.ts index 9638415ef..eaa9a6c3f 100644 --- a/src/client/v2/algod/accountApplicationInformation.ts +++ b/src/client/v2/algod/accountApplicationInformation.ts @@ -18,4 +18,9 @@ export default class AccountApplicationInformation extends JSONRequest { this.query.exclude = exclude; return this; } + + // eslint-disable-next-line class-methods-use-this + prepare(body: Uint8Array): Account { + return Account.from_obj_for_encoding(body); + } } diff --git a/src/client/v2/algod/compile.ts b/src/client/v2/algod/compile.ts index 9b5cd3919..f898c9ca9 100644 --- a/src/client/v2/algod/compile.ts +++ b/src/client/v2/algod/compile.ts @@ -49,4 +49,9 @@ export default class Compile extends JSONRequest { ); return res.body; } + + // eslint-disable-next-line class-methods-use-this + prepare(body: Uint8Array): CompileResponse { + return CompileResponse.from_obj_for_encoding(body); + } } diff --git a/src/client/v2/algod/disassemble.ts b/src/client/v2/algod/disassemble.ts index 951edde5c..9c21d780e 100644 --- a/src/client/v2/algod/disassemble.ts +++ b/src/client/v2/algod/disassemble.ts @@ -44,4 +44,9 @@ export default class Disassemble extends JSONRequest { ); return res.body; } + + // eslint-disable-next-line class-methods-use-this + prepare(body: Uint8Array): DisassembleResponse { + return DisassembleResponse.from_obj_for_encoding(body); + } } diff --git a/src/client/v2/algod/dryrun.ts b/src/client/v2/algod/dryrun.ts index cb907ae5a..fc64c79ff 100644 --- a/src/client/v2/algod/dryrun.ts +++ b/src/client/v2/algod/dryrun.ts @@ -33,4 +33,9 @@ export default class Dryrun extends JSONRequest { ); return res.body; } + + // eslint-disable-next-line class-methods-use-this + prepare(body: Uint8Array): DryrunResponse { + return DryrunResponse.from_obj_for_encoding(body); + } } diff --git a/src/client/v2/algod/getApplicationByID.ts b/src/client/v2/algod/getApplicationByID.ts index e11e50dea..333817901 100644 --- a/src/client/v2/algod/getApplicationByID.ts +++ b/src/client/v2/algod/getApplicationByID.ts @@ -12,4 +12,9 @@ export default class GetApplicationByID extends JSONRequest { path() { return `/v2/applications/${this.index}`; } + + // eslint-disable-next-line class-methods-use-this + prepare(body: Uint8Array): Application { + return Application.from_obj_for_encoding(body); + } } diff --git a/src/client/v2/algod/getAssetByID.ts b/src/client/v2/algod/getAssetByID.ts index 4010b8b5b..b7962b668 100644 --- a/src/client/v2/algod/getAssetByID.ts +++ b/src/client/v2/algod/getAssetByID.ts @@ -12,4 +12,9 @@ export default class GetAssetByID extends JSONRequest { path() { return `/v2/assets/${this.index}`; } + + // eslint-disable-next-line class-methods-use-this + prepare(body: Uint8Array): Asset { + return Asset.from_obj_for_encoding(body); + } } diff --git a/src/client/v2/algod/getBlockHash.ts b/src/client/v2/algod/getBlockHash.ts index 2f5d4dcb2..7c9ba6bdf 100644 --- a/src/client/v2/algod/getBlockHash.ts +++ b/src/client/v2/algod/getBlockHash.ts @@ -16,4 +16,9 @@ export default class GetBlockHash extends JSONRequest { path() { return `/v2/blocks/${this.round}/hash`; } + + // eslint-disable-next-line class-methods-use-this + prepare(body: Uint8Array): BlockHashResponse { + return BlockHashResponse.from_obj_for_encoding(body); + } } diff --git a/src/client/v2/algod/getTransactionProof.ts b/src/client/v2/algod/getTransactionProof.ts index e8add2b40..912420023 100644 --- a/src/client/v2/algod/getTransactionProof.ts +++ b/src/client/v2/algod/getTransactionProof.ts @@ -41,4 +41,9 @@ export default class GetTransactionProof extends JSONRequest { path() { return `/v2/blocks/${this.round}/lightheader/proof`; } + + // eslint-disable-next-line class-methods-use-this + prepare(body: Uint8Array): LBHP { + return LBHP.from_obj_for_encoding(body); + } } diff --git a/src/client/v2/algod/sendRawTransaction.ts b/src/client/v2/algod/sendRawTransaction.ts index 25a33e138..6d4b2d721 100644 --- a/src/client/v2/algod/sendRawTransaction.ts +++ b/src/client/v2/algod/sendRawTransaction.ts @@ -59,4 +59,9 @@ export default class SendRawTransaction extends JSONRequest { path() { return `/v2/stateproofs/${this.round}`; } + + // eslint-disable-next-line class-methods-use-this + prepare(body: Uint8Array): SP { + return SP.from_obj_for_encoding(body); + } } diff --git a/src/client/v2/algod/status.ts b/src/client/v2/algod/status.ts index 7752e74b8..374d69fb3 100644 --- a/src/client/v2/algod/status.ts +++ b/src/client/v2/algod/status.ts @@ -6,4 +6,9 @@ export default class Status extends JSONRequest { path() { return '/v2/status'; } + + // eslint-disable-next-line class-methods-use-this + prepare(body: Uint8Array): NodeStatusResponse { + return NodeStatusResponse.from_obj_for_encoding(body); + } } diff --git a/src/client/v2/algod/statusAfterBlock.ts b/src/client/v2/algod/statusAfterBlock.ts index 80c0e42ca..170a1d5db 100644 --- a/src/client/v2/algod/statusAfterBlock.ts +++ b/src/client/v2/algod/statusAfterBlock.ts @@ -13,4 +13,9 @@ export default class StatusAfterBlock extends JSONRequest { path() { return `/v2/status/wait-for-block-after/${this.round}`; } + + // eslint-disable-next-line class-methods-use-this + prepare(body: Uint8Array): NodeStatusResponse { + return NodeStatusResponse.from_obj_for_encoding(body); + } } diff --git a/src/client/v2/algod/supply.ts b/src/client/v2/algod/supply.ts index 49f432ae9..0f6eac3ba 100644 --- a/src/client/v2/algod/supply.ts +++ b/src/client/v2/algod/supply.ts @@ -6,4 +6,9 @@ export default class Supply extends JSONRequest { path() { return '/v2/ledger/supply'; } + + // eslint-disable-next-line class-methods-use-this + prepare(body: Uint8Array): SupplyResponse { + return SupplyResponse.from_obj_for_encoding(body); + } } diff --git a/src/client/v2/algod/versions.ts b/src/client/v2/algod/versions.ts index 3093af8e1..02edd51b5 100644 --- a/src/client/v2/algod/versions.ts +++ b/src/client/v2/algod/versions.ts @@ -9,4 +9,9 @@ export default class Versions extends JSONRequest { path() { return '/versions'; } + + // eslint-disable-next-line class-methods-use-this + prepare(body: Uint8Array): Version { + return Version.from_obj_for_encoding(body); + } } diff --git a/tests/cucumber/steps/steps.js b/tests/cucumber/steps/steps.js index 0126a944e..fcf6e24f6 100644 --- a/tests/cucumber/steps/steps.js +++ b/tests/cucumber/steps/steps.js @@ -177,6 +177,24 @@ module.exports = function getSteps(options) { return boxRefArray; } + let doRaw = false; + + function doOrDoRaw(req) { + if (doRaw === true) { + doRaw = false; + return req.doRaw(); + } + return req.do(); + } + + async function doOrDoRawAsync(req) { + if (doRaw === true) { + doRaw = false; + return req.doRaw(); + } + return req.do(); + } + Given('a kmd client', function () { this.kcl = new algosdk.Kmd(kmdToken, 'http://localhost', 60001); return this.kcl; @@ -1131,7 +1149,7 @@ module.exports = function getSteps(options) { const accountResponse = await this.v2Client .accountInformation(this.assetTestFixture.creator) .do(); - const heldAssets = accountResponse['created-assets']; + const heldAssets = accountResponse.createdAssets; let assetIds = heldAssets.map((asset) => asset.index); assetIds = assetIds.sort(sortKeysAscending); const assetIndex = assetIds[assetIds.length - 1]; @@ -1473,6 +1491,7 @@ module.exports = function getSteps(options) { Given( 'mock http responses in {string} loaded from {string}', function (expectedBody, format) { + doRaw = false; if (expectedBody !== null) { expectedMockResponse = expectedBody; if (format === 'msgp') { @@ -1500,6 +1519,7 @@ module.exports = function getSteps(options) { Given( 'mock http responses in {string} loaded from {string} with status {int}.', function (expectedBody, status, format) { + doRaw = false; if (expectedBody !== null) { expectedMockResponse = expectedBody; if (format === 'msgp') { @@ -1535,7 +1555,7 @@ module.exports = function getSteps(options) { if (responseFormat === 'msgp') { this.actualMockResponse = await this.v2Client.block(0).do(); } else { - this.actualMockResponse = await this.v2Client.status().do(); + this.actualMockResponse = await this.v2Client.genesis().do(); } } else if (client === 'indexer') { // endpoints are ignored by mock server, see setupMockServerForResponses @@ -1590,6 +1610,7 @@ module.exports = function getSteps(options) { }); Given('mock server recording request paths', function () { + doRaw = true; this.v2Client = new algosdk.Algodv2( '', `http://${mockAlgodPathRecorderHost}`, @@ -1686,7 +1707,7 @@ module.exports = function getSteps(options) { if (format !== 'msgpack') { assert.fail('this SDK only supports format msgpack for this function'); } - await this.v2Client.pendingTransactionInformation(txid).do(); + await doOrDoRawAsync(this.v2Client.pendingTransactionInformation(txid)); } ); @@ -1696,14 +1717,16 @@ module.exports = function getSteps(options) { if (format !== 'msgpack') { assert.fail('this SDK only supports format msgpack for this function'); } - await this.v2Client.pendingTransactionsInformation().max(max).do(); + await doOrDoRawAsync( + this.v2Client.pendingTransactionsInformation().max(max) + ); } ); When( 'we make a Pending Transactions By Address call against account {string} and max {int}', function (account, max) { - this.v2Client.pendingTransactionByAddress(account).max(max).do(); + doOrDoRaw(this.v2Client.pendingTransactionByAddress(account).max(max)); } ); @@ -1713,51 +1736,57 @@ module.exports = function getSteps(options) { if (format !== 'msgpack') { assert.fail('this SDK only supports format msgpack for this function'); } - await this.v2Client.pendingTransactionByAddress(account).max(max).do(); + await doOrDoRawAsync( + this.v2Client.pendingTransactionByAddress(account).max(max) + ); } ); When( 'we make a Status after Block call with round {int}', async function (round) { - await this.v2Client.statusAfterBlock(round).do(); + await doOrDoRawAsync(this.v2Client.statusAfterBlock(round)); } ); When( 'we make an Account Information call against account {string} with exclude {string}', async function (account, exclude) { - await this.v2Client.accountInformation(account).exclude(exclude).do(); + await doOrDoRawAsync( + this.v2Client.accountInformation(account).exclude(exclude) + ); } ); When( 'we make an Account Information call against account {string}', async function (account) { - await this.v2Client.accountInformation(account).do(); + await doOrDoRawAsync(this.v2Client.accountInformation(account)); } ); When( 'we make an Account Asset Information call against account {string} assetID {int}', async function (account, assetID) { - await this.v2Client.accountAssetInformation(account, assetID).do(); + await doOrDoRawAsync( + this.v2Client.accountAssetInformation(account, assetID) + ); } ); When( 'we make an Account Application Information call against account {string} applicationID {int}', async function (account, applicationID) { - await this.v2Client - .accountApplicationInformation(account, applicationID) - .do(); + await doOrDoRawAsync( + this.v2Client.accountApplicationInformation(account, applicationID) + ); } ); When( 'we make a Get Block call against block number {int}', function (blockNum) { - this.v2Client.block(blockNum).do(); + doOrDoRaw(this.v2Client.block(blockNum)); } ); @@ -1767,18 +1796,18 @@ module.exports = function getSteps(options) { if (format !== 'msgpack') { assert.fail('this SDK only supports format msgpack for this function'); } - await this.v2Client.block(blockNum).do(); + await doOrDoRawAsync(this.v2Client.block(blockNum)); } ); When('we make a GetAssetByID call for assetID {int}', async function (index) { - await this.v2Client.getAssetByID(index).do(); + await doOrDoRawAsync(this.v2Client.getAssetByID(index)); }); When( 'we make a GetApplicationByID call for applicationID {int}', async function (index) { - await this.v2Client.getApplicationByID(index).do(); + await doOrDoRawAsync(this.v2Client.getApplicationByID(index)); } ); @@ -1800,9 +1829,9 @@ module.exports = function getSteps(options) { let anyPendingTransactionInfoResponse; When('we make any Pending Transaction Information call', async function () { - anyPendingTransactionInfoResponse = await this.v2Client - .pendingTransactionInformation() - .do(); + anyPendingTransactionInfoResponse = await doOrDoRawAsync( + this.v2Client.pendingTransactionInformation() + ); }); Then( @@ -1818,9 +1847,9 @@ module.exports = function getSteps(options) { let anyPendingTransactionsInfoResponse; When('we make any Pending Transactions Information call', async function () { - anyPendingTransactionsInfoResponse = await this.v2Client - .pendingTransactionsInformation() - .do(); + anyPendingTransactionsInfoResponse = await doOrDoRawAsync( + this.v2Client.pendingTransactionsInformation() + ); }); Then( @@ -1844,9 +1873,9 @@ module.exports = function getSteps(options) { let anySendRawTransactionResponse; When('we make any Send Raw Transaction call', async function () { - anySendRawTransactionResponse = await this.v2Client - .sendRawTransaction(makeUint8Array(0)) - .do(); + anySendRawTransactionResponse = await doOrDoRawAsync( + this.v2Client.sendRawTransaction(makeUint8Array(0)) + ); }); Then( @@ -1859,9 +1888,9 @@ module.exports = function getSteps(options) { let anyPendingTransactionsByAddressResponse; When('we make any Pending Transactions By Address call', async function () { - anyPendingTransactionsByAddressResponse = await this.v2Client - .pendingTransactionByAddress() - .do(); + anyPendingTransactionsByAddressResponse = await doOrDoRawAsync( + this.v2Client.pendingTransactionByAddress() + ); }); Then( @@ -1885,48 +1914,50 @@ module.exports = function getSteps(options) { let anyNodeStatusResponse; When('we make any Node Status call', async function () { - anyNodeStatusResponse = await this.v2Client.status().do(); + anyNodeStatusResponse = await doOrDoRawAsync(this.v2Client.status()); }); Then( 'the parsed Node Status response should have a last round of {int}', (lastRound) => { - assert.strictEqual(lastRound, anyNodeStatusResponse['last-round']); + assert.strictEqual(lastRound, anyNodeStatusResponse.lastRound); } ); let anyLedgerSupplyResponse; When('we make any Ledger Supply call', async function () { - anyLedgerSupplyResponse = await this.v2Client.supply().do(); + anyLedgerSupplyResponse = await doOrDoRawAsync(this.v2Client.supply()); }); Then( 'the parsed Ledger Supply response should have totalMoney {int} onlineMoney {int} on round {int}', (totalMoney, onlineMoney, round) => { - assert.strictEqual(totalMoney, anyLedgerSupplyResponse['total-money']); - assert.strictEqual(onlineMoney, anyLedgerSupplyResponse['online-money']); - assert.strictEqual(round, anyLedgerSupplyResponse.current_round); + assert.strictEqual(totalMoney, anyLedgerSupplyResponse.totalMoney); + assert.strictEqual(onlineMoney, anyLedgerSupplyResponse.onlineMoney); + assert.strictEqual(round, anyLedgerSupplyResponse.currentRound); } ); When('we make any Status After Block call', async function () { - anyNodeStatusResponse = await this.v2Client.statusAfterBlock(1).do(); + anyNodeStatusResponse = await doOrDoRawAsync( + this.v2Client.statusAfterBlock(1) + ); }); Then( 'the parsed Status After Block response should have a last round of {int}', (lastRound) => { - assert.strictEqual(lastRound, anyNodeStatusResponse['last-round']); + assert.strictEqual(lastRound, anyNodeStatusResponse.lastRound); } ); let anyAccountInformationResponse; When('we make any Account Information call', async function () { - anyAccountInformationResponse = await this.v2Client - .accountInformation() - .do(); + anyAccountInformationResponse = await doOrDoRawAsync( + this.v2Client.accountInformation() + ); }); Then( @@ -1939,7 +1970,7 @@ module.exports = function getSteps(options) { let anyBlockResponse; When('we make any Get Block call', async function () { - anyBlockResponse = await this.v2Client.block(1).do(); + anyBlockResponse = await doOrDoRawAsync(this.v2Client.block(1)); }); Then( @@ -1955,9 +1986,9 @@ module.exports = function getSteps(options) { let anySuggestedTransactionsResponse; When('we make any Suggested Transaction Parameters call', async function () { - anySuggestedTransactionsResponse = await this.v2Client - .getTransactionParams() - .do(); + anySuggestedTransactionsResponse = await doOrDoRawAsync( + this.v2Client.getTransactionParams() + ); }); Then( @@ -1979,12 +2010,13 @@ module.exports = function getSteps(options) { currencyGreater, currencyLesser ) { - await this.indexerClient - .lookupAssetBalances(index) - .limit(limit) - .currencyGreaterThan(currencyGreater) - .currencyLessThan(currencyLesser) - .do(); + await doOrDoRawAsync( + this.indexerClient + .lookupAssetBalances(index) + .limit(limit) + .currencyGreaterThan(currencyGreater) + .currencyLessThan(currencyLesser) + ); } ); @@ -3508,12 +3540,12 @@ module.exports = function getSteps(options) { const accountInfo = await this.v2Client .accountInformation(this.transientAccount.addr) .do(); - const appTotalSchema = accountInfo['apps-total-schema']; - assert.strictEqual(appTotalSchema['num-byte-slice'], numByteSlices); - assert.strictEqual(appTotalSchema['num-uint'], numUints); + const appTotalSchema = accountInfo.appsTotalSchema; + assert.strictEqual(appTotalSchema.numByteSlice, numByteSlices); + assert.strictEqual(appTotalSchema.numUint, numUints); const appCreated = appCreatedBoolAsString === 'true'; - const createdApps = accountInfo['created-apps']; + const { createdApps } = accountInfo; // If we don't expect the app to exist, verify that it isn't there and exit. if (!appCreated) { for (let i = 0; i < createdApps.length; i++) { @@ -3541,20 +3573,20 @@ module.exports = function getSteps(options) { let keyValues = []; if (applicationState === 'local') { let counter = 0; - for (let i = 0; i < accountInfo['apps-local-state'].length; i++) { - const localState = accountInfo['apps-local-state'][i]; + for (let i = 0; i < accountInfo.appsLocalState.length; i++) { + const localState = accountInfo.appsLocalState[i]; if (localState.id === this.currentApplicationIndex) { - keyValues = localState['key-value']; + keyValues = localState.keyValue; counter += 1; } } assert.strictEqual(counter, 1); } else if (applicationState === 'global') { let counter = 0; - for (let i = 0; i < accountInfo['created-apps'].length; i++) { - const createdApp = accountInfo['created-apps'][i]; + for (let i = 0; i < accountInfo.createdApps.length; i++) { + const createdApp = accountInfo.createdApps[i]; if (createdApp.id === this.currentApplicationIndex) { - keyValues = createdApp.params['global-state']; + keyValues = createdApp.params.globalState; counter += 1; } } @@ -4649,18 +4681,18 @@ module.exports = function getSteps(options) { When( 'we make a GetLightBlockHeaderProof call for round {int}', async function (int) { - await this.v2Client.getLightBlockHeaderProof(int).do(); + await doOrDoRawAsync(this.v2Client.getLightBlockHeaderProof(int)); } ); When('we make a GetStateProof call for round {int}', async function (int) { - await this.v2Client.getStateProof(int).do(); + await doOrDoRawAsync(this.v2Client.getStateProof(int)); }); When( 'we make a Lookup Block Hash call against round {int}', async function (int) { - await this.v2Client.getBlockHash(int).do(); + await doOrDoRawAsync(this.v2Client.getBlockHash(int)); } ); From f4a3589299e7f94cd87f7ab6d91e8b838b475dd9 Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Fri, 28 Jul 2023 09:16:28 -0700 Subject: [PATCH 08/33] Fixes for typed response tests --- .../v2/algod/pendingTransactionInformation.ts | 4 ++- src/client/v2/algod/sendRawTransaction.ts | 2 +- src/composer.ts | 15 ++++++--- src/wait.ts | 11 ++++--- tests/cucumber/steps/steps.js | 33 +++++++++---------- 5 files changed, 37 insertions(+), 28 deletions(-) diff --git a/src/client/v2/algod/pendingTransactionInformation.ts b/src/client/v2/algod/pendingTransactionInformation.ts index 21ab9f8f8..f43eaae8d 100644 --- a/src/client/v2/algod/pendingTransactionInformation.ts +++ b/src/client/v2/algod/pendingTransactionInformation.ts @@ -16,7 +16,9 @@ export default class PendingTransactionInformation extends JSONRequest 0) { - return encoding.decode(body) as PendingTransactionResponse; + return PendingTransactionResponse.from_obj_for_encoding( + encoding.decode(body) + ); } return undefined; } diff --git a/src/client/v2/algod/sendRawTransaction.ts b/src/client/v2/algod/sendRawTransaction.ts index 6d4b2d721..9852f2f18 100644 --- a/src/client/v2/algod/sendRawTransaction.ts +++ b/src/client/v2/algod/sendRawTransaction.ts @@ -57,7 +57,7 @@ export default class SendRawTransaction extends JSONRequest + pendingInfo: PendingTransactionResponse ): ABIResult { const returnedResult: ABIResult = methodResult; try { returnedResult.txInfo = pendingInfo; if (method.returns.type !== 'void') { - const logs: string[] = pendingInfo.logs || []; + const logs: string[] = []; + if (pendingInfo.logs) { + pendingInfo.logs.forEach((value) => + logs.push(new TextDecoder().decode(value)) + ); + } + // const logs: string[] = pendingInfo.logs || []; if (logs.length === 0) { throw new Error('App call transaction did not log a return value'); } diff --git a/src/wait.ts b/src/wait.ts index 5ade09d5e..6aa43e261 100644 --- a/src/wait.ts +++ b/src/wait.ts @@ -1,4 +1,5 @@ import Algodv2 from './client/v2/algod/algod'; +import { PendingTransactionResponse } from './client/v2/algod/models/types'; /** * Wait until a transaction has been confirmed or rejected by the network, or @@ -13,7 +14,7 @@ export async function waitForConfirmation( client: Algodv2, txid: string, waitRounds: number -): Promise> { +): Promise { // Wait until the transaction is confirmed or rejected, or until 'waitRounds' // number of rounds have passed. @@ -21,7 +22,7 @@ export async function waitForConfirmation( if (typeof status === 'undefined') { throw new Error('Unable to get node status'); } - const startRound = status['last-round'] + 1; + const startRound = Number(status.lastRound) + 1; let currentRound = startRound; /* eslint-disable no-await-in-loop */ @@ -30,15 +31,15 @@ export async function waitForConfirmation( try { const pendingInfo = await client.pendingTransactionInformation(txid).do(); - if (pendingInfo['confirmed-round']) { + if (pendingInfo.confirmedRound) { // Got the completed Transaction return pendingInfo; } - if (pendingInfo['pool-error']) { + if (pendingInfo.poolError) { // If there was a pool error, then the transaction has been rejected poolError = true; - throw new Error(`Transaction Rejected: ${pendingInfo['pool-error']}`); + throw new Error(`Transaction Rejected: ${pendingInfo.poolError}`); } } catch (err) { // Ignore errors from PendingTransactionInformation, since it may return 404 if the algod diff --git a/tests/cucumber/steps/steps.js b/tests/cucumber/steps/steps.js index fcf6e24f6..416309f74 100644 --- a/tests/cucumber/steps/steps.js +++ b/tests/cucumber/steps/steps.js @@ -792,14 +792,14 @@ module.exports = function getSteps(options) { When('I send the transaction', async function () { const txid = await this.v2Client.sendRawTransaction(this.stx).do(); - this.txid = txid.txId; + this.txid = txid.txid; this.appTxid = txid; // Alias to use in waitForTransaction. return this.txid; }); When('I send the kmd-signed transaction', async function () { const txid = await this.v2Client.sendRawTransaction(this.stxKmd).do(); - this.txid = txid.txId; + this.txid = txid.txid; this.appTxid = txid; // Alias to use in waitForTransaction. return this.txid; }); @@ -1362,7 +1362,7 @@ module.exports = function getSteps(options) { .accountInformation(this.assetTestFixture.creator) .do(); for (const asset of accountInformation.assets) { - if (asset['asset-id'] === this.assetTestFixture.index) { + if (asset.assetId === this.assetTestFixture.index) { assert.deepStrictEqual(asset.amount, parseInt(expectedTotal)); } } @@ -1857,13 +1857,13 @@ module.exports = function getSteps(options) { (len, idx, sender) => { assert.strictEqual( len, - anyPendingTransactionsInfoResponse['top-transactions'].length + anyPendingTransactionsInfoResponse.topTransactions.length ); if (len !== 0) { assert.strictEqual( sender, algosdk.encodeAddress( - anyPendingTransactionsInfoResponse['top-transactions'][idx].txn.snd + anyPendingTransactionsInfoResponse.topTransactions[idx].txn.snd ) ); } @@ -1881,7 +1881,7 @@ module.exports = function getSteps(options) { Then( 'the parsed Send Raw Transaction response should have txid {string}', (txid) => { - assert.strictEqual(txid, anySendRawTransactionResponse.txId); + assert.strictEqual(txid, anySendRawTransactionResponse.txid); } ); @@ -1898,14 +1898,13 @@ module.exports = function getSteps(options) { (len, idx, sender) => { assert.strictEqual( len, - anyPendingTransactionsByAddressResponse['total-transactions'] + anyPendingTransactionsByAddressResponse.totalTransactions ); if (len === 0) { return; } let actualSender = - anyPendingTransactionsByAddressResponse['top-transactions'][idx].txn - .snd; + anyPendingTransactionsByAddressResponse.topTransactions[idx].txn.snd; actualSender = algosdk.encodeAddress(actualSender); assert.strictEqual(sender, actualSender); } @@ -2996,10 +2995,10 @@ module.exports = function getSteps(options) { const fundingResponse = await this.v2Client.sendRawTransaction(stxn).do(); const info = await algosdk.waitForConfirmation( this.v2Client, - fundingResponse.txId, + fundingResponse.txid, 1 ); - assert.ok(info['confirmed-round'] > 0); + assert.ok(info.confirmedRound > 0); } ); @@ -3376,10 +3375,10 @@ module.exports = function getSteps(options) { .do(); const info = await algosdk.waitForConfirmation( this.v2Client, - fundingResponse.txId, + fundingResponse.txid, 1 ); - assert.ok(info['confirmed-round'] > 0); + assert.ok(info.confirmedRound > 0); } ); @@ -3504,10 +3503,10 @@ module.exports = function getSteps(options) { Given('I wait for the transaction to be confirmed.', async function () { const info = await algosdk.waitForConfirmation( this.v2Client, - this.appTxid.txId, + this.appTxid.txid, 1 ); - assert.ok(info['confirmed-round'] > 0); + assert.ok(info.confirmedRound > 0); }); Given('I reset the array of application IDs to remember.', async function () { @@ -3516,9 +3515,9 @@ module.exports = function getSteps(options) { Given('I remember the new application ID.', async function () { const info = await this.v2Client - .pendingTransactionInformation(this.appTxid.txId) + .pendingTransactionInformation(this.appTxid.txid) .do(); - this.currentApplicationIndex = info['application-index']; + this.currentApplicationIndex = info.applicationIndex; if (!Object.prototype.hasOwnProperty.call(this, 'appIDs')) { this.appIDs = []; From 9e6394ac4c7a69fb084d16e94d0407c51634e869 Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Fri, 28 Jul 2023 15:09:36 -0700 Subject: [PATCH 09/33] Fix the rest of the tests --- src/client/v2/algod/dryrun.ts | 4 ++-- src/client/v2/algod/pendingTransactions.ts | 4 +++- .../v2/algod/pendingTransactionsByAddress.ts | 4 +++- tests/cucumber/steps/steps.js | 17 +++++++---------- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/client/v2/algod/dryrun.ts b/src/client/v2/algod/dryrun.ts index f636709db..6ef117fd8 100644 --- a/src/client/v2/algod/dryrun.ts +++ b/src/client/v2/algod/dryrun.ts @@ -24,8 +24,8 @@ export default class Dryrun extends JSONRequest { */ async do(headers = {}) { const txHeaders = setHeaders(headers); - const res = await this.c.post(this.path(), this.blob, txHeaders); - return res.body; + const res = await this.c.post(this.path(), this.blob, null, txHeaders); + return this.prepare(res.body); } // eslint-disable-next-line class-methods-use-this diff --git a/src/client/v2/algod/pendingTransactions.ts b/src/client/v2/algod/pendingTransactions.ts index a93efe84d..224eab97a 100644 --- a/src/client/v2/algod/pendingTransactions.ts +++ b/src/client/v2/algod/pendingTransactions.ts @@ -19,7 +19,9 @@ export default class PendingTransactions extends JSONRequest 0) { - return encoding.decode(body) as PendingTransactionsResponse; + return PendingTransactionsResponse.from_obj_for_encoding( + encoding.decode(body) + ); } return undefined; } diff --git a/src/client/v2/algod/pendingTransactionsByAddress.ts b/src/client/v2/algod/pendingTransactionsByAddress.ts index fb1460e33..9c520e722 100644 --- a/src/client/v2/algod/pendingTransactionsByAddress.ts +++ b/src/client/v2/algod/pendingTransactionsByAddress.ts @@ -16,7 +16,9 @@ export default class PendingTransactionsByAddress extends JSONRequest 0) { - return encoding.decode(body) as PendingTransactionsResponse; + return PendingTransactionsResponse.from_obj_for_encoding( + encoding.decode(body) + ); } return undefined; } diff --git a/tests/cucumber/steps/steps.js b/tests/cucumber/steps/steps.js index 963a426f0..73918003a 100644 --- a/tests/cucumber/steps/steps.js +++ b/tests/cucumber/steps/steps.js @@ -2840,16 +2840,13 @@ module.exports = function getSteps(options) { Then('I get execution result {string}', (result) => { let msgs; const res = dryrunResponse.txns[0]; - if ( - res['logic-sig-messages'] !== undefined && - res['logic-sig-messages'].length > 0 - ) { - msgs = res['logic-sig-messages']; + if (res.logicSigMessages !== undefined && res.logicSigMessages.length > 0) { + msgs = res.logicSigMessages; } else if ( - res['app-call-messages'] !== undefined && - res['app-call-messages'].length > 0 + res.appCallMessages !== undefined && + res.appCallMessages.length > 0 ) { - msgs = res['app-call-messages']; + msgs = res.appCallMessages; } assert.ok(msgs.length > 0); assert.strictEqual(msgs[0], result); @@ -4352,7 +4349,7 @@ module.exports = function getSteps(options) { function (index, pathString, expectedResult) { let actualResult = this.composerExecuteResponse.methodResults[index] .txInfo; - actualResult = glom(actualResult, pathString); + actualResult = glom(actualResult.get_obj_for_encoding(), pathString); assert.strictEqual(expectedResult, actualResult.toString()); } @@ -4372,7 +4369,7 @@ module.exports = function getSteps(options) { if (j === 0) { actualResults = actualResults[itxnIndex].txInfo; } else { - actualResults = actualResults['inner-txns'][itxnIndex]; + actualResults = actualResults.innerTxns[itxnIndex]; } const thisGroupID = actualResults.txn.txn.group; From e7ef82fc606515d40098217209c2c1cac9b3bd56 Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Fri, 28 Jul 2023 16:07:27 -0700 Subject: [PATCH 10/33] Fix dryrun test --- tests/cucumber/steps/steps.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cucumber/steps/steps.js b/tests/cucumber/steps/steps.js index 73918003a..52b29b7fe 100644 --- a/tests/cucumber/steps/steps.js +++ b/tests/cucumber/steps/steps.js @@ -2781,9 +2781,9 @@ module.exports = function getSteps(options) { Then( 'the parsed Dryrun Response should have global delta {string} with {int}', (key, action) => { - assert.strictEqual(dryrunResponse.txns[0]['global-delta'][0].key, key); + assert.strictEqual(dryrunResponse.txns[0].globalDelta[0].key, key); assert.strictEqual( - dryrunResponse.txns[0]['global-delta'][0].value.action, + dryrunResponse.txns[0].globalDelta[0].value.action, action ); } From 2baaabdd00b770df3aae545b0bc746395bbf32a2 Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Mon, 31 Jul 2023 08:16:01 -0700 Subject: [PATCH 11/33] Fix some examples --- examples/app.ts | 6 +++--- examples/asa.ts | 4 ++-- examples/atc.ts | 2 +- examples/overview.ts | 4 ++-- examples/utils.ts | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/app.ts b/examples/app.ts index c5829a862..9c62deef9 100644 --- a/examples/app.ts +++ b/examples/app.ts @@ -70,7 +70,7 @@ async function main() { 3 ); // Grab app id from confirmed transaction result - const appId = result['application-index']; + const appId = Number(result.applicationIndex); console.log(`Created app with index: ${appId}`); // example: APP_CREATE @@ -148,7 +148,7 @@ async function main() { // example: APP_READ_STATE const appInfo = await algodClient.getApplicationByID(appId).do(); - const globalState = appInfo.params['global-state'][0]; + const globalState = appInfo.params.globalState[0]; console.log(`Raw global state - ${JSON.stringify(globalState)}`); // decode b64 string key with Buffer @@ -164,7 +164,7 @@ async function main() { .accountApplicationInformation(caller.addr, appId) .do(); - const localState = accountAppInfo['app-local-state']['key-value'][0]; + const localState = accountAppInfo.appLocalState.keyValue[0]; console.log(`Raw local state - ${JSON.stringify(localState)}`); // decode b64 string key with Buffer diff --git a/examples/asa.ts b/examples/asa.ts index 41a3dbc4c..1fd7700b0 100644 --- a/examples/asa.ts +++ b/examples/asa.ts @@ -39,7 +39,7 @@ async function main() { 3 ); - const assetIndex = result['asset-index']; + const assetIndex = Number(result.assetIndex); console.log(`Asset ID created: ${assetIndex}`); // example: ASSET_CREATE @@ -79,7 +79,7 @@ async function main() { txn.txID().toString(), 3 ); - console.log(`Result confirmed in round: ${configResult['confirmed-round']}`); + console.log(`Result confirmed in round: ${configResult.confirmedRound}`); // example: ASSET_CONFIG const receiver = accounts[2]; diff --git a/examples/atc.ts b/examples/atc.ts index 61fd3d776..c7a8968a1 100644 --- a/examples/atc.ts +++ b/examples/atc.ts @@ -45,7 +45,7 @@ async function main() { createTxn.txID().toString(), 3 ); - const appIndex = response['application-index']; + const appIndex = Number(response.applicationIndex); // example: ATC_CREATE const atc = new algosdk.AtomicTransactionComposer(); diff --git a/examples/overview.ts b/examples/overview.ts index d44a33bcc..7031ffe63 100644 --- a/examples/overview.ts +++ b/examples/overview.ts @@ -35,8 +35,8 @@ async function main() { // example: TRANSACTION_PAYMENT_SIGN // example: TRANSACTION_PAYMENT_SUBMIT - const { txId } = await algodClient.sendRawTransaction(signedTxn).do(); - const result = await algosdk.waitForConfirmation(algodClient, txId, 4); + const { txid } = await algodClient.sendRawTransaction(signedTxn).do(); + const result = await algosdk.waitForConfirmation(algodClient, txid, 4); console.log(result); console.log(`Transaction Information: ${JSON.stringify(result.txn)}`); console.log( diff --git a/examples/utils.ts b/examples/utils.ts index da6ab0244..f022e85c2 100644 --- a/examples/utils.ts +++ b/examples/utils.ts @@ -130,6 +130,6 @@ export async function deployCalculatorApp( appCreateTxn.txID().toString(), 3 ); - const appId = result['application-index']; + const appId = Number(result.applicationIndex); return appId; } From 45104d1ac71bac874a143bf9e3c61930b8fec71b Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Mon, 31 Jul 2023 08:30:28 -0700 Subject: [PATCH 12/33] Fix debug example --- examples/debug.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/examples/debug.ts b/examples/debug.ts index ed5515bf2..7fbfa00c2 100644 --- a/examples/debug.ts +++ b/examples/debug.ts @@ -49,8 +49,7 @@ async function main() { // example: DEBUG_DRYRUN_SUBMIT const dryrunResponse = await algodClient.dryrun(dryrunRequest).do(); dryrunResponse.txns.forEach((txn) => { - console.log('Txn:', txn.txn); - console.log('Txn Results:', txn.txnresults); + console.log('Txn:', txn); }); // example: DEBUG_DRYRUN_SUBMIT } From 4b807de014cc8ace19b615be074cef774c73a852 Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Mon, 31 Jul 2023 10:30:01 -0700 Subject: [PATCH 13/33] Remove buffer --- src/client/v2/algod/sendRawTransaction.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/v2/algod/sendRawTransaction.ts b/src/client/v2/algod/sendRawTransaction.ts index 84d9629a6..dd3c387a2 100644 --- a/src/client/v2/algod/sendRawTransaction.ts +++ b/src/client/v2/algod/sendRawTransaction.ts @@ -52,7 +52,7 @@ export default class SendRawTransaction extends JSONRequest Date: Tue, 1 Aug 2023 10:17:28 -0700 Subject: [PATCH 14/33] Convert number to bigint union --- .../v2/algod/accountApplicationInformation.ts | 2 +- .../v2/algod/accountAssetInformation.ts | 2 +- src/client/v2/algod/algod.ts | 30 +++++++++---------- src/client/v2/algod/block.ts | 4 +-- .../v2/algod/getApplicationBoxByName.ts | 2 +- src/client/v2/algod/getApplicationBoxes.ts | 6 +++- src/client/v2/algod/getApplicationByID.ts | 6 +++- src/client/v2/algod/getAssetByID.ts | 6 +++- src/client/v2/algod/getBlockHash.ts | 8 +++-- src/client/v2/algod/getLedgerStateDelta.ts | 6 +++- ...ansactionGroupLedgerStateDeltasForRound.ts | 6 +++- src/client/v2/algod/getTransactionProof.ts | 2 +- src/client/v2/algod/lightBlockHeaderProof.ts | 6 +++- src/client/v2/algod/setSyncRound.ts | 6 +++- src/client/v2/algod/stateproof.ts | 6 +++- src/client/v2/algod/statusAfterBlock.ts | 6 +++- 16 files changed, 72 insertions(+), 32 deletions(-) diff --git a/src/client/v2/algod/accountApplicationInformation.ts b/src/client/v2/algod/accountApplicationInformation.ts index eaa9a6c3f..5195b4504 100644 --- a/src/client/v2/algod/accountApplicationInformation.ts +++ b/src/client/v2/algod/accountApplicationInformation.ts @@ -8,7 +8,7 @@ export default class AccountApplicationInformation extends JSONRequest > { - constructor(c: HTTPClient, intDecoding: IntDecoding, private index: number) { + constructor( + c: HTTPClient, + intDecoding: IntDecoding, + private index: number | bigint + ) { super(c, intDecoding); this.index = index; this.query.max = 0; diff --git a/src/client/v2/algod/getApplicationByID.ts b/src/client/v2/algod/getApplicationByID.ts index 333817901..b0b5da504 100644 --- a/src/client/v2/algod/getApplicationByID.ts +++ b/src/client/v2/algod/getApplicationByID.ts @@ -4,7 +4,11 @@ import IntDecoding from '../../../types/intDecoding'; import { Application } from './models/types'; export default class GetApplicationByID extends JSONRequest { - constructor(c: HTTPClient, intDecoding: IntDecoding, private index: number) { + constructor( + c: HTTPClient, + intDecoding: IntDecoding, + private index: number | bigint + ) { super(c, intDecoding); this.index = index; } diff --git a/src/client/v2/algod/getAssetByID.ts b/src/client/v2/algod/getAssetByID.ts index b7962b668..9db85e2f9 100644 --- a/src/client/v2/algod/getAssetByID.ts +++ b/src/client/v2/algod/getAssetByID.ts @@ -4,7 +4,11 @@ import IntDecoding from '../../../types/intDecoding'; import { Asset } from './models/types'; export default class GetAssetByID extends JSONRequest { - constructor(c: HTTPClient, intDecoding: IntDecoding, private index: number) { + constructor( + c: HTTPClient, + intDecoding: IntDecoding, + private index: number | bigint + ) { super(c, intDecoding); this.index = index; } diff --git a/src/client/v2/algod/getBlockHash.ts b/src/client/v2/algod/getBlockHash.ts index 7c9ba6bdf..e0622e092 100644 --- a/src/client/v2/algod/getBlockHash.ts +++ b/src/client/v2/algod/getBlockHash.ts @@ -4,9 +4,13 @@ import IntDecoding from '../../../types/intDecoding'; import { BlockHashResponse } from './models/types'; export default class GetBlockHash extends JSONRequest { - round: number; + round: number | bigint; - constructor(c: HTTPClient, intDecoding: IntDecoding, roundNumber: number) { + constructor( + c: HTTPClient, + intDecoding: IntDecoding, + roundNumber: number | bigint + ) { super(c, intDecoding); if (!Number.isInteger(roundNumber)) throw Error('roundNumber should be an integer'); diff --git a/src/client/v2/algod/getLedgerStateDelta.ts b/src/client/v2/algod/getLedgerStateDelta.ts index ac69daeab..31e7b3794 100644 --- a/src/client/v2/algod/getLedgerStateDelta.ts +++ b/src/client/v2/algod/getLedgerStateDelta.ts @@ -3,7 +3,11 @@ import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; export default class GetLedgerStateDelta extends JSONRequest { - constructor(c: HTTPClient, intDecoding: IntDecoding, private round: bigint) { + constructor( + c: HTTPClient, + intDecoding: IntDecoding, + private round: number | bigint + ) { super(c, intDecoding); this.round = round; this.query = { format: 'json' }; diff --git a/src/client/v2/algod/getTransactionGroupLedgerStateDeltasForRound.ts b/src/client/v2/algod/getTransactionGroupLedgerStateDeltasForRound.ts index 1c1776034..cb0c9d401 100644 --- a/src/client/v2/algod/getTransactionGroupLedgerStateDeltasForRound.ts +++ b/src/client/v2/algod/getTransactionGroupLedgerStateDeltasForRound.ts @@ -7,7 +7,11 @@ export default class GetTransactionGroupLedgerStateDeltasForRound extends JSONRe TransactionGroupLedgerStateDeltasForRoundResponse, Record > { - constructor(c: HTTPClient, intDecoding: IntDecoding, private round: bigint) { + constructor( + c: HTTPClient, + intDecoding: IntDecoding, + private round: number | bigint + ) { super(c, intDecoding); this.round = round; this.query = { format: 'json' }; diff --git a/src/client/v2/algod/getTransactionProof.ts b/src/client/v2/algod/getTransactionProof.ts index 912420023..109ce9134 100644 --- a/src/client/v2/algod/getTransactionProof.ts +++ b/src/client/v2/algod/getTransactionProof.ts @@ -7,7 +7,7 @@ export default class GetTransactionProof extends JSONRequest { - constructor(c: HTTPClient, intDecoding: IntDecoding, private round: number) { + constructor( + c: HTTPClient, + intDecoding: IntDecoding, + private round: number | bigint + ) { super(c, intDecoding); this.round = round; diff --git a/src/client/v2/algod/setSyncRound.ts b/src/client/v2/algod/setSyncRound.ts index f6427a734..60c55daff 100644 --- a/src/client/v2/algod/setSyncRound.ts +++ b/src/client/v2/algod/setSyncRound.ts @@ -3,7 +3,11 @@ import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; export default class SetSyncRound extends JSONRequest { - constructor(c: HTTPClient, intDecoding: IntDecoding, private round: number) { + constructor( + c: HTTPClient, + intDecoding: IntDecoding, + private round: number | bigint + ) { super(c, intDecoding); this.round = round; diff --git a/src/client/v2/algod/stateproof.ts b/src/client/v2/algod/stateproof.ts index 05a2406d0..168823908 100644 --- a/src/client/v2/algod/stateproof.ts +++ b/src/client/v2/algod/stateproof.ts @@ -4,7 +4,11 @@ import IntDecoding from '../../../types/intDecoding'; import { StateProof as SP } from './models/types'; export default class StateProof extends JSONRequest { - constructor(c: HTTPClient, intDecoding: IntDecoding, private round: number) { + constructor( + c: HTTPClient, + intDecoding: IntDecoding, + private round: number | bigint + ) { super(c, intDecoding); this.round = round; diff --git a/src/client/v2/algod/statusAfterBlock.ts b/src/client/v2/algod/statusAfterBlock.ts index 170a1d5db..733a3aceb 100644 --- a/src/client/v2/algod/statusAfterBlock.ts +++ b/src/client/v2/algod/statusAfterBlock.ts @@ -4,7 +4,11 @@ import IntDecoding from '../../../types/intDecoding'; import { NodeStatusResponse } from './models/types'; export default class StatusAfterBlock extends JSONRequest { - constructor(c: HTTPClient, intDecoding: IntDecoding, private round: number) { + constructor( + c: HTTPClient, + intDecoding: IntDecoding, + private round: number | bigint + ) { super(c, intDecoding); if (!Number.isInteger(round)) throw Error('round should be an integer'); this.round = round; From 923d5357622d4c646d5be9d1f83994966757a6a9 Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Tue, 1 Aug 2023 10:29:15 -0700 Subject: [PATCH 15/33] Add comment on doRaw --- tests/cucumber/steps/steps.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/cucumber/steps/steps.js b/tests/cucumber/steps/steps.js index 52b29b7fe..a77c48497 100644 --- a/tests/cucumber/steps/steps.js +++ b/tests/cucumber/steps/steps.js @@ -180,6 +180,12 @@ module.exports = function getSteps(options) { return boxRefArray; } + /* + doRaw and the associated functions are used to allow test servers to return unexpected response data in cases where + we're not testing the functionality of the response. It is the responsibility of the mocking step to set the doRaw + variable to true if it intends to send bad responses. + By default, we you `do` which will throw an exception if malformed response data is returned. + */ let doRaw = false; function doOrDoRaw(req) { From e56540f5af109b525a0980b4ed525566a898df04 Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Tue, 15 Aug 2023 16:14:00 -0700 Subject: [PATCH 16/33] PR comments --- .../v2/algod/accountApplicationInformation.ts | 7 +- .../v2/algod/accountAssetInformation.ts | 7 +- src/client/v2/algod/accountInformation.ts | 7 +- src/client/v2/algod/compile.ts | 7 +- src/client/v2/algod/disassemble.ts | 7 +- src/client/v2/algod/dryrun.ts | 7 +- src/client/v2/algod/getApplicationByID.ts | 7 +- src/client/v2/algod/getAssetByID.ts | 7 +- src/client/v2/algod/getBlockHash.ts | 7 +- src/client/v2/algod/getTransactionProof.ts | 7 +- src/client/v2/algod/lightBlockHeaderProof.ts | 7 +- .../v2/algod/pendingTransactionInformation.ts | 5 +- src/client/v2/algod/pendingTransactions.ts | 5 +- .../v2/algod/pendingTransactionsByAddress.ts | 5 +- src/client/v2/algod/sendRawTransaction.ts | 7 +- src/client/v2/algod/stateproof.ts | 4 +- src/client/v2/algod/status.ts | 7 +- src/client/v2/algod/statusAfterBlock.ts | 7 +- src/client/v2/algod/suggestedParams.ts | 5 +- src/client/v2/algod/supply.ts | 7 +- src/client/v2/algod/versions.ts | 7 +- src/client/v2/serviceClient.ts | 2 +- src/composer.ts | 2 +- tests/cucumber/steps/steps.js | 128 ++++++++++-------- 24 files changed, 169 insertions(+), 99 deletions(-) diff --git a/src/client/v2/algod/accountApplicationInformation.ts b/src/client/v2/algod/accountApplicationInformation.ts index 5195b4504..30135aff3 100644 --- a/src/client/v2/algod/accountApplicationInformation.ts +++ b/src/client/v2/algod/accountApplicationInformation.ts @@ -3,7 +3,10 @@ import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; import { AccountApplicationResponse } from './models/types'; -export default class AccountApplicationInformation extends JSONRequest { +export default class AccountApplicationInformation extends JSONRequest< + AccountApplicationResponse, + Record +> { constructor( c: HTTPClient, intDecoding: IntDecoding, @@ -20,7 +23,7 @@ export default class AccountApplicationInformation extends JSONRequest): AccountApplicationResponse { return AccountApplicationResponse.from_obj_for_encoding(body); } } diff --git a/src/client/v2/algod/accountAssetInformation.ts b/src/client/v2/algod/accountAssetInformation.ts index 8955bd759..1fa2939da 100644 --- a/src/client/v2/algod/accountAssetInformation.ts +++ b/src/client/v2/algod/accountAssetInformation.ts @@ -3,7 +3,10 @@ import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; import { AccountAssetResponse } from './models/types'; -export default class AccountAssetInformation extends JSONRequest { +export default class AccountAssetInformation extends JSONRequest< + AccountAssetResponse, + Record +> { constructor( c: HTTPClient, intDecoding: IntDecoding, @@ -20,7 +23,7 @@ export default class AccountAssetInformation extends JSONRequest): AccountAssetResponse { return AccountAssetResponse.from_obj_for_encoding(body); } } diff --git a/src/client/v2/algod/accountInformation.ts b/src/client/v2/algod/accountInformation.ts index f322e4714..d50598d54 100644 --- a/src/client/v2/algod/accountInformation.ts +++ b/src/client/v2/algod/accountInformation.ts @@ -3,7 +3,10 @@ import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; import { Account } from './models/types'; -export default class AccountInformation extends JSONRequest { +export default class AccountInformation extends JSONRequest< + Account, + Record +> { constructor( c: HTTPClient, intDecoding: IntDecoding, @@ -37,7 +40,7 @@ export default class AccountInformation extends JSONRequest { } // eslint-disable-next-line class-methods-use-this - prepare(body: Uint8Array): Account { + prepare(body: Record): Account { return Account.from_obj_for_encoding(body); } } diff --git a/src/client/v2/algod/compile.ts b/src/client/v2/algod/compile.ts index f935c7c07..1c9c125d6 100644 --- a/src/client/v2/algod/compile.ts +++ b/src/client/v2/algod/compile.ts @@ -19,7 +19,10 @@ export function setHeaders(headers = {}) { /** * Executes compile */ -export default class Compile extends JSONRequest { +export default class Compile extends JSONRequest< + CompileResponse, + Record +> { constructor(c: HTTPClient, private source: string | Uint8Array) { super(c); this.source = source; @@ -51,7 +54,7 @@ export default class Compile extends JSONRequest { } // eslint-disable-next-line class-methods-use-this - prepare(body: Uint8Array): CompileResponse { + prepare(body: Record): CompileResponse { return CompileResponse.from_obj_for_encoding(body); } } diff --git a/src/client/v2/algod/disassemble.ts b/src/client/v2/algod/disassemble.ts index eaa5c62de..29f1e486a 100644 --- a/src/client/v2/algod/disassemble.ts +++ b/src/client/v2/algod/disassemble.ts @@ -19,7 +19,10 @@ export function setHeaders(headers = {}) { /** * Executes disassemble */ -export default class Disassemble extends JSONRequest { +export default class Disassemble extends JSONRequest< + DisassembleResponse, + Record +> { constructor(c: HTTPClient, private source: string | Uint8Array) { super(c); this.source = source; @@ -46,7 +49,7 @@ export default class Disassemble extends JSONRequest { } // eslint-disable-next-line class-methods-use-this - prepare(body: Uint8Array): DisassembleResponse { + prepare(body: Record): DisassembleResponse { return DisassembleResponse.from_obj_for_encoding(body); } } diff --git a/src/client/v2/algod/dryrun.ts b/src/client/v2/algod/dryrun.ts index 6ef117fd8..9674d1e17 100644 --- a/src/client/v2/algod/dryrun.ts +++ b/src/client/v2/algod/dryrun.ts @@ -5,7 +5,10 @@ import { setHeaders } from './compile'; import { DryrunResponse } from './models/types'; import * as modelsv2 from './models/types'; -export default class Dryrun extends JSONRequest { +export default class Dryrun extends JSONRequest< + DryrunResponse, + Record +> { private blob: Uint8Array; constructor(c: HTTPClient, dr: modelsv2.DryrunRequest) { @@ -29,7 +32,7 @@ export default class Dryrun extends JSONRequest { } // eslint-disable-next-line class-methods-use-this - prepare(body: Uint8Array): DryrunResponse { + prepare(body: Record): DryrunResponse { return DryrunResponse.from_obj_for_encoding(body); } } diff --git a/src/client/v2/algod/getApplicationByID.ts b/src/client/v2/algod/getApplicationByID.ts index b0b5da504..368c9f4b0 100644 --- a/src/client/v2/algod/getApplicationByID.ts +++ b/src/client/v2/algod/getApplicationByID.ts @@ -3,7 +3,10 @@ import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; import { Application } from './models/types'; -export default class GetApplicationByID extends JSONRequest { +export default class GetApplicationByID extends JSONRequest< + Application, + Record +> { constructor( c: HTTPClient, intDecoding: IntDecoding, @@ -18,7 +21,7 @@ export default class GetApplicationByID extends JSONRequest { } // eslint-disable-next-line class-methods-use-this - prepare(body: Uint8Array): Application { + prepare(body: Record): Application { return Application.from_obj_for_encoding(body); } } diff --git a/src/client/v2/algod/getAssetByID.ts b/src/client/v2/algod/getAssetByID.ts index 9db85e2f9..cde2c4db1 100644 --- a/src/client/v2/algod/getAssetByID.ts +++ b/src/client/v2/algod/getAssetByID.ts @@ -3,7 +3,10 @@ import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; import { Asset } from './models/types'; -export default class GetAssetByID extends JSONRequest { +export default class GetAssetByID extends JSONRequest< + Asset, + Record +> { constructor( c: HTTPClient, intDecoding: IntDecoding, @@ -18,7 +21,7 @@ export default class GetAssetByID extends JSONRequest { } // eslint-disable-next-line class-methods-use-this - prepare(body: Uint8Array): Asset { + prepare(body: Record): Asset { return Asset.from_obj_for_encoding(body); } } diff --git a/src/client/v2/algod/getBlockHash.ts b/src/client/v2/algod/getBlockHash.ts index e0622e092..8432e85a3 100644 --- a/src/client/v2/algod/getBlockHash.ts +++ b/src/client/v2/algod/getBlockHash.ts @@ -3,7 +3,10 @@ import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; import { BlockHashResponse } from './models/types'; -export default class GetBlockHash extends JSONRequest { +export default class GetBlockHash extends JSONRequest< + BlockHashResponse, + Record +> { round: number | bigint; constructor( @@ -22,7 +25,7 @@ export default class GetBlockHash extends JSONRequest { } // eslint-disable-next-line class-methods-use-this - prepare(body: Uint8Array): BlockHashResponse { + prepare(body: Record): BlockHashResponse { return BlockHashResponse.from_obj_for_encoding(body); } } diff --git a/src/client/v2/algod/getTransactionProof.ts b/src/client/v2/algod/getTransactionProof.ts index 109ce9134..930d5c73f 100644 --- a/src/client/v2/algod/getTransactionProof.ts +++ b/src/client/v2/algod/getTransactionProof.ts @@ -3,7 +3,10 @@ import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; import { TransactionProofResponse } from './models/types'; -export default class GetTransactionProof extends JSONRequest { +export default class GetTransactionProof extends JSONRequest< + TransactionProofResponse, + Record +> { constructor( c: HTTPClient, intDecoding: IntDecoding, @@ -43,7 +46,7 @@ export default class GetTransactionProof extends JSONRequest): TransactionProofResponse { return TransactionProofResponse.from_obj_for_encoding(body); } } diff --git a/src/client/v2/algod/lightBlockHeaderProof.ts b/src/client/v2/algod/lightBlockHeaderProof.ts index 36757c608..765851d41 100644 --- a/src/client/v2/algod/lightBlockHeaderProof.ts +++ b/src/client/v2/algod/lightBlockHeaderProof.ts @@ -3,7 +3,10 @@ import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; import { LightBlockHeaderProof as LBHP } from './models/types'; -export default class LightBlockHeaderProof extends JSONRequest { +export default class LightBlockHeaderProof extends JSONRequest< + LBHP, + Record +> { constructor( c: HTTPClient, intDecoding: IntDecoding, @@ -19,7 +22,7 @@ export default class LightBlockHeaderProof extends JSONRequest { } // eslint-disable-next-line class-methods-use-this - prepare(body: Uint8Array): LBHP { + prepare(body: Record): LBHP { return LBHP.from_obj_for_encoding(body); } } diff --git a/src/client/v2/algod/pendingTransactionInformation.ts b/src/client/v2/algod/pendingTransactionInformation.ts index f43eaae8d..f3dcadd3b 100644 --- a/src/client/v2/algod/pendingTransactionInformation.ts +++ b/src/client/v2/algod/pendingTransactionInformation.ts @@ -6,7 +6,10 @@ import { PendingTransactionResponse } from './models/types'; /** * returns the transaction information for a specific txid of a pending transaction */ -export default class PendingTransactionInformation extends JSONRequest { +export default class PendingTransactionInformation extends JSONRequest< + PendingTransactionResponse, + Uint8Array +> { constructor(c: HTTPClient, private txid: string) { super(c); this.txid = txid; diff --git a/src/client/v2/algod/pendingTransactions.ts b/src/client/v2/algod/pendingTransactions.ts index 224eab97a..97f457fb8 100644 --- a/src/client/v2/algod/pendingTransactions.ts +++ b/src/client/v2/algod/pendingTransactions.ts @@ -6,7 +6,10 @@ import { PendingTransactionsResponse } from './models/types'; /** * pendingTransactionsInformation returns transactions that are pending in the pool */ -export default class PendingTransactions extends JSONRequest { +export default class PendingTransactions extends JSONRequest< + PendingTransactionsResponse, + Uint8Array +> { constructor(c: HTTPClient) { super(c); this.query.format = 'msgpack'; diff --git a/src/client/v2/algod/pendingTransactionsByAddress.ts b/src/client/v2/algod/pendingTransactionsByAddress.ts index 9c520e722..c3dff4636 100644 --- a/src/client/v2/algod/pendingTransactionsByAddress.ts +++ b/src/client/v2/algod/pendingTransactionsByAddress.ts @@ -6,7 +6,10 @@ import { PendingTransactionsResponse } from './models/types'; /** * returns all transactions for a PK [addr] in the [first, last] rounds range. */ -export default class PendingTransactionsByAddress extends JSONRequest { +export default class PendingTransactionsByAddress extends JSONRequest< + PendingTransactionsResponse, + Uint8Array +> { constructor(c: HTTPClient, private address: string) { super(c); this.address = address; diff --git a/src/client/v2/algod/sendRawTransaction.ts b/src/client/v2/algod/sendRawTransaction.ts index dd3c387a2..f422eef2b 100644 --- a/src/client/v2/algod/sendRawTransaction.ts +++ b/src/client/v2/algod/sendRawTransaction.ts @@ -24,7 +24,10 @@ function isByteArray(array: any): array is Uint8Array { /** * broadcasts the passed signed txns to the network */ -export default class SendRawTransaction extends JSONRequest { +export default class SendRawTransaction extends JSONRequest< + PostTransactionsResponse, + Record +> { private txnBytesToPost: Uint8Array; constructor(c: HTTPClient, stxOrStxs: Uint8Array | Uint8Array[]) { @@ -60,7 +63,7 @@ export default class SendRawTransaction extends JSONRequest): PostTransactionsResponse { return PostTransactionsResponse.from_obj_for_encoding(body); } } diff --git a/src/client/v2/algod/stateproof.ts b/src/client/v2/algod/stateproof.ts index 168823908..6d485a6e7 100644 --- a/src/client/v2/algod/stateproof.ts +++ b/src/client/v2/algod/stateproof.ts @@ -3,7 +3,7 @@ import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; import { StateProof as SP } from './models/types'; -export default class StateProof extends JSONRequest { +export default class StateProof extends JSONRequest> { constructor( c: HTTPClient, intDecoding: IntDecoding, @@ -19,7 +19,7 @@ export default class StateProof extends JSONRequest { } // eslint-disable-next-line class-methods-use-this - prepare(body: Uint8Array): SP { + prepare(body: Record): SP { return SP.from_obj_for_encoding(body); } } diff --git a/src/client/v2/algod/status.ts b/src/client/v2/algod/status.ts index 374d69fb3..ab203c389 100644 --- a/src/client/v2/algod/status.ts +++ b/src/client/v2/algod/status.ts @@ -1,14 +1,17 @@ import JSONRequest from '../jsonrequest'; import { NodeStatusResponse } from './models/types'; -export default class Status extends JSONRequest { +export default class Status extends JSONRequest< + NodeStatusResponse, + Record +> { // eslint-disable-next-line class-methods-use-this path() { return '/v2/status'; } // eslint-disable-next-line class-methods-use-this - prepare(body: Uint8Array): NodeStatusResponse { + prepare(body: Record): NodeStatusResponse { return NodeStatusResponse.from_obj_for_encoding(body); } } diff --git a/src/client/v2/algod/statusAfterBlock.ts b/src/client/v2/algod/statusAfterBlock.ts index 733a3aceb..f70cf0792 100644 --- a/src/client/v2/algod/statusAfterBlock.ts +++ b/src/client/v2/algod/statusAfterBlock.ts @@ -3,7 +3,10 @@ import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; import { NodeStatusResponse } from './models/types'; -export default class StatusAfterBlock extends JSONRequest { +export default class StatusAfterBlock extends JSONRequest< + NodeStatusResponse, + Record +> { constructor( c: HTTPClient, intDecoding: IntDecoding, @@ -19,7 +22,7 @@ export default class StatusAfterBlock extends JSONRequest { } // eslint-disable-next-line class-methods-use-this - prepare(body: Uint8Array): NodeStatusResponse { + prepare(body: Record): NodeStatusResponse { return NodeStatusResponse.from_obj_for_encoding(body); } } diff --git a/src/client/v2/algod/suggestedParams.ts b/src/client/v2/algod/suggestedParams.ts index 86421a27f..f4ca8cea6 100644 --- a/src/client/v2/algod/suggestedParams.ts +++ b/src/client/v2/algod/suggestedParams.ts @@ -4,7 +4,10 @@ import { SuggestedParamsWithMinFee } from '../../../types/transactions/base'; /** * Returns the common needed parameters for a new transaction, in a format the transaction builder expects */ -export default class SuggestedParamsRequest extends JSONRequest { +export default class SuggestedParamsRequest extends JSONRequest< + SuggestedParamsWithMinFee, + Record +> { /* eslint-disable class-methods-use-this */ path() { return '/v2/transactions/params'; diff --git a/src/client/v2/algod/supply.ts b/src/client/v2/algod/supply.ts index 0f6eac3ba..21f350307 100644 --- a/src/client/v2/algod/supply.ts +++ b/src/client/v2/algod/supply.ts @@ -1,14 +1,17 @@ import JSONRequest from '../jsonrequest'; import { SupplyResponse } from './models/types'; -export default class Supply extends JSONRequest { +export default class Supply extends JSONRequest< + SupplyResponse, + Record +> { // eslint-disable-next-line class-methods-use-this path() { return '/v2/ledger/supply'; } // eslint-disable-next-line class-methods-use-this - prepare(body: Uint8Array): SupplyResponse { + prepare(body: Record): SupplyResponse { return SupplyResponse.from_obj_for_encoding(body); } } diff --git a/src/client/v2/algod/versions.ts b/src/client/v2/algod/versions.ts index 02edd51b5..05b77d554 100644 --- a/src/client/v2/algod/versions.ts +++ b/src/client/v2/algod/versions.ts @@ -4,14 +4,17 @@ import { Version } from './models/types'; /** * retrieves the VersionResponse from the running node */ -export default class Versions extends JSONRequest { +export default class Versions extends JSONRequest< + Version, + Record +> { // eslint-disable-next-line class-methods-use-this path() { return '/versions'; } // eslint-disable-next-line class-methods-use-this - prepare(body: Uint8Array): Version { + prepare(body: Record): Version { return Version.from_obj_for_encoding(body); } } diff --git a/src/client/v2/serviceClient.ts b/src/client/v2/serviceClient.ts index 877818b29..0103ae5df 100644 --- a/src/client/v2/serviceClient.ts +++ b/src/client/v2/serviceClient.ts @@ -67,7 +67,7 @@ export default abstract class ServiceClient { this.c = new HTTPClient(tokenHeader, baseServer, port, defaultHeaders); } - this.intDecoding = IntDecoding.DEFAULT; + this.intDecoding = IntDecoding.BIGINT; } /** diff --git a/src/composer.ts b/src/composer.ts index 660fa740d..40272dee2 100644 --- a/src/composer.ts +++ b/src/composer.ts @@ -64,7 +64,7 @@ export interface ABIResult { /** If the SDK was unable to decode a return value, the error will be here. */ decodeError?: Error; /** The pending transaction information from the method transaction */ - txInfo?: Record; + txInfo?: PendingTransactionResponse; } export enum AtomicTransactionComposerStatus { diff --git a/tests/cucumber/steps/steps.js b/tests/cucumber/steps/steps.js index a77c48497..020fdae46 100644 --- a/tests/cucumber/steps/steps.js +++ b/tests/cucumber/steps/steps.js @@ -2,6 +2,7 @@ const assert = require('assert'); const fs = require('fs'); const path = require('path'); +const JSONBig = require('json-bigint'); const algosdk = require('../../../src/index'); const nacl = require('../../../src/nacl/naclWrappers'); @@ -188,15 +189,7 @@ module.exports = function getSteps(options) { */ let doRaw = false; - function doOrDoRaw(req) { - if (doRaw === true) { - doRaw = false; - return req.doRaw(); - } - return req.do(); - } - - async function doOrDoRawAsync(req) { + async function doOrDoRaw(req) { if (doRaw === true) { doRaw = false; return req.doRaw(); @@ -1599,8 +1592,8 @@ module.exports = function getSteps(options) { // them before comparing, which is why we chain encoding/decoding below. if (responseFormat === 'json') { assert.strictEqual( - JSON.stringify(JSON.parse(expectedMockResponse)), - JSON.stringify(this.actualMockResponse) + JSONBig.stringify(JSONBig.parse(expectedMockResponse)), + JSONBig.stringify(this.actualMockResponse) ); } else { assert.deepStrictEqual( @@ -1719,7 +1712,7 @@ module.exports = function getSteps(options) { if (format !== 'msgpack') { assert.fail('this SDK only supports format msgpack for this function'); } - await doOrDoRawAsync(this.v2Client.pendingTransactionInformation(txid)); + await doOrDoRaw(this.v2Client.pendingTransactionInformation(txid)); } ); @@ -1729,16 +1722,16 @@ module.exports = function getSteps(options) { if (format !== 'msgpack') { assert.fail('this SDK only supports format msgpack for this function'); } - await doOrDoRawAsync( - this.v2Client.pendingTransactionsInformation().max(max) - ); + await doOrDoRaw(this.v2Client.pendingTransactionsInformation().max(max)); } ); When( 'we make a Pending Transactions By Address call against account {string} and max {int}', - function (account, max) { - doOrDoRaw(this.v2Client.pendingTransactionByAddress(account).max(max)); + async function (account, max) { + await doOrDoRaw( + this.v2Client.pendingTransactionByAddress(account).max(max) + ); } ); @@ -1748,7 +1741,7 @@ module.exports = function getSteps(options) { if (format !== 'msgpack') { assert.fail('this SDK only supports format msgpack for this function'); } - await doOrDoRawAsync( + await doOrDoRaw( this.v2Client.pendingTransactionByAddress(account).max(max) ); } @@ -1757,14 +1750,14 @@ module.exports = function getSteps(options) { When( 'we make a Status after Block call with round {int}', async function (round) { - await doOrDoRawAsync(this.v2Client.statusAfterBlock(round)); + await doOrDoRaw(this.v2Client.statusAfterBlock(round)); } ); When( 'we make an Account Information call against account {string} with exclude {string}', async function (account, exclude) { - await doOrDoRawAsync( + await doOrDoRaw( this.v2Client.accountInformation(account).exclude(exclude) ); } @@ -1773,23 +1766,21 @@ module.exports = function getSteps(options) { When( 'we make an Account Information call against account {string}', async function (account) { - await doOrDoRawAsync(this.v2Client.accountInformation(account)); + await doOrDoRaw(this.v2Client.accountInformation(account)); } ); When( 'we make an Account Asset Information call against account {string} assetID {int}', async function (account, assetID) { - await doOrDoRawAsync( - this.v2Client.accountAssetInformation(account, assetID) - ); + await doOrDoRaw(this.v2Client.accountAssetInformation(account, assetID)); } ); When( 'we make an Account Application Information call against account {string} applicationID {int}', async function (account, applicationID) { - await doOrDoRawAsync( + await doOrDoRaw( this.v2Client.accountApplicationInformation(account, applicationID) ); } @@ -1797,8 +1788,8 @@ module.exports = function getSteps(options) { When( 'we make a Get Block call against block number {int}', - function (blockNum) { - doOrDoRaw(this.v2Client.block(blockNum)); + async function (blockNum) { + await doOrDoRaw(this.v2Client.block(blockNum)); } ); @@ -1808,18 +1799,18 @@ module.exports = function getSteps(options) { if (format !== 'msgpack') { assert.fail('this SDK only supports format msgpack for this function'); } - await doOrDoRawAsync(this.v2Client.block(blockNum)); + await doOrDoRaw(this.v2Client.block(blockNum)); } ); When('we make a GetAssetByID call for assetID {int}', async function (index) { - await doOrDoRawAsync(this.v2Client.getAssetByID(index)); + await doOrDoRaw(this.v2Client.getAssetByID(index)); }); When( 'we make a GetApplicationByID call for applicationID {int}', async function (index) { - await doOrDoRawAsync(this.v2Client.getApplicationByID(index)); + await doOrDoRaw(this.v2Client.getApplicationByID(index)); } ); @@ -1841,7 +1832,7 @@ module.exports = function getSteps(options) { let anyPendingTransactionInfoResponse; When('we make any Pending Transaction Information call', async function () { - anyPendingTransactionInfoResponse = await doOrDoRawAsync( + anyPendingTransactionInfoResponse = await doOrDoRaw( this.v2Client.pendingTransactionInformation() ); }); @@ -1859,7 +1850,7 @@ module.exports = function getSteps(options) { let anyPendingTransactionsInfoResponse; When('we make any Pending Transactions Information call', async function () { - anyPendingTransactionsInfoResponse = await doOrDoRawAsync( + anyPendingTransactionsInfoResponse = await doOrDoRaw( this.v2Client.pendingTransactionsInformation() ); }); @@ -1885,7 +1876,7 @@ module.exports = function getSteps(options) { let anySendRawTransactionResponse; When('we make any Send Raw Transaction call', async function () { - anySendRawTransactionResponse = await doOrDoRawAsync( + anySendRawTransactionResponse = await doOrDoRaw( this.v2Client.sendRawTransaction(makeUint8Array(0)) ); }); @@ -1900,7 +1891,7 @@ module.exports = function getSteps(options) { let anyPendingTransactionsByAddressResponse; When('we make any Pending Transactions By Address call', async function () { - anyPendingTransactionsByAddressResponse = await doOrDoRawAsync( + anyPendingTransactionsByAddressResponse = await doOrDoRaw( this.v2Client.pendingTransactionByAddress() ); }); @@ -1925,48 +1916,61 @@ module.exports = function getSteps(options) { let anyNodeStatusResponse; When('we make any Node Status call', async function () { - anyNodeStatusResponse = await doOrDoRawAsync(this.v2Client.status()); + anyNodeStatusResponse = await doOrDoRaw(this.v2Client.status()); }); Then( 'the parsed Node Status response should have a last round of {int}', (lastRound) => { - assert.strictEqual(lastRound, anyNodeStatusResponse.lastRound); + assert.strictEqual( + lastRound.toString(), + anyNodeStatusResponse.lastRound.toString() + ); } ); let anyLedgerSupplyResponse; When('we make any Ledger Supply call', async function () { - anyLedgerSupplyResponse = await doOrDoRawAsync(this.v2Client.supply()); + anyLedgerSupplyResponse = await doOrDoRaw(this.v2Client.supply()); }); Then( 'the parsed Ledger Supply response should have totalMoney {int} onlineMoney {int} on round {int}', (totalMoney, onlineMoney, round) => { - assert.strictEqual(totalMoney, anyLedgerSupplyResponse.totalMoney); - assert.strictEqual(onlineMoney, anyLedgerSupplyResponse.onlineMoney); - assert.strictEqual(round, anyLedgerSupplyResponse.currentRound); + assert.strictEqual( + totalMoney.toString(), + anyLedgerSupplyResponse.totalMoney.toString() + ); + assert.strictEqual( + onlineMoney.toString(), + anyLedgerSupplyResponse.onlineMoney.toString() + ); + assert.strictEqual( + round.toString(), + anyLedgerSupplyResponse.currentRound.toString() + ); } ); When('we make any Status After Block call', async function () { - anyNodeStatusResponse = await doOrDoRawAsync( - this.v2Client.statusAfterBlock(1) - ); + anyNodeStatusResponse = await doOrDoRaw(this.v2Client.statusAfterBlock(1)); }); Then( 'the parsed Status After Block response should have a last round of {int}', (lastRound) => { - assert.strictEqual(lastRound, anyNodeStatusResponse.lastRound); + assert.strictEqual( + lastRound.toString(), + anyNodeStatusResponse.lastRound.toString() + ); } ); let anyAccountInformationResponse; When('we make any Account Information call', async function () { - anyAccountInformationResponse = await doOrDoRawAsync( + anyAccountInformationResponse = await doOrDoRaw( this.v2Client.accountInformation() ); }); @@ -1981,7 +1985,7 @@ module.exports = function getSteps(options) { let anyBlockResponse; When('we make any Get Block call', async function () { - anyBlockResponse = await doOrDoRawAsync(this.v2Client.block(1)); + anyBlockResponse = await doOrDoRaw(this.v2Client.block(1)); }); Then( @@ -1997,7 +2001,7 @@ module.exports = function getSteps(options) { let anySuggestedTransactionsResponse; When('we make any Suggested Transaction Parameters call', async function () { - anySuggestedTransactionsResponse = await doOrDoRawAsync( + anySuggestedTransactionsResponse = await doOrDoRaw( this.v2Client.getTransactionParams() ); }); @@ -2021,7 +2025,7 @@ module.exports = function getSteps(options) { currencyGreater, currencyLesser ) { - await doOrDoRawAsync( + await doOrDoRaw( this.indexerClient .lookupAssetBalances(index) .limit(limit) @@ -2586,8 +2590,8 @@ module.exports = function getSteps(options) { 'the parsed LookupAccountTransactions response should be valid on round {int}, and contain an array of len {int} and element number {int} should have sender {string}', (round, length, idx, sender) => { assert.strictEqual( - round, - anyLookupAccountTransactionsResponse['current-round'] + round.toString(), + anyLookupAccountTransactionsResponse['current-round'].toString() ); assert.strictEqual( length, @@ -2656,7 +2660,10 @@ module.exports = function getSteps(options) { Then( 'the parsed SearchAccounts response should be valid on round {int} and the array should be of len {int} and the element at index {int} should have address {string}', (round, length, idx, address) => { - assert.strictEqual(round, anySearchAccountsResponse['current-round']); + assert.strictEqual( + round.toString(), + anySearchAccountsResponse['current-round'].toString() + ); assert.strictEqual(length, anySearchAccountsResponse.accounts.length); if (length === 0) { return; @@ -2695,8 +2702,8 @@ module.exports = function getSteps(options) { 'the parsed SearchForTransactions response should be valid on round {int} and the array should be of len {int} and the element at index {int} should have sender {string}', (round, length, idx, sender) => { assert.strictEqual( - round, - anySearchForTransactionsResponse['current-round'] + round.toString(), + anySearchForTransactionsResponse['current-round'].toString() ); assert.strictEqual( length, @@ -2744,14 +2751,17 @@ module.exports = function getSteps(options) { Then( 'the parsed SearchForAssets response should be valid on round {int} and the array should be of len {int} and the element at index {int} should have asset index {int}', (round, length, idx, assetIndex) => { - assert.strictEqual(round, anySearchForAssetsResponse['current-round']); + assert.strictEqual( + round.toString(), + anySearchForAssetsResponse['current-round'].toString() + ); assert.strictEqual(length, anySearchForAssetsResponse.assets.length); if (length === 0) { return; } assert.strictEqual( - assetIndex, - anySearchForAssetsResponse.assets[idx].index + assetIndex.toString(), + anySearchForAssetsResponse.assets[idx].index.toString() ); } ); @@ -4683,18 +4693,18 @@ module.exports = function getSteps(options) { When( 'we make a GetLightBlockHeaderProof call for round {int}', async function (int) { - await doOrDoRawAsync(this.v2Client.getLightBlockHeaderProof(int)); + await doOrDoRaw(this.v2Client.getLightBlockHeaderProof(int)); } ); When('we make a GetStateProof call for round {int}', async function (int) { - await doOrDoRawAsync(this.v2Client.getStateProof(int)); + await doOrDoRaw(this.v2Client.getStateProof(int)); }); When( 'we make a Lookup Block Hash call against round {int}', async function (int) { - await doOrDoRawAsync(this.v2Client.getBlockHash(int)); + await doOrDoRaw(this.v2Client.getBlockHash(int)); } ); From 22b7a40e7be511df27218815c9484246946f5314 Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Tue, 15 Aug 2023 16:18:57 -0700 Subject: [PATCH 17/33] Remove integer check from statusAfterBlock --- src/client/v2/algod/statusAfterBlock.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client/v2/algod/statusAfterBlock.ts b/src/client/v2/algod/statusAfterBlock.ts index f70cf0792..58c0cd11a 100644 --- a/src/client/v2/algod/statusAfterBlock.ts +++ b/src/client/v2/algod/statusAfterBlock.ts @@ -13,7 +13,6 @@ export default class StatusAfterBlock extends JSONRequest< private round: number | bigint ) { super(c, intDecoding); - if (!Number.isInteger(round)) throw Error('round should be an integer'); this.round = round; } From 1df8de91a0554d492c94c252be2f7b8f72740402 Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Tue, 15 Aug 2023 16:20:04 -0700 Subject: [PATCH 18/33] Remove the rest of the integer checks --- src/client/v2/algod/block.ts | 2 -- src/client/v2/algod/getBlockHash.ts | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/client/v2/algod/block.ts b/src/client/v2/algod/block.ts index 263397bf3..98ea1c0a1 100644 --- a/src/client/v2/algod/block.ts +++ b/src/client/v2/algod/block.ts @@ -10,8 +10,6 @@ export default class Block extends JSONRequest { constructor(c: HTTPClient, roundNumber: number | bigint) { super(c); - if (!Number.isInteger(roundNumber)) - throw Error('roundNumber should be an integer'); this.round = roundNumber; this.query = { format: 'msgpack' }; } diff --git a/src/client/v2/algod/getBlockHash.ts b/src/client/v2/algod/getBlockHash.ts index 8432e85a3..270a06f45 100644 --- a/src/client/v2/algod/getBlockHash.ts +++ b/src/client/v2/algod/getBlockHash.ts @@ -15,8 +15,6 @@ export default class GetBlockHash extends JSONRequest< roundNumber: number | bigint ) { super(c, intDecoding); - if (!Number.isInteger(roundNumber)) - throw Error('roundNumber should be an integer'); this.round = roundNumber; } From d36436ee056319ebcce7bac87f03f74550f1a055 Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Tue, 15 Aug 2023 16:22:12 -0700 Subject: [PATCH 19/33] Remove type casts for round in example --- examples/block_fetcher/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/block_fetcher/index.ts b/examples/block_fetcher/index.ts index 0943ec329..04d5a6676 100644 --- a/examples/block_fetcher/index.ts +++ b/examples/block_fetcher/index.ts @@ -33,7 +33,7 @@ function removeNulls(obj) { console.log(`Round: ${lastRound}`); // Fetch block - const round = await client.block(lastRound as number).do(); + const round = await client.block(lastRound).do(); const { block } = round; const { txns } = block; @@ -79,7 +79,7 @@ function removeNulls(obj) { } // Wait for next round - status = await client.statusAfterBlock(lastRound as number).do(); + status = await client.statusAfterBlock(lastRound).do(); lastRound = status['last-round']; } })(); From 7569f079b0ca5ef8021a0c69b2ac31005c391372 Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Wed, 16 Aug 2023 09:59:31 -0700 Subject: [PATCH 20/33] Update chromedriver to 116 --- package-lock.json | 220 ++-------------------------------------------- package.json | 2 +- 2 files changed, 8 insertions(+), 214 deletions(-) diff --git a/package-lock.json b/package-lock.json index c409f41c3..1209cc658 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "@typescript-eslint/eslint-plugin": "^5.59.2", "@typescript-eslint/parser": "^5.59.2", "assert": "^2.0.0", - "chromedriver": "^114.0.0", + "chromedriver": "^116.0.0", "concurrently": "^6.2.0", "cucumber": "^5.1.0", "es-abstract": "^1.18.3", @@ -1269,15 +1269,6 @@ "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", "dev": true }, - "node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, "node_modules/array-buffer-byte-length": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", @@ -1746,9 +1737,9 @@ } }, "node_modules/chromedriver": { - "version": "114.0.3", - "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-114.0.3.tgz", - "integrity": "sha512-Qy5kqsAUrCDwpovM5pIWFkb3X3IgJLoorigwFEDgC1boL094svny3N7yw06marJHAuyX4CE/hhd25RarIcKvKg==", + "version": "116.0.0", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-116.0.0.tgz", + "integrity": "sha512-/TQaRn+RUAYnVqy5Vx8VtU8DvtWosU8QLM2u7BoNM5h55PRQPXF/onHAehEi8Sj/CehdKqH50NFdiumQAUr0DQ==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -3130,19 +3121,6 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/esquery": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", @@ -3977,18 +3955,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.1.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/got": { "version": "11.8.5", "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz", @@ -4987,19 +4953,6 @@ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", "dev": true }, - "node_modules/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, - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, "node_modules/json-bigint": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz", @@ -5206,12 +5159,6 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "node_modules/lodash.truncate": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=", - "dev": true - }, "node_modules/log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -6991,12 +6938,6 @@ "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=", "dev": true }, - "node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, "node_modules/stack-chain": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/stack-chain/-/stack-chain-2.0.0.tgz", @@ -7237,51 +7178,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/table": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz", - "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==", - "dev": true, - "dependencies": { - "ajv": "^8.0.1", - "lodash.clonedeep": "^4.5.0", - "lodash.truncate": "^4.4.2", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/table/node_modules/ajv": { - "version": "8.6.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz", - "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/table/node_modules/json-schema-traverse": { - "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, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", @@ -9257,15 +9153,6 @@ "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", "dev": true }, - "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" - } - }, "array-buffer-byte-length": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", @@ -9619,9 +9506,9 @@ "dev": true }, "chromedriver": { - "version": "114.0.3", - "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-114.0.3.tgz", - "integrity": "sha512-Qy5kqsAUrCDwpovM5pIWFkb3X3IgJLoorigwFEDgC1boL094svny3N7yw06marJHAuyX4CE/hhd25RarIcKvKg==", + "version": "116.0.0", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-116.0.0.tgz", + "integrity": "sha512-/TQaRn+RUAYnVqy5Vx8VtU8DvtWosU8QLM2u7BoNM5h55PRQPXF/onHAehEi8Sj/CehdKqH50NFdiumQAUr0DQ==", "dev": true, "requires": { "@testim/chrome-version": "^1.1.3", @@ -10691,12 +10578,6 @@ "eslint-visitor-keys": "^3.4.0" } }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, "esquery": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", @@ -11321,15 +11202,6 @@ "get-intrinsic": "^1.1.3" } }, - "gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dev": true, - "requires": { - "get-intrinsic": "^1.1.3" - } - }, "got": { "version": "11.8.5", "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz", @@ -12034,16 +11906,6 @@ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", "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-bigint": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz", @@ -12222,12 +12084,6 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "lodash.truncate": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=", - "dev": true - }, "log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -13529,12 +13385,6 @@ "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=", "dev": true }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, "stack-chain": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/stack-chain/-/stack-chain-2.0.0.tgz", @@ -13717,62 +13567,6 @@ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true }, - "table": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz", - "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==", - "dev": true, - "requires": { - "ajv": "^8.0.1", - "lodash.clonedeep": "^4.5.0", - "lodash.truncate": "^4.4.2", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "ajv": { - "version": "8.6.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz", - "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - } - }, - "json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - } - }, - "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - } - } - }, "tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", diff --git a/package.json b/package.json index bf493ed39..8d8f3b725 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@typescript-eslint/eslint-plugin": "^5.59.2", "@typescript-eslint/parser": "^5.59.2", "assert": "^2.0.0", - "chromedriver": "^114.0.0", + "chromedriver": "^116.0.0", "concurrently": "^6.2.0", "cucumber": "^5.1.0", "es-abstract": "^1.18.3", From acfc50b5668542cce037997938f37e69d90c4cb9 Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Wed, 16 Aug 2023 12:04:24 -0700 Subject: [PATCH 21/33] Add toString to more tests, fixing number bigint comparisons --- tests/cucumber/steps/steps.js | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/tests/cucumber/steps/steps.js b/tests/cucumber/steps/steps.js index 87d79353c..8d33e6556 100644 --- a/tests/cucumber/steps/steps.js +++ b/tests/cucumber/steps/steps.js @@ -1054,7 +1054,7 @@ module.exports = function getSteps(options) { // update vars used by other helpers this.assetTestFixture.expectedParams = { creator: this.assetTestFixture.creator, - total: parsedIssuance, + total: BigInt(parsedIssuance), defaultfrozen: defaultFrozen, unitname: unitName, assetname: assetName, @@ -1064,7 +1064,7 @@ module.exports = function getSteps(options) { reserveaddr: reserve, freezeaddr: freeze, clawbackaddr: clawback, - decimals, + decimals: BigInt(decimals), }; this.txn = this.assetTestFixture.lastTxn; this.lastValid = this.params.lastValid; @@ -1120,7 +1120,7 @@ module.exports = function getSteps(options) { // update vars used by other helpers this.assetTestFixture.expectedParams = { creator: this.assetTestFixture.creator, - total: parsedIssuance, + total: BigInt(parsedIssuance), defaultfrozen: defaultFrozen, unitname: unitName, assetname: assetName, @@ -3559,8 +3559,14 @@ module.exports = function getSteps(options) { .accountInformation(this.transientAccount.addr) .do(); const appTotalSchema = accountInfo.appsTotalSchema; - assert.strictEqual(appTotalSchema.numByteSlice, numByteSlices); - assert.strictEqual(appTotalSchema.numUint, numUints); + assert.strictEqual( + appTotalSchema.numByteSlice.toString(), + numByteSlices.toString() + ); + assert.strictEqual( + appTotalSchema.numUint.toString(), + numUints.toString() + ); const appCreated = appCreatedBoolAsString === 'true'; const { createdApps } = accountInfo; @@ -3578,7 +3584,9 @@ module.exports = function getSteps(options) { let foundApp = false; for (let i = 0; i < createdApps.length; i++) { foundApp = - foundApp || createdApps[i].id === this.currentApplicationIndex; + foundApp || + createdApps[i].id.toString() === + this.currentApplicationIndex.toString(); } assert.ok(foundApp); @@ -3593,7 +3601,9 @@ module.exports = function getSteps(options) { let counter = 0; for (let i = 0; i < accountInfo.appsLocalState.length; i++) { const localState = accountInfo.appsLocalState[i]; - if (localState.id === this.currentApplicationIndex) { + if ( + localState.id.toString() === this.currentApplicationIndex.toString() + ) { keyValues = localState.keyValue; counter += 1; } @@ -3603,7 +3613,9 @@ module.exports = function getSteps(options) { let counter = 0; for (let i = 0; i < accountInfo.createdApps.length; i++) { const createdApp = accountInfo.createdApps[i]; - if (createdApp.id === this.currentApplicationIndex) { + if ( + createdApp.id.toString() === this.currentApplicationIndex.toString() + ) { keyValues = createdApp.params.globalState; counter += 1; } From f79e0e7eb8aafc530624533e0f42729b1a1bd877 Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Wed, 16 Aug 2023 12:17:02 -0700 Subject: [PATCH 22/33] Move import --- tests/cucumber/steps/steps.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/cucumber/steps/steps.js b/tests/cucumber/steps/steps.js index 8d33e6556..ec6eda4ee 100644 --- a/tests/cucumber/steps/steps.js +++ b/tests/cucumber/steps/steps.js @@ -2,7 +2,6 @@ const assert = require('assert'); const fs = require('fs'); const path = require('path'); -const JSONBig = require('json-bigint'); const algosdk = require('../../../src/index'); const nacl = require('../../../src/nacl/naclWrappers'); @@ -122,6 +121,10 @@ module.exports = function getSteps(options) { steps.then[name] = fn; } + // We need to import inside the steps export so that the browser tests have the dependency imported + // eslint-disable-next-line global-require + const JSONBig = require('json-bigint'); + // Dev Mode State const DEV_MODE_INITIAL_MICROALGOS = 100_000_000; From 8727b60a987a6d167353d15200242da3fa83a975 Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Wed, 16 Aug 2023 12:43:08 -0700 Subject: [PATCH 23/33] Replace json with json-bigint --- examples/accounts.ts | 5 ++--- examples/app.ts | 5 +++-- examples/asa.ts | 3 ++- examples/indexer.ts | 3 ++- examples/overview.ts | 3 ++- src/composer.ts | 5 +++-- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/examples/accounts.ts b/examples/accounts.ts index fb1cfc3f6..4b2123c45 100644 --- a/examples/accounts.ts +++ b/examples/accounts.ts @@ -2,6 +2,7 @@ /* eslint-disable import/no-unresolved */ /* eslint-disable no-promise-executor-return */ /* eslint-disable no-console */ +import { stringify } from 'json-bigint'; import algosdk from '../src'; import { getLocalAlgodClient, getLocalAccounts } from './utils'; @@ -101,9 +102,7 @@ async function main() { const acctInfo = await client.accountInformation(acct1.addr).do(); console.log( - `Account Info: ${JSON.stringify(acctInfo)} Auth Addr: ${ - acctInfo['auth-addr'] - }` + `Account Info: ${stringify(acctInfo)} Auth Addr: ${acctInfo['auth-addr']}` ); // example: ACCOUNT_REKEY diff --git a/examples/app.ts b/examples/app.ts index b2420fffc..36ff7dbf0 100644 --- a/examples/app.ts +++ b/examples/app.ts @@ -4,6 +4,7 @@ /* eslint-disable no-console */ import fs from 'fs'; import path from 'path'; +import { stringify } from 'json-bigint'; import { getLocalAlgodClient, getLocalAccounts, compileProgram } from './utils'; import algosdk from '../src'; @@ -149,7 +150,7 @@ async function main() { // example: APP_READ_STATE const appInfo = await algodClient.getApplicationByID(appId).do(); const globalState = appInfo.params.globalState[0]; - console.log(`Raw global state - ${JSON.stringify(globalState)}`); + console.log(`Raw global state - ${stringify(globalState)}`); // decode b64 string key with Buffer const globalKey = algosdk.base64ToString(globalState.key); @@ -163,7 +164,7 @@ async function main() { .do(); const localState = accountAppInfo.appLocalState.keyValue[0]; - console.log(`Raw local state - ${JSON.stringify(localState)}`); + console.log(`Raw local state - ${stringify(localState)}`); // decode b64 string key with Buffer const localKey = algosdk.base64ToString(localState.key); diff --git a/examples/asa.ts b/examples/asa.ts index cfdceb4c2..fa9f608b7 100644 --- a/examples/asa.ts +++ b/examples/asa.ts @@ -2,6 +2,7 @@ /* eslint-disable import/no-unresolved */ /* eslint-disable no-promise-executor-return */ /* eslint-disable no-console */ +import { stringify } from 'json-bigint'; import algosdk from '../src'; import { getLocalAlgodClient, @@ -46,7 +47,7 @@ async function main() { // example: ASSET_INFO const assetInfo = await algodClient.getAssetByID(assetIndex).do(); console.log(`Asset Name: ${assetInfo.params.name}`); - console.log(`Asset Params: ${JSON.stringify(assetInfo.params)}`); + console.log(`Asset Params: ${stringify(assetInfo.params)}`); // example: ASSET_INFO await new Promise((f) => setTimeout(f, 5000)); // sleep to ensure indexer is caught up diff --git a/examples/indexer.ts b/examples/indexer.ts index 73021b69f..70ceadc59 100644 --- a/examples/indexer.ts +++ b/examples/indexer.ts @@ -2,6 +2,7 @@ /* eslint-disable import/no-unresolved */ /* eslint-disable no-promise-executor-return */ /* eslint-disable no-console */ +import { stringify } from 'json-bigint'; import { getLocalIndexerClient, getLocalAccounts, @@ -82,7 +83,7 @@ async function main() { .notePrefix(new TextEncoder().encode('Hello')) .do(); console.log( - `Transactions with note prefix "Hello" ${JSON.stringify( + `Transactions with note prefix "Hello" ${stringify( txnsWithNotePrefix, undefined, 2 diff --git a/examples/overview.ts b/examples/overview.ts index a94d863ca..a97eed53e 100644 --- a/examples/overview.ts +++ b/examples/overview.ts @@ -1,3 +1,4 @@ +import { stringify } from 'json-bigint'; import algosdk from '../src'; import { getLocalAccounts, getLocalAlgodClient } from './utils'; @@ -38,7 +39,7 @@ async function main() { const { txid } = await algodClient.sendRawTransaction(signedTxn).do(); const result = await algosdk.waitForConfirmation(algodClient, txid, 4); console.log(result); - console.log(`Transaction Information: ${JSON.stringify(result.txn)}`); + console.log(`Transaction Information: ${stringify(result.txn)}`); console.log( `Decoded Note: ${new TextDecoder('utf-8').decode(result.txn.txn.note)}` ); diff --git a/src/composer.ts b/src/composer.ts index 0bc9d0669..16b28bd09 100644 --- a/src/composer.ts +++ b/src/composer.ts @@ -1,3 +1,4 @@ +import { stringify } from 'json-bigint'; import { ABIAddressType, abiCheckTransactionType, @@ -785,7 +786,7 @@ export class AtomicTransactionComposer { const logs = pendingInfo.logs || []; if (logs.length === 0) { throw new Error( - `App call transaction did not log a return value ${JSON.stringify( + `App call transaction did not log a return value ${stringify( pendingInfo )}` ); @@ -796,7 +797,7 @@ export class AtomicTransactionComposer { !arrayEqual(lastLog.slice(0, 4), RETURN_PREFIX) ) { throw new Error( - `App call transaction did not log a ABI return value ${JSON.stringify( + `App call transaction did not log a ABI return value ${stringify( pendingInfo )}` ); From 070bf9566b112beedaba05c8ee193895ef0c6b02 Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Wed, 16 Aug 2023 14:59:29 -0700 Subject: [PATCH 24/33] wrap require in function --- tests/cucumber/steps/steps.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/cucumber/steps/steps.js b/tests/cucumber/steps/steps.js index ec6eda4ee..12caa8b95 100644 --- a/tests/cucumber/steps/steps.js +++ b/tests/cucumber/steps/steps.js @@ -3,6 +3,8 @@ const assert = require('assert'); const fs = require('fs'); const path = require('path'); +const JSONBig = require('json-bigint'); + const algosdk = require('../../../src/index'); const nacl = require('../../../src/nacl/naclWrappers'); @@ -75,7 +77,11 @@ function makeObject(obj) { } function parseJSON(json) { - return JSON.parse(json); + return JSONBig.parse(json); +} + +function stringifyJSON(obj) { + return JSONBig.stringify(obj); } // END OBJECT CREATION FUNCTIONS @@ -121,10 +127,6 @@ module.exports = function getSteps(options) { steps.then[name] = fn; } - // We need to import inside the steps export so that the browser tests have the dependency imported - // eslint-disable-next-line global-require - const JSONBig = require('json-bigint'); - // Dev Mode State const DEV_MODE_INITIAL_MICROALGOS = 100_000_000; @@ -1595,8 +1597,8 @@ module.exports = function getSteps(options) { // them before comparing, which is why we chain encoding/decoding below. if (responseFormat === 'json') { assert.strictEqual( - JSONBig.stringify(JSONBig.parse(expectedMockResponse)), - JSONBig.stringify(this.actualMockResponse) + stringifyJSON(parseJSON(expectedMockResponse)), + stringifyJSON(this.actualMockResponse) ); } else { assert.deepStrictEqual( From 91c646af0203a090706650dd46b5b68a7cb87f3c Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Wed, 16 Aug 2023 15:31:14 -0700 Subject: [PATCH 25/33] fix browsers --- tests/cucumber/steps/index.js | 2 ++ tests/cucumber/steps/steps.js | 10 +++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/cucumber/steps/index.js b/tests/cucumber/steps/index.js index 828b73ab4..41d65c898 100644 --- a/tests/cucumber/steps/index.js +++ b/tests/cucumber/steps/index.js @@ -13,6 +13,8 @@ const { } = require('cucumber'); const express = require('express'); const ServerMock = require('mock-http-server'); +// eslint-disable-next-line @typescript-eslint/no-unused-vars +const JSONBig = require('json-bigint'); const getSteps = require('./steps'); const cucumberPath = path.dirname(__dirname); diff --git a/tests/cucumber/steps/steps.js b/tests/cucumber/steps/steps.js index 12caa8b95..4c191e262 100644 --- a/tests/cucumber/steps/steps.js +++ b/tests/cucumber/steps/steps.js @@ -77,11 +77,7 @@ function makeObject(obj) { } function parseJSON(json) { - return JSONBig.parse(json); -} - -function stringifyJSON(obj) { - return JSONBig.stringify(obj); + return JSON.parse(json); } // END OBJECT CREATION FUNCTIONS @@ -1597,8 +1593,8 @@ module.exports = function getSteps(options) { // them before comparing, which is why we chain encoding/decoding below. if (responseFormat === 'json') { assert.strictEqual( - stringifyJSON(parseJSON(expectedMockResponse)), - stringifyJSON(this.actualMockResponse) + JSONBig.stringify(JSONBig.parse(expectedMockResponse)), + JSONBig.stringify(this.actualMockResponse) ); } else { assert.deepStrictEqual( From 9d172c3655fb7b71ebe96f9dc4e63acdaa3fba3c Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Wed, 16 Aug 2023 22:09:28 -0700 Subject: [PATCH 26/33] export jsonbig --- src/utils/utils.ts | 5 ++++- tests/cucumber/steps/steps.js | 7 +++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 620644b3a..f43d65b03 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -1,7 +1,10 @@ import JSONbigWithoutConfig from 'json-bigint'; import IntDecoding from '../types/intDecoding'; -const JSONbig = JSONbigWithoutConfig({ useNativeBigInt: true, strict: true }); +export const JSONbig = JSONbigWithoutConfig({ + useNativeBigInt: true, + strict: true, +}); export interface JSONOptions { intDecoding?: IntDecoding; diff --git a/tests/cucumber/steps/steps.js b/tests/cucumber/steps/steps.js index 4c191e262..ab23d3154 100644 --- a/tests/cucumber/steps/steps.js +++ b/tests/cucumber/steps/steps.js @@ -3,8 +3,7 @@ const assert = require('assert'); const fs = require('fs'); const path = require('path'); -const JSONBig = require('json-bigint'); - +const utils = require('../../../src/utils/utils'); const algosdk = require('../../../src/index'); const nacl = require('../../../src/nacl/naclWrappers'); @@ -1593,8 +1592,8 @@ module.exports = function getSteps(options) { // them before comparing, which is why we chain encoding/decoding below. if (responseFormat === 'json') { assert.strictEqual( - JSONBig.stringify(JSONBig.parse(expectedMockResponse)), - JSONBig.stringify(this.actualMockResponse) + utils.JSONbig.stringify(utils.JSONbig.parse(expectedMockResponse)), + utils.JSONbig.stringify(this.actualMockResponse) ); } else { assert.deepStrictEqual( From 45864d9de038e271fd3a7d0ab8aac5c3d2938f86 Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Thu, 17 Aug 2023 10:32:35 -0700 Subject: [PATCH 27/33] fix browser requires --- src/utils/utils.ts | 2 +- tests/cucumber/browser/test.js | 9 +++++++++ tests/cucumber/steps/steps.js | 14 +++++++++++--- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/utils/utils.ts b/src/utils/utils.ts index f43d65b03..9ae6932f8 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -1,7 +1,7 @@ import JSONbigWithoutConfig from 'json-bigint'; import IntDecoding from '../types/intDecoding'; -export const JSONbig = JSONbigWithoutConfig({ +const JSONbig = JSONbigWithoutConfig({ useNativeBigInt: true, strict: true, }); diff --git a/tests/cucumber/browser/test.js b/tests/cucumber/browser/test.js index 45ae7b977..419ba53d9 100644 --- a/tests/cucumber/browser/test.js +++ b/tests/cucumber/browser/test.js @@ -2,6 +2,7 @@ const assert = require('assert'); const sha512 = require('js-sha512'); const nacl = require('tweetnacl'); +const JSONBig = require('json-bigint'); window.assert = assert; @@ -74,6 +75,14 @@ window.parseJSON = function parseJSON(json) { return JSON.parse(json); }; +window.parseJSONBig = function parseJSONBig(json) { + return JSONBig.parse(json); +}; + +window.stringifyJSONBig = function stringifyJSONBig(obj) { + return JSONBig.stringify(obj); +}; + window.formatIncludeAll = function formatIncludeAll(includeAll) { if (!['true', 'false'].includes(includeAll)) { throw new Error(`Unknown value for includeAll: ${includeAll}`); diff --git a/tests/cucumber/steps/steps.js b/tests/cucumber/steps/steps.js index ab23d3154..c75ce271f 100644 --- a/tests/cucumber/steps/steps.js +++ b/tests/cucumber/steps/steps.js @@ -2,8 +2,8 @@ const assert = require('assert'); const fs = require('fs'); const path = require('path'); +const JSONBig = require('json-bigint'); -const utils = require('../../../src/utils/utils'); const algosdk = require('../../../src/index'); const nacl = require('../../../src/nacl/naclWrappers'); @@ -79,6 +79,14 @@ function parseJSON(json) { return JSON.parse(json); } +function parseJSONBig(json) { + return JSONBig.parse(json); +} + +function stringifyJSONBig(obj) { + return JSONBig.stringify(obj); +} + // END OBJECT CREATION FUNCTIONS const steps = { @@ -1592,8 +1600,8 @@ module.exports = function getSteps(options) { // them before comparing, which is why we chain encoding/decoding below. if (responseFormat === 'json') { assert.strictEqual( - utils.JSONbig.stringify(utils.JSONbig.parse(expectedMockResponse)), - utils.JSONbig.stringify(this.actualMockResponse) + stringifyJSONBig(parseJSONBig(expectedMockResponse)), + stringifyJSONBig(this.actualMockResponse) ); } else { assert.deepStrictEqual( From fc8f51021558dfac03e93621b771109aa4dda69a Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Wed, 23 Aug 2023 09:49:21 -0700 Subject: [PATCH 28/33] Increase wait --- examples/asa.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/asa.ts b/examples/asa.ts index fa9f608b7..17377607a 100644 --- a/examples/asa.ts +++ b/examples/asa.ts @@ -50,7 +50,7 @@ async function main() { console.log(`Asset Params: ${stringify(assetInfo.params)}`); // example: ASSET_INFO - await new Promise((f) => setTimeout(f, 5000)); // sleep to ensure indexer is caught up + await new Promise((f) => setTimeout(f, 45000)); // sleep to ensure indexer is caught up // example: INDEXER_LOOKUP_ASSET const indexer = getLocalIndexerClient(); From fbadfc26e782b5080f703b68215c6926751cd24a Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Mon, 28 Aug 2023 21:59:24 -0700 Subject: [PATCH 29/33] Revert bigint changes --- examples/accounts.ts | 5 ++-- examples/app.ts | 7 ++--- examples/asa.ts | 5 ++-- examples/atc.ts | 2 +- examples/indexer.ts | 3 +- examples/overview.ts | 3 +- examples/utils.ts | 2 +- .../v2/algod/accountApplicationInformation.ts | 2 +- .../v2/algod/accountAssetInformation.ts | 2 +- src/client/v2/algod/algod.ts | 30 +++++++++---------- src/client/v2/algod/block.ts | 4 +-- .../v2/algod/getApplicationBoxByName.ts | 2 +- src/client/v2/algod/getApplicationBoxes.ts | 6 +--- src/client/v2/algod/getApplicationByID.ts | 6 +--- src/client/v2/algod/getAssetByID.ts | 6 +--- src/client/v2/algod/getBlockHash.ts | 6 +--- src/client/v2/algod/getLedgerStateDelta.ts | 6 +--- ...ansactionGroupLedgerStateDeltasForRound.ts | 6 +--- src/client/v2/algod/getTransactionProof.ts | 2 +- src/client/v2/algod/lightBlockHeaderProof.ts | 6 +--- src/client/v2/algod/setSyncRound.ts | 6 +--- src/client/v2/algod/stateproof.ts | 6 +--- src/client/v2/algod/statusAfterBlock.ts | 7 ++--- src/client/v2/serviceClient.ts | 2 +- src/composer.ts | 7 ++--- src/wait.ts | 2 +- tests/cucumber/browser/test.js | 9 ------ tests/cucumber/steps/index.js | 2 -- tests/cucumber/steps/steps.js | 19 ++++-------- 29 files changed, 54 insertions(+), 117 deletions(-) diff --git a/examples/accounts.ts b/examples/accounts.ts index 4b2123c45..fb1cfc3f6 100644 --- a/examples/accounts.ts +++ b/examples/accounts.ts @@ -2,7 +2,6 @@ /* eslint-disable import/no-unresolved */ /* eslint-disable no-promise-executor-return */ /* eslint-disable no-console */ -import { stringify } from 'json-bigint'; import algosdk from '../src'; import { getLocalAlgodClient, getLocalAccounts } from './utils'; @@ -102,7 +101,9 @@ async function main() { const acctInfo = await client.accountInformation(acct1.addr).do(); console.log( - `Account Info: ${stringify(acctInfo)} Auth Addr: ${acctInfo['auth-addr']}` + `Account Info: ${JSON.stringify(acctInfo)} Auth Addr: ${ + acctInfo['auth-addr'] + }` ); // example: ACCOUNT_REKEY diff --git a/examples/app.ts b/examples/app.ts index 36ff7dbf0..a041e0ff1 100644 --- a/examples/app.ts +++ b/examples/app.ts @@ -4,7 +4,6 @@ /* eslint-disable no-console */ import fs from 'fs'; import path from 'path'; -import { stringify } from 'json-bigint'; import { getLocalAlgodClient, getLocalAccounts, compileProgram } from './utils'; import algosdk from '../src'; @@ -71,7 +70,7 @@ async function main() { 3 ); // Grab app id from confirmed transaction result - const appId = Number(result.applicationIndex); + const appId = result.applicationIndex; console.log(`Created app with index: ${appId}`); // example: APP_CREATE @@ -150,7 +149,7 @@ async function main() { // example: APP_READ_STATE const appInfo = await algodClient.getApplicationByID(appId).do(); const globalState = appInfo.params.globalState[0]; - console.log(`Raw global state - ${stringify(globalState)}`); + console.log(`Raw global state - ${JSON.stringify(globalState)}`); // decode b64 string key with Buffer const globalKey = algosdk.base64ToString(globalState.key); @@ -164,7 +163,7 @@ async function main() { .do(); const localState = accountAppInfo.appLocalState.keyValue[0]; - console.log(`Raw local state - ${stringify(localState)}`); + console.log(`Raw local state - ${JSON.stringify(localState)}`); // decode b64 string key with Buffer const localKey = algosdk.base64ToString(localState.key); diff --git a/examples/asa.ts b/examples/asa.ts index 17377607a..63a026592 100644 --- a/examples/asa.ts +++ b/examples/asa.ts @@ -2,7 +2,6 @@ /* eslint-disable import/no-unresolved */ /* eslint-disable no-promise-executor-return */ /* eslint-disable no-console */ -import { stringify } from 'json-bigint'; import algosdk from '../src'; import { getLocalAlgodClient, @@ -40,14 +39,14 @@ async function main() { 3 ); - const assetIndex = Number(result.assetIndex); + const {assetIndex} = result; console.log(`Asset ID created: ${assetIndex}`); // example: ASSET_CREATE // example: ASSET_INFO const assetInfo = await algodClient.getAssetByID(assetIndex).do(); console.log(`Asset Name: ${assetInfo.params.name}`); - console.log(`Asset Params: ${stringify(assetInfo.params)}`); + console.log(`Asset Params: ${JSON.stringify(assetInfo.params)}`); // example: ASSET_INFO await new Promise((f) => setTimeout(f, 45000)); // sleep to ensure indexer is caught up diff --git a/examples/atc.ts b/examples/atc.ts index cee37a44d..a54a94d49 100644 --- a/examples/atc.ts +++ b/examples/atc.ts @@ -45,7 +45,7 @@ async function main() { createTxn.txID().toString(), 3 ); - const appIndex = Number(response.applicationIndex); + const appIndex = response.applicationIndex; // example: ATC_CREATE const atc = new algosdk.AtomicTransactionComposer(); diff --git a/examples/indexer.ts b/examples/indexer.ts index 70ceadc59..73021b69f 100644 --- a/examples/indexer.ts +++ b/examples/indexer.ts @@ -2,7 +2,6 @@ /* eslint-disable import/no-unresolved */ /* eslint-disable no-promise-executor-return */ /* eslint-disable no-console */ -import { stringify } from 'json-bigint'; import { getLocalIndexerClient, getLocalAccounts, @@ -83,7 +82,7 @@ async function main() { .notePrefix(new TextEncoder().encode('Hello')) .do(); console.log( - `Transactions with note prefix "Hello" ${stringify( + `Transactions with note prefix "Hello" ${JSON.stringify( txnsWithNotePrefix, undefined, 2 diff --git a/examples/overview.ts b/examples/overview.ts index a97eed53e..a94d863ca 100644 --- a/examples/overview.ts +++ b/examples/overview.ts @@ -1,4 +1,3 @@ -import { stringify } from 'json-bigint'; import algosdk from '../src'; import { getLocalAccounts, getLocalAlgodClient } from './utils'; @@ -39,7 +38,7 @@ async function main() { const { txid } = await algodClient.sendRawTransaction(signedTxn).do(); const result = await algosdk.waitForConfirmation(algodClient, txid, 4); console.log(result); - console.log(`Transaction Information: ${stringify(result.txn)}`); + console.log(`Transaction Information: ${JSON.stringify(result.txn)}`); console.log( `Decoded Note: ${new TextDecoder('utf-8').decode(result.txn.txn.note)}` ); diff --git a/examples/utils.ts b/examples/utils.ts index 7c9133c55..52cc8565e 100644 --- a/examples/utils.ts +++ b/examples/utils.ts @@ -130,6 +130,6 @@ export async function deployCalculatorApp( appCreateTxn.txID().toString(), 3 ); - const appId = Number(result.applicationIndex); + const appId = result.applicationIndex; return appId; } diff --git a/src/client/v2/algod/accountApplicationInformation.ts b/src/client/v2/algod/accountApplicationInformation.ts index 30135aff3..563e8fe04 100644 --- a/src/client/v2/algod/accountApplicationInformation.ts +++ b/src/client/v2/algod/accountApplicationInformation.ts @@ -11,7 +11,7 @@ export default class AccountApplicationInformation extends JSONRequest< c: HTTPClient, intDecoding: IntDecoding, private account: string, - private applicationID: number | bigint + private applicationID: number ) { super(c, intDecoding); this.account = account; diff --git a/src/client/v2/algod/accountAssetInformation.ts b/src/client/v2/algod/accountAssetInformation.ts index 1fa2939da..93394e1c5 100644 --- a/src/client/v2/algod/accountAssetInformation.ts +++ b/src/client/v2/algod/accountAssetInformation.ts @@ -11,7 +11,7 @@ export default class AccountAssetInformation extends JSONRequest< c: HTTPClient, intDecoding: IntDecoding, private account: string, - private assetID: number | bigint + private assetID: number ) { super(c, intDecoding); this.account = account; diff --git a/src/client/v2/algod/algod.ts b/src/client/v2/algod/algod.ts index ac2da502c..3b0d146ec 100644 --- a/src/client/v2/algod/algod.ts +++ b/src/client/v2/algod/algod.ts @@ -171,7 +171,7 @@ export default class AlgodClient extends ServiceClient { * @param index - The asset ID to look up. * @category GET */ - accountAssetInformation(account: string, index: number | bigint) { + accountAssetInformation(account: string, index: number) { return new AccountAssetInformation( this.c, this.intDecoding, @@ -195,7 +195,7 @@ export default class AlgodClient extends ServiceClient { * @param index - The application ID to look up. * @category GET */ - accountApplicationInformation(account: string, index: number | bigint) { + accountApplicationInformation(account: string, index: number) { return new AccountApplicationInformation( this.c, this.intDecoding, @@ -217,7 +217,7 @@ export default class AlgodClient extends ServiceClient { * @param roundNumber - The round number of the block to get. * @category GET */ - block(roundNumber: number | bigint) { + block(roundNumber: number) { return new Block(this.c, roundNumber); } @@ -234,7 +234,7 @@ export default class AlgodClient extends ServiceClient { * @param roundNumber - The round number of the block to get. * @category GET */ - getBlockHash(roundNumber: number | bigint) { + getBlockHash(roundNumber: number) { return new GetBlockHash(this.c, this.intDecoding, roundNumber); } @@ -346,7 +346,7 @@ export default class AlgodClient extends ServiceClient { * @param round - The number of the round to wait for. * @category GET */ - statusAfterBlock(round: number | bigint) { + statusAfterBlock(round: number) { return new StatusAfterBlock(this.c, this.intDecoding, round); } @@ -458,7 +458,7 @@ export default class AlgodClient extends ServiceClient { * @param index - The asset ID to look up. * @category GET */ - getAssetByID(index: number | bigint) { + getAssetByID(index: number) { return new GetAssetByID(this.c, this.intDecoding, index); } @@ -476,7 +476,7 @@ export default class AlgodClient extends ServiceClient { * @param index - The application ID to look up. * @category GET */ - getApplicationByID(index: number | bigint) { + getApplicationByID(index: number) { return new GetApplicationByID(this.c, this.intDecoding, index); } @@ -495,7 +495,7 @@ export default class AlgodClient extends ServiceClient { * @param index - The application ID to look up. * @category GET */ - getApplicationBoxByName(index: number | bigint, boxName: Uint8Array) { + getApplicationBoxByName(index: number, boxName: Uint8Array) { return new GetApplicationBoxByName( this.c, this.intDecoding, @@ -518,7 +518,7 @@ export default class AlgodClient extends ServiceClient { * @param index - The application ID to look up. * @category GET */ - getApplicationBoxes(index: number | bigint) { + getApplicationBoxes(index: number) { return new GetApplicationBoxes(this.c, this.intDecoding, index); } @@ -552,7 +552,7 @@ export default class AlgodClient extends ServiceClient { * @param txID - The transaction ID for which to generate a proof. * @category GET */ - getTransactionProof(round: number | bigint, txID: string) { + getTransactionProof(round: number, txID: string) { return new GetTransactionProof(this.c, this.intDecoding, round, txID); } @@ -568,7 +568,7 @@ export default class AlgodClient extends ServiceClient { * [Response data schema details](https://developer.algorand.org/docs/rest-apis/algod/v2#get-v2blocksroundlightheaderproof) * @param round */ - getLightBlockHeaderProof(round: number | bigint) { + getLightBlockHeaderProof(round: number) { return new LightBlockHeaderProof(this.c, this.intDecoding, round); } @@ -584,7 +584,7 @@ export default class AlgodClient extends ServiceClient { * [Response data schema details](https://developer.algorand.org/docs/rest-apis/algod/v2#get-v2stateproofsround) * @param round */ - getStateProof(round: number | bigint) { + getStateProof(round: number) { return new StateProof(this.c, this.intDecoding, round); } @@ -706,7 +706,7 @@ export default class AlgodClient extends ServiceClient { * @param round * @category POST */ - setSyncRound(round: number | bigint) { + setSyncRound(round: number) { return new SetSyncRound(this.c, this.intDecoding, round); } @@ -789,7 +789,7 @@ export default class AlgodClient extends ServiceClient { * @param round the round number to be searched for * @category GET */ - getLedgerStateDelta(round: number | bigint) { + getLedgerStateDelta(round: number) { return new GetLedgerStateDelta(this.c, this.intDecoding, round); } @@ -806,7 +806,7 @@ export default class AlgodClient extends ServiceClient { * @param round the round number to be searched for * @category GET */ - getTransactionGroupLedgerStateDeltasForRound(round: number | bigint) { + getTransactionGroupLedgerStateDeltasForRound(round: number) { return new GetTransactionGroupLedgerStateDeltasForRound( this.c, this.intDecoding, diff --git a/src/client/v2/algod/block.ts b/src/client/v2/algod/block.ts index 98ea1c0a1..b039d1084 100644 --- a/src/client/v2/algod/block.ts +++ b/src/client/v2/algod/block.ts @@ -6,9 +6,9 @@ import HTTPClient from '../../client'; * block gets the block info for the given round. this call may block */ export default class Block extends JSONRequest { - private round: number | bigint; + private round: number; - constructor(c: HTTPClient, roundNumber: number | bigint) { + constructor(c: HTTPClient, roundNumber: number) { super(c); this.round = roundNumber; this.query = { format: 'msgpack' }; diff --git a/src/client/v2/algod/getApplicationBoxByName.ts b/src/client/v2/algod/getApplicationBoxByName.ts index 9a9171241..246c3ba0d 100644 --- a/src/client/v2/algod/getApplicationBoxByName.ts +++ b/src/client/v2/algod/getApplicationBoxByName.ts @@ -26,7 +26,7 @@ export default class GetApplicationBoxByName extends JSONRequest< constructor( c: HTTPClient, intDecoding: IntDecoding, - private index: number | bigint, + private index: number, name: Uint8Array ) { super(c, intDecoding); diff --git a/src/client/v2/algod/getApplicationBoxes.ts b/src/client/v2/algod/getApplicationBoxes.ts index 83331ed00..68f6f0447 100644 --- a/src/client/v2/algod/getApplicationBoxes.ts +++ b/src/client/v2/algod/getApplicationBoxes.ts @@ -21,11 +21,7 @@ export default class GetApplicationBoxes extends JSONRequest< BoxesResponse, Record > { - constructor( - c: HTTPClient, - intDecoding: IntDecoding, - private index: number | bigint - ) { + constructor(c: HTTPClient, intDecoding: IntDecoding, private index: number) { super(c, intDecoding); this.index = index; this.query.max = 0; diff --git a/src/client/v2/algod/getApplicationByID.ts b/src/client/v2/algod/getApplicationByID.ts index 368c9f4b0..1bb55b3a2 100644 --- a/src/client/v2/algod/getApplicationByID.ts +++ b/src/client/v2/algod/getApplicationByID.ts @@ -7,11 +7,7 @@ export default class GetApplicationByID extends JSONRequest< Application, Record > { - constructor( - c: HTTPClient, - intDecoding: IntDecoding, - private index: number | bigint - ) { + constructor(c: HTTPClient, intDecoding: IntDecoding, private index: number) { super(c, intDecoding); this.index = index; } diff --git a/src/client/v2/algod/getAssetByID.ts b/src/client/v2/algod/getAssetByID.ts index cde2c4db1..38f1068e1 100644 --- a/src/client/v2/algod/getAssetByID.ts +++ b/src/client/v2/algod/getAssetByID.ts @@ -7,11 +7,7 @@ export default class GetAssetByID extends JSONRequest< Asset, Record > { - constructor( - c: HTTPClient, - intDecoding: IntDecoding, - private index: number | bigint - ) { + constructor(c: HTTPClient, intDecoding: IntDecoding, private index: number) { super(c, intDecoding); this.index = index; } diff --git a/src/client/v2/algod/getBlockHash.ts b/src/client/v2/algod/getBlockHash.ts index 270a06f45..032e30c89 100644 --- a/src/client/v2/algod/getBlockHash.ts +++ b/src/client/v2/algod/getBlockHash.ts @@ -9,11 +9,7 @@ export default class GetBlockHash extends JSONRequest< > { round: number | bigint; - constructor( - c: HTTPClient, - intDecoding: IntDecoding, - roundNumber: number | bigint - ) { + constructor(c: HTTPClient, intDecoding: IntDecoding, roundNumber: number) { super(c, intDecoding); this.round = roundNumber; } diff --git a/src/client/v2/algod/getLedgerStateDelta.ts b/src/client/v2/algod/getLedgerStateDelta.ts index 31e7b3794..7570c5e3c 100644 --- a/src/client/v2/algod/getLedgerStateDelta.ts +++ b/src/client/v2/algod/getLedgerStateDelta.ts @@ -3,11 +3,7 @@ import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; export default class GetLedgerStateDelta extends JSONRequest { - constructor( - c: HTTPClient, - intDecoding: IntDecoding, - private round: number | bigint - ) { + constructor(c: HTTPClient, intDecoding: IntDecoding, private round: number) { super(c, intDecoding); this.round = round; this.query = { format: 'json' }; diff --git a/src/client/v2/algod/getTransactionGroupLedgerStateDeltasForRound.ts b/src/client/v2/algod/getTransactionGroupLedgerStateDeltasForRound.ts index cb0c9d401..c5550ecdc 100644 --- a/src/client/v2/algod/getTransactionGroupLedgerStateDeltasForRound.ts +++ b/src/client/v2/algod/getTransactionGroupLedgerStateDeltasForRound.ts @@ -7,11 +7,7 @@ export default class GetTransactionGroupLedgerStateDeltasForRound extends JSONRe TransactionGroupLedgerStateDeltasForRoundResponse, Record > { - constructor( - c: HTTPClient, - intDecoding: IntDecoding, - private round: number | bigint - ) { + constructor(c: HTTPClient, intDecoding: IntDecoding, private round: number) { super(c, intDecoding); this.round = round; this.query = { format: 'json' }; diff --git a/src/client/v2/algod/getTransactionProof.ts b/src/client/v2/algod/getTransactionProof.ts index 930d5c73f..6f67660d9 100644 --- a/src/client/v2/algod/getTransactionProof.ts +++ b/src/client/v2/algod/getTransactionProof.ts @@ -10,7 +10,7 @@ export default class GetTransactionProof extends JSONRequest< constructor( c: HTTPClient, intDecoding: IntDecoding, - private round: number | bigint, + private round: number, private txID: string ) { super(c, intDecoding); diff --git a/src/client/v2/algod/lightBlockHeaderProof.ts b/src/client/v2/algod/lightBlockHeaderProof.ts index 765851d41..cfa594a64 100644 --- a/src/client/v2/algod/lightBlockHeaderProof.ts +++ b/src/client/v2/algod/lightBlockHeaderProof.ts @@ -7,11 +7,7 @@ export default class LightBlockHeaderProof extends JSONRequest< LBHP, Record > { - constructor( - c: HTTPClient, - intDecoding: IntDecoding, - private round: number | bigint - ) { + constructor(c: HTTPClient, intDecoding: IntDecoding, private round: number) { super(c, intDecoding); this.round = round; diff --git a/src/client/v2/algod/setSyncRound.ts b/src/client/v2/algod/setSyncRound.ts index 60c55daff..f6427a734 100644 --- a/src/client/v2/algod/setSyncRound.ts +++ b/src/client/v2/algod/setSyncRound.ts @@ -3,11 +3,7 @@ import HTTPClient from '../../client'; import IntDecoding from '../../../types/intDecoding'; export default class SetSyncRound extends JSONRequest { - constructor( - c: HTTPClient, - intDecoding: IntDecoding, - private round: number | bigint - ) { + constructor(c: HTTPClient, intDecoding: IntDecoding, private round: number) { super(c, intDecoding); this.round = round; diff --git a/src/client/v2/algod/stateproof.ts b/src/client/v2/algod/stateproof.ts index 6d485a6e7..4f527df20 100644 --- a/src/client/v2/algod/stateproof.ts +++ b/src/client/v2/algod/stateproof.ts @@ -4,11 +4,7 @@ import IntDecoding from '../../../types/intDecoding'; import { StateProof as SP } from './models/types'; export default class StateProof extends JSONRequest> { - constructor( - c: HTTPClient, - intDecoding: IntDecoding, - private round: number | bigint - ) { + constructor(c: HTTPClient, intDecoding: IntDecoding, private round: number) { super(c, intDecoding); this.round = round; diff --git a/src/client/v2/algod/statusAfterBlock.ts b/src/client/v2/algod/statusAfterBlock.ts index 58c0cd11a..1daf58ea1 100644 --- a/src/client/v2/algod/statusAfterBlock.ts +++ b/src/client/v2/algod/statusAfterBlock.ts @@ -7,12 +7,9 @@ export default class StatusAfterBlock extends JSONRequest< NodeStatusResponse, Record > { - constructor( - c: HTTPClient, - intDecoding: IntDecoding, - private round: number | bigint - ) { + constructor(c: HTTPClient, intDecoding: IntDecoding, private round: number) { super(c, intDecoding); + if (!Number.isInteger(round)) throw Error('round should be an integer'); this.round = round; } diff --git a/src/client/v2/serviceClient.ts b/src/client/v2/serviceClient.ts index 0103ae5df..877818b29 100644 --- a/src/client/v2/serviceClient.ts +++ b/src/client/v2/serviceClient.ts @@ -67,7 +67,7 @@ export default abstract class ServiceClient { this.c = new HTTPClient(tokenHeader, baseServer, port, defaultHeaders); } - this.intDecoding = IntDecoding.BIGINT; + this.intDecoding = IntDecoding.DEFAULT; } /** diff --git a/src/composer.ts b/src/composer.ts index 16b28bd09..4a3388184 100644 --- a/src/composer.ts +++ b/src/composer.ts @@ -1,4 +1,3 @@ -import { stringify } from 'json-bigint'; import { ABIAddressType, abiCheckTransactionType, @@ -727,7 +726,7 @@ export class AtomicTransactionComposer { ); this.status = AtomicTransactionComposerStatus.COMMITTED; - const confirmedRound = Number(confirmedTxnInfo.confirmedRound); + const {confirmedRound} = confirmedTxnInfo; const methodResults: ABIResult[] = []; @@ -786,7 +785,7 @@ export class AtomicTransactionComposer { const logs = pendingInfo.logs || []; if (logs.length === 0) { throw new Error( - `App call transaction did not log a return value ${stringify( + `App call transaction did not log a return value ${JSON.stringify( pendingInfo )}` ); @@ -797,7 +796,7 @@ export class AtomicTransactionComposer { !arrayEqual(lastLog.slice(0, 4), RETURN_PREFIX) ) { throw new Error( - `App call transaction did not log a ABI return value ${stringify( + `App call transaction did not log a ABI return value ${JSON.stringify( pendingInfo )}` ); diff --git a/src/wait.ts b/src/wait.ts index 6aa43e261..b0160ea68 100644 --- a/src/wait.ts +++ b/src/wait.ts @@ -22,7 +22,7 @@ export async function waitForConfirmation( if (typeof status === 'undefined') { throw new Error('Unable to get node status'); } - const startRound = Number(status.lastRound) + 1; + const startRound = status.lastRound + 1; let currentRound = startRound; /* eslint-disable no-await-in-loop */ diff --git a/tests/cucumber/browser/test.js b/tests/cucumber/browser/test.js index 419ba53d9..45ae7b977 100644 --- a/tests/cucumber/browser/test.js +++ b/tests/cucumber/browser/test.js @@ -2,7 +2,6 @@ const assert = require('assert'); const sha512 = require('js-sha512'); const nacl = require('tweetnacl'); -const JSONBig = require('json-bigint'); window.assert = assert; @@ -75,14 +74,6 @@ window.parseJSON = function parseJSON(json) { return JSON.parse(json); }; -window.parseJSONBig = function parseJSONBig(json) { - return JSONBig.parse(json); -}; - -window.stringifyJSONBig = function stringifyJSONBig(obj) { - return JSONBig.stringify(obj); -}; - window.formatIncludeAll = function formatIncludeAll(includeAll) { if (!['true', 'false'].includes(includeAll)) { throw new Error(`Unknown value for includeAll: ${includeAll}`); diff --git a/tests/cucumber/steps/index.js b/tests/cucumber/steps/index.js index 41d65c898..828b73ab4 100644 --- a/tests/cucumber/steps/index.js +++ b/tests/cucumber/steps/index.js @@ -13,8 +13,6 @@ const { } = require('cucumber'); const express = require('express'); const ServerMock = require('mock-http-server'); -// eslint-disable-next-line @typescript-eslint/no-unused-vars -const JSONBig = require('json-bigint'); const getSteps = require('./steps'); const cucumberPath = path.dirname(__dirname); diff --git a/tests/cucumber/steps/steps.js b/tests/cucumber/steps/steps.js index ea710d641..f8cb9beff 100644 --- a/tests/cucumber/steps/steps.js +++ b/tests/cucumber/steps/steps.js @@ -2,7 +2,6 @@ const assert = require('assert'); const fs = require('fs'); const path = require('path'); -const JSONBig = require('json-bigint'); const algosdk = require('../../../src/index'); const nacl = require('../../../src/nacl/naclWrappers'); @@ -79,14 +78,6 @@ function parseJSON(json) { return JSON.parse(json); } -function parseJSONBig(json) { - return JSONBig.parse(json); -} - -function stringifyJSONBig(obj) { - return JSONBig.stringify(obj); -} - // END OBJECT CREATION FUNCTIONS const steps = { @@ -1062,7 +1053,7 @@ module.exports = function getSteps(options) { // update vars used by other helpers this.assetTestFixture.expectedParams = { creator: this.assetTestFixture.creator, - total: BigInt(parsedIssuance), + total: parsedIssuance, defaultfrozen: defaultFrozen, unitname: unitName, assetname: assetName, @@ -1072,7 +1063,7 @@ module.exports = function getSteps(options) { reserveaddr: reserve, freezeaddr: freeze, clawbackaddr: clawback, - decimals: BigInt(decimals), + decimals, }; this.txn = this.assetTestFixture.lastTxn; this.lastValid = this.params.lastValid; @@ -1128,7 +1119,7 @@ module.exports = function getSteps(options) { // update vars used by other helpers this.assetTestFixture.expectedParams = { creator: this.assetTestFixture.creator, - total: BigInt(parsedIssuance), + total: parsedIssuance, defaultfrozen: defaultFrozen, unitname: unitName, assetname: assetName, @@ -1600,8 +1591,8 @@ module.exports = function getSteps(options) { // them before comparing, which is why we chain encoding/decoding below. if (responseFormat === 'json') { assert.strictEqual( - stringifyJSONBig(parseJSONBig(expectedMockResponse)), - stringifyJSONBig(this.actualMockResponse) + JSON.stringify(JSON.parse(expectedMockResponse)), + JSON.stringify(this.actualMockResponse) ); } else { assert.deepStrictEqual( From 6e7994558b0d3ebc31e82c95d64e7136acc6181e Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Wed, 30 Aug 2023 08:00:40 -0700 Subject: [PATCH 30/33] Final lint fixes --- src/composer.ts | 2 +- src/wait.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/composer.ts b/src/composer.ts index 4a3388184..0bc9d0669 100644 --- a/src/composer.ts +++ b/src/composer.ts @@ -726,7 +726,7 @@ export class AtomicTransactionComposer { ); this.status = AtomicTransactionComposerStatus.COMMITTED; - const {confirmedRound} = confirmedTxnInfo; + const confirmedRound = Number(confirmedTxnInfo.confirmedRound); const methodResults: ABIResult[] = []; diff --git a/src/wait.ts b/src/wait.ts index b0160ea68..6aa43e261 100644 --- a/src/wait.ts +++ b/src/wait.ts @@ -22,7 +22,7 @@ export async function waitForConfirmation( if (typeof status === 'undefined') { throw new Error('Unable to get node status'); } - const startRound = status.lastRound + 1; + const startRound = Number(status.lastRound) + 1; let currentRound = startRound; /* eslint-disable no-await-in-loop */ From ce2192f55d4a9717e81c5374b504c4c91ce8b53a Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Wed, 30 Aug 2023 10:13:25 -0700 Subject: [PATCH 31/33] make format --- examples/asa.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/asa.ts b/examples/asa.ts index 63a026592..64f75dc55 100644 --- a/examples/asa.ts +++ b/examples/asa.ts @@ -39,7 +39,7 @@ async function main() { 3 ); - const {assetIndex} = result; + const { assetIndex } = result; console.log(`Asset ID created: ${assetIndex}`); // example: ASSET_CREATE From fef19974328ab7a31fdc47f24cd7585fb863025f Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Wed, 30 Aug 2023 10:21:40 -0700 Subject: [PATCH 32/33] Convert block to typed --- src/client/v2/algod/block.ts | 7 ++++--- tests/cucumber/steps/steps.js | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/client/v2/algod/block.ts b/src/client/v2/algod/block.ts index b039d1084..7d0b5d911 100644 --- a/src/client/v2/algod/block.ts +++ b/src/client/v2/algod/block.ts @@ -1,11 +1,12 @@ import * as encoding from '../../../encoding/encoding'; import JSONRequest from '../jsonrequest'; import HTTPClient from '../../client'; +import { BlockResponse } from './models/types'; /** * block gets the block info for the given round. this call may block */ -export default class Block extends JSONRequest { +export default class Block extends JSONRequest { private round: number; constructor(c: HTTPClient, roundNumber: number) { @@ -19,9 +20,9 @@ export default class Block extends JSONRequest { } // eslint-disable-next-line class-methods-use-this - prepare(body: Uint8Array) { + prepare(body: Uint8Array): BlockResponse { if (body && body.byteLength > 0) { - return encoding.decode(body) as Record; + return BlockResponse.from_obj_for_encoding(encoding.decode(body)); } return undefined; } diff --git a/tests/cucumber/steps/steps.js b/tests/cucumber/steps/steps.js index f8cb9beff..b7856a28c 100644 --- a/tests/cucumber/steps/steps.js +++ b/tests/cucumber/steps/steps.js @@ -1557,7 +1557,8 @@ module.exports = function getSteps(options) { if (client === 'algod') { // endpoints are ignored by mock server, see setupMockServerForResponses if (responseFormat === 'msgp') { - this.actualMockResponse = await this.v2Client.block(0).do(); + const response = await this.v2Client.block(0).do(); + this.actualMockResponse = response.get_obj_for_encoding(true); } else { this.actualMockResponse = await this.v2Client.genesis().do(); } From fd0c6f306286c01b86a6cb76d8603b1c1de07d6f Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Wed, 30 Aug 2023 11:02:15 -0700 Subject: [PATCH 33/33] Fix exmaples utils --- examples/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/utils.ts b/examples/utils.ts index 52cc8565e..7c9133c55 100644 --- a/examples/utils.ts +++ b/examples/utils.ts @@ -130,6 +130,6 @@ export async function deployCalculatorApp( appCreateTxn.txID().toString(), 3 ); - const appId = result.applicationIndex; + const appId = Number(result.applicationIndex); return appId; }