From d688e7a15cd681067f5e3cdf129bebdcfe9cdea4 Mon Sep 17 00:00:00 2001 From: Pavel Murygin Date: Thu, 23 Mar 2023 11:36:26 +0400 Subject: [PATCH 1/7] use vite --- packages/core/js-peer/jest.config.cjs | 17 - packages/core/js-peer/package.json | 9 +- .../src/compilerSupport/__test__/v3.spec.ts | 1 + .../js-peer/__test__/integration/smokeTest.ts | 19 +- .../unit/{ast.spec.ts.skip => ast.spec.ts} | 2 + .../__test__/unit/builtInHandler.spec.ts | 2 + .../src/keypair/__test__/KeyPair.spec.ts | 1 + pnpm-lock.yaml | 1023 +++++------------ 8 files changed, 300 insertions(+), 774 deletions(-) delete mode 100644 packages/core/js-peer/jest.config.cjs rename packages/core/js-peer/src/js-peer/__test__/unit/{ast.spec.ts.skip => ast.spec.ts} (92%) diff --git a/packages/core/js-peer/jest.config.cjs b/packages/core/js-peer/jest.config.cjs deleted file mode 100644 index aeb61cbc3..000000000 --- a/packages/core/js-peer/jest.config.cjs +++ /dev/null @@ -1,17 +0,0 @@ -/** @type {import('ts-jest').JestConfigWithTsJest} */ -module.exports = { - extensionsToTreatAsEsm: ['.ts'], - "preset": "ts-jest/presets/default-esm", - "moduleNameMapper": { - "^(\\.{1,2}/.*)\\.js$": "$1" - }, - "transform": { - "^.+\\.tsx?$": [ - "ts-jest", - { - "useESM": true - } - ] - } - -}; diff --git a/packages/core/js-peer/package.json b/packages/core/js-peer/package.json index c643a8e95..2a20a9cc2 100644 --- a/packages/core/js-peer/package.json +++ b/packages/core/js-peer/package.json @@ -12,10 +12,7 @@ "scripts": { "build": "tsc", "compile-aqua": "aqua -i ./aqua/ -o ./src/internal/_aqua", - "test:smoke": "node ./dist/js-peer/__test__/integration/smokeTest.js", - "test": "NODE_OPTIONS=--experimental-vm-modules pnpm jest", - "test:unit": "NODE_OPTIONS=--experimental-vm-modules pnpm jest --testPathPattern=src/__test__/unit", - "test:integration": "NODE_OPTIONS=--experimental-vm-modules pnpm jest --testPathPattern=src/__test__/integration" + "test": "vitest run" }, "repository": "https://github.com/fluencelabs/fluence-js", "author": "Fluence Labs", @@ -58,9 +55,7 @@ "@fluencelabs/fluence-network-environment": "1.0.13", "@types/bs58": "4.0.1", "@types/uuid": "8.3.2", - "@types/jest": "29.4.0", "@types/debug": "4.1.7", - "jest": "29.4.1", - "ts-jest": "next" + "vitest": "0.29.7" } } diff --git a/packages/core/js-peer/src/compilerSupport/__test__/v3.spec.ts b/packages/core/js-peer/src/compilerSupport/__test__/v3.spec.ts index d13fb409c..651f5eb10 100644 --- a/packages/core/js-peer/src/compilerSupport/__test__/v3.spec.ts +++ b/packages/core/js-peer/src/compilerSupport/__test__/v3.spec.ts @@ -1,3 +1,4 @@ +import { it, describe, expect, test } from 'vitest'; import { aqua2ts, ts2aqua } from '../conversions.js'; const i32 = { tag: 'scalar', name: 'i32' } as const; diff --git a/packages/core/js-peer/src/js-peer/__test__/integration/smokeTest.ts b/packages/core/js-peer/src/js-peer/__test__/integration/smokeTest.ts index ba3d0c736..d75c34490 100644 --- a/packages/core/js-peer/src/js-peer/__test__/integration/smokeTest.ts +++ b/packages/core/js-peer/src/js-peer/__test__/integration/smokeTest.ts @@ -1,8 +1,11 @@ +import exp from 'constants'; +import { it, describe, expect } from 'vitest'; + import { handleTimeout } from '../../utils.js'; import { nodes } from '../connection.js'; import { mkTestPeer, registerHandlersHelper } from '../util.js'; -const smokeTest = async () => { +describe('Smoke test', async () => { // arrange const peer = mkTestPeer(); await peer.start({ @@ -53,15 +56,5 @@ const smokeTest = async () => { await peer.stop(); - if (result[0] !== 'hello world!') { - throw new Error('Expecting "hello wrold!" got ' + result[0]); - } -}; - -smokeTest() - .then(() => { - console.log('Test passed'); - }) - .catch((err) => { - console.error('Test failed: ', err); - }); + expect(result).toBe('hello world!'); +}); diff --git a/packages/core/js-peer/src/js-peer/__test__/unit/ast.spec.ts.skip b/packages/core/js-peer/src/js-peer/__test__/unit/ast.spec.ts similarity index 92% rename from packages/core/js-peer/src/js-peer/__test__/unit/ast.spec.ts.skip rename to packages/core/js-peer/src/js-peer/__test__/unit/ast.spec.ts index 0d4b1526c..a8798d791 100644 --- a/packages/core/js-peer/src/js-peer/__test__/unit/ast.spec.ts.skip +++ b/packages/core/js-peer/src/js-peer/__test__/unit/ast.spec.ts @@ -1,3 +1,5 @@ +import { it, describe, expect, beforeAll, afterAll } from 'vitest'; + import { mkTestPeer } from '../util.js'; const peer = mkTestPeer(); diff --git a/packages/core/js-peer/src/js-peer/__test__/unit/builtInHandler.spec.ts b/packages/core/js-peer/src/js-peer/__test__/unit/builtInHandler.spec.ts index e9009e83e..f4259dee7 100644 --- a/packages/core/js-peer/src/js-peer/__test__/unit/builtInHandler.spec.ts +++ b/packages/core/js-peer/src/js-peer/__test__/unit/builtInHandler.spec.ts @@ -1,3 +1,5 @@ +import { it, describe, expect, test } from 'vitest'; + import { CallParams } from '@fluencelabs/interfaces'; import { toUint8Array } from 'js-base64'; import { CallServiceData } from '../../../interfaces/commonTypes.js'; diff --git a/packages/core/js-peer/src/keypair/__test__/KeyPair.spec.ts b/packages/core/js-peer/src/keypair/__test__/KeyPair.spec.ts index d63aaeecc..937665b38 100644 --- a/packages/core/js-peer/src/keypair/__test__/KeyPair.spec.ts +++ b/packages/core/js-peer/src/keypair/__test__/KeyPair.spec.ts @@ -1,3 +1,4 @@ +import { it, describe, expect } from 'vitest'; import { toUint8Array } from 'js-base64'; import * as bs58 from 'bs58'; import { KeyPair } from '../index.js'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0c5ed0001..05bd056b1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -206,7 +206,6 @@ importers: '@multiformats/multiaddr': 11.3.0 '@types/bs58': 4.0.1 '@types/debug': 4.1.7 - '@types/jest': 29.4.0 '@types/uuid': 8.3.2 async: 3.2.4 bs58: 5.0.0 @@ -215,16 +214,15 @@ importers: it-length-prefixed: 8.0.4 it-map: 2.0.0 it-pipe: 2.0.5 - jest: 29.4.1 js-base64: 3.7.5 libp2p: 0.42.2 multiformats: 11.0.1 rxjs: 7.5.5 threads: 1.7.0 - ts-jest: next ts-pattern: 3.3.3 uint8arrays: 4.0.3 uuid: 8.3.2 + vitest: 0.29.7 dependencies: '@chainsafe/libp2p-noise': 11.0.0 '@fluencelabs/avm': 0.35.4 @@ -256,16 +254,14 @@ importers: uint8arrays: 4.0.3 uuid: 8.3.2 devDependencies: - '@fluencelabs/aqua': 0.7.7-362_4ybkoodcah37urerzfcwvnjsoe + '@fluencelabs/aqua': 0.7.7-362_sxyfz5frysr7cnkewysdljfvwu '@fluencelabs/aqua-api': 0.9.1-373 '@fluencelabs/aqua-lib': 0.6.0 '@fluencelabs/fluence-network-environment': 1.0.13 '@types/bs58': 4.0.1 '@types/debug': 4.1.7 - '@types/jest': 29.4.0 '@types/uuid': 8.3.2 - jest: 29.4.1 - ts-jest: 29.0.0-next.1_ecv55cdbauq6znr7ci2lzguwra + vitest: 0.29.7 packages: @@ -2408,13 +2404,13 @@ packages: resolution: {integrity: sha512-ifjtCM93KO3LhzPkMxqmXhwLmrg/scjOiyTihEVg7ns5N+BVzaK1eWzdOdqGdl9ZVoah43pdlQUepEo7VdRmsw==} dev: true - /@fluencelabs/aqua/0.7.7-362_4ybkoodcah37urerzfcwvnjsoe: + /@fluencelabs/aqua/0.7.7-362_sxyfz5frysr7cnkewysdljfvwu: resolution: {integrity: sha512-CwvBc3wKQdvnDM4Zxj6yFE5MR2oeh+EZ++m2hLvENt7OWl3cnZVR4cJQkRxMMLVT0MxRwLiy97UIBwGsPqlSCA==} hasBin: true dependencies: '@fluencelabs/aqua-ipfs': 0.5.5 '@fluencelabs/aqua-lib': 0.5.2 - '@fluencelabs/fluence': 0.26.3-snapshot-4_4ybkoodcah37urerzfcwvnjsoe + '@fluencelabs/fluence': 0.26.3-snapshot-4_sxyfz5frysr7cnkewysdljfvwu '@fluencelabs/fluence-network-environment': 1.0.13 ipfs-http-client: 50.1.2_node-fetch@3.3.0 transitivePeerDependencies: @@ -2626,7 +2622,7 @@ packages: /@fluencelabs/fluence-network-environment/1.0.14: resolution: {integrity: sha512-lMiH+7obmJW2Q+PMUR/vNAuX6TcVqlKmsWAHvnBogH7s8IeMT+UGN8qrweILWmE57G7MfauB302dIFQowR9tug==} - /@fluencelabs/fluence/0.26.3-snapshot-4_4ybkoodcah37urerzfcwvnjsoe: + /@fluencelabs/fluence/0.26.3-snapshot-4_sxyfz5frysr7cnkewysdljfvwu: resolution: {integrity: sha512-M/iQhnViXfMaATj3gFPQXrZe9zSVcyN9F9A9hfJBUn0VLamhmbfeIoSZeheK8VGBxYbRGcrtoqLPTy1vJQVgVw==} engines: {node: '>=10', pnpm: '>=3'} hasBin: true @@ -2635,7 +2631,7 @@ packages: '@fluencelabs/connection': 0.2.0_node-fetch@3.3.0 '@fluencelabs/interfaces': 0.1.0 '@fluencelabs/keypair': 0.2.0 - '@fluencelabs/marine-js': 0.3.18_ddylxr3wxksmlyjpihqkkowegi + '@fluencelabs/marine-js': 0.3.18_cnngzrja2umb46xxazlucyx2qu async: 3.2.3 base64-js: 1.5.1 browser-or-node: 2.1.1 @@ -2751,7 +2747,7 @@ packages: peer-id: 0.16.0 dev: true - /@fluencelabs/marine-js/0.3.18_ddylxr3wxksmlyjpihqkkowegi: + /@fluencelabs/marine-js/0.3.18_cnngzrja2umb46xxazlucyx2qu: resolution: {integrity: sha512-aNuGtyY910kJvtRwfqmZKjVs+1l3LVWShv5xvkY04faHm65nX3sZLe8UHwughdja/4ixV1IFKlaTUgw2u3Sf5A==} dependencies: '@wasmer/wasi': 0.12.0 @@ -2759,7 +2755,7 @@ packages: browser-or-node: 2.1.1 buffer: 6.0.3 threads: 1.7.0 - ts-jest: 27.1.5_ddylxr3wxksmlyjpihqkkowegi + ts-jest: 27.1.5_cnngzrja2umb46xxazlucyx2qu transitivePeerDependencies: - '@babel/core' - '@types/jest' @@ -2917,18 +2913,6 @@ packages: jest-util: 28.1.3 slash: 3.0.0 - /@jest/console/29.4.2: - resolution: {integrity: sha512-0I/rEJwMpV9iwi9cDEnT71a5nNGK9lj8Z4+1pRAU2x/thVXCDnaTGrvxyK+cAqZTFVFCiR+hfVrP4l2m+dCmQg==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@jest/types': 29.4.2 - '@types/node': 18.13.0 - chalk: 4.1.2 - jest-message-util: 29.4.2 - jest-util: 29.4.2 - slash: 3.0.0 - dev: true - /@jest/core/27.5.1: resolution: {integrity: sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -3062,48 +3046,6 @@ packages: - ts-node dev: true - /@jest/core/29.4.2: - resolution: {integrity: sha512-KGuoQah0P3vGNlaS/l9/wQENZGNKGoWb+OPxh3gz+YzG7/XExvYu34MzikRndQCdM2S0tzExN4+FL37i6gZmCQ==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - peerDependencies: - node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 - peerDependenciesMeta: - node-notifier: - optional: true - dependencies: - '@jest/console': 29.4.2 - '@jest/reporters': 29.4.2 - '@jest/test-result': 29.4.2 - '@jest/transform': 29.4.2 - '@jest/types': 29.4.2 - '@types/node': 18.13.0 - ansi-escapes: 4.3.2 - chalk: 4.1.2 - ci-info: 3.8.0 - exit: 0.1.2 - graceful-fs: 4.2.10 - jest-changed-files: 29.4.2 - jest-config: 29.4.2_@types+node@18.13.0 - jest-haste-map: 29.4.2 - jest-message-util: 29.4.2 - jest-regex-util: 29.4.2 - jest-resolve: 29.4.2 - jest-resolve-dependencies: 29.4.2 - jest-runner: 29.4.2 - jest-runtime: 29.4.2 - jest-snapshot: 29.4.2 - jest-util: 29.4.2 - jest-validate: 29.4.2 - jest-watcher: 29.4.2 - micromatch: 4.0.5 - pretty-format: 29.4.2 - slash: 3.0.0 - strip-ansi: 6.0.1 - transitivePeerDependencies: - - supports-color - - ts-node - dev: true - /@jest/environment/27.5.1: resolution: {integrity: sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -3123,16 +3065,6 @@ packages: jest-mock: 28.1.3 dev: true - /@jest/environment/29.4.2: - resolution: {integrity: sha512-JKs3VUtse0vQfCaFGJRX1bir9yBdtasxziSyu+pIiEllAQOe4oQhdCYIf3+Lx+nGglFktSKToBnRJfD5QKp+NQ==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@jest/fake-timers': 29.4.2 - '@jest/types': 29.4.2 - '@types/node': 18.13.0 - jest-mock: 29.4.2 - dev: true - /@jest/expect-utils/28.1.3: resolution: {integrity: sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} @@ -3145,6 +3077,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: jest-get-type: 29.4.2 + dev: false /@jest/expect/28.1.3: resolution: {integrity: sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==} @@ -3156,16 +3089,6 @@ packages: - supports-color dev: true - /@jest/expect/29.4.2: - resolution: {integrity: sha512-NUAeZVApzyaeLjfWIV/64zXjA2SS+NuUPHpAlO7IwVMGd5Vf9szTl9KEDlxY3B4liwLO31os88tYNHl6cpjtKQ==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - expect: 29.4.2 - jest-snapshot: 29.4.2 - transitivePeerDependencies: - - supports-color - dev: true - /@jest/fake-timers/27.5.1: resolution: {integrity: sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -3189,18 +3112,6 @@ packages: jest-util: 28.1.3 dev: true - /@jest/fake-timers/29.4.2: - resolution: {integrity: sha512-Ny1u0Wg6kCsHFWq7A/rW/tMhIedq2siiyHyLpHCmIhP7WmcAmd2cx95P+0xtTZlj5ZbJxIRQi4OPydZZUoiSQQ==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@jest/types': 29.4.2 - '@sinonjs/fake-timers': 10.0.2 - '@types/node': 18.13.0 - jest-message-util: 29.4.2 - jest-mock: 29.4.2 - jest-util: 29.4.2 - dev: true - /@jest/globals/27.5.1: resolution: {integrity: sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -3220,18 +3131,6 @@ packages: - supports-color dev: true - /@jest/globals/29.4.2: - resolution: {integrity: sha512-zCk70YGPzKnz/I9BNFDPlK+EuJLk21ur/NozVh6JVM86/YYZtZHqxFFQ62O9MWq7uf3vIZnvNA0BzzrtxD9iyg==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@jest/environment': 29.4.2 - '@jest/expect': 29.4.2 - '@jest/types': 29.4.2 - jest-mock: 29.4.2 - transitivePeerDependencies: - - supports-color - dev: true - /@jest/reporters/27.5.1: resolution: {integrity: sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -3307,43 +3206,6 @@ packages: - supports-color dev: true - /@jest/reporters/29.4.2: - resolution: {integrity: sha512-10yw6YQe75zCgYcXgEND9kw3UZZH5tJeLzWv4vTk/2mrS1aY50A37F+XT2hPO5OqQFFnUWizXD8k1BMiATNfUw==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - peerDependencies: - node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 - peerDependenciesMeta: - node-notifier: - optional: true - dependencies: - '@bcoe/v8-coverage': 0.2.3 - '@jest/console': 29.4.2 - '@jest/test-result': 29.4.2 - '@jest/transform': 29.4.2 - '@jest/types': 29.4.2 - '@jridgewell/trace-mapping': 0.3.17 - '@types/node': 18.13.0 - chalk: 4.1.2 - collect-v8-coverage: 1.0.1 - exit: 0.1.2 - glob: 7.2.3 - graceful-fs: 4.2.10 - istanbul-lib-coverage: 3.2.0 - istanbul-lib-instrument: 5.2.1 - istanbul-lib-report: 3.0.0 - istanbul-lib-source-maps: 4.0.1 - istanbul-reports: 3.1.5 - jest-message-util: 29.4.2 - jest-util: 29.4.2 - jest-worker: 29.4.2 - slash: 3.0.0 - string-length: 4.0.2 - strip-ansi: 6.0.1 - v8-to-istanbul: 9.0.1 - transitivePeerDependencies: - - supports-color - dev: true - /@jest/schemas/28.1.3: resolution: {integrity: sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} @@ -3355,6 +3217,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@sinclair/typebox': 0.25.21 + dev: false /@jest/source-map/27.5.1: resolution: {integrity: sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==} @@ -3373,15 +3236,6 @@ packages: graceful-fs: 4.2.10 dev: true - /@jest/source-map/29.4.2: - resolution: {integrity: sha512-tIoqV5ZNgYI9XCKXMqbYe5JbumcvyTgNN+V5QW4My033lanijvCD0D4PI9tBw4pRTqWOc00/7X3KVvUh+qnF4Q==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@jridgewell/trace-mapping': 0.3.17 - callsites: 3.1.0 - graceful-fs: 4.2.10 - dev: true - /@jest/test-result/27.5.1: resolution: {integrity: sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -3400,16 +3254,6 @@ packages: '@types/istanbul-lib-coverage': 2.0.4 collect-v8-coverage: 1.0.1 - /@jest/test-result/29.4.2: - resolution: {integrity: sha512-HZsC3shhiHVvMtP+i55MGR5bPcc3obCFbA5bzIOb8pCjwBZf11cZliJncCgaVUbC5yoQNuGqCkC0Q3t6EItxZA==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@jest/console': 29.4.2 - '@jest/types': 29.4.2 - '@types/istanbul-lib-coverage': 2.0.4 - collect-v8-coverage: 1.0.1 - dev: true - /@jest/test-sequencer/27.5.1: resolution: {integrity: sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -3431,16 +3275,6 @@ packages: slash: 3.0.0 dev: true - /@jest/test-sequencer/29.4.2: - resolution: {integrity: sha512-9Z2cVsD6CcObIVrWigHp2McRJhvCxL27xHtrZFgNC1RwnoSpDx6fZo8QYjJmziFlW9/hr78/3sxF54S8B6v8rg==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@jest/test-result': 29.4.2 - graceful-fs: 4.2.10 - jest-haste-map: 29.4.2 - slash: 3.0.0 - dev: true - /@jest/transform/27.5.1: resolution: {integrity: sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -3486,29 +3320,6 @@ packages: - supports-color dev: true - /@jest/transform/29.4.2: - resolution: {integrity: sha512-kf1v5iTJHn7p9RbOsBuc/lcwyPtJaZJt5885C98omWz79NIeD3PfoiiaPSu7JyCyFzNOIzKhmMhQLUhlTL9BvQ==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@babel/core': 7.20.12 - '@jest/types': 29.4.2 - '@jridgewell/trace-mapping': 0.3.17 - babel-plugin-istanbul: 6.1.1 - chalk: 4.1.2 - convert-source-map: 2.0.0 - fast-json-stable-stringify: 2.1.0 - graceful-fs: 4.2.10 - jest-haste-map: 29.4.2 - jest-regex-util: 29.4.2 - jest-util: 29.4.2 - micromatch: 4.0.5 - pirates: 4.0.5 - slash: 3.0.0 - write-file-atomic: 4.0.2 - transitivePeerDependencies: - - supports-color - dev: true - /@jest/types/27.5.1: resolution: {integrity: sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -3540,6 +3351,7 @@ packages: '@types/node': 18.13.0 '@types/yargs': 17.0.22 chalk: 4.1.2 + dev: false /@jridgewell/gen-mapping/0.1.1: resolution: {integrity: sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==} @@ -4970,6 +4782,7 @@ packages: /@sinclair/typebox/0.25.21: resolution: {integrity: sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g==} + dev: false /@sindresorhus/is/0.14.0: resolution: {integrity: sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==} @@ -4986,18 +4799,6 @@ packages: dependencies: type-detect: 4.0.8 - /@sinonjs/commons/2.0.0: - resolution: {integrity: sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==} - dependencies: - type-detect: 4.0.8 - dev: true - - /@sinonjs/fake-timers/10.0.2: - resolution: {integrity: sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==} - dependencies: - '@sinonjs/commons': 2.0.0 - dev: true - /@sinonjs/fake-timers/8.1.0: resolution: {integrity: sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==} dependencies: @@ -5484,6 +5285,12 @@ packages: '@types/chai': 4.3.4 dev: true + /@types/chai-subset/1.3.3: + resolution: {integrity: sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==} + dependencies: + '@types/chai': 4.3.4 + dev: true + /@types/chai/4.3.4: resolution: {integrity: sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw==} dev: true @@ -5624,6 +5431,7 @@ packages: dependencies: expect: 29.4.2 pretty-format: 29.4.2 + dev: false /@types/json-schema/7.0.11: resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==} @@ -5979,6 +5787,37 @@ packages: resolution: {integrity: sha512-MVEJ4vWAPNbrGLjz7ITnHYg+YXZ6ijAqtH5/cHwSoCpbvuJ98aLXwFfPKAUfZpJMQR5uXB58UJajbY130IRF/w==} dev: true + /@vitest/expect/0.29.7: + resolution: {integrity: sha512-UtG0tW0DP6b3N8aw7PHmweKDsvPv4wjGvrVZW7OSxaFg76ShtVdMiMcUkZJgCE8QWUmhwaM0aQhbbVLo4F4pkA==} + dependencies: + '@vitest/spy': 0.29.7 + '@vitest/utils': 0.29.7 + chai: 4.3.7 + dev: true + + /@vitest/runner/0.29.7: + resolution: {integrity: sha512-Yt0+csM945+odOx4rjZSjibQfl2ymxqVsmYz6sO2fiO5RGPYDFCo60JF6tLL9pz4G/kjY4irUxadeB1XT+H1jg==} + dependencies: + '@vitest/utils': 0.29.7 + p-limit: 4.0.0 + pathe: 1.1.0 + dev: true + + /@vitest/spy/0.29.7: + resolution: {integrity: sha512-IalL0iO6A6Xz8hthR8sctk6ZS//zVBX48EiNwQguYACdgdei9ZhwMaBFV70mpmeYAFCRAm+DpoFHM5470Im78A==} + dependencies: + tinyspy: 1.1.1 + dev: true + + /@vitest/utils/0.29.7: + resolution: {integrity: sha512-vNgGadp2eE5XKCXtZXL5UyNEDn68npSct75OC9AlELenSK0DiV1Mb9tfkwJHKjRb69iek+e79iipoJx8+s3SdA==} + dependencies: + cli-truncate: 3.1.0 + diff: 5.1.0 + loupe: 2.3.6 + pretty-format: 27.5.1 + dev: true + /@walletconnect/core/2.4.7_mqijgjbnahaa3tnbkktxyzzb3a: resolution: {integrity: sha512-w92NrtziqrWs070HJICGh80Vp60PaXu06OjNvOnVZEorbTipCWx4xxgcC2NhsT4TCQ8r1FOut6ahLe1PILuRsg==} dependencies: @@ -6947,24 +6786,6 @@ packages: - supports-color dev: true - /babel-jest/29.4.2_@babel+core@7.20.12: - resolution: {integrity: sha512-vcghSqhtowXPG84posYkkkzcZsdayFkubUgbE3/1tuGbX7AQtwCkkNA/wIbB0BMjuCPoqTkiDyKN7Ty7d3uwNQ==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - peerDependencies: - '@babel/core': ^7.8.0 - dependencies: - '@babel/core': 7.20.12 - '@jest/transform': 29.4.2 - '@types/babel__core': 7.20.0 - babel-plugin-istanbul: 6.1.1 - babel-preset-jest: 29.4.2_@babel+core@7.20.12 - chalk: 4.1.2 - graceful-fs: 4.2.10 - slash: 3.0.0 - transitivePeerDependencies: - - supports-color - dev: true - /babel-loader/8.3.0_la66t7xldg4uecmyawueag5wkm: resolution: {integrity: sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==} engines: {node: '>= 8.9'} @@ -7011,16 +6832,6 @@ packages: '@types/babel__traverse': 7.18.3 dev: true - /babel-plugin-jest-hoist/29.4.2: - resolution: {integrity: sha512-5HZRCfMeWypFEonRbEkwWXtNS1sQK159LhRVyRuLzyfVBxDy/34Tr/rg4YVi0SScSJ4fqeaR/OIeceJ/LaQ0pQ==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@babel/template': 7.20.7 - '@babel/types': 7.20.7 - '@types/babel__core': 7.20.0 - '@types/babel__traverse': 7.18.3 - dev: true - /babel-plugin-macros/3.1.0: resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==} engines: {node: '>=10', npm: '>=6'} @@ -7127,17 +6938,6 @@ packages: babel-preset-current-node-syntax: 1.0.1_@babel+core@7.20.12 dev: true - /babel-preset-jest/29.4.2_@babel+core@7.20.12: - resolution: {integrity: sha512-ecWdaLY/8JyfUDr0oELBMpj3R5I1L6ZqG+kRJmwqfHtLWuPrJStR0LUkvUhfykJWTsXXMnohsayN/twltBbDrQ==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - peerDependencies: - '@babel/core': ^7.0.0 - dependencies: - '@babel/core': 7.20.12 - babel-plugin-jest-hoist: 29.4.2 - babel-preset-current-node-syntax: 1.0.1_@babel+core@7.20.12 - dev: true - /babel-preset-react-app/10.0.1: resolution: {integrity: sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==} dependencies: @@ -7574,6 +7374,11 @@ packages: resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} engines: {node: '>= 0.8'} + /cac/6.7.14: + resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} + engines: {node: '>=8'} + dev: true + /cacheable-lookup/5.0.4: resolution: {integrity: sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==} engines: {node: '>=10.6.0'} @@ -7928,6 +7733,14 @@ packages: colors: 1.4.0 dev: true + /cli-truncate/3.1.0: + resolution: {integrity: sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dependencies: + slice-ansi: 5.0.0 + string-width: 5.1.2 + dev: true + /cli-width/4.0.0: resolution: {integrity: sha512-ZksGS2xpa/bYkNzN3BAw1wEjsLV/ZKOf/CCrJ/QOBsxx6fOARIkwTutxp1XIOIohi6HKmOFjMoK/XaqDVUpEEw==} engines: {node: '>= 12'} @@ -8147,10 +7960,6 @@ packages: /convert-source-map/1.9.0: resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} - /convert-source-map/2.0.0: - resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} - dev: true - /cookie-signature/1.0.6: resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==} @@ -8948,6 +8757,7 @@ packages: /diff-sequences/29.4.2: resolution: {integrity: sha512-R6P0Y6PrsH3n4hUXxL3nns0rbRk6Q33js3ygJBeEpbzLzgcNuJ61+u0RXasFpTKISw99TxUzFnumSnRLsjhLaw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + dev: false /diff/3.5.0: resolution: {integrity: sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==} @@ -8964,6 +8774,11 @@ packages: engines: {node: '>=0.3.1'} dev: true + /diff/5.1.0: + resolution: {integrity: sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==} + engines: {node: '>=0.3.1'} + dev: true + /diffie-hellman/5.0.3: resolution: {integrity: sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==} dependencies: @@ -9208,11 +9023,6 @@ packages: resolution: {integrity: sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==} engines: {node: '>=12'} - /emittery/0.13.1: - resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==} - engines: {node: '>=12'} - dev: true - /emittery/0.8.1: resolution: {integrity: sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==} engines: {node: '>=10'} @@ -10126,6 +9936,7 @@ packages: jest-matcher-utils: 29.4.2 jest-message-util: 29.4.2 jest-util: 29.4.2 + dev: false /express/4.18.2: resolution: {integrity: sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==} @@ -11994,6 +11805,11 @@ packages: resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} engines: {node: '>=8'} + /is-fullwidth-code-point/4.0.0: + resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==} + engines: {node: '>=12'} + dev: true + /is-function/1.0.2: resolution: {integrity: sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==} dev: true @@ -12586,14 +12402,6 @@ packages: p-limit: 3.1.0 dev: true - /jest-changed-files/29.4.2: - resolution: {integrity: sha512-Qdd+AXdqD16PQa+VsWJpxR3kN0JyOCX1iugQfx5nUgAsI4gwsKviXkpclxOK9ZnwaY2IQVHz+771eAvqeOlfuw==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - execa: 5.1.1 - p-limit: 3.1.0 - dev: true - /jest-circus/27.5.1: resolution: {integrity: sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -12647,33 +12455,6 @@ packages: - supports-color dev: true - /jest-circus/29.4.2: - resolution: {integrity: sha512-wW3ztp6a2P5c1yOc1Cfrt5ozJ7neWmqeXm/4SYiqcSriyisgq63bwFj1NuRdSR5iqS0CMEYwSZd89ZA47W9zUg==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@jest/environment': 29.4.2 - '@jest/expect': 29.4.2 - '@jest/test-result': 29.4.2 - '@jest/types': 29.4.2 - '@types/node': 18.13.0 - chalk: 4.1.2 - co: 4.6.0 - dedent: 0.7.0 - is-generator-fn: 2.1.0 - jest-each: 29.4.2 - jest-matcher-utils: 29.4.2 - jest-message-util: 29.4.2 - jest-runtime: 29.4.2 - jest-snapshot: 29.4.2 - jest-util: 29.4.2 - p-limit: 3.1.0 - pretty-format: 29.4.2 - slash: 3.0.0 - stack-utils: 2.0.6 - transitivePeerDependencies: - - supports-color - dev: true - /jest-cli/27.5.1: resolution: {integrity: sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -12762,41 +12543,13 @@ packages: - ts-node dev: true - /jest-cli/29.4.2: - resolution: {integrity: sha512-b+eGUtXq/K2v7SH3QcJvFvaUaCDS1/YAZBYz0m28Q/Ppyr+1qNaHmVYikOrbHVbZqYQs2IeI3p76uy6BWbXq8Q==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - hasBin: true + /jest-config/27.5.1: + resolution: {integrity: sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} peerDependencies: - node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 + ts-node: '>=9.0.0' peerDependenciesMeta: - node-notifier: - optional: true - dependencies: - '@jest/core': 29.4.2 - '@jest/test-result': 29.4.2 - '@jest/types': 29.4.2 - chalk: 4.1.2 - exit: 0.1.2 - graceful-fs: 4.2.10 - import-local: 3.1.0 - jest-config: 29.4.2 - jest-util: 29.4.2 - jest-validate: 29.4.2 - prompts: 2.4.2 - yargs: 17.6.2 - transitivePeerDependencies: - - '@types/node' - - supports-color - - ts-node - dev: true - - /jest-config/27.5.1: - resolution: {integrity: sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - peerDependencies: - ts-node: '>=9.0.0' - peerDependenciesMeta: - ts-node: + ts-node: optional: true dependencies: '@babel/core': 7.20.12 @@ -12949,83 +12702,6 @@ packages: - supports-color dev: true - /jest-config/29.4.2: - resolution: {integrity: sha512-919CtnXic52YM0zW4C1QxjG6aNueX1kBGthuMtvFtRTAxhKfJmiXC9qwHmi6o2josjbDz8QlWyY55F1SIVmCWA==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - peerDependencies: - '@types/node': '*' - ts-node: '>=9.0.0' - peerDependenciesMeta: - '@types/node': - optional: true - ts-node: - optional: true - dependencies: - '@babel/core': 7.20.12 - '@jest/test-sequencer': 29.4.2 - '@jest/types': 29.4.2 - babel-jest: 29.4.2_@babel+core@7.20.12 - chalk: 4.1.2 - ci-info: 3.8.0 - deepmerge: 4.3.0 - glob: 7.2.3 - graceful-fs: 4.2.10 - jest-circus: 29.4.2 - jest-environment-node: 29.4.2 - jest-get-type: 29.4.2 - jest-regex-util: 29.4.2 - jest-resolve: 29.4.2 - jest-runner: 29.4.2 - jest-util: 29.4.2 - jest-validate: 29.4.2 - micromatch: 4.0.5 - parse-json: 5.2.0 - pretty-format: 29.4.2 - slash: 3.0.0 - strip-json-comments: 3.1.1 - transitivePeerDependencies: - - supports-color - dev: true - - /jest-config/29.4.2_@types+node@18.13.0: - resolution: {integrity: sha512-919CtnXic52YM0zW4C1QxjG6aNueX1kBGthuMtvFtRTAxhKfJmiXC9qwHmi6o2josjbDz8QlWyY55F1SIVmCWA==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - peerDependencies: - '@types/node': '*' - ts-node: '>=9.0.0' - peerDependenciesMeta: - '@types/node': - optional: true - ts-node: - optional: true - dependencies: - '@babel/core': 7.20.12 - '@jest/test-sequencer': 29.4.2 - '@jest/types': 29.4.2 - '@types/node': 18.13.0 - babel-jest: 29.4.2_@babel+core@7.20.12 - chalk: 4.1.2 - ci-info: 3.8.0 - deepmerge: 4.3.0 - glob: 7.2.3 - graceful-fs: 4.2.10 - jest-circus: 29.4.2 - jest-environment-node: 29.4.2 - jest-get-type: 29.4.2 - jest-regex-util: 29.4.2 - jest-resolve: 29.4.2 - jest-runner: 29.4.2 - jest-util: 29.4.2 - jest-validate: 29.4.2 - micromatch: 4.0.5 - parse-json: 5.2.0 - pretty-format: 29.4.2 - slash: 3.0.0 - strip-json-comments: 3.1.1 - transitivePeerDependencies: - - supports-color - dev: true - /jest-diff/27.5.1: resolution: {integrity: sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -13053,6 +12729,7 @@ packages: diff-sequences: 29.4.2 jest-get-type: 29.4.2 pretty-format: 29.4.2 + dev: false /jest-docblock/27.5.1: resolution: {integrity: sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==} @@ -13067,13 +12744,6 @@ packages: detect-newline: 3.1.0 dev: true - /jest-docblock/29.4.2: - resolution: {integrity: sha512-dV2JdahgClL34Y5vLrAHde3nF3yo2jKRH+GIYJuCpfqwEJZcikzeafVTGAjbOfKPG17ez9iWXwUYp7yefeCRag==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - detect-newline: 3.1.0 - dev: true - /jest-each/27.5.1: resolution: {integrity: sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -13095,17 +12765,6 @@ packages: pretty-format: 28.1.3 dev: true - /jest-each/29.4.2: - resolution: {integrity: sha512-trvKZb0JYiCndc55V1Yh0Luqi7AsAdDWpV+mKT/5vkpnnFQfuQACV72IoRV161aAr6kAVIBpmYzwhBzm34vQkA==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@jest/types': 29.4.2 - chalk: 4.1.2 - jest-get-type: 29.4.2 - jest-util: 29.4.2 - pretty-format: 29.4.2 - dev: true - /jest-environment-jsdom/27.5.1: resolution: {integrity: sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -13146,18 +12805,6 @@ packages: jest-util: 28.1.3 dev: true - /jest-environment-node/29.4.2: - resolution: {integrity: sha512-MLPrqUcOnNBc8zTOfqBbxtoa8/Ee8tZ7UFW7hRDQSUT+NGsvS96wlbHGTf+EFAT9KC3VNb7fWEM6oyvmxtE/9w==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@jest/environment': 29.4.2 - '@jest/fake-timers': 29.4.2 - '@jest/types': 29.4.2 - '@types/node': 18.13.0 - jest-mock: 29.4.2 - jest-util: 29.4.2 - dev: true - /jest-get-type/27.5.1: resolution: {integrity: sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -13170,6 +12817,7 @@ packages: /jest-get-type/29.4.2: resolution: {integrity: sha512-vERN30V5i2N6lqlFu4ljdTqQAgrkTFMC9xaIIfOPYBw04pufjXRty5RuXBiB1d72tGbURa/UgoiHB90ruOSivg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + dev: false /jest-haste-map/27.5.1: resolution: {integrity: sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==} @@ -13209,25 +12857,6 @@ packages: fsevents: 2.3.2 dev: true - /jest-haste-map/29.4.2: - resolution: {integrity: sha512-WkUgo26LN5UHPknkezrBzr7lUtV1OpGsp+NfXbBwHztsFruS3gz+AMTTBcEklvi8uPzpISzYjdKXYZQJXBnfvw==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@jest/types': 29.4.2 - '@types/graceful-fs': 4.1.6 - '@types/node': 18.13.0 - anymatch: 3.1.3 - fb-watchman: 2.0.2 - graceful-fs: 4.2.10 - jest-regex-util: 29.4.2 - jest-util: 29.4.2 - jest-worker: 29.4.2 - micromatch: 4.0.5 - walker: 1.0.8 - optionalDependencies: - fsevents: 2.3.2 - dev: true - /jest-jasmine2/27.5.1: resolution: {integrity: sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -13267,14 +12896,6 @@ packages: pretty-format: 28.1.3 dev: true - /jest-leak-detector/29.4.2: - resolution: {integrity: sha512-Wa62HuRJmWXtX9F00nUpWlrbaH5axeYCdyRsOs/+Rb1Vb6+qWTlB5rKwCCRKtorM7owNwKsyJ8NRDUcZ8ghYUA==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - jest-get-type: 29.4.2 - pretty-format: 29.4.2 - dev: true - /jest-matcher-utils/27.5.1: resolution: {integrity: sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -13302,6 +12923,7 @@ packages: jest-diff: 29.4.2 jest-get-type: 29.4.2 pretty-format: 29.4.2 + dev: false /jest-message-util/27.5.1: resolution: {integrity: sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==} @@ -13344,6 +12966,7 @@ packages: pretty-format: 29.4.2 slash: 3.0.0 stack-utils: 2.0.6 + dev: false /jest-mock/27.5.1: resolution: {integrity: sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==} @@ -13360,15 +12983,6 @@ packages: '@types/node': 18.13.0 dev: true - /jest-mock/29.4.2: - resolution: {integrity: sha512-x1FSd4Gvx2yIahdaIKoBjwji6XpboDunSJ95RpntGrYulI1ByuYQCKN/P7hvk09JB74IonU3IPLdkutEWYt++g==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@jest/types': 29.4.2 - '@types/node': 18.13.0 - jest-util: 29.4.2 - dev: true - /jest-pnp-resolver/1.2.3_jest-resolve@27.5.1: resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==} engines: {node: '>=6'} @@ -13392,18 +13006,6 @@ packages: jest-resolve: 28.1.3 dev: true - /jest-pnp-resolver/1.2.3_jest-resolve@29.4.2: - resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==} - engines: {node: '>=6'} - peerDependencies: - jest-resolve: '*' - peerDependenciesMeta: - jest-resolve: - optional: true - dependencies: - jest-resolve: 29.4.2 - dev: true - /jest-regex-util/27.5.1: resolution: {integrity: sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -13412,11 +13014,6 @@ packages: resolution: {integrity: sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} - /jest-regex-util/29.4.2: - resolution: {integrity: sha512-XYZXOqUl1y31H6VLMrrUL1ZhXuiymLKPz0BO1kEeR5xER9Tv86RZrjTm74g5l9bPJQXA/hyLdaVPN/sdqfteig==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dev: true - /jest-resolve-dependencies/27.5.1: resolution: {integrity: sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -13437,16 +13034,6 @@ packages: - supports-color dev: true - /jest-resolve-dependencies/29.4.2: - resolution: {integrity: sha512-6pL4ptFw62rjdrPk7rRpzJYgcRqRZNsZTF1VxVTZMishbO6ObyWvX57yHOaNGgKoADtAHRFYdHQUEvYMJATbDg==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - jest-regex-util: 29.4.2 - jest-snapshot: 29.4.2 - transitivePeerDependencies: - - supports-color - dev: true - /jest-resolve/27.5.1: resolution: {integrity: sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -13477,21 +13064,6 @@ packages: slash: 3.0.0 dev: true - /jest-resolve/29.4.2: - resolution: {integrity: sha512-RtKWW0mbR3I4UdkOrW7552IFGLYQ5AF9YrzD0FnIOkDu0rAMlA5/Y1+r7lhCAP4nXSBTaE7ueeqj6IOwZpgoqw==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - chalk: 4.1.2 - graceful-fs: 4.2.10 - jest-haste-map: 29.4.2 - jest-pnp-resolver: 1.2.3_jest-resolve@29.4.2 - jest-util: 29.4.2 - jest-validate: 29.4.2 - resolve: 1.22.1 - resolve.exports: 2.0.0 - slash: 3.0.0 - dev: true - /jest-runner/27.5.1: resolution: {integrity: sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -13552,35 +13124,6 @@ packages: - supports-color dev: true - /jest-runner/29.4.2: - resolution: {integrity: sha512-wqwt0drm7JGjwdH+x1XgAl+TFPH7poowMguPQINYxaukCqlczAcNLJiK+OLxUxQAEWMdy+e6nHZlFHO5s7EuRg==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@jest/console': 29.4.2 - '@jest/environment': 29.4.2 - '@jest/test-result': 29.4.2 - '@jest/transform': 29.4.2 - '@jest/types': 29.4.2 - '@types/node': 18.13.0 - chalk: 4.1.2 - emittery: 0.13.1 - graceful-fs: 4.2.10 - jest-docblock: 29.4.2 - jest-environment-node: 29.4.2 - jest-haste-map: 29.4.2 - jest-leak-detector: 29.4.2 - jest-message-util: 29.4.2 - jest-resolve: 29.4.2 - jest-runtime: 29.4.2 - jest-util: 29.4.2 - jest-watcher: 29.4.2 - jest-worker: 29.4.2 - p-limit: 3.1.0 - source-map-support: 0.5.13 - transitivePeerDependencies: - - supports-color - dev: true - /jest-runtime/27.5.1: resolution: {integrity: sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -13640,37 +13183,6 @@ packages: - supports-color dev: true - /jest-runtime/29.4.2: - resolution: {integrity: sha512-3fque9vtpLzGuxT9eZqhxi+9EylKK/ESfhClv4P7Y9sqJPs58LjVhTt8jaMp/pRO38agll1CkSu9z9ieTQeRrw==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@jest/environment': 29.4.2 - '@jest/fake-timers': 29.4.2 - '@jest/globals': 29.4.2 - '@jest/source-map': 29.4.2 - '@jest/test-result': 29.4.2 - '@jest/transform': 29.4.2 - '@jest/types': 29.4.2 - '@types/node': 18.13.0 - chalk: 4.1.2 - cjs-module-lexer: 1.2.2 - collect-v8-coverage: 1.0.1 - glob: 7.2.3 - graceful-fs: 4.2.10 - jest-haste-map: 29.4.2 - jest-message-util: 29.4.2 - jest-mock: 29.4.2 - jest-regex-util: 29.4.2 - jest-resolve: 29.4.2 - jest-snapshot: 29.4.2 - jest-util: 29.4.2 - semver: 7.3.8 - slash: 3.0.0 - strip-bom: 4.0.0 - transitivePeerDependencies: - - supports-color - dev: true - /jest-serializer/27.5.1: resolution: {integrity: sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -13738,38 +13250,6 @@ packages: - supports-color dev: true - /jest-snapshot/29.4.2: - resolution: {integrity: sha512-PdfubrSNN5KwroyMH158R23tWcAXJyx4pvSvWls1dHoLCaUhGul9rsL3uVjtqzRpkxlkMavQjGuWG1newPgmkw==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@babel/core': 7.20.12 - '@babel/generator': 7.20.14 - '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.20.12 - '@babel/plugin-syntax-typescript': 7.20.0_@babel+core@7.20.12 - '@babel/traverse': 7.20.13 - '@babel/types': 7.20.7 - '@jest/expect-utils': 29.4.2 - '@jest/transform': 29.4.2 - '@jest/types': 29.4.2 - '@types/babel__traverse': 7.18.3 - '@types/prettier': 2.7.2 - babel-preset-current-node-syntax: 1.0.1_@babel+core@7.20.12 - chalk: 4.1.2 - expect: 29.4.2 - graceful-fs: 4.2.10 - jest-diff: 29.4.2 - jest-get-type: 29.4.2 - jest-haste-map: 29.4.2 - jest-matcher-utils: 29.4.2 - jest-message-util: 29.4.2 - jest-util: 29.4.2 - natural-compare: 1.4.0 - pretty-format: 29.4.2 - semver: 7.3.8 - transitivePeerDependencies: - - supports-color - dev: true - /jest-util/27.5.1: resolution: {integrity: sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -13802,6 +13282,7 @@ packages: ci-info: 3.8.0 graceful-fs: 4.2.10 picomatch: 2.3.1 + dev: false /jest-validate/27.5.1: resolution: {integrity: sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==} @@ -13826,18 +13307,6 @@ packages: pretty-format: 28.1.3 dev: true - /jest-validate/29.4.2: - resolution: {integrity: sha512-tto7YKGPJyFbhcKhIDFq8B5od+eVWD/ySZ9Tvcp/NGCvYA4RQbuzhbwYWtIjMT5W5zA2W0eBJwu4HVw34d5G6Q==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@jest/types': 29.4.2 - camelcase: 6.3.0 - chalk: 4.1.2 - jest-get-type: 29.4.2 - leven: 3.1.0 - pretty-format: 29.4.2 - dev: true - /jest-watch-typeahead/1.1.0_jest@27.5.1: resolution: {integrity: sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -13879,20 +13348,6 @@ packages: jest-util: 28.1.3 string-length: 4.0.2 - /jest-watcher/29.4.2: - resolution: {integrity: sha512-onddLujSoGiMJt+tKutehIidABa175i/Ays+QvKxCqBwp7fvxP3ZhKsrIdOodt71dKxqk4sc0LN41mWLGIK44w==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@jest/test-result': 29.4.2 - '@jest/types': 29.4.2 - '@types/node': 18.13.0 - ansi-escapes: 4.3.2 - chalk: 4.1.2 - emittery: 0.13.1 - jest-util: 29.4.2 - string-length: 4.0.2 - dev: true - /jest-worker/26.6.2: resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} engines: {node: '>= 10.13.0'} @@ -13917,16 +13372,6 @@ packages: merge-stream: 2.0.0 supports-color: 8.1.1 - /jest-worker/29.4.2: - resolution: {integrity: sha512-VIuZA2hZmFyRbchsUCHEehoSf2HEl0YVF8SDJqtPnKorAaBuh42V8QsLnde0XP5F6TyCynGPEGgBOn3Fc+wZGw==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@types/node': 18.13.0 - jest-util: 29.4.2 - merge-stream: 2.0.0 - supports-color: 8.1.1 - dev: true - /jest/27.5.1: resolution: {integrity: sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -13988,26 +13433,6 @@ packages: - ts-node dev: true - /jest/29.4.1: - resolution: {integrity: sha512-cknimw7gAXPDOmj0QqztlxVtBVCw2lYY9CeIE5N6kD+kET1H4H79HSNISJmijb1HF+qk+G+ploJgiDi5k/fRlg==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - hasBin: true - peerDependencies: - node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 - peerDependenciesMeta: - node-notifier: - optional: true - dependencies: - '@jest/core': 29.4.2 - '@jest/types': 29.4.2 - import-local: 3.1.0 - jest-cli: 29.4.2 - transitivePeerDependencies: - - '@types/node' - - supports-color - - ts-node - dev: true - /js-base64/3.7.5: resolution: {integrity: sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA==} @@ -14151,6 +13576,10 @@ packages: engines: {node: '>=6'} hasBin: true + /jsonc-parser/3.2.0: + resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==} + dev: true + /jsonfile/2.4.0: resolution: {integrity: sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==} optionalDependencies: @@ -14708,6 +14137,11 @@ packages: resolution: {integrity: sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==} engines: {node: '>= 12.13.0'} + /local-pkg/0.4.3: + resolution: {integrity: sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==} + engines: {node: '>=14'} + dev: true + /locate-path/2.0.0: resolution: {integrity: sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==} engines: {node: '>=4'} @@ -15224,6 +14658,15 @@ packages: hasBin: true dev: true + /mlly/1.2.0: + resolution: {integrity: sha512-+c7A3CV0KGdKcylsI6khWyts/CYrGTrRVo4R/I7u/cUsy0Conxa6LUhiEzVKIw14lc2L5aiO4+SeVe4TeGRKww==} + dependencies: + acorn: 8.8.2 + pathe: 1.1.0 + pkg-types: 1.0.2 + ufo: 1.1.1 + dev: true + /mnemonist/0.38.5: resolution: {integrity: sha512-bZTFT5rrPKtPJxj8KSV0WkPyNxl72vQepqqVUAW2ARUpUSF2qXMB6jZj7hW5/k7C1rtpzqbD/IIbJwLXUjCHeg==} dependencies: @@ -16099,7 +15542,6 @@ packages: engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dependencies: yocto-queue: 1.0.0 - dev: false /p-locate/2.0.0: resolution: {integrity: sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==} @@ -16339,6 +15781,10 @@ packages: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} + /pathe/1.1.0: + resolution: {integrity: sha512-ODbEPR0KKHqECXW1GoxdDb+AZvULmXjVPy4rt+pGo2+TnjJTIPJQSVS6N63n8T2Ip+syHhbn52OewKicV0373w==} + dev: true + /pathval/1.1.1: resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==} dev: true @@ -16473,6 +15919,14 @@ packages: dependencies: find-up: 4.1.0 + /pkg-types/1.0.2: + resolution: {integrity: sha512-hM58GKXOcj8WTqUXnsQyJYXdeAPbythQgEF3nTcEo+nkD49chjQ9IKm/QJy9xf6JakXptz86h7ecP2024rrLaQ==} + dependencies: + jsonc-parser: 3.2.0 + mlly: 1.2.0 + pathe: 1.1.0 + dev: true + /pkg-up/3.1.0: resolution: {integrity: sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==} engines: {node: '>=8'} @@ -17314,6 +16768,7 @@ packages: '@jest/schemas': 29.4.2 ansi-styles: 5.2.0 react-is: 18.2.0 + dev: false /private-ip/2.3.4: resolution: {integrity: sha512-ts/YFVwfBeLq61f9+KsOhXW6RH0wvY0gU50R6QZYzgFhggyyLK6WDFeYdjfi/HMnBm2hecLvsR3PB3JcRxDk+A==} @@ -18081,11 +17536,6 @@ packages: resolution: {integrity: sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==} engines: {node: '>=10'} - /resolve.exports/2.0.0: - resolution: {integrity: sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg==} - engines: {node: '>=10'} - dev: true - /resolve/1.1.7: resolution: {integrity: sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==} dev: true @@ -18668,6 +18118,10 @@ packages: get-intrinsic: 1.2.0 object-inspect: 1.12.3 + /siginfo/2.0.0: + resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==} + dev: true + /signal-exit/3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} @@ -18704,6 +18158,14 @@ packages: is-fullwidth-code-point: 3.0.0 dev: true + /slice-ansi/5.0.0: + resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==} + engines: {node: '>=12'} + dependencies: + ansi-styles: 6.2.1 + is-fullwidth-code-point: 4.0.0 + dev: true + /sockjs/0.3.24: resolution: {integrity: sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==} dependencies: @@ -18894,6 +18356,10 @@ packages: dependencies: escape-string-regexp: 2.0.0 + /stackback/0.0.2: + resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} + dev: true + /stackframe/1.3.4: resolution: {integrity: sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==} dev: false @@ -18914,6 +18380,10 @@ packages: resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==} engines: {node: '>= 0.8'} + /std-env/3.3.2: + resolution: {integrity: sha512-uUZI65yrV2Qva5gqE0+A7uVAvO40iPo6jGhs7s8keRfHCmtg+uB2X6EiLGCI9IgL1J17xGhvoOqSz79lzICPTA==} + dev: true + /stealthy-require/1.1.1: resolution: {integrity: sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==} engines: {node: '>=0.10.0'} @@ -19145,6 +18615,12 @@ packages: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} engines: {node: '>=8'} + /strip-literal/1.0.1: + resolution: {integrity: sha512-QZTsipNpa2Ppr6v1AmJHESqJ3Uz247MUS0OjrnnZjFAvEoWqxuyFuXn2xLgMtRnijJShAa1HL0gtJyUs7u7n3Q==} + dependencies: + acorn: 8.8.2 + dev: true + /strip-outer/2.0.0: resolution: {integrity: sha512-A21Xsm1XzUkK0qK1ZrytDUvqsQWict2Cykhvi0fBQntGG5JSprESasEyV1EZ/4CiR5WB5KjzLTrP/bO37B0wPg==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -19552,6 +19028,20 @@ packages: esm: 3.2.25 optional: true + /tinybench/2.4.0: + resolution: {integrity: sha512-iyziEiyFxX4kyxSp+MtY1oCH/lvjH3PxFN8PGCDeqcZWAJ/i+9y+nL85w99PxVzrIvew/GSkSbDYtiGVa85Afg==} + dev: true + + /tinypool/0.4.0: + resolution: {integrity: sha512-2ksntHOKf893wSAH4z/+JbPpi92esw8Gn9N2deXX+B0EO92hexAVI9GIZZPx7P5aYo5KULfeOSt3kMOmSOy6uA==} + engines: {node: '>=14.0.0'} + dev: true + + /tinyspy/1.1.1: + resolution: {integrity: sha512-UVq5AXt/gQlti7oxoIg5oi/9r0WpF7DGEVwXgqWSMmyN16+e3tl5lIvTaOpJ3TAtu5xFzWccFRM4R5NaWHF+4g==} + engines: {node: '>=14.0.0'} + dev: true + /tmp/0.0.33: resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==} engines: {node: '>=0.6.0'} @@ -19690,41 +19180,6 @@ packages: yargs-parser: 20.2.9 dev: true - /ts-jest/27.1.5_ddylxr3wxksmlyjpihqkkowegi: - resolution: {integrity: sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - hasBin: true - peerDependencies: - '@babel/core': '>=7.0.0-beta.0 <8' - '@types/jest': ^27.0.0 - babel-jest: '>=27.0.0 <28' - esbuild: '*' - jest: ^27.0.0 - typescript: '>=3.8 <5.0' - peerDependenciesMeta: - '@babel/core': - optional: true - '@types/jest': - optional: true - babel-jest: - optional: true - esbuild: - optional: true - dependencies: - '@babel/core': 7.20.12 - '@types/jest': 29.4.0 - bs-logger: 0.2.6 - fast-json-stable-stringify: 2.1.0 - jest: 29.4.1 - jest-util: 27.5.1 - json5: 2.2.3 - lodash.memoize: 4.1.2 - make-error: 1.3.6 - semver: 7.3.8 - typescript: 4.9.5 - yargs-parser: 20.2.9 - dev: true - /ts-jest/27.1.5_g4n3hsjlbmz4ag5o32ytojordu: resolution: {integrity: sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -19793,40 +19248,6 @@ packages: yargs-parser: 20.2.9 dev: true - /ts-jest/29.0.0-next.1_ecv55cdbauq6znr7ci2lzguwra: - resolution: {integrity: sha512-bVo2GDuJiV+cWEYB72tdz2Ips4JDKa04bcKikPULxxUHT4fsoY1zB2zvsrJym18qrFpXyVrIdgJFLfEx2YTkbg==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - hasBin: true - peerDependencies: - '@babel/core': '>=7.0.0-beta.0 <8' - '@jest/types': ^29.0.0 - babel-jest: ^29.0.0 - esbuild: '*' - jest: ^29.0.0 - typescript: '>=4.3' - peerDependenciesMeta: - '@babel/core': - optional: true - '@jest/types': - optional: true - babel-jest: - optional: true - esbuild: - optional: true - dependencies: - '@babel/core': 7.20.12 - bs-logger: 0.2.6 - fast-json-stable-stringify: 2.1.0 - jest: 29.4.1 - jest-util: 29.4.2 - json5: 2.2.3 - lodash.memoize: 4.1.2 - make-error: 1.3.6 - semver: 7.3.8 - typescript: 4.9.5 - yargs-parser: 21.1.1 - dev: true - /ts-node/10.9.1_4bewfcp2iebiwuold25d6rgcsy: resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true @@ -20068,6 +19489,10 @@ packages: engines: {node: '>=8'} dev: true + /ufo/1.1.1: + resolution: {integrity: sha512-MvlCc4GHrmZdAllBc0iUDowff36Q9Ndw/UzqmEKyrfSzokTd9ZCy1i+IIk5hrYKkjoYVQyNbrw7/F8XJ2rEwTg==} + dev: true + /uglify-js/3.17.4: resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==} engines: {node: '>=0.8.0'} @@ -20360,6 +19785,27 @@ packages: extsprintf: 1.3.0 dev: true + /vite-node/0.29.7_@types+node@18.13.0: + resolution: {integrity: sha512-PakCZLvz37yFfUPWBnLa1OYHPCGm5v4pmRrTcFN4V/N/T3I6tyP3z07S//9w+DdeL7vVd0VSeyMZuAh+449ZWw==} + engines: {node: '>=v14.16.0'} + hasBin: true + dependencies: + cac: 6.7.14 + debug: 4.3.4 + mlly: 1.2.0 + pathe: 1.1.0 + picocolors: 1.0.0 + vite: 4.0.4_@types+node@18.13.0 + transitivePeerDependencies: + - '@types/node' + - less + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + /vite-plugin-replace/0.1.1_vite@4.0.4: resolution: {integrity: sha512-v+okl3JNt2pf1jDYijw+WPVt6h9FWa/atTi+qnSFBqmKThLTDhlesx0r3bh+oFPmxRJmis5tNx9HtN6lGFoqWg==} peerDependencies: @@ -20416,6 +19862,101 @@ packages: fsevents: 2.3.2 dev: true + /vite/4.0.4_@types+node@18.13.0: + resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==} + engines: {node: ^14.18.0 || >=16.0.0} + hasBin: true + peerDependencies: + '@types/node': '>= 14' + less: '*' + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + '@types/node': 18.13.0 + esbuild: 0.16.17 + postcss: 8.4.21 + resolve: 1.22.1 + rollup: 3.15.0 + optionalDependencies: + fsevents: 2.3.2 + dev: true + + /vitest/0.29.7: + resolution: {integrity: sha512-aWinOSOu4jwTuZHkb+cCyrqQ116Q9TXaJrNKTHudKBknIpR0VplzeaOUuDF9jeZcrbtQKZQt6yrtd+eakbaxHg==} + engines: {node: '>=v14.16.0'} + hasBin: true + peerDependencies: + '@edge-runtime/vm': '*' + '@vitest/browser': '*' + '@vitest/ui': '*' + happy-dom: '*' + jsdom: '*' + safaridriver: '*' + webdriverio: '*' + peerDependenciesMeta: + '@edge-runtime/vm': + optional: true + '@vitest/browser': + optional: true + '@vitest/ui': + optional: true + happy-dom: + optional: true + jsdom: + optional: true + safaridriver: + optional: true + webdriverio: + optional: true + dependencies: + '@types/chai': 4.3.4 + '@types/chai-subset': 1.3.3 + '@types/node': 18.13.0 + '@vitest/expect': 0.29.7 + '@vitest/runner': 0.29.7 + '@vitest/spy': 0.29.7 + '@vitest/utils': 0.29.7 + acorn: 8.8.2 + acorn-walk: 8.2.0 + cac: 6.7.14 + chai: 4.3.7 + debug: 4.3.4 + local-pkg: 0.4.3 + pathe: 1.1.0 + picocolors: 1.0.0 + source-map: 0.6.1 + std-env: 3.3.2 + strip-literal: 1.0.1 + tinybench: 2.4.0 + tinypool: 0.4.0 + tinyspy: 1.1.1 + vite: 4.0.4_@types+node@18.13.0 + vite-node: 0.29.7_@types+node@18.13.0 + why-is-node-running: 2.2.2 + transitivePeerDependencies: + - less + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + /w3c-hr-time/1.0.2: resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==} deprecated: Use your platform's native performance.now() and performance.timeOrigin. @@ -21280,6 +20821,15 @@ packages: dependencies: isexe: 2.0.0 + /why-is-node-running/2.2.2: + resolution: {integrity: sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==} + engines: {node: '>=8'} + hasBin: true + dependencies: + siginfo: 2.0.0 + stackback: 0.0.2 + dev: true + /wide-align/1.1.3: resolution: {integrity: sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==} dependencies: @@ -21795,4 +21345,3 @@ packages: /yocto-queue/1.0.0: resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} engines: {node: '>=12.20'} - dev: false From 4d8dc57f591b00bf2e857e3f97f9eda0d41b7a65 Mon Sep 17 00:00:00 2001 From: Pavel Murygin Date: Thu, 23 Mar 2023 11:50:06 +0400 Subject: [PATCH 2/7] enable smoke test --- packages/core/js-peer/.gitignore | 3 +++ packages/core/js-peer/package.json | 2 +- .../__test__/integration/{smokeTest.ts => smokeTest.spec.ts} | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) rename packages/core/js-peer/src/js-peer/__test__/integration/{smokeTest.ts => smokeTest.spec.ts} (98%) diff --git a/packages/core/js-peer/.gitignore b/packages/core/js-peer/.gitignore index 1a59a95f5..74f8ee7e6 100644 --- a/packages/core/js-peer/.gitignore +++ b/packages/core/js-peer/.gitignore @@ -19,3 +19,6 @@ node_modules/ jspm_packages/ .idea + +# workaround to make integration tests work +src/marine/worker-script/index.js \ No newline at end of file diff --git a/packages/core/js-peer/package.json b/packages/core/js-peer/package.json index 2a20a9cc2..6aafc260f 100644 --- a/packages/core/js-peer/package.json +++ b/packages/core/js-peer/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "tsc", "compile-aqua": "aqua -i ./aqua/ -o ./src/internal/_aqua", - "test": "vitest run" + "test": "cp ./packages/core/js-peer/dist/marine/worker-script/index.js ./packages/core/js-peer/src/marine/worker-script/ && vitest run" }, "repository": "https://github.com/fluencelabs/fluence-js", "author": "Fluence Labs", diff --git a/packages/core/js-peer/src/js-peer/__test__/integration/smokeTest.ts b/packages/core/js-peer/src/js-peer/__test__/integration/smokeTest.spec.ts similarity index 98% rename from packages/core/js-peer/src/js-peer/__test__/integration/smokeTest.ts rename to packages/core/js-peer/src/js-peer/__test__/integration/smokeTest.spec.ts index d75c34490..3c04dfa5a 100644 --- a/packages/core/js-peer/src/js-peer/__test__/integration/smokeTest.ts +++ b/packages/core/js-peer/src/js-peer/__test__/integration/smokeTest.spec.ts @@ -1,4 +1,3 @@ -import exp from 'constants'; import { it, describe, expect } from 'vitest'; import { handleTimeout } from '../../utils.js'; From 0916d3959e4f68e16994adcd791f6621bde36630 Mon Sep 17 00:00:00 2001 From: Pavel Murygin Date: Thu, 23 Mar 2023 12:03:05 +0400 Subject: [PATCH 3/7] workaround works --- packages/core/js-peer/copy-worker-script-workaround.mjs | 3 +++ packages/core/js-peer/package.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 packages/core/js-peer/copy-worker-script-workaround.mjs diff --git a/packages/core/js-peer/copy-worker-script-workaround.mjs b/packages/core/js-peer/copy-worker-script-workaround.mjs new file mode 100644 index 000000000..b33b6d1d2 --- /dev/null +++ b/packages/core/js-peer/copy-worker-script-workaround.mjs @@ -0,0 +1,3 @@ +import { copyFileSync } from 'fs'; + +copyFileSync('./dist/marine/worker-script/index.js', './src/marine/worker-script/index.js'); diff --git a/packages/core/js-peer/package.json b/packages/core/js-peer/package.json index 6aafc260f..35301d5b1 100644 --- a/packages/core/js-peer/package.json +++ b/packages/core/js-peer/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "tsc", "compile-aqua": "aqua -i ./aqua/ -o ./src/internal/_aqua", - "test": "cp ./packages/core/js-peer/dist/marine/worker-script/index.js ./packages/core/js-peer/src/marine/worker-script/ && vitest run" + "test": "node ./copy-worker-script-workaround.mjs && vitest run" }, "repository": "https://github.com/fluencelabs/fluence-js", "author": "Fluence Labs", From e29aff06f4bfd2e1b2c3b07b3b9ba4aa3ed3f364 Mon Sep 17 00:00:00 2001 From: Pavel Murygin Date: Thu, 23 Mar 2023 12:14:53 +0400 Subject: [PATCH 4/7] more tests pass --- .../{avm.spec.ts.skip => avm.spec.ts} | 2 + ...iltin.spec.ts.skip => jsonBuiltin.spec.ts} | 2 + .../__test__/integration/marine-js.spec.ts | 30 +++++++++++ .../integration/marine-js.spec.ts.skip | 53 ------------------- .../{peer.spec.ts.skip => peer.spec.ts} | 28 ++++------ ...ervice.spec.ts.skip => sigService.spec.ts} | 41 +++++++++----- .../{srv.spec.ts.skip => srv.spec.ts} | 1 + 7 files changed, 74 insertions(+), 83 deletions(-) rename packages/core/js-peer/src/js-peer/__test__/integration/{avm.spec.ts.skip => avm.spec.ts} (99%) rename packages/core/js-peer/src/js-peer/__test__/integration/{jsonBuiltin.spec.ts.skip => jsonBuiltin.spec.ts} (97%) create mode 100644 packages/core/js-peer/src/js-peer/__test__/integration/marine-js.spec.ts delete mode 100644 packages/core/js-peer/src/js-peer/__test__/integration/marine-js.spec.ts.skip rename packages/core/js-peer/src/js-peer/__test__/integration/{peer.spec.ts.skip => peer.spec.ts} (94%) rename packages/core/js-peer/src/js-peer/__test__/integration/{sigService.spec.ts.skip => sigService.spec.ts} (72%) rename packages/core/js-peer/src/js-peer/__test__/integration/{srv.spec.ts.skip => srv.spec.ts} (97%) diff --git a/packages/core/js-peer/src/js-peer/__test__/integration/avm.spec.ts.skip b/packages/core/js-peer/src/js-peer/__test__/integration/avm.spec.ts similarity index 99% rename from packages/core/js-peer/src/js-peer/__test__/integration/avm.spec.ts.skip rename to packages/core/js-peer/src/js-peer/__test__/integration/avm.spec.ts index 85f3dc62e..27846db5a 100644 --- a/packages/core/js-peer/src/js-peer/__test__/integration/avm.spec.ts.skip +++ b/packages/core/js-peer/src/js-peer/__test__/integration/avm.spec.ts @@ -1,3 +1,5 @@ +import { it, describe, expect } from 'vitest'; + import { handleTimeout } from '../../utils.js'; import { registerHandlersHelper, withPeer } from '../util.js'; diff --git a/packages/core/js-peer/src/js-peer/__test__/integration/jsonBuiltin.spec.ts.skip b/packages/core/js-peer/src/js-peer/__test__/integration/jsonBuiltin.spec.ts similarity index 97% rename from packages/core/js-peer/src/js-peer/__test__/integration/jsonBuiltin.spec.ts.skip rename to packages/core/js-peer/src/js-peer/__test__/integration/jsonBuiltin.spec.ts index e1a32a6a6..1748526ff 100644 --- a/packages/core/js-peer/src/js-peer/__test__/integration/jsonBuiltin.spec.ts.skip +++ b/packages/core/js-peer/src/js-peer/__test__/integration/jsonBuiltin.spec.ts @@ -1,3 +1,5 @@ +import { it, describe, expect, beforeEach, afterEach } from 'vitest'; + import { Particle } from '../../Particle.js'; import { doNothing } from '../../utils.js'; import { FluencePeer } from '../../FluencePeer.js'; diff --git a/packages/core/js-peer/src/js-peer/__test__/integration/marine-js.spec.ts b/packages/core/js-peer/src/js-peer/__test__/integration/marine-js.spec.ts new file mode 100644 index 000000000..2616b5fc9 --- /dev/null +++ b/packages/core/js-peer/src/js-peer/__test__/integration/marine-js.spec.ts @@ -0,0 +1,30 @@ +import { it, describe, expect, beforeAll } from 'vitest'; + +import * as fs from 'fs'; +import * as url from 'url'; +import * as path from 'path'; +import { compileAqua, withPeer } from '../util.js'; + +let aqua: any; +const __dirname = url.fileURLToPath(new URL('.', import.meta.url)); + +describe('Marine js tests', () => { + beforeAll(async () => { + const { services, functions } = await compileAqua(path.join(__dirname, '../data/marine-js.aqua')); + aqua = functions; + }); + + it('should call marine service correctly', async () => { + await withPeer(async (peer) => { + // arrange + const wasm = await fs.promises.readFile(path.join(__dirname, '../data/greeting.wasm')); + await peer.registerMarineService(wasm, 'greeting'); + + // act + const res = await aqua.call(peer, { arg: 'test' }); + + // assert + expect(res).toBe('Hi, Hi, Hi, test'); + }); + }); +}); diff --git a/packages/core/js-peer/src/js-peer/__test__/integration/marine-js.spec.ts.skip b/packages/core/js-peer/src/js-peer/__test__/integration/marine-js.spec.ts.skip deleted file mode 100644 index 0738dd8dd..000000000 --- a/packages/core/js-peer/src/js-peer/__test__/integration/marine-js.spec.ts.skip +++ /dev/null @@ -1,53 +0,0 @@ -import * as fs from 'fs'; -import * as url from 'url'; -import * as path from 'path'; -import { compileAqua, withPeer } from '../util.js'; - -let aqua: any; -const __dirname = url.fileURLToPath(new URL('.', import.meta.url)); - -describe('Marine js tests', () => { - beforeAll(async () => { - const { services, functions } = await compileAqua(path.join(__dirname, '../data/marine-js.aqua')); - aqua = functions; - }); - - it('should call marine service correctly', async () => { - await withPeer(async (peer) => { - // arrange - const wasm = await fs.promises.readFile(path.join(__dirname, '../data/greeting.wasm')); - await peer.registerMarineService(wasm, 'greeting'); - - // act - const res = await aqua.call(peer, { arg: 'test' }); - - // assert - expect(res).toBe('Hi, Hi, Hi, test'); - }); - }); - - // TODO: console printouts are happening inside web-worker\worker threads. - // Find a way to mock functions in background thread - it.skip('logging should work', async () => { - await withPeer(async (peer) => { - // arrange - - jest.spyOn(global.console, 'info').mockImplementation(() => {}); - - await peer.start({ - debug: { - marineLogLevel: 'debug', - }, - }); - const wasm = await fs.promises.readFile(path.join(__dirname, '../data/greeting-record.wasm')); - await peer.registerMarineService(wasm, 'greeting'); - - // act - await aqua.call_info(peer, { arg: 'greeting' }); - - // assert - expect(console.info).toBeCalledTimes(1); - expect(console.info).toHaveBeenNthCalledWith(1, '[marine service "greeting"]: info'); - }); - }); -}); diff --git a/packages/core/js-peer/src/js-peer/__test__/integration/peer.spec.ts.skip b/packages/core/js-peer/src/js-peer/__test__/integration/peer.spec.ts similarity index 94% rename from packages/core/js-peer/src/js-peer/__test__/integration/peer.spec.ts.skip rename to packages/core/js-peer/src/js-peer/__test__/integration/peer.spec.ts index 4cf7d2d09..197fade27 100644 --- a/packages/core/js-peer/src/js-peer/__test__/integration/peer.spec.ts.skip +++ b/packages/core/js-peer/src/js-peer/__test__/integration/peer.spec.ts @@ -1,7 +1,10 @@ +import { it, describe, expect } from 'vitest'; + import { nodes } from '../connection.js'; import { checkConnection, doNothing, handleTimeout } from '../../utils.js'; import { registerHandlersHelper, mkTestPeer, withPeer, withConnectedPeer } from '../util.js'; import { FluencePeer } from '../../FluencePeer.js'; +import { isFluencePeer } from '@fluencelabs/interfaces'; describe('Typescript usage suite', () => { it('should perform test for FluencePeer class correctly', () => { @@ -12,10 +15,10 @@ describe('Typescript usage suite', () => { const undefinedVal = undefined; // act - const isPeerPeer = FluencePeer.isInstance(peer); - const isNumberPeer = FluencePeer.isInstance(number); - const isObjectPeer = FluencePeer.isInstance(object); - const isUndefinedPeer = FluencePeer.isInstance(undefinedVal); + const isPeerPeer = isFluencePeer(peer); + const isNumberPeer = isFluencePeer(number); + const isObjectPeer = isFluencePeer(object); + const isUndefinedPeer = isFluencePeer(undefinedVal); // act expect(isPeerPeer).toBe(true); @@ -196,7 +199,7 @@ describe('Typescript usage suite', () => { expect(isConnected).toBeTruthy(); }, - { connectTo: nodes[0], dialTimeoutMs: 100000 }, + { relay: nodes[0], connectionOptions: { dialTimeoutMs: 100000 } }, ); }); @@ -207,18 +210,7 @@ describe('Typescript usage suite', () => { expect(isConnected).toBeTruthy(); }, - { connectTo: nodes[0], skipCheckConnection: true }, - ); - }); - - it('With connection options: checkConnectionTTL', async () => { - await withPeer( - async (peer) => { - const isConnected = await checkConnection(peer); - - expect(isConnected).toBeTruthy(); - }, - { connectTo: nodes[0], checkConnectionTimeoutMs: 1000 }, + { relay: nodes[0], connectionOptions: { skipCheckConnection: true } }, ); }); @@ -229,7 +221,7 @@ describe('Typescript usage suite', () => { expect(isConnected).toBeFalsy(); }, - { connectTo: nodes[0], defaultTtlMs: 1 }, + { relay: nodes[0], defaultTtlMs: 1 }, ); }); }); diff --git a/packages/core/js-peer/src/js-peer/__test__/integration/sigService.spec.ts.skip b/packages/core/js-peer/src/js-peer/__test__/integration/sigService.spec.ts similarity index 72% rename from packages/core/js-peer/src/js-peer/__test__/integration/sigService.spec.ts.skip rename to packages/core/js-peer/src/js-peer/__test__/integration/sigService.spec.ts index 155563499..81ae101fa 100644 --- a/packages/core/js-peer/src/js-peer/__test__/integration/sigService.spec.ts.skip +++ b/packages/core/js-peer/src/js-peer/__test__/integration/sigService.spec.ts @@ -1,10 +1,12 @@ +import { it, describe, expect, beforeAll } from 'vitest'; + import * as path from 'path'; import * as url from 'url'; import { KeyPair } from '../../../keypair/index.js'; import { allowServiceFn } from '../../builtins/securityGuard.js'; import { Sig } from '../../builtins/Sig.js'; import { compileAqua, withPeer } from '../util.js'; -import { registerServiceImpl } from '../../compilerSupport/registerService.js'; +import { registerService } from '../../../compilerSupport/registerService.js'; const __dirname = url.fileURLToPath(new URL('.', import.meta.url)); @@ -26,11 +28,16 @@ describe('Sig service test suite', () => { const customSig = new Sig(customKeyPair); const data = [1, 2, 3, 4, 5]; - registerServiceImpl(peer, sigDef, 'CustomSig', customSig); + registerService({ peer, def: sigDef, serviceId: 'CustomSig', service: customSig }); - registerServiceImpl(peer, dataProviderDef, 'data', { - provide_data: () => { - return data; + registerService({ + peer, + def: dataProviderDef, + serviceId: 'data', + service: { + provide_data: () => { + return data; + }, }, }); @@ -50,11 +57,16 @@ describe('Sig service test suite', () => { const customSig = new Sig(customKeyPair); const data = [1, 2, 3, 4, 5]; - registerServiceImpl(peer, sigDef, 'CustomSig', customSig); + registerService({ peer, def: sigDef, serviceId: 'CustomSig', service: customSig }); - registerServiceImpl(peer, dataProviderDef, 'data', { - provide_data: () => { - return data; + registerService({ + peer, + def: dataProviderDef, + serviceId: 'data', + service: { + provide_data: () => { + return data; + }, }, }); @@ -69,9 +81,14 @@ describe('Sig service test suite', () => { const sig = peer.getServices().sig; const data = [1, 2, 3, 4, 5]; - registerServiceImpl(peer, dataProviderDef, 'data', { - provide_data: () => { - return data; + registerService({ + peer: peer, + def: dataProviderDef, + serviceId: 'data', + service: { + provide_data: () => { + return data; + }, }, }); diff --git a/packages/core/js-peer/src/js-peer/__test__/integration/srv.spec.ts.skip b/packages/core/js-peer/src/js-peer/__test__/integration/srv.spec.ts similarity index 97% rename from packages/core/js-peer/src/js-peer/__test__/integration/srv.spec.ts.skip rename to packages/core/js-peer/src/js-peer/__test__/integration/srv.spec.ts index 9612413ce..1067401d8 100644 --- a/packages/core/js-peer/src/js-peer/__test__/integration/srv.spec.ts.skip +++ b/packages/core/js-peer/src/js-peer/__test__/integration/srv.spec.ts @@ -1,3 +1,4 @@ +import { it, describe, expect, beforeAll } from 'vitest'; import * as path from 'path'; import * as url from 'url'; import { compileAqua, withPeer } from '../util.js'; From d5150ea744ed87726aaf6dabf9962ae6331f472c Mon Sep 17 00:00:00 2001 From: Pavel Murygin Date: Thu, 23 Mar 2023 12:17:49 +0400 Subject: [PATCH 5/7] Some more tests pass --- .../__test__/integration/smokeTest.spec.ts | 64 ++++++++++--------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/packages/core/js-peer/src/js-peer/__test__/integration/smokeTest.spec.ts b/packages/core/js-peer/src/js-peer/__test__/integration/smokeTest.spec.ts index 3c04dfa5a..7f93340c4 100644 --- a/packages/core/js-peer/src/js-peer/__test__/integration/smokeTest.spec.ts +++ b/packages/core/js-peer/src/js-peer/__test__/integration/smokeTest.spec.ts @@ -4,15 +4,16 @@ import { handleTimeout } from '../../utils.js'; import { nodes } from '../connection.js'; import { mkTestPeer, registerHandlersHelper } from '../util.js'; -describe('Smoke test', async () => { - // arrange - const peer = mkTestPeer(); - await peer.start({ - relay: nodes[0], - }); +describe('Smoke test', () => { + it('Simple call', async () => { + // arrange + const peer = mkTestPeer(); + await peer.start({ + relay: nodes[0], + }); - const result = await new Promise((resolve, reject) => { - const script = ` + const result = await new Promise((resolve, reject) => { + const script = ` (xor (seq (call %init_peer_id% ("load" "relay") [] init_relay) @@ -26,34 +27,35 @@ describe('Smoke test', async () => { (call %init_peer_id% ("callback" "error") [%last_error%]) ) )`; - const particle = peer.internals.createNewParticle(script); + const particle = peer.internals.createNewParticle(script); - if (particle instanceof Error) { - return reject(particle.message); - } + if (particle instanceof Error) { + return reject(particle.message); + } - registerHandlersHelper(peer, particle, { - load: { - relay: () => { - return peer.getStatus().relayPeerId; + registerHandlersHelper(peer, particle, { + load: { + relay: () => { + return peer.getStatus().relayPeerId; + }, }, - }, - callback: { - callback: (args: any) => { - const [val] = args; - resolve(val); + callback: { + callback: (args: any) => { + const [val] = args; + resolve(val); + }, + error: (args: any) => { + const [error] = args; + reject(error); + }, }, - error: (args: any) => { - const [error] = args; - reject(error); - }, - }, - }); + }); - peer.internals.initiateParticle(particle, handleTimeout(reject)); - }); + peer.internals.initiateParticle(particle, handleTimeout(reject)); + }); - await peer.stop(); + await peer.stop(); - expect(result).toBe('hello world!'); + expect(result).toBe('hello world!'); + }); }); From 6890024a256c28cef8fda6a7198e7385de3071fd Mon Sep 17 00:00:00 2001 From: Pavel Murygin Date: Thu, 23 Mar 2023 12:41:43 +0400 Subject: [PATCH 6/7] Every test pass --- .../data => aqua_test}/marine-js.aqua | 0 .../data => aqua_test}/sigService.aqua | 2 +- .../__test__/data => aqua_test}/srv.aqua | 4 +- packages/core/js-peer/package.json | 6 +- .../__test__/integration/marine-js.spec.ts | 3 +- .../__test__/integration/sigService.spec.ts | 4 +- .../js-peer/__test__/integration/srv.spec.ts | 3 +- .../core/js-peer/src/js-peer/__test__/util.ts | 4 + pnpm-lock.yaml | 254 +++++++++++------- 9 files changed, 167 insertions(+), 113 deletions(-) rename packages/core/js-peer/{src/js-peer/__test__/data => aqua_test}/marine-js.aqua (100%) rename packages/core/js-peer/{src/js-peer/__test__/data => aqua_test}/sigService.aqua (81%) rename packages/core/js-peer/{src/js-peer/__test__/data => aqua_test}/srv.aqua (91%) diff --git a/packages/core/js-peer/src/js-peer/__test__/data/marine-js.aqua b/packages/core/js-peer/aqua_test/marine-js.aqua similarity index 100% rename from packages/core/js-peer/src/js-peer/__test__/data/marine-js.aqua rename to packages/core/js-peer/aqua_test/marine-js.aqua diff --git a/packages/core/js-peer/src/js-peer/__test__/data/sigService.aqua b/packages/core/js-peer/aqua_test/sigService.aqua similarity index 81% rename from packages/core/js-peer/src/js-peer/__test__/data/sigService.aqua rename to packages/core/js-peer/aqua_test/sigService.aqua index 409f6b6f7..87dac834f 100644 --- a/packages/core/js-peer/src/js-peer/__test__/data/sigService.aqua +++ b/packages/core/js-peer/aqua_test/sigService.aqua @@ -1,6 +1,6 @@ module Export -import SignResult, Sig from "../../../aqua/services.aqua" +import SignResult, Sig from "../aqua/services.aqua" export Sig, DataProvider, callSig service DataProvider("data"): diff --git a/packages/core/js-peer/src/js-peer/__test__/data/srv.aqua b/packages/core/js-peer/aqua_test/srv.aqua similarity index 91% rename from packages/core/js-peer/src/js-peer/__test__/data/srv.aqua rename to packages/core/js-peer/aqua_test/srv.aqua index c564b1276..d47ca173e 100644 --- a/packages/core/js-peer/src/js-peer/__test__/data/srv.aqua +++ b/packages/core/js-peer/aqua_test/srv.aqua @@ -1,7 +1,7 @@ module Export -import Srv from "../../../aqua/single-module-srv.aqua" -import NodeUtils from "../../../aqua/node-utils.aqua" +import Srv from "../aqua/single-module-srv.aqua" +import NodeUtils from "../aqua/node-utils.aqua" export happy_path, list_services, file_not_found, service_removed, removing_non_exiting service Greeting("greeting"): diff --git a/packages/core/js-peer/package.json b/packages/core/js-peer/package.json index 35301d5b1..32e6f0c8d 100644 --- a/packages/core/js-peer/package.json +++ b/packages/core/js-peer/package.json @@ -11,7 +11,7 @@ "type": "module", "scripts": { "build": "tsc", - "compile-aqua": "aqua -i ./aqua/ -o ./src/internal/_aqua", + "compile-aqua": "fluence aqua -i ./aqua/ -o ./aqua", "test": "node ./copy-worker-script-workaround.mjs && vitest run" }, "repository": "https://github.com/fluencelabs/fluence-js", @@ -49,8 +49,8 @@ "@multiformats/multiaddr": "11.3.0" }, "devDependencies": { - "@fluencelabs/aqua": "0.7.7-362", - "@fluencelabs/aqua-api": "0.9.1-373", + "@fluencelabs/cli": "0.3.9", + "@fluencelabs/aqua-api": "0.9.3", "@fluencelabs/aqua-lib": "0.6.0", "@fluencelabs/fluence-network-environment": "1.0.13", "@types/bs58": "4.0.1", diff --git a/packages/core/js-peer/src/js-peer/__test__/integration/marine-js.spec.ts b/packages/core/js-peer/src/js-peer/__test__/integration/marine-js.spec.ts index 2616b5fc9..f9ad801c1 100644 --- a/packages/core/js-peer/src/js-peer/__test__/integration/marine-js.spec.ts +++ b/packages/core/js-peer/src/js-peer/__test__/integration/marine-js.spec.ts @@ -10,7 +10,8 @@ const __dirname = url.fileURLToPath(new URL('.', import.meta.url)); describe('Marine js tests', () => { beforeAll(async () => { - const { services, functions } = await compileAqua(path.join(__dirname, '../data/marine-js.aqua')); + const pathToAquaFiles = path.join(__dirname, '../../../../aqua_test/marine-js.aqua'); + const { services, functions } = await compileAqua(pathToAquaFiles); aqua = functions; }); diff --git a/packages/core/js-peer/src/js-peer/__test__/integration/sigService.spec.ts b/packages/core/js-peer/src/js-peer/__test__/integration/sigService.spec.ts index 81ae101fa..21d35c7be 100644 --- a/packages/core/js-peer/src/js-peer/__test__/integration/sigService.spec.ts +++ b/packages/core/js-peer/src/js-peer/__test__/integration/sigService.spec.ts @@ -16,7 +16,9 @@ let dataProviderDef: any; describe('Sig service test suite', () => { beforeAll(async () => { - const { services, functions } = await compileAqua(path.join(__dirname, '../data/sigService.aqua')); + const pathToAquaFiles = path.join(__dirname, '../../../../aqua_test/sigService.aqua'); + const { services, functions } = await compileAqua(pathToAquaFiles); + aqua = functions; sigDef = services.Sig; dataProviderDef = services.DataProvider; diff --git a/packages/core/js-peer/src/js-peer/__test__/integration/srv.spec.ts b/packages/core/js-peer/src/js-peer/__test__/integration/srv.spec.ts index 1067401d8..b9676298d 100644 --- a/packages/core/js-peer/src/js-peer/__test__/integration/srv.spec.ts +++ b/packages/core/js-peer/src/js-peer/__test__/integration/srv.spec.ts @@ -8,7 +8,8 @@ let aqua: any; describe('Srv service test suite', () => { beforeAll(async () => { - const { services, functions } = await compileAqua(path.join(__dirname, '../data/srv.aqua')); + const pathToAquaFiles = path.join(__dirname, '../../../../aqua_test/srv.aqua'); + const { services, functions } = await compileAqua(pathToAquaFiles); aqua = functions; }); diff --git a/packages/core/js-peer/src/js-peer/__test__/util.ts b/packages/core/js-peer/src/js-peer/__test__/util.ts index e03ccb973..7054f551f 100644 --- a/packages/core/js-peer/src/js-peer/__test__/util.ts +++ b/packages/core/js-peer/src/js-peer/__test__/util.ts @@ -36,6 +36,10 @@ export const compileAqua = async (aquaFile: string): Promise => { const compilationResult = await api.Aqua.compile(new api.Path(aquaFile), [], undefined); + if (compilationResult.errors.length > 0) { + throw new Error('Aqua compilation failed. Error: ' + compilationResult.errors.join('/n')); + } + const functions = Object.entries(compilationResult.functions) .map(([name, fnInfo]) => { const callFn = (peer: FluencePeer, args: { [key: string]: any }) => { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 05bd056b1..cf2a2cf5c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -187,10 +187,10 @@ importers: packages/core/js-peer: specifiers: '@chainsafe/libp2p-noise': 11.0.0 - '@fluencelabs/aqua': 0.7.7-362 - '@fluencelabs/aqua-api': 0.9.1-373 + '@fluencelabs/aqua-api': 0.9.3 '@fluencelabs/aqua-lib': 0.6.0 '@fluencelabs/avm': 0.35.4 + '@fluencelabs/cli': 0.3.9 '@fluencelabs/fluence-network-environment': 1.0.13 '@fluencelabs/interfaces': 0.7.3 '@fluencelabs/marine-js': 0.3.45 @@ -254,9 +254,9 @@ importers: uint8arrays: 4.0.3 uuid: 8.3.2 devDependencies: - '@fluencelabs/aqua': 0.7.7-362_sxyfz5frysr7cnkewysdljfvwu - '@fluencelabs/aqua-api': 0.9.1-373 + '@fluencelabs/aqua-api': 0.9.3 '@fluencelabs/aqua-lib': 0.6.0 + '@fluencelabs/cli': 0.3.9_qpxy5lgkhl6krmgytbtmcegdtu '@fluencelabs/fluence-network-environment': 1.0.13 '@types/bs58': 4.0.1 '@types/debug': 4.1.7 @@ -2050,7 +2050,7 @@ packages: /@ethereumjs/tx/3.3.2: resolution: {integrity: sha512-6AaJhwg4ucmwTvw/1qLaZUX5miWrwZ4nLOUsKyb/HtzS3BMw/CasKhdi1ims9mBKeK9sOJCH4qGKOBGyJCeeog==} dependencies: - '@ethereumjs/common': 2.5.0 + '@ethereumjs/common': 2.6.5 ethereumjs-util: 7.1.5 dev: true @@ -2380,14 +2380,8 @@ packages: resolution: {integrity: sha512-OBRH6HEJQlD6qqVyit491OsI/Vr3GfSzEaf9GkHe9tOABZsu58gpiTQDFIC/cpmTG1YGq2oZcx9nsyRc5CkNTw==} dev: true - /@fluencelabs/aqua-api/0.9.1-373: - resolution: {integrity: sha512-q0A2z/FXOlc9UKCQ/Kf00ig0VpgdJ9woITYSj1tnVo9X3kR71gSv4loCQmukJoqlVZXzfQ8r+spalwBerin89A==} - dev: true - - /@fluencelabs/aqua-ipfs/0.5.5: - resolution: {integrity: sha512-TBSClVs2r3FhgxVFSDPXzJNP0/EqHbIaVSY9U6LTzBDUdZDItu8Yt+Rsjj4LX5X4kOwo94ADkYG0UG8nKC1L5A==} - dependencies: - '@fluencelabs/aqua-lib': 0.5.2 + /@fluencelabs/aqua-api/0.9.3: + resolution: {integrity: sha512-ieM2e7qMXgm9BPSSd2fxVbqLlYkR/a/aVTAQXO8gdx2rKKFqnTgFX4gpSOTxrrCMshi8OnXfd2OZi1hsJHTnKA==} dev: true /@fluencelabs/aqua-ipfs/0.5.8: @@ -2404,29 +2398,6 @@ packages: resolution: {integrity: sha512-ifjtCM93KO3LhzPkMxqmXhwLmrg/scjOiyTihEVg7ns5N+BVzaK1eWzdOdqGdl9ZVoah43pdlQUepEo7VdRmsw==} dev: true - /@fluencelabs/aqua/0.7.7-362_sxyfz5frysr7cnkewysdljfvwu: - resolution: {integrity: sha512-CwvBc3wKQdvnDM4Zxj6yFE5MR2oeh+EZ++m2hLvENt7OWl3cnZVR4cJQkRxMMLVT0MxRwLiy97UIBwGsPqlSCA==} - hasBin: true - dependencies: - '@fluencelabs/aqua-ipfs': 0.5.5 - '@fluencelabs/aqua-lib': 0.5.2 - '@fluencelabs/fluence': 0.26.3-snapshot-4_sxyfz5frysr7cnkewysdljfvwu - '@fluencelabs/fluence-network-environment': 1.0.13 - ipfs-http-client: 50.1.2_node-fetch@3.3.0 - transitivePeerDependencies: - - '@babel/core' - - '@types/jest' - - babel-jest - - bufferutil - - encoding - - esbuild - - jest - - node-fetch - - supports-color - - typescript - - utf-8-validate - dev: true - /@fluencelabs/aqua/0.9.1-374_jaxubti5gf66xc76fsqhxmuwn4: resolution: {integrity: sha512-jF6oVE4h7bP/dQArKEfsy4UxbQbzACfVIBY/TFUL5D3np4ssjxrh15Y3gl1PwSWjlaPcDeFvAuStmcqfYQmLqQ==} hasBin: true @@ -2454,10 +2425,6 @@ packages: resolution: {integrity: sha512-tkpjdHyRmsTwAEZCJt15//jXEgC2Nw2qFiD1NenvK127SlgKeuzQU9IMReUYY3dowb2IGeC578/uGMu96jHYKw==} dev: true - /@fluencelabs/avm/0.31.4: - resolution: {integrity: sha512-rApXdqk0NUX+Fyq9BJ1jQ7X//EfVrAg9wrjdd4K/tvo54Lgij0tY/IT+imwr/Eb4qgHgi1QMW4zT0AOlgKIKmw==} - dev: true - /@fluencelabs/avm/0.35.3: resolution: {integrity: sha512-Y5mPPCmAUUKc5CDO12IL8mGEreWa7maVdX0MWCAH4+GvfLPFN1FxOMSKRYEtvkyVEL88pc9pd8cm5IRCBkFthg==} dev: true @@ -2536,6 +2503,77 @@ packages: - utf-8-validate dev: true + /@fluencelabs/cli/0.3.9_qpxy5lgkhl6krmgytbtmcegdtu: + resolution: {integrity: sha512-xJYi7+AHrWt6RgWnr7Efr8Jpv0dNLoWhiCMvgSbXoFpIZzQAyNDgk5hnCdwIQ/eiJcNg0GHY0gyC+Q/d5YKc1Q==} + engines: {node: '=16'} + hasBin: true + dependencies: + '@fluencelabs/aqua-api': 0.10.3 + '@fluencelabs/deal-aurora': 0.1.8_gc7gatgk3jrcbnir3tz2izmvqi + '@fluencelabs/fluence': 0.28.0_zchmlqqvawdfhvpuz6nrqhtseq + '@fluencelabs/fluence-network-environment': 1.0.14 + '@iarna/toml': 2.2.5 + '@mswjs/interceptors': 0.19.5 + '@oclif/color': 1.0.4 + '@oclif/core': 2.6.2_4bewfcp2iebiwuold25d6rgcsy + '@oclif/plugin-autocomplete': 2.1.4_4bewfcp2iebiwuold25d6rgcsy + '@oclif/plugin-help': 5.2.7_4bewfcp2iebiwuold25d6rgcsy + '@oclif/plugin-not-found': 2.3.21_4bewfcp2iebiwuold25d6rgcsy + '@walletconnect/universal-provider': 2.4.7_uz4bki5hahbpc2hwfvrjhsfeca + ajv: 8.12.0 + camelcase: 7.0.1 + chokidar: 3.5.3 + countly-sdk-nodejs: 22.6.0 + decompress: 4.2.1 + dotenv: 16.0.3 + ethers: 5.7.2 + filenamify: 5.1.1 + inquirer: 9.1.4 + ipfs-http-client: 60.0.0 + it-all: 1.0.6 + lodash-es: 4.17.21 + lokijs: 1.5.12 + multiaddr: 10.0.1_node-fetch@2.6.9 + node-fetch: 2.6.9 + platform: 1.3.6 + replace-homedir: 2.0.0 + web3: 1.8.2 + yaml: 2.2.1 + yaml-diff-patch: 2.0.0 + transitivePeerDependencies: + - '@babel/core' + - '@ethersproject/abi' + - '@ethersproject/providers' + - '@nomicfoundation/hardhat-chai-matchers' + - '@nomicfoundation/hardhat-network-helpers' + - '@nomiclabs/hardhat-ethers' + - '@nomiclabs/hardhat-etherscan' + - '@react-native-async-storage/async-storage' + - '@swc/core' + - '@swc/wasm' + - '@typechain/ethers-v5' + - '@typechain/hardhat' + - '@types/chai' + - '@types/jest' + - '@types/mocha' + - '@types/node' + - babel-jest + - bufferutil + - chai + - debug + - encoding + - esbuild + - hardhat + - hardhat-gas-reporter + - jest + - solidity-coverage + - supports-color + - ts-node + - typechain + - typescript + - utf-8-validate + dev: true + /@fluencelabs/connection/0.2.0_node-fetch@2.6.9: resolution: {integrity: sha512-0jTRI1h/j/fR2VaLIlcIm6VoP3j2jL2lI6/OaYaOnwGXmI6CbZWHNeq9eaKWycT9B1vpN9wHu0Vi7vH3pFplhg==} engines: {node: '>=10', pnpm: '>=3'} @@ -2622,43 +2660,6 @@ packages: /@fluencelabs/fluence-network-environment/1.0.14: resolution: {integrity: sha512-lMiH+7obmJW2Q+PMUR/vNAuX6TcVqlKmsWAHvnBogH7s8IeMT+UGN8qrweILWmE57G7MfauB302dIFQowR9tug==} - /@fluencelabs/fluence/0.26.3-snapshot-4_sxyfz5frysr7cnkewysdljfvwu: - resolution: {integrity: sha512-M/iQhnViXfMaATj3gFPQXrZe9zSVcyN9F9A9hfJBUn0VLamhmbfeIoSZeheK8VGBxYbRGcrtoqLPTy1vJQVgVw==} - engines: {node: '>=10', pnpm: '>=3'} - hasBin: true - dependencies: - '@fluencelabs/avm': 0.31.4 - '@fluencelabs/connection': 0.2.0_node-fetch@3.3.0 - '@fluencelabs/interfaces': 0.1.0 - '@fluencelabs/keypair': 0.2.0 - '@fluencelabs/marine-js': 0.3.18_cnngzrja2umb46xxazlucyx2qu - async: 3.2.3 - base64-js: 1.5.1 - browser-or-node: 2.1.1 - bs58: 5.0.0 - buffer: 6.0.3 - cids: 1.1.9 - loglevel: 1.8.0 - multiformats: 9.6.5 - peer-id: 0.16.0 - platform: 1.3.6 - rxjs: 7.5.5 - ts-pattern: 3.3.3 - uuid: 8.3.2 - transitivePeerDependencies: - - '@babel/core' - - '@types/jest' - - babel-jest - - bufferutil - - encoding - - esbuild - - jest - - node-fetch - - supports-color - - typescript - - utf-8-validate - dev: true - /@fluencelabs/fluence/0.27.5_jaxubti5gf66xc76fsqhxmuwn4: resolution: {integrity: sha512-nMCzd/oHHk5/yWdg/+rPB+sc8X+fQ5YgwPhGVDoxFs8/CmIr1G5Na8Y6l8rrigasgQd+LV5GtAyh50Oq7/IXkg==} engines: {node: '>=10', pnpm: '>=3'} @@ -2747,25 +2748,6 @@ packages: peer-id: 0.16.0 dev: true - /@fluencelabs/marine-js/0.3.18_cnngzrja2umb46xxazlucyx2qu: - resolution: {integrity: sha512-aNuGtyY910kJvtRwfqmZKjVs+1l3LVWShv5xvkY04faHm65nX3sZLe8UHwughdja/4ixV1IFKlaTUgw2u3Sf5A==} - dependencies: - '@wasmer/wasi': 0.12.0 - '@wasmer/wasmfs': 0.12.0 - browser-or-node: 2.1.1 - buffer: 6.0.3 - threads: 1.7.0 - ts-jest: 27.1.5_cnngzrja2umb46xxazlucyx2qu - transitivePeerDependencies: - - '@babel/core' - - '@types/jest' - - babel-jest - - esbuild - - jest - - supports-color - - typescript - dev: true - /@fluencelabs/marine-js/0.3.37_cnngzrja2umb46xxazlucyx2qu: resolution: {integrity: sha512-/Kpu3S+aDOfrOpKBAK1VeWSHKCoD36/dxtHEWHbj3Lsro0GB9zkoaZPHlFFL7rorCB+hyjAJqLDuBGI8f3l/qg==} dependencies: @@ -3412,6 +3394,20 @@ packages: - utf-8-validate dev: true + /@json-rpc-tools/provider/1.7.6_debug@4.3.4: + resolution: {integrity: sha512-z7D3xvJ33UfCGv77n40lbzOYjZKVM3k2+5cV7xS8G6SCvKTzMkhkUYuD/qzQUNT4cG/lv0e9mRToweEEVLVVmA==} + deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. + dependencies: + '@json-rpc-tools/utils': 1.7.6 + axios: 0.21.4_debug@4.3.4 + safe-json-utils: 1.1.1 + ws: 7.5.9 + transitivePeerDependencies: + - bufferutil + - debug + - utf-8-validate + dev: true + /@json-rpc-tools/types/1.7.6: resolution: {integrity: sha512-nDSqmyRNEqEK9TZHtM15uNnDljczhCUdBmRhpNZ95bIPKEDQ+nTDmGMFd2lLin3upc5h2VVVd9tkTDdbXUhDIQ==} deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. @@ -6047,6 +6043,33 @@ packages: - utf-8-validate dev: true + /@walletconnect/universal-provider/2.4.7_uz4bki5hahbpc2hwfvrjhsfeca: + resolution: {integrity: sha512-xlefq2ahAsH3SpcsofWQQ5JT3Tz9NLAViA8FW07PHhfuf9p7OLp+Mu1wKxQEoBilyvfYRF4R5MTyTPy1wqJiRA==} + dependencies: + '@walletconnect/jsonrpc-http-connection': 1.0.6 + '@walletconnect/jsonrpc-provider': 1.0.8 + '@walletconnect/jsonrpc-types': 1.0.2 + '@walletconnect/jsonrpc-utils': 1.0.6 + '@walletconnect/logger': 2.0.1 + '@walletconnect/sign-client': 2.4.7_mqijgjbnahaa3tnbkktxyzzb3a + '@walletconnect/types': 2.4.7_mqijgjbnahaa3tnbkktxyzzb3a + '@walletconnect/utils': 2.4.7_mqijgjbnahaa3tnbkktxyzzb3a + eip1193-provider: 1.0.1_debug@4.3.4 + events: 3.3.0 + pino: 7.11.0 + transitivePeerDependencies: + - '@react-native-async-storage/async-storage' + - '@swc/core' + - '@swc/wasm' + - '@types/node' + - bufferutil + - debug + - encoding + - lokijs + - typescript + - utf-8-validate + dev: true + /@walletconnect/utils/2.4.7_mqijgjbnahaa3tnbkktxyzzb3a: resolution: {integrity: sha512-t3kW0qLClnejTTKg3y/o/MmJb5ZDGfD13YT9Nw56Up3qq/pwVfTtWjt8vJOQWMIm0hZgjgESivcf6/wuu3/Oqw==} dependencies: @@ -6681,10 +6704,6 @@ packages: lodash: 4.17.21 dev: true - /async/3.2.3: - resolution: {integrity: sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==} - dev: true - /async/3.2.4: resolution: {integrity: sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==} @@ -6744,6 +6763,14 @@ packages: - debug dev: true + /axios/0.21.4_debug@4.3.4: + resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} + dependencies: + follow-redirects: 1.15.2_debug@4.3.4 + transitivePeerDependencies: + - debug + dev: true + /axobject-query/3.1.1: resolution: {integrity: sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==} dependencies: @@ -8990,6 +9017,16 @@ packages: - utf-8-validate dev: true + /eip1193-provider/1.0.1_debug@4.3.4: + resolution: {integrity: sha512-kSuqwQ26d7CzuS/t3yRXo2Su2cVH0QfvyKbr2H7Be7O5YDyIq4hQGCNTo5wRdP07bt+E2R/8nPCzey4ojBHf7g==} + dependencies: + '@json-rpc-tools/provider': 1.7.6_debug@4.3.4 + transitivePeerDependencies: + - bufferutil + - debug + - utf-8-validate + dev: true + /ejs/3.1.8: resolution: {integrity: sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==} engines: {node: '>=0.10.0'} @@ -10278,6 +10315,18 @@ packages: debug: optional: true + /follow-redirects/1.15.2_debug@4.3.4: + resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==} + engines: {node: '>=4.0'} + peerDependencies: + debug: '*' + peerDependenciesMeta: + debug: + optional: true + dependencies: + debug: 4.3.4 + dev: true + /for-each/0.3.3: resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} dependencies: @@ -14923,10 +14972,6 @@ packages: resolution: {integrity: sha512-atWruyH34YiknSdL5yeIir00EDlJRpHzELYQxG7Iy29eCyL+VrZHpPrX5yqlik3jnuqpLpRKVZ0SGVb9UzKaSA==} engines: {node: '>=16.0.0', npm: '>=7.0.0'} - /multiformats/9.6.5: - resolution: {integrity: sha512-vMwf/FUO+qAPvl3vlSZEgEVFY/AxeZq5yg761ScF3CZsXgmTi/HGkicUiNN0CI4PW8FiY2P0OLklOcmQjdQJhw==} - dev: true - /multiformats/9.9.0: resolution: {integrity: sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg==} dev: true @@ -17745,6 +17790,7 @@ packages: resolution: {integrity: sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==} dependencies: tslib: 2.5.0 + dev: false /rxjs/7.8.0: resolution: {integrity: sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==} From 87d09590410d96265327820e5b3fdc761855535f Mon Sep 17 00:00:00 2001 From: shamsartem Date: Thu, 23 Mar 2023 13:57:18 +0300 Subject: [PATCH 7/7] Update packages/core/js-peer/.gitignore --- packages/core/js-peer/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/js-peer/.gitignore b/packages/core/js-peer/.gitignore index 74f8ee7e6..fe11902df 100644 --- a/packages/core/js-peer/.gitignore +++ b/packages/core/js-peer/.gitignore @@ -21,4 +21,4 @@ jspm_packages/ .idea # workaround to make integration tests work -src/marine/worker-script/index.js \ No newline at end of file +src/marine/worker-script/index.js