From ab016eb3e6f6e78971934a36cb3379386201a91a Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 16 Jun 2023 22:26:07 +0000 Subject: [PATCH 01/88] Switch point to be browser compatible --- ts/src/types/point.ts | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/ts/src/types/point.ts b/ts/src/types/point.ts index 0e97450abf..830d313cbd 100644 --- a/ts/src/types/point.ts +++ b/ts/src/types/point.ts @@ -1,3 +1,5 @@ +// TODO: fix this file for browser (already did) + import { Fr } from './index.js'; import { BufferReader } from '../serialize/buffer_reader.js'; @@ -18,15 +20,30 @@ export class Point { } static fromString(address: string) { - return Point.fromBuffer(Buffer.from(address.replace(/^0x/i, ''), 'hex')); + address = address.replace(/^0x/i, ''); + const byteValues = new Uint8Array(Math.ceil(address.length / 2)); + for (let i = 0; i < byteValues.length; i++) { + byteValues[i] = Number.parseInt(address.substr(i * 2, 2), 16); + } + return Point.fromBuffer(byteValues); } toBuffer() { - return Buffer.concat([this.x.toBuffer(), this.y.toBuffer()]); + const xBuffer = this.x.toBuffer(); + const yBuffer = this.y.toBuffer(); + const combined = new Uint8Array(xBuffer.length + yBuffer.length); + combined.set(xBuffer, 0); + combined.set(yBuffer, xBuffer.length); + return combined; } toString() { - return '0x' + this.toBuffer().toString('hex'); + const buffer = this.toBuffer(); + let hexString = '0x'; + for (let i = 0; i < buffer.length; i++) { + hexString += buffer[i].toString(16).padStart(2, '0'); + } + return hexString; } equals(rhs: Point) { From e35ae608b264ed65836ec58fdbb298148d2bc037 Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 16 Jun 2023 22:38:11 +0000 Subject: [PATCH 02/88] Webpack config changes --- ts/webpack.config.cjs | 64 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 ts/webpack.config.cjs diff --git a/ts/webpack.config.cjs b/ts/webpack.config.cjs new file mode 100644 index 0000000000..b08f794cea --- /dev/null +++ b/ts/webpack.config.cjs @@ -0,0 +1,64 @@ +/** + * Builds both the web and node version of the worker, and outputs it to the dest directory. + */ +const { resolve, dirname } = require('path'); +const { fileURLToPath } = require('url'); +const ResolveTypeScriptPlugin = require('resolve-typescript-plugin'); +const CopyWebpackPlugin = require('copy-webpack-plugin'); +const HtmlWebpackPlugin = require('html-webpack-plugin'); +const webpack = require('webpack'); + +module.exports = { + target: 'web', + mode: 'production', + entry: { + index_web: './src/index_web.ts', + }, + module: { + rules: [ + { + test: /\.tsx?$/, + use: [{ loader: 'ts-loader', options: { transpileOnly: true, onlyCompileBundledFiles: true } }], + }, + ], + }, + output: { + path: resolve(__dirname, './dest'), + filename: '[name].js', + }, + plugins: [ + new webpack.DefinePlugin({ 'process.env.NODE_DEBUG': false }), + new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }), + new CopyWebpackPlugin({ + patterns: [ + { + from: `../cpp/build-wasm/bin/barretenberg.wasm`, + to: 'barretenberg.wasm', + }, + { + from: `../cpp/build-wasm-threads/bin/barretenberg.wasm`, + to: 'barretenberg-threads.wasm', + }, + ], + }), + ], + resolve: { + alias: { + // TODO: this alias is not working, /dest is not exporting with ./browser/index imports + './node/index': './browser/index', + 'idb-keyval': require.resolve('idb-keyval'), + worker_threads: 'browser-threads', + crypto: require.resolve('crypto-browserify'), + path: require.resolve('path-browserify'), + url: require.resolve('url/'), + }, + fallback: { + os: require.resolve('os-browserify/browser'), + events: false, + }, + plugins: [new ResolveTypeScriptPlugin()], + }, + optimization: { + minimize: false, + }, +}; From 38ab0ea8f786d39be8501c73f51e40326395b609 Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 16 Jun 2023 22:38:32 +0000 Subject: [PATCH 03/88] Package.json changes --- ts/package.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ts/package.json b/ts/package.json index 0d07309df9..479a57e825 100644 --- a/ts/package.json +++ b/ts/package.json @@ -8,6 +8,7 @@ "displayName": "bb.js", "tsconfig": "./tsconfig.json" }, + "main": "./dest/index_web.js", "bin": "./dest/main.js", "files": [ "src/", @@ -51,9 +52,14 @@ "dependencies": { "comlink": "^4.4.1", "commander": "^10.0.1", + "crypto-browserify": "^3.12.0", "debug": "^4.3.4", + "eventemitter3": "^5.0.1", + "os-browserify": "^0.3.0", + "path-browserify": "^1.0.1", "ts-node": "^10.9.1", - "tslib": "^2.4.0" + "tslib": "^2.4.0", + "url": "^0.11.1" }, "devDependencies": { "@jest/globals": "^29.4.3", From c51086fa00c706cdd2b5a79501a5b3be4111622b Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 16 Jun 2023 22:38:59 +0000 Subject: [PATCH 04/88] Add web entrypoint --- ts/src/index_web.ts | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 ts/src/index_web.ts diff --git a/ts/src/index_web.ts b/ts/src/index_web.ts new file mode 100644 index 0000000000..686cf4af06 --- /dev/null +++ b/ts/src/index_web.ts @@ -0,0 +1,5 @@ +export * from './crs/index.js'; +export * from './barretenberg_wasm/index.js'; +export * from './barretenberg_api/index.js'; +export * from './factory/index.js'; +export { RawBuffer } from './types/index.js'; From 2ec7f60fb86240b8af9aeb58718076a1844ff8f1 Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 16 Jun 2023 23:41:49 +0000 Subject: [PATCH 05/88] Remove old webpack --- ts/webpack.config.js | 68 --- ts/yarn.lock | 1335 +++++++++++++++++++++++++++++------------- 2 files changed, 926 insertions(+), 477 deletions(-) delete mode 100644 ts/webpack.config.js diff --git a/ts/webpack.config.js b/ts/webpack.config.js deleted file mode 100644 index 5c8623b230..0000000000 --- a/ts/webpack.config.js +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Builds the web version of the worker, and outputs it to the dest directory. - */ -import { resolve, dirname } from 'path'; -import { fileURLToPath } from 'url'; -import ResolveTypeScriptPlugin from 'resolve-typescript-plugin'; -import CopyWebpackPlugin from 'copy-webpack-plugin'; -import HtmlWebpackPlugin from 'html-webpack-plugin'; -import webpack from 'webpack'; -// import { createRequire } from 'module'; - -// const require = createRequire(import.meta.url); - -export default { - target: 'web', - mode: 'production', - entry: { - barretenberg_wasm: './src/barretenberg_wasm/browser/worker.ts', - simple_test: './src/examples/simple.rawtest.ts', - }, - module: { - rules: [ - { - test: /\.tsx?$/, - use: [{ loader: 'ts-loader', options: { transpileOnly: true, onlyCompileBundledFiles: true } }], - }, - ], - }, - output: { - path: resolve(dirname(fileURLToPath(import.meta.url)), './dest'), - filename: '[name].js', - }, - plugins: [ - new HtmlWebpackPlugin({ inject: false, template: './src/index.html' }), - new webpack.DefinePlugin({ 'process.env.NODE_DEBUG': false }), - new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }), - new CopyWebpackPlugin({ - patterns: [ - { - // Point directly to the built file, not the symlink, else copy-on-change doesn't work... - from: `../cpp/build-wasm/bin/barretenberg.wasm`, - to: 'barretenberg.wasm', - }, - { - from: `../cpp/build-wasm-threads/bin/barretenberg.wasm`, - to: 'barretenberg-threads.wasm', - }, - ], - }), - ], - resolve: { - alias: { - './node/index.js': './browser/index.js', - }, - plugins: [new ResolveTypeScriptPlugin()], - }, - devServer: { - hot: false, - client: { - logging: 'none', - overlay: false, - }, - headers: { - 'Cross-Origin-Opener-Policy': 'same-origin', - 'Cross-Origin-Embedder-Policy': 'require-corp', - }, - }, -}; diff --git a/ts/yarn.lock b/ts/yarn.lock index 0b068d22d7..986eedd592 100644 --- a/ts/yarn.lock +++ b/ts/yarn.lock @@ -31,12 +31,16 @@ __metadata: comlink: ^4.4.1 commander: ^10.0.1 copy-webpack-plugin: ^11.0.0 + crypto-browserify: ^3.12.0 debug: ^4.3.4 eslint: ^8.35.0 eslint-config-prettier: ^8.8.0 + eventemitter3: ^5.0.1 html-webpack-plugin: ^5.5.1 idb-keyval: ^6.2.1 jest: ^29.5.0 + os-browserify: ^0.3.0 + path-browserify: ^1.0.1 prettier: ^2.8.4 resolve-typescript-plugin: ^2.0.1 ts-jest: ^29.1.0 @@ -44,6 +48,7 @@ __metadata: ts-node: ^10.9.1 tslib: ^2.4.0 typescript: ^5.0.4 + url: ^0.11.1 webpack: ^5.82.1 webpack-cli: ^5.1.1 webpack-dev-server: ^4.15.0 @@ -52,197 +57,197 @@ __metadata: languageName: unknown linkType: soft -"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.21.4": - version: 7.21.4 - resolution: "@babel/code-frame@npm:7.21.4" +"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/code-frame@npm:7.22.5" dependencies: - "@babel/highlight": ^7.18.6 - checksum: e5390e6ec1ac58dcef01d4f18eaf1fd2f1325528661ff6d4a5de8979588b9f5a8e852a54a91b923846f7a5c681b217f0a45c2524eb9560553160cd963b7d592c + "@babel/highlight": ^7.22.5 + checksum: cfe804f518f53faaf9a1d3e0f9f74127ab9a004912c3a16fda07fb6a633393ecb9918a053cb71804204c1b7ec3d49e1699604715e2cfb0c9f7bc4933d324ebb6 languageName: node linkType: hard -"@babel/compat-data@npm:^7.22.0": - version: 7.22.3 - resolution: "@babel/compat-data@npm:7.22.3" - checksum: eb001646f41459f42ccb0d39ee8bb3c3c495bc297234817044c0002689c625e3159a6678c53fd31bd98cf21f31472b73506f350fc6906e3bdfa49cb706e2af8d +"@babel/compat-data@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/compat-data@npm:7.22.5" + checksum: eb1a47ebf79ae268b4a16903e977be52629339806e248455eb9973897c503a04b701f36a9de64e19750d6e081d0561e77a514c8dc470babbeba59ae94298ed18 languageName: node linkType: hard "@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3": - version: 7.22.1 - resolution: "@babel/core@npm:7.22.1" + version: 7.22.5 + resolution: "@babel/core@npm:7.22.5" dependencies: "@ampproject/remapping": ^2.2.0 - "@babel/code-frame": ^7.21.4 - "@babel/generator": ^7.22.0 - "@babel/helper-compilation-targets": ^7.22.1 - "@babel/helper-module-transforms": ^7.22.1 - "@babel/helpers": ^7.22.0 - "@babel/parser": ^7.22.0 - "@babel/template": ^7.21.9 - "@babel/traverse": ^7.22.1 - "@babel/types": ^7.22.0 + "@babel/code-frame": ^7.22.5 + "@babel/generator": ^7.22.5 + "@babel/helper-compilation-targets": ^7.22.5 + "@babel/helper-module-transforms": ^7.22.5 + "@babel/helpers": ^7.22.5 + "@babel/parser": ^7.22.5 + "@babel/template": ^7.22.5 + "@babel/traverse": ^7.22.5 + "@babel/types": ^7.22.5 convert-source-map: ^1.7.0 debug: ^4.1.0 gensync: ^1.0.0-beta.2 json5: ^2.2.2 semver: ^6.3.0 - checksum: bbe45e791f223a7e692d2ea6597a73f48050abd24b119c85c48ac6504c30ce63343a2ea3f79b5847bf4b409ddd8a68b6cdc4f0272ded1d2ef6f6b1e9663432f0 + checksum: 173ae426958c90c7bbd7de622c6f13fcab8aef0fac3f138e2d47bc466d1cd1f86f71ca82ae0acb9032fd8794abed8efb56fea55c031396337eaec0d673b69d56 languageName: node linkType: hard -"@babel/generator@npm:^7.22.0, @babel/generator@npm:^7.22.3, @babel/generator@npm:^7.7.2": - version: 7.22.3 - resolution: "@babel/generator@npm:7.22.3" +"@babel/generator@npm:^7.22.5, @babel/generator@npm:^7.7.2": + version: 7.22.5 + resolution: "@babel/generator@npm:7.22.5" dependencies: - "@babel/types": ^7.22.3 + "@babel/types": ^7.22.5 "@jridgewell/gen-mapping": ^0.3.2 "@jridgewell/trace-mapping": ^0.3.17 jsesc: ^2.5.1 - checksum: ccb6426ca5b5a38f0d47a3ac9628e223d2aaaa489cbf90ffab41468795c22afe86855f68a58667f0f2673949f1810d4d5a57b826c17984eab3e28fdb34a909e6 + checksum: efa64da70ca88fe69f05520cf5feed6eba6d30a85d32237671488cc355fdc379fe2c3246382a861d49574c4c2f82a317584f8811e95eb024e365faff3232b49d languageName: node linkType: hard -"@babel/helper-compilation-targets@npm:^7.22.1": - version: 7.22.1 - resolution: "@babel/helper-compilation-targets@npm:7.22.1" +"@babel/helper-compilation-targets@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-compilation-targets@npm:7.22.5" dependencies: - "@babel/compat-data": ^7.22.0 - "@babel/helper-validator-option": ^7.21.0 + "@babel/compat-data": ^7.22.5 + "@babel/helper-validator-option": ^7.22.5 browserslist: ^4.21.3 lru-cache: ^5.1.1 semver: ^6.3.0 peerDependencies: "@babel/core": ^7.0.0 - checksum: a686a01bd3288cf95ca26faa27958d34c04e2501c4b0858c3a6558776dec20317b5635f33d64c5a635b6fbdfe462a85c30d4bfa0ae7e7ffe3467e4d06442d7c8 + checksum: a479460615acffa0f4fd0a29b740eafb53a93694265207d23a6038ccd18d183a382cacca515e77b7c9b042c3ba80b0aca0da5f1f62215140e81660d2cf721b68 languageName: node linkType: hard -"@babel/helper-environment-visitor@npm:^7.22.1": - version: 7.22.1 - resolution: "@babel/helper-environment-visitor@npm:7.22.1" - checksum: a6b4bb5505453bff95518d361ac1de393f0029aeb8b690c70540f4317934c53c43cc4afcda8c752ffa8c272e63ed6b929a56eca28e4978424177b24238b21bf9 +"@babel/helper-environment-visitor@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-environment-visitor@npm:7.22.5" + checksum: 248532077d732a34cd0844eb7b078ff917c3a8ec81a7f133593f71a860a582f05b60f818dc5049c2212e5baa12289c27889a4b81d56ef409b4863db49646c4b1 languageName: node linkType: hard -"@babel/helper-function-name@npm:^7.21.0": - version: 7.21.0 - resolution: "@babel/helper-function-name@npm:7.21.0" +"@babel/helper-function-name@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-function-name@npm:7.22.5" dependencies: - "@babel/template": ^7.20.7 - "@babel/types": ^7.21.0 - checksum: d63e63c3e0e3e8b3138fa47b0cd321148a300ef12b8ee951196994dcd2a492cc708aeda94c2c53759a5c9177fffaac0fd8778791286746f72a000976968daf4e + "@babel/template": ^7.22.5 + "@babel/types": ^7.22.5 + checksum: 6b1f6ce1b1f4e513bf2c8385a557ea0dd7fa37971b9002ad19268ca4384bbe90c09681fe4c076013f33deabc63a53b341ed91e792de741b4b35e01c00238177a languageName: node linkType: hard -"@babel/helper-hoist-variables@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-hoist-variables@npm:7.18.6" +"@babel/helper-hoist-variables@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-hoist-variables@npm:7.22.5" dependencies: - "@babel/types": ^7.18.6 - checksum: fd9c35bb435fda802bf9ff7b6f2df06308a21277c6dec2120a35b09f9de68f68a33972e2c15505c1a1a04b36ec64c9ace97d4a9e26d6097b76b4396b7c5fa20f + "@babel/types": ^7.22.5 + checksum: 394ca191b4ac908a76e7c50ab52102669efe3a1c277033e49467913c7ed6f7c64d7eacbeabf3bed39ea1f41731e22993f763b1edce0f74ff8563fd1f380d92cc languageName: node linkType: hard -"@babel/helper-module-imports@npm:^7.21.4": - version: 7.21.4 - resolution: "@babel/helper-module-imports@npm:7.21.4" +"@babel/helper-module-imports@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-module-imports@npm:7.22.5" dependencies: - "@babel/types": ^7.21.4 - checksum: bd330a2edaafeb281fbcd9357652f8d2666502567c0aad71db926e8499c773c9ea9c10dfaae30122452940326d90c8caff5c649ed8e1bf15b23f858758d3abc6 + "@babel/types": ^7.22.5 + checksum: 9ac2b0404fa38b80bdf2653fbeaf8e8a43ccb41bd505f9741d820ed95d3c4e037c62a1bcdcb6c9527d7798d2e595924c4d025daed73283badc180ada2c9c49ad languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.22.1": - version: 7.22.1 - resolution: "@babel/helper-module-transforms@npm:7.22.1" +"@babel/helper-module-transforms@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-module-transforms@npm:7.22.5" dependencies: - "@babel/helper-environment-visitor": ^7.22.1 - "@babel/helper-module-imports": ^7.21.4 - "@babel/helper-simple-access": ^7.21.5 - "@babel/helper-split-export-declaration": ^7.18.6 - "@babel/helper-validator-identifier": ^7.19.1 - "@babel/template": ^7.21.9 - "@babel/traverse": ^7.22.1 - "@babel/types": ^7.22.0 - checksum: dfa084211a93c9f0174ab07385fdbf7831bbf5c1ff3d4f984effc489f48670825ad8b817b9e9d2ec6492fde37ed6518c15944e9dd7a60b43a3d9874c9250f5f8 + "@babel/helper-environment-visitor": ^7.22.5 + "@babel/helper-module-imports": ^7.22.5 + "@babel/helper-simple-access": ^7.22.5 + "@babel/helper-split-export-declaration": ^7.22.5 + "@babel/helper-validator-identifier": ^7.22.5 + "@babel/template": ^7.22.5 + "@babel/traverse": ^7.22.5 + "@babel/types": ^7.22.5 + checksum: 8985dc0d971fd17c467e8b84fe0f50f3dd8610e33b6c86e5b3ca8e8859f9448bcc5c84e08a2a14285ef388351c0484797081c8f05a03770bf44fc27bf4900e68 languageName: node linkType: hard -"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.8.0": - version: 7.21.5 - resolution: "@babel/helper-plugin-utils@npm:7.21.5" - checksum: 6f086e9a84a50ea7df0d5639c8f9f68505af510ea3258b3c8ac8b175efdfb7f664436cb48996f71791a1350ba68f47ad3424131e8e718c5e2ad45564484cbb36 +"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0": + version: 7.22.5 + resolution: "@babel/helper-plugin-utils@npm:7.22.5" + checksum: c0fc7227076b6041acd2f0e818145d2e8c41968cc52fb5ca70eed48e21b8fe6dd88a0a91cbddf4951e33647336eb5ae184747ca706817ca3bef5e9e905151ff5 languageName: node linkType: hard -"@babel/helper-simple-access@npm:^7.21.5": - version: 7.21.5 - resolution: "@babel/helper-simple-access@npm:7.21.5" +"@babel/helper-simple-access@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-simple-access@npm:7.22.5" dependencies: - "@babel/types": ^7.21.5 - checksum: ad212beaa24be3864c8c95bee02f840222457ccf5419991e2d3e3e39b0f75b77e7e857e0bf4ed428b1cd97acefc87f3831bdb0b9696d5ad0557421f398334fc3 + "@babel/types": ^7.22.5 + checksum: fe9686714caf7d70aedb46c3cce090f8b915b206e09225f1e4dbc416786c2fdbbee40b38b23c268b7ccef749dd2db35f255338fb4f2444429874d900dede5ad2 languageName: node linkType: hard -"@babel/helper-split-export-declaration@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-split-export-declaration@npm:7.18.6" +"@babel/helper-split-export-declaration@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-split-export-declaration@npm:7.22.5" dependencies: - "@babel/types": ^7.18.6 - checksum: c6d3dede53878f6be1d869e03e9ffbbb36f4897c7cc1527dc96c56d127d834ffe4520a6f7e467f5b6f3c2843ea0e81a7819d66ae02f707f6ac057f3d57943a2b + "@babel/types": ^7.22.5 + checksum: d10e05a02f49c1f7c578cea63d2ac55356501bbf58856d97ac9bfde4957faee21ae97c7f566aa309e38a256eef58b58e5b670a7f568b362c00e93dfffe072650 languageName: node linkType: hard -"@babel/helper-string-parser@npm:^7.21.5": - version: 7.21.5 - resolution: "@babel/helper-string-parser@npm:7.21.5" - checksum: 36c0ded452f3858e67634b81960d4bde1d1cd2a56b82f4ba2926e97864816021c885f111a7cf81de88a0ed025f49d84a393256700e9acbca2d99462d648705d8 +"@babel/helper-string-parser@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-string-parser@npm:7.22.5" + checksum: 836851ca5ec813077bbb303acc992d75a360267aa3b5de7134d220411c852a6f17de7c0d0b8c8dcc0f567f67874c00f4528672b2a4f1bc978a3ada64c8c78467 languageName: node linkType: hard -"@babel/helper-validator-identifier@npm:^7.18.6, @babel/helper-validator-identifier@npm:^7.19.1": - version: 7.19.1 - resolution: "@babel/helper-validator-identifier@npm:7.19.1" - checksum: 0eca5e86a729162af569b46c6c41a63e18b43dbe09fda1d2a3c8924f7d617116af39cac5e4cd5d431bb760b4dca3c0970e0c444789b1db42bcf1fa41fbad0a3a +"@babel/helper-validator-identifier@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-validator-identifier@npm:7.22.5" + checksum: 7f0f30113474a28298c12161763b49de5018732290ca4de13cdaefd4fd0d635a6fe3f6686c37a02905fb1e64f21a5ee2b55140cf7b070e729f1bd66866506aea languageName: node linkType: hard -"@babel/helper-validator-option@npm:^7.21.0": - version: 7.21.0 - resolution: "@babel/helper-validator-option@npm:7.21.0" - checksum: 8ece4c78ffa5461fd8ab6b6e57cc51afad59df08192ed5d84b475af4a7193fc1cb794b59e3e7be64f3cdc4df7ac78bf3dbb20c129d7757ae078e6279ff8c2f07 +"@babel/helper-validator-option@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-validator-option@npm:7.22.5" + checksum: bbeca8a85ee86990215c0424997438b388b8d642d69b9f86c375a174d3cdeb270efafd1ff128bc7a1d370923d13b6e45829ba8581c027620e83e3a80c5c414b3 languageName: node linkType: hard -"@babel/helpers@npm:^7.22.0": - version: 7.22.3 - resolution: "@babel/helpers@npm:7.22.3" +"@babel/helpers@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helpers@npm:7.22.5" dependencies: - "@babel/template": ^7.21.9 - "@babel/traverse": ^7.22.1 - "@babel/types": ^7.22.3 - checksum: 385289ee8b87cf9af448bbb9fcf747f6e67600db5f7f64eb4ad97761ee387819bf2212b6a757008286c6bfacf4f3fc0b6de88686f2e517a70fb59996bdfbd1e9 + "@babel/template": ^7.22.5 + "@babel/traverse": ^7.22.5 + "@babel/types": ^7.22.5 + checksum: a96e785029dff72f171190943df895ab0f76e17bf3881efd630bc5fae91215042d1c2e9ed730e8e4adf4da6f28b24bd1f54ed93b90ffbca34c197351872a084e languageName: node linkType: hard -"@babel/highlight@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/highlight@npm:7.18.6" +"@babel/highlight@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/highlight@npm:7.22.5" dependencies: - "@babel/helper-validator-identifier": ^7.18.6 + "@babel/helper-validator-identifier": ^7.22.5 chalk: ^2.0.0 js-tokens: ^4.0.0 - checksum: 92d8ee61549de5ff5120e945e774728e5ccd57fd3b2ed6eace020ec744823d4a98e242be1453d21764a30a14769ecd62170fba28539b211799bbaf232bbb2789 + checksum: f61ae6de6ee0ea8d9b5bcf2a532faec5ab0a1dc0f7c640e5047fc61630a0edb88b18d8c92eb06566d30da7a27db841aca11820ecd3ebe9ce514c9350fbed39c4 languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.21.9, @babel/parser@npm:^7.22.0, @babel/parser@npm:^7.22.4": - version: 7.22.4 - resolution: "@babel/parser@npm:7.22.4" +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/parser@npm:7.22.5" bin: parser: ./bin/babel-parser.js - checksum: 0ca6d3a2d9aae2504ba1bc494704b64a83140884f7379f609de69bd39b60adb58a4f8ec692fe53fef8657dd82705d01b7e6efb65e18296326bdd66f71d52d9a9 + checksum: 470ebba516417ce8683b36e2eddd56dcfecb32c54b9bb507e28eb76b30d1c3e618fd0cfeee1f64d8357c2254514e1a19e32885cfb4e73149f4ae875436a6d59c languageName: node linkType: hard @@ -302,13 +307,13 @@ __metadata: linkType: hard "@babel/plugin-syntax-jsx@npm:^7.7.2": - version: 7.21.4 - resolution: "@babel/plugin-syntax-jsx@npm:7.21.4" + version: 7.22.5 + resolution: "@babel/plugin-syntax-jsx@npm:7.22.5" dependencies: - "@babel/helper-plugin-utils": ^7.20.2 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: bb7309402a1d4e155f32aa0cf216e1fa8324d6c4cfd248b03280028a015a10e46b6efd6565f515f8913918a3602b39255999c06046f7d4b8a5106be2165d724a + checksum: 8829d30c2617ab31393d99cec2978e41f014f4ac6f01a1cecf4c4dd8320c3ec12fdc3ce121126b2d8d32f6887e99ca1a0bad53dedb1e6ad165640b92b24980ce languageName: node linkType: hard @@ -390,53 +395,53 @@ __metadata: linkType: hard "@babel/plugin-syntax-typescript@npm:^7.7.2": - version: 7.21.4 - resolution: "@babel/plugin-syntax-typescript@npm:7.21.4" + version: 7.22.5 + resolution: "@babel/plugin-syntax-typescript@npm:7.22.5" dependencies: - "@babel/helper-plugin-utils": ^7.20.2 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: a59ce2477b7ae8c8945dc37dda292fef9ce46a6507b3d76b03ce7f3a6c9451a6567438b20a78ebcb3955d04095fd1ccd767075a863f79fcc30aa34dcfa441fe0 + checksum: 8ab7718fbb026d64da93681a57797d60326097fd7cb930380c8bffd9eb101689e90142c760a14b51e8e69c88a73ba3da956cb4520a3b0c65743aee5c71ef360a languageName: node linkType: hard -"@babel/template@npm:^7.20.7, @babel/template@npm:^7.21.9, @babel/template@npm:^7.3.3": - version: 7.21.9 - resolution: "@babel/template@npm:7.21.9" +"@babel/template@npm:^7.22.5, @babel/template@npm:^7.3.3": + version: 7.22.5 + resolution: "@babel/template@npm:7.22.5" dependencies: - "@babel/code-frame": ^7.21.4 - "@babel/parser": ^7.21.9 - "@babel/types": ^7.21.5 - checksum: 6ec2c60d4d53b2a9230ab82c399ba6525df87e9a4e01e4b111e071cbad283b1362e7c99a1bc50027073f44f2de36a495a89c27112c4e7efe7ef9c8d9c84de2ec + "@babel/code-frame": ^7.22.5 + "@babel/parser": ^7.22.5 + "@babel/types": ^7.22.5 + checksum: c5746410164039aca61829cdb42e9a55410f43cace6f51ca443313f3d0bdfa9a5a330d0b0df73dc17ef885c72104234ae05efede37c1cc8a72dc9f93425977a3 languageName: node linkType: hard -"@babel/traverse@npm:^7.22.1, @babel/traverse@npm:^7.7.2": - version: 7.22.4 - resolution: "@babel/traverse@npm:7.22.4" +"@babel/traverse@npm:^7.22.5, @babel/traverse@npm:^7.7.2": + version: 7.22.5 + resolution: "@babel/traverse@npm:7.22.5" dependencies: - "@babel/code-frame": ^7.21.4 - "@babel/generator": ^7.22.3 - "@babel/helper-environment-visitor": ^7.22.1 - "@babel/helper-function-name": ^7.21.0 - "@babel/helper-hoist-variables": ^7.18.6 - "@babel/helper-split-export-declaration": ^7.18.6 - "@babel/parser": ^7.22.4 - "@babel/types": ^7.22.4 + "@babel/code-frame": ^7.22.5 + "@babel/generator": ^7.22.5 + "@babel/helper-environment-visitor": ^7.22.5 + "@babel/helper-function-name": ^7.22.5 + "@babel/helper-hoist-variables": ^7.22.5 + "@babel/helper-split-export-declaration": ^7.22.5 + "@babel/parser": ^7.22.5 + "@babel/types": ^7.22.5 debug: ^4.1.0 globals: ^11.1.0 - checksum: 9560ae22092d5a7c52849145dd3e5aed2ffb73d61255e70e19e3fbd06bcbafbbdecea28df40a42ee3b60b01e85a42224ec841df93e867547e329091cc2f2bb6f + checksum: 560931422dc1761f2df723778dcb4e51ce0d02e560cf2caa49822921578f49189a5a7d053b78a32dca33e59be886a6b2200a6e24d4ae9b5086ca0ba803815694 languageName: node linkType: hard -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.0, @babel/types@npm:^7.21.4, @babel/types@npm:^7.21.5, @babel/types@npm:^7.22.0, @babel/types@npm:^7.22.3, @babel/types@npm:^7.22.4, @babel/types@npm:^7.3.3, @babel/types@npm:^7.8.3": - version: 7.22.4 - resolution: "@babel/types@npm:7.22.4" +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.8.3": + version: 7.22.5 + resolution: "@babel/types@npm:7.22.5" dependencies: - "@babel/helper-string-parser": ^7.21.5 - "@babel/helper-validator-identifier": ^7.19.1 + "@babel/helper-string-parser": ^7.22.5 + "@babel/helper-validator-identifier": ^7.22.5 to-fast-properties: ^2.0.0 - checksum: ffe36bb4f4a99ad13c426a98c3b508d70736036cae4e471d9c862e3a579847ed4f480686af0fce2633f6f7c0f0d3bf02da73da36e7edd3fde0b2061951dcba9a + checksum: c13a9c1dc7d2d1a241a2f8363540cb9af1d66e978e8984b400a20c4f38ba38ca29f06e26a0f2d49a70bad9e57615dac09c35accfddf1bb90d23cd3e0a0bab892 languageName: node linkType: hard @@ -498,28 +503,21 @@ __metadata: languageName: node linkType: hard -"@eslint/js@npm:8.41.0": - version: 8.41.0 - resolution: "@eslint/js@npm:8.41.0" - checksum: af013d70fe8d0429cdf5cd8b5dcc6fc384ed026c1eccb0cfe30f5849b968ab91645111373fd1b83282b38955b1bdfbe667c1a7dbda3b06cae753521223cad775 +"@eslint/js@npm:8.42.0": + version: 8.42.0 + resolution: "@eslint/js@npm:8.42.0" + checksum: 750558843ac458f7da666122083ee05306fc087ecc1e5b21e7e14e23885775af6c55bcc92283dff1862b7b0d8863ec676c0f18c7faf1219c722fe91a8ece56b6 languageName: node linkType: hard -"@gar/promisify@npm:^1.1.3": - version: 1.1.3 - resolution: "@gar/promisify@npm:1.1.3" - checksum: 4059f790e2d07bf3c3ff3e0fec0daa8144fe35c1f6e0111c9921bd32106adaa97a4ab096ad7dab1e28ee6a9060083c4d1a4ada42a7f5f3f7a96b8812e2b757c1 - languageName: node - linkType: hard - -"@humanwhocodes/config-array@npm:^0.11.8": - version: 0.11.8 - resolution: "@humanwhocodes/config-array@npm:0.11.8" +"@humanwhocodes/config-array@npm:^0.11.10": + version: 0.11.10 + resolution: "@humanwhocodes/config-array@npm:0.11.10" dependencies: "@humanwhocodes/object-schema": ^1.2.1 debug: ^4.1.1 minimatch: ^3.0.5 - checksum: 0fd6b3c54f1674ce0a224df09b9c2f9846d20b9e54fabae1281ecfc04f2e6ad69bf19e1d6af6a28f88e8aa3990168b6cb9e1ef755868c3256a630605ec2cb1d3 + checksum: 1b1302e2403d0e35bc43e66d67a2b36b0ad1119efc704b5faff68c41f791a052355b010fb2d27ef022670f550de24cd6d08d5ecf0821c16326b7dcd0ee5d5d8a languageName: node linkType: hard @@ -537,6 +535,20 @@ __metadata: languageName: node linkType: hard +"@isaacs/cliui@npm:^8.0.2": + version: 8.0.2 + resolution: "@isaacs/cliui@npm:8.0.2" + dependencies: + string-width: ^5.1.2 + string-width-cjs: "npm:string-width@^4.2.0" + strip-ansi: ^7.0.1 + strip-ansi-cjs: "npm:strip-ansi@^6.0.1" + wrap-ansi: ^8.1.0 + wrap-ansi-cjs: "npm:wrap-ansi@^7.0.0" + checksum: 4a473b9b32a7d4d3cfb7a614226e555091ff0c5a29a1734c28c72a182c2f6699b26fc6b5c2131dfd841e86b185aea714c72201d7c98c2fba5f17709333a67aeb + languageName: node + linkType: hard + "@istanbuljs/load-nyc-config@npm:^1.0.0": version: 1.1.0 resolution: "@istanbuljs/load-nyc-config@npm:1.1.0" @@ -819,7 +831,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/source-map@npm:^0.3.2": +"@jridgewell/source-map@npm:^0.3.3": version: 0.3.3 resolution: "@jridgewell/source-map@npm:0.3.3" dependencies: @@ -897,23 +909,19 @@ __metadata: languageName: node linkType: hard -"@npmcli/fs@npm:^2.1.0": - version: 2.1.2 - resolution: "@npmcli/fs@npm:2.1.2" +"@npmcli/fs@npm:^3.1.0": + version: 3.1.0 + resolution: "@npmcli/fs@npm:3.1.0" dependencies: - "@gar/promisify": ^1.1.3 semver: ^7.3.5 - checksum: 405074965e72d4c9d728931b64d2d38e6ea12066d4fad651ac253d175e413c06fe4350970c783db0d749181da8fe49c42d3880bd1cbc12cd68e3a7964d820225 + checksum: a50a6818de5fc557d0b0e6f50ec780a7a02ab8ad07e5ac8b16bf519e0ad60a144ac64f97d05c443c3367235d337182e1d012bbac0eb8dbae8dc7b40b193efd0e languageName: node linkType: hard -"@npmcli/move-file@npm:^2.0.0": - version: 2.0.1 - resolution: "@npmcli/move-file@npm:2.0.1" - dependencies: - mkdirp: ^1.0.4 - rimraf: ^3.0.2 - checksum: 52dc02259d98da517fae4cb3a0a3850227bdae4939dda1980b788a7670636ca2b4a01b58df03dd5f65c1e3cb70c50fa8ce5762b582b3f499ec30ee5ce1fd9380 +"@pkgjs/parseargs@npm:^0.11.0": + version: 0.11.0 + resolution: "@pkgjs/parseargs@npm:0.11.0" + checksum: 6ad6a00fc4f2f2cfc6bff76fb1d88b8ee20bc0601e18ebb01b6d4be583733a860239a521a7fbca73b612e66705078809483549d2b18f370eb346c5155c8e4a0f languageName: node linkType: hard @@ -934,11 +942,11 @@ __metadata: linkType: hard "@sinonjs/fake-timers@npm:^10.0.2": - version: 10.2.0 - resolution: "@sinonjs/fake-timers@npm:10.2.0" + version: 10.1.0 + resolution: "@sinonjs/fake-timers@npm:10.1.0" dependencies: "@sinonjs/commons": ^3.0.0 - checksum: 586c76e1dd90d03b0c4e754f2011325b38ac6055878c81c52434c900f36d9d245438c96ef69e08e28d9fbecf2335fb347b67850962d8b6e539dd7359d8c62802 + checksum: f8f7e23a136e32ba0128493207e4223f453e033471257a971acb43840927e738a0838004b1e4fa046279609762a2dd8d700606616e9264dc3891c4f8d45889a2 languageName: node linkType: hard @@ -1010,11 +1018,11 @@ __metadata: linkType: hard "@types/babel__traverse@npm:*, @types/babel__traverse@npm:^7.0.6": - version: 7.20.0 - resolution: "@types/babel__traverse@npm:7.20.0" + version: 7.20.1 + resolution: "@types/babel__traverse@npm:7.20.1" dependencies: "@babel/types": ^7.20.7 - checksum: 030d647a61baa70aff5bc1193227694098191578e45e18720db3a14614f1827664d609630a668ad75cddffd7b80cd14a55455364239d1f14ea55f1f4d7d2c9ef + checksum: 58341e23c649c0eba134a1682d4f20d027fad290d92e5740faa1279978f6ed476fc467ae51ce17a877e2566d805aeac64eae541168994367761ec883a4150221 languageName: node linkType: hard @@ -1083,12 +1091,12 @@ __metadata: linkType: hard "@types/eslint@npm:*": - version: 8.40.0 - resolution: "@types/eslint@npm:8.40.0" + version: 8.40.2 + resolution: "@types/eslint@npm:8.40.2" dependencies: "@types/estree": "*" "@types/json-schema": "*" - checksum: bab41d7f590182e743853cdd5bf5359cbc4240df986223457c8a5f5674743a3fe2a8626704b65bf9121dfa0ce0a0efd760da8339cc329018f229d4d2d6ee1c43 + checksum: a4780e45e677e3af21c44a900846996cb6d9ae8f71d51940942a047163ae93a05444392c005f491ed46aa169f3b25f8be125ab42c5d8bdb571154bf62a7c828a languageName: node linkType: hard @@ -1212,16 +1220,16 @@ __metadata: linkType: hard "@types/node@npm:*": - version: 20.2.5 - resolution: "@types/node@npm:20.2.5" - checksum: 38ce7c7e9d76880dc632f71d71e0d5914fcda9d5e9a7095d6c339abda55ca4affb0f2a882aeb29398f8e09d2c5151f0b6586c81c8ccdfe529c34b1ea3337425e + version: 20.3.1 + resolution: "@types/node@npm:20.3.1" + checksum: 63a393ab6d947be17320817b35d7277ef03728e231558166ed07ee30b09fd7c08861be4d746f10fdc63ca7912e8cd023939d4eab887ff6580ff704ff24ed810c languageName: node linkType: hard "@types/node@npm:^18.7.23": - version: 18.16.16 - resolution: "@types/node@npm:18.16.16" - checksum: 0efad726dd1e0bef71c392c708fc5d78c5b39c46b0ac5186fee74de4ccb1b2e847b3fa468da67d62812f56569da721b15bf31bdc795e6c69b56c73a45079ed2d + version: 18.16.18 + resolution: "@types/node@npm:18.16.18" + checksum: d32d8a0a04cd3f5ecb361bcb42f3a07623881ac90d680e06bf626defb3c663a94860d11690babe607cfe67265eceeb8a59ba5fe40c0e49f5a1b01e0088640469 languageName: node linkType: hard @@ -1314,12 +1322,12 @@ __metadata: languageName: node linkType: hard -"@types/ws@npm:^8.5.1": - version: 8.5.4 - resolution: "@types/ws@npm:8.5.4" +"@types/ws@npm:^8.5.5": + version: 8.5.5 + resolution: "@types/ws@npm:8.5.5" dependencies: "@types/node": "*" - checksum: fefbad20d211929bb996285c4e6f699b12192548afedbe4930ab4384f8a94577c9cd421acaad163cacd36b88649509970a05a0b8f20615b30c501ed5269038d1 + checksum: d00bf8070e6938e3ccf933010921c6ce78ac3606696ce37a393b27a9a603f7bd93ea64f3c5fa295a2f743575ba9c9a9fdb904af0f5fe2229bf2adf0630386e4a languageName: node linkType: hard @@ -1340,13 +1348,13 @@ __metadata: linkType: hard "@typescript-eslint/eslint-plugin@npm:^5.54.1": - version: 5.59.8 - resolution: "@typescript-eslint/eslint-plugin@npm:5.59.8" + version: 5.59.11 + resolution: "@typescript-eslint/eslint-plugin@npm:5.59.11" dependencies: "@eslint-community/regexpp": ^4.4.0 - "@typescript-eslint/scope-manager": 5.59.8 - "@typescript-eslint/type-utils": 5.59.8 - "@typescript-eslint/utils": 5.59.8 + "@typescript-eslint/scope-manager": 5.59.11 + "@typescript-eslint/type-utils": 5.59.11 + "@typescript-eslint/utils": 5.59.11 debug: ^4.3.4 grapheme-splitter: ^1.0.4 ignore: ^5.2.0 @@ -1359,43 +1367,43 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 3e05cd06149ec3741c3c2fb638e2d19a55687b4614a5c8820433db82997687650297e51c17828d320162ccf4241798cf5712c405561e7605cb17e984a6967f7b + checksum: ff03eaa65a9fa4415cc1a14c2d4382289b9483f11dd3e0746233c2148d941cdbef421c1693304502f42307c72e049d4c3f3b58d30ce5d2ae452f31906e394e62 languageName: node linkType: hard "@typescript-eslint/parser@npm:^5.54.1": - version: 5.59.8 - resolution: "@typescript-eslint/parser@npm:5.59.8" + version: 5.59.11 + resolution: "@typescript-eslint/parser@npm:5.59.11" dependencies: - "@typescript-eslint/scope-manager": 5.59.8 - "@typescript-eslint/types": 5.59.8 - "@typescript-eslint/typescript-estree": 5.59.8 + "@typescript-eslint/scope-manager": 5.59.11 + "@typescript-eslint/types": 5.59.11 + "@typescript-eslint/typescript-estree": 5.59.11 debug: ^4.3.4 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: bac9f09d8552086ceb882a7b87ce4d98dfaa41579249216c75d97e3fc07af33cddc4cbbd07a127a5823c826a258882643aaf658bec19cb2a434002b55c5f0d12 + checksum: 75eb6e60577690e3c9dd66fde83c9b4e9e5fd818fe9673e532052d5ba8fa21a5f7a69aad19be99e6ef5825e9f52036262b25e918e51f96e1dc26e862448d2d3a languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.59.8": - version: 5.59.8 - resolution: "@typescript-eslint/scope-manager@npm:5.59.8" +"@typescript-eslint/scope-manager@npm:5.59.11": + version: 5.59.11 + resolution: "@typescript-eslint/scope-manager@npm:5.59.11" dependencies: - "@typescript-eslint/types": 5.59.8 - "@typescript-eslint/visitor-keys": 5.59.8 - checksum: e1e810ee991cfeb433330b04ee949bb6784abe4dbdb7d9480aa7a7536671b4fec914b7803edf662516c8ecb1b31dcff126797f9923270a529c26e2b00b0ea96f + "@typescript-eslint/types": 5.59.11 + "@typescript-eslint/visitor-keys": 5.59.11 + checksum: f5c4e6d26da0a983b8f0c016f3ae63b3462442fe9c04d7510ca397461e13f6c48332b09b584258a7f336399fa7cd866f3ab55eaad89c5096a411c0d05d296475 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.59.8": - version: 5.59.8 - resolution: "@typescript-eslint/type-utils@npm:5.59.8" +"@typescript-eslint/type-utils@npm:5.59.11": + version: 5.59.11 + resolution: "@typescript-eslint/type-utils@npm:5.59.11" dependencies: - "@typescript-eslint/typescript-estree": 5.59.8 - "@typescript-eslint/utils": 5.59.8 + "@typescript-eslint/typescript-estree": 5.59.11 + "@typescript-eslint/utils": 5.59.11 debug: ^4.3.4 tsutils: ^3.21.0 peerDependencies: @@ -1403,23 +1411,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: d9fde31397da0f0e62a5568f64bad99d06bcd324b7e3aac7fd997a3d045a0fe4c084b2e85d440e0a39645acd2269ad6593f196399c2c0f880d293417fec894e3 + checksum: 3570ba21af35e7e0a916b606c1af311c00d20fe354a5837e0e937191b5e99ceb0076a5ba2924eaa028d4614e03981b20cfdd83a2be780c39e02be3b3bd365b63 languageName: node linkType: hard -"@typescript-eslint/types@npm:5.59.8": - version: 5.59.8 - resolution: "@typescript-eslint/types@npm:5.59.8" - checksum: 559473d5601c849eb0da1874a2ac67c753480beed484ad6f6cda62fa6023273f2c3005c7f2864d9c2afb7c6356412d0d304b57db10c53597207f18a7f6cd4f18 +"@typescript-eslint/types@npm:5.59.11": + version: 5.59.11 + resolution: "@typescript-eslint/types@npm:5.59.11" + checksum: 4bb667571a7254f8c2b0dc3e37100e7290f9be14978722cc31c7204dfababd8a346bed4125e70dcafd15d07be386fb55bb9738bd86662ac10b98a6c964716396 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.59.8": - version: 5.59.8 - resolution: "@typescript-eslint/typescript-estree@npm:5.59.8" +"@typescript-eslint/typescript-estree@npm:5.59.11": + version: 5.59.11 + resolution: "@typescript-eslint/typescript-estree@npm:5.59.11" dependencies: - "@typescript-eslint/types": 5.59.8 - "@typescript-eslint/visitor-keys": 5.59.8 + "@typescript-eslint/types": 5.59.11 + "@typescript-eslint/visitor-keys": 5.59.11 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 @@ -1428,35 +1436,35 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: d93371cc866f573a6a1ddc0eb10d498a8e59f36763a99ce21da0737fff2b4c942eef1587216aad273f8d896ebc0b19003677cba63a27d2646aa2c087638963eb + checksum: 516a828884e6939000aac17a27208088055670b0fd9bd22d137a7b2d359a8db9ce9cd09eedffed6f498f968be90ce3c2695a91d46abbd4049f87fd3b7bb986b5 languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.59.8": - version: 5.59.8 - resolution: "@typescript-eslint/utils@npm:5.59.8" +"@typescript-eslint/utils@npm:5.59.11": + version: 5.59.11 + resolution: "@typescript-eslint/utils@npm:5.59.11" dependencies: "@eslint-community/eslint-utils": ^4.2.0 "@types/json-schema": ^7.0.9 "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 5.59.8 - "@typescript-eslint/types": 5.59.8 - "@typescript-eslint/typescript-estree": 5.59.8 + "@typescript-eslint/scope-manager": 5.59.11 + "@typescript-eslint/types": 5.59.11 + "@typescript-eslint/typescript-estree": 5.59.11 eslint-scope: ^5.1.1 semver: ^7.3.7 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: cbaa057485c7f52c45d0dfb4f5a8e9273abccb1c52dcb4426a79f9e71d2c1062cf2525bad6d4aca5ec42db3fe723d749843bcade5a323bde7fbe4b5d5b5d5c3b + checksum: a61f3e761dbdc5d0bdb6c78bca7b2e628f7a1920192286d002219cc3acb516757613c2ec2a4adc416858ba1751ecbe2784457d6ebcec6bbb109cfc2ca210572b languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.59.8": - version: 5.59.8 - resolution: "@typescript-eslint/visitor-keys@npm:5.59.8" +"@typescript-eslint/visitor-keys@npm:5.59.11": + version: 5.59.11 + resolution: "@typescript-eslint/visitor-keys@npm:5.59.11" dependencies: - "@typescript-eslint/types": 5.59.8 + "@typescript-eslint/types": 5.59.11 eslint-visitor-keys: ^3.3.0 - checksum: 6bfa7918dbb0e08d8a7404aeeef7bcd1a85736dc8d01614d267c0c5ec10f94d2746b50a945bf5c82c54fda67926e8deaeba8565c919da17f725fc11209ef8987 + checksum: 4894ec4b2b8da773b1f44398c836fcacb7f5a0c81f9404ecd193920e88d618091a7328659e0aa24697edda10479534db30bec7c8b0ba9fa0fce43f78222d5619 languageName: node linkType: hard @@ -1611,36 +1619,36 @@ __metadata: languageName: node linkType: hard -"@webpack-cli/configtest@npm:^2.1.0": - version: 2.1.0 - resolution: "@webpack-cli/configtest@npm:2.1.0" +"@webpack-cli/configtest@npm:^2.1.1": + version: 2.1.1 + resolution: "@webpack-cli/configtest@npm:2.1.1" peerDependencies: webpack: 5.x.x webpack-cli: 5.x.x - checksum: b875fccd8be9a936924e24986725823347703e3eb72ea884e74669ca20f007704e859855a6a05940d5d3805ce2fc08b183a0f1658d5395b5454b3f5f88293081 + checksum: 9f9f9145c2d05471fc83d426db1df85cf49f329836b0c4b9f46b6948bed4b013464c00622b136d2a0a26993ce2306976682592245b08ee717500b1db45009a72 languageName: node linkType: hard -"@webpack-cli/info@npm:^2.0.1": - version: 2.0.1 - resolution: "@webpack-cli/info@npm:2.0.1" +"@webpack-cli/info@npm:^2.0.2": + version: 2.0.2 + resolution: "@webpack-cli/info@npm:2.0.2" peerDependencies: webpack: 5.x.x webpack-cli: 5.x.x - checksum: b8fba49fee10d297c2affb0b064c9a81e9038d75517c6728fb85f9fb254cae634e5d33e696dac5171e6944ae329d85fddac72f781c7d833f7e9dfe43151ce60d + checksum: 8f9a178afca5c82e113aed1efa552d64ee5ae4fdff63fe747c096a981ec74f18a5d07bd6e89bbe6715c3e57d96eea024a410e58977169489fe1df044c10dd94e languageName: node linkType: hard -"@webpack-cli/serve@npm:^2.0.4": - version: 2.0.4 - resolution: "@webpack-cli/serve@npm:2.0.4" +"@webpack-cli/serve@npm:^2.0.5": + version: 2.0.5 + resolution: "@webpack-cli/serve@npm:2.0.5" peerDependencies: webpack: 5.x.x webpack-cli: 5.x.x peerDependenciesMeta: webpack-dev-server: optional: true - checksum: 561ea2e6eb551415f0b1675393a8480e1201293fe37eae334cbb1fdc466986668cca76ca1ca327ada9b498eae27cbecef0793e3bb5677288f1a5216cad414efe + checksum: 75f0e54681796d567a71ac3e2781d2901a8d8cf1cdfc82f261034dddac59a8343e8c3bc5e32b4bb9d6766759ba49fb29a5cd86ef1701d79c506fe886bb63ac75 languageName: node linkType: hard @@ -1700,7 +1708,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.4.1, acorn@npm:^8.5.0, acorn@npm:^8.7.1, acorn@npm:^8.8.0": +"acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.0, acorn@npm:^8.8.2": version: 8.8.2 resolution: "acorn@npm:8.8.2" bin: @@ -1822,6 +1830,13 @@ __metadata: languageName: node linkType: hard +"ansi-regex@npm:^6.0.1": + version: 6.0.1 + resolution: "ansi-regex@npm:6.0.1" + checksum: 1ff8b7667cded1de4fa2c9ae283e979fc87036864317da86a2e546725f96406746411d0d85e87a2d12fa5abd715d90006de7fa4fa0477c92321ad3b4c7d4e169 + languageName: node + linkType: hard + "ansi-styles@npm:^3.2.1": version: 3.2.1 resolution: "ansi-styles@npm:3.2.1" @@ -1847,6 +1862,13 @@ __metadata: languageName: node linkType: hard +"ansi-styles@npm:^6.1.0": + version: 6.2.1 + resolution: "ansi-styles@npm:6.2.1" + checksum: ef940f2f0ced1a6347398da88a91da7930c33ecac3c77b72c5905f8b8fe402c52e6fde304ff5347f616e27a742da3f1dc76de98f6866c69251ad0b07a66776d9 + languageName: node + linkType: hard + "anymatch@npm:^3.0.3, anymatch@npm:~3.1.2": version: 3.1.3 resolution: "anymatch@npm:3.1.3" @@ -1918,6 +1940,18 @@ __metadata: languageName: node linkType: hard +"asn1.js@npm:^5.2.0": + version: 5.4.1 + resolution: "asn1.js@npm:5.4.1" + dependencies: + bn.js: ^4.0.0 + inherits: ^2.0.1 + minimalistic-assert: ^1.0.0 + safer-buffer: ^2.1.0 + checksum: 3786a101ac6f304bd4e9a7df79549a7561950a13d4bcaec0c7790d44c80d147c1a94ba3d4e663673406064642a40b23fcd6c82a9952468e386c1a1376d747f9a + languageName: node + linkType: hard + "babel-jest@npm:^29.5.0": version: 29.5.0 resolution: "babel-jest@npm:29.5.0" @@ -2022,6 +2056,20 @@ __metadata: languageName: node linkType: hard +"bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.11.9": + version: 4.12.0 + resolution: "bn.js@npm:4.12.0" + checksum: 39afb4f15f4ea537b55eaf1446c896af28ac948fdcf47171961475724d1bb65118cca49fa6e3d67706e4790955ec0e74de584e45c8f1ef89f46c812bee5b5a12 + languageName: node + linkType: hard + +"bn.js@npm:^5.0.0, bn.js@npm:^5.1.1": + version: 5.2.1 + resolution: "bn.js@npm:5.2.1" + checksum: 3dd8c8d38055fedfa95c1d5fc3c99f8dd547b36287b37768db0abab3c239711f88ff58d18d155dd8ad902b0b0cee973747b7ae20ea12a09473272b0201c9edd3 + languageName: node + linkType: hard + "body-parser@npm:1.20.1": version: 1.20.1 resolution: "body-parser@npm:1.20.1" @@ -2089,17 +2137,88 @@ __metadata: languageName: node linkType: hard +"brorand@npm:^1.0.1, brorand@npm:^1.1.0": + version: 1.1.0 + resolution: "brorand@npm:1.1.0" + checksum: 8a05c9f3c4b46572dec6ef71012b1946db6cae8c7bb60ccd4b7dd5a84655db49fe043ecc6272e7ef1f69dc53d6730b9e2a3a03a8310509a3d797a618cbee52be + languageName: node + linkType: hard + +"browserify-aes@npm:^1.0.0, browserify-aes@npm:^1.0.4": + version: 1.2.0 + resolution: "browserify-aes@npm:1.2.0" + dependencies: + buffer-xor: ^1.0.3 + cipher-base: ^1.0.0 + create-hash: ^1.1.0 + evp_bytestokey: ^1.0.3 + inherits: ^2.0.1 + safe-buffer: ^5.0.1 + checksum: 4a17c3eb55a2aa61c934c286f34921933086bf6d67f02d4adb09fcc6f2fc93977b47d9d884c25619144fccd47b3b3a399e1ad8b3ff5a346be47270114bcf7104 + languageName: node + linkType: hard + +"browserify-cipher@npm:^1.0.0": + version: 1.0.1 + resolution: "browserify-cipher@npm:1.0.1" + dependencies: + browserify-aes: ^1.0.4 + browserify-des: ^1.0.0 + evp_bytestokey: ^1.0.0 + checksum: 2d8500acf1ee535e6bebe808f7a20e4c3a9e2ed1a6885fff1facbfd201ac013ef030422bec65ca9ece8ffe82b03ca580421463f9c45af6c8415fd629f4118c13 + languageName: node + linkType: hard + +"browserify-des@npm:^1.0.0": + version: 1.0.2 + resolution: "browserify-des@npm:1.0.2" + dependencies: + cipher-base: ^1.0.1 + des.js: ^1.0.0 + inherits: ^2.0.1 + safe-buffer: ^5.1.2 + checksum: b15a3e358a1d78a3b62ddc06c845d02afde6fc826dab23f1b9c016e643e7b1fda41de628d2110b712f6a44fb10cbc1800bc6872a03ddd363fb50768e010395b7 + languageName: node + linkType: hard + +"browserify-rsa@npm:^4.0.0, browserify-rsa@npm:^4.0.1": + version: 4.1.0 + resolution: "browserify-rsa@npm:4.1.0" + dependencies: + bn.js: ^5.0.0 + randombytes: ^2.0.1 + checksum: 155f0c135873efc85620571a33d884aa8810e40176125ad424ec9d85016ff105a07f6231650914a760cca66f29af0494087947b7be34880dd4599a0cd3c38e54 + languageName: node + linkType: hard + +"browserify-sign@npm:^4.0.0": + version: 4.2.1 + resolution: "browserify-sign@npm:4.2.1" + dependencies: + bn.js: ^5.1.1 + browserify-rsa: ^4.0.1 + create-hash: ^1.2.0 + create-hmac: ^1.1.7 + elliptic: ^6.5.3 + inherits: ^2.0.4 + parse-asn1: ^5.1.5 + readable-stream: ^3.6.0 + safe-buffer: ^5.2.0 + checksum: 0221f190e3f5b2d40183fa51621be7e838d9caa329fe1ba773406b7637855f37b30f5d83e52ff8f244ed12ffe6278dd9983638609ed88c841ce547e603855707 + languageName: node + linkType: hard + "browserslist@npm:^4.14.5, browserslist@npm:^4.21.3": - version: 4.21.7 - resolution: "browserslist@npm:4.21.7" + version: 4.21.8 + resolution: "browserslist@npm:4.21.8" dependencies: - caniuse-lite: ^1.0.30001489 - electron-to-chromium: ^1.4.411 + caniuse-lite: ^1.0.30001502 + electron-to-chromium: ^1.4.428 node-releases: ^2.0.12 update-browserslist-db: ^1.0.11 bin: browserslist: cli.js - checksum: 3d0d025e6d381c4db5e71b538258952660ba574c060832095f182a9877ca798836fa550736269e669a2080e486f0cfdf5d3bcf2769b9f7cf123f6c6b8c005f8f + checksum: 20ab0adafb1832bdfb19153d09a140b779b8e883ce504221c580094cc2adec691515ed304c9091300996ad35fc24e957fbfde169ba0c4a7d219b0794ad2e1556 languageName: node linkType: hard @@ -2128,6 +2247,13 @@ __metadata: languageName: node linkType: hard +"buffer-xor@npm:^1.0.3": + version: 1.0.3 + resolution: "buffer-xor@npm:1.0.3" + checksum: 10c520df29d62fa6e785e2800e586a20fc4f6dfad84bcdbd12e1e8a83856de1cb75c7ebd7abe6d036bbfab738a6cf18a3ae9c8e5a2e2eb3167ca7399ce65373a + languageName: node + linkType: hard + "buffer@npm:^6.0.3": version: 6.0.3 resolution: "buffer@npm:6.0.3" @@ -2152,29 +2278,23 @@ __metadata: languageName: node linkType: hard -"cacache@npm:^16.1.0": - version: 16.1.3 - resolution: "cacache@npm:16.1.3" +"cacache@npm:^17.0.0": + version: 17.1.3 + resolution: "cacache@npm:17.1.3" dependencies: - "@npmcli/fs": ^2.1.0 - "@npmcli/move-file": ^2.0.0 - chownr: ^2.0.0 - fs-minipass: ^2.1.0 - glob: ^8.0.1 - infer-owner: ^1.0.4 + "@npmcli/fs": ^3.1.0 + fs-minipass: ^3.0.0 + glob: ^10.2.2 lru-cache: ^7.7.1 - minipass: ^3.1.6 + minipass: ^5.0.0 minipass-collect: ^1.0.2 minipass-flush: ^1.0.5 minipass-pipeline: ^1.2.4 - mkdirp: ^1.0.4 p-map: ^4.0.0 - promise-inflight: ^1.0.1 - rimraf: ^3.0.2 - ssri: ^9.0.0 + ssri: ^10.0.0 tar: ^6.1.11 - unique-filename: ^2.0.0 - checksum: d91409e6e57d7d9a3a25e5dcc589c84e75b178ae8ea7de05cbf6b783f77a5fae938f6e8fda6f5257ed70000be27a681e1e44829251bfffe4c10216002f8f14e6 + unique-filename: ^3.0.0 + checksum: 385756781e1e21af089160d89d7462b7ed9883c978e848c7075b90b73cb823680e66092d61513050164588387d2ca87dd6d910e28d64bc13a9ac82cd8580c796 languageName: node linkType: hard @@ -2219,10 +2339,10 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.30001489": - version: 1.0.30001492 - resolution: "caniuse-lite@npm:1.0.30001492" - checksum: 261869f910ec905ab6aa5a754e4ae57da8c5c33f3b723db2fa21840da307667bff61057aef3abaca32091c1561c254dd3a807c0fdb054cdc9e7e3ba495a55e20 +"caniuse-lite@npm:^1.0.30001502": + version: 1.0.30001503 + resolution: "caniuse-lite@npm:1.0.30001503" + checksum: cd5f0af37655ff71ec4ab3c49124d75e0b8b68de625d07ea80e9a82329e616b5203d5dad6865192653be9da50081c06878f081ab069dac0be35adf29aa1599cd languageName: node linkType: hard @@ -2294,10 +2414,20 @@ __metadata: languageName: node linkType: hard +"cipher-base@npm:^1.0.0, cipher-base@npm:^1.0.1, cipher-base@npm:^1.0.3": + version: 1.0.4 + resolution: "cipher-base@npm:1.0.4" + dependencies: + inherits: ^2.0.1 + safe-buffer: ^5.0.1 + checksum: 47d3568dbc17431a339bad1fe7dff83ac0891be8206911ace3d3b818fc695f376df809bea406e759cdea07fff4b454fa25f1013e648851bec790c1d75763032e + languageName: node + linkType: hard + "cjs-module-lexer@npm:^1.0.0": - version: 1.2.2 - resolution: "cjs-module-lexer@npm:1.2.2" - checksum: 977f3f042bd4f08e368c890d91eecfbc4f91da0bc009a3c557bc4dfbf32022ad1141244ac1178d44de70fc9f3dea7add7cd9a658a34b9fae98a55d8f92331ce5 + version: 1.2.3 + resolution: "cjs-module-lexer@npm:1.2.3" + checksum: 5ea3cb867a9bb609b6d476cd86590d105f3cfd6514db38ff71f63992ab40939c2feb68967faa15a6d2b1f90daa6416b79ea2de486e9e2485a6f8b66a21b4fb0a languageName: node linkType: hard @@ -2541,6 +2671,43 @@ __metadata: languageName: node linkType: hard +"create-ecdh@npm:^4.0.0": + version: 4.0.4 + resolution: "create-ecdh@npm:4.0.4" + dependencies: + bn.js: ^4.1.0 + elliptic: ^6.5.3 + checksum: 0dd7fca9711d09e152375b79acf1e3f306d1a25ba87b8ff14c2fd8e68b83aafe0a7dd6c4e540c9ffbdd227a5fa1ad9b81eca1f233c38bb47770597ba247e614b + languageName: node + linkType: hard + +"create-hash@npm:^1.1.0, create-hash@npm:^1.1.2, create-hash@npm:^1.2.0": + version: 1.2.0 + resolution: "create-hash@npm:1.2.0" + dependencies: + cipher-base: ^1.0.1 + inherits: ^2.0.1 + md5.js: ^1.3.4 + ripemd160: ^2.0.1 + sha.js: ^2.4.0 + checksum: 02a6ae3bb9cd4afee3fabd846c1d8426a0e6b495560a977ba46120c473cb283be6aa1cace76b5f927cf4e499c6146fb798253e48e83d522feba807d6b722eaa9 + languageName: node + linkType: hard + +"create-hmac@npm:^1.1.0, create-hmac@npm:^1.1.4, create-hmac@npm:^1.1.7": + version: 1.1.7 + resolution: "create-hmac@npm:1.1.7" + dependencies: + cipher-base: ^1.0.3 + create-hash: ^1.1.0 + inherits: ^2.0.1 + ripemd160: ^2.0.0 + safe-buffer: ^5.0.1 + sha.js: ^2.4.8 + checksum: ba12bb2257b585a0396108c72830e85f882ab659c3320c83584b1037f8ab72415095167ced80dc4ce8e446a8ecc4b2acf36d87befe0707d73b26cf9dc77440ed + languageName: node + linkType: hard + "create-require@npm:^1.1.0": version: 1.1.1 resolution: "create-require@npm:1.1.1" @@ -2548,7 +2715,7 @@ __metadata: languageName: node linkType: hard -"cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3": +"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3": version: 7.0.3 resolution: "cross-spawn@npm:7.0.3" dependencies: @@ -2559,6 +2726,25 @@ __metadata: languageName: node linkType: hard +"crypto-browserify@npm:^3.12.0": + version: 3.12.0 + resolution: "crypto-browserify@npm:3.12.0" + dependencies: + browserify-cipher: ^1.0.0 + browserify-sign: ^4.0.0 + create-ecdh: ^4.0.0 + create-hash: ^1.1.0 + create-hmac: ^1.1.0 + diffie-hellman: ^5.0.0 + inherits: ^2.0.1 + pbkdf2: ^3.0.3 + public-encrypt: ^4.0.0 + randombytes: ^2.0.0 + randomfill: ^1.0.3 + checksum: c1609af82605474262f3eaa07daa0b2140026bd264ab316d4bf1170272570dbe02f0c49e29407fe0d3634f96c507c27a19a6765fb856fed854a625f9d15618e2 + languageName: node + linkType: hard + "css-select@npm:^4.1.3": version: 4.3.0 resolution: "css-select@npm:4.3.0" @@ -2658,6 +2844,16 @@ __metadata: languageName: node linkType: hard +"des.js@npm:^1.0.0": + version: 1.1.0 + resolution: "des.js@npm:1.1.0" + dependencies: + inherits: ^2.0.1 + minimalistic-assert: ^1.0.0 + checksum: 0e9c1584b70d31e20f20a613fc9ef60fbc6a147dfec9e448a168794a4b97ac04d8dc47ea008f1fa93b0f8aaf7c1ead632a5e59ce1913a6079d2d244c9f5ebe33 + languageName: node + linkType: hard + "destroy@npm:1.2.0": version: 1.2.0 resolution: "destroy@npm:1.2.0" @@ -2693,6 +2889,17 @@ __metadata: languageName: node linkType: hard +"diffie-hellman@npm:^5.0.0": + version: 5.0.3 + resolution: "diffie-hellman@npm:5.0.3" + dependencies: + bn.js: ^4.1.0 + miller-rabin: ^4.0.0 + randombytes: ^2.0.0 + checksum: 0e620f322170c41076e70181dd1c24e23b08b47dbb92a22a644f3b89b6d3834b0f8ee19e37916164e5eb1ee26d2aa836d6129f92723995267250a0b541811065 + languageName: node + linkType: hard + "dir-glob@npm:^3.0.1": version: 3.0.1 resolution: "dir-glob@npm:3.0.1" @@ -2784,6 +2991,13 @@ __metadata: languageName: node linkType: hard +"eastasianwidth@npm:^0.2.0": + version: 0.2.0 + resolution: "eastasianwidth@npm:0.2.0" + checksum: 7d00d7cd8e49b9afa762a813faac332dee781932d6f2c848dc348939c4253f1d4564341b7af1d041853bc3f32c2ef141b58e0a4d9862c17a7f08f68df1e0f1ed + languageName: node + linkType: hard + "ee-first@npm:1.1.1": version: 1.1.1 resolution: "ee-first@npm:1.1.1" @@ -2791,10 +3005,25 @@ __metadata: languageName: node linkType: hard -"electron-to-chromium@npm:^1.4.411": - version: 1.4.416 - resolution: "electron-to-chromium@npm:1.4.416" - checksum: a1804fe6f1955b3b80519bf2feb69d5e2111914e824cdacdff85545dba48da44d16f43d5fb702ff4cfc9148f7d0be7cd2669cb5e939b0ed13ee9772cae3edfd4 +"electron-to-chromium@npm:^1.4.428": + version: 1.4.430 + resolution: "electron-to-chromium@npm:1.4.430" + checksum: f5350cc693d272426f3421515e7e1fee19da2526e86565a0fcc0dcd8e8a870e1907c975669d41aca43ce729a02b61df1faf50be7edcdb6f0e1b7dab9eec20a9e + languageName: node + linkType: hard + +"elliptic@npm:^6.5.3": + version: 6.5.4 + resolution: "elliptic@npm:6.5.4" + dependencies: + bn.js: ^4.11.9 + brorand: ^1.1.0 + hash.js: ^1.0.0 + hmac-drbg: ^1.0.1 + inherits: ^2.0.4 + minimalistic-assert: ^1.0.1 + minimalistic-crypto-utils: ^1.0.1 + checksum: d56d21fd04e97869f7ffcc92e18903b9f67f2d4637a23c860492fbbff5a3155fd9ca0184ce0c865dd6eb2487d234ce9551335c021c376cd2d3b7cb749c7d10f4 languageName: node linkType: hard @@ -2812,6 +3041,13 @@ __metadata: languageName: node linkType: hard +"emoji-regex@npm:^9.2.2": + version: 9.2.2 + resolution: "emoji-regex@npm:9.2.2" + checksum: 8487182da74aabd810ac6d6f1994111dfc0e331b01271ae01ec1eb0ad7b5ecc2bbbbd2f053c05cb55a1ac30449527d819bbfbf0e3de1023db308cbcb47f86601 + languageName: node + linkType: hard + "encodeurl@npm:~1.0.2": version: 1.0.2 resolution: "encodeurl@npm:1.0.2" @@ -2829,12 +3065,12 @@ __metadata: linkType: hard "enhanced-resolve@npm:^5.0.0, enhanced-resolve@npm:^5.14.1": - version: 5.14.1 - resolution: "enhanced-resolve@npm:5.14.1" + version: 5.15.0 + resolution: "enhanced-resolve@npm:5.15.0" dependencies: graceful-fs: ^4.2.4 tapable: ^2.2.0 - checksum: ad2a31928b6649eed40d364838449587f731baa63863e83d2629bebaa8be1eabac18b90f89c1784bc805b0818363e99b22547159edd485d7e5ccf18cdc640642 + checksum: fbd8cdc9263be71cc737aa8a7d6c57b43d6aa38f6cc75dde6fcd3598a130cc465f979d2f4d01bb3bf475acb43817749c79f8eef9be048683602ca91ab52e4f11 languageName: node linkType: hard @@ -2878,9 +3114,9 @@ __metadata: linkType: hard "es-module-lexer@npm:^1.2.1": - version: 1.2.1 - resolution: "es-module-lexer@npm:1.2.1" - checksum: c4145b853e1491eaa5d591e4580926d242978c38071ad3d09165c3b6d50314cc0ae3bf6e1dec81a9e53768b9299df2063d2e4a67d7742a5029ddeae6c4fc26f0 + version: 1.3.0 + resolution: "es-module-lexer@npm:1.3.0" + checksum: 48fd9f504a9d2a894126f75c8b7ccc6273a289983e9b67255f165bfd9ae765d50100218251e94e702ca567826905ea2f7b3b4a0c4d74d3ce99cce3a2a606a238 languageName: node linkType: hard @@ -2958,14 +3194,14 @@ __metadata: linkType: hard "eslint@npm:^8.35.0": - version: 8.41.0 - resolution: "eslint@npm:8.41.0" + version: 8.42.0 + resolution: "eslint@npm:8.42.0" dependencies: "@eslint-community/eslint-utils": ^4.2.0 "@eslint-community/regexpp": ^4.4.0 "@eslint/eslintrc": ^2.0.3 - "@eslint/js": 8.41.0 - "@humanwhocodes/config-array": ^0.11.8 + "@eslint/js": 8.42.0 + "@humanwhocodes/config-array": ^0.11.10 "@humanwhocodes/module-importer": ^1.0.1 "@nodelib/fs.walk": ^1.2.8 ajv: ^6.10.0 @@ -3002,7 +3238,7 @@ __metadata: text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: 09979a6f8451dcc508a7005b6670845c8a518376280b3fd96657a406b8b6ef29d0e480d1ba11b4eb48da93d607e0c55c9b877676fe089d09973ec152354e23b2 + checksum: 07105397b5f2ff4064b983b8971e8c379ec04b1dfcc9d918976b3e00377189000161dac991d82ba14f8759e466091b8c71146f602930ca810c290ee3fcb3faf0 languageName: node linkType: hard @@ -3080,6 +3316,13 @@ __metadata: languageName: node linkType: hard +"eventemitter3@npm:^5.0.1": + version: 5.0.1 + resolution: "eventemitter3@npm:5.0.1" + checksum: 543d6c858ab699303c3c32e0f0f47fc64d360bf73c3daf0ac0b5079710e340d6fe9f15487f94e66c629f5f82cd1a8678d692f3dbb6f6fcd1190e1b97fcad36f8 + languageName: node + linkType: hard + "events@npm:^3.2.0": version: 3.3.0 resolution: "events@npm:3.3.0" @@ -3087,6 +3330,17 @@ __metadata: languageName: node linkType: hard +"evp_bytestokey@npm:^1.0.0, evp_bytestokey@npm:^1.0.3": + version: 1.0.3 + resolution: "evp_bytestokey@npm:1.0.3" + dependencies: + md5.js: ^1.3.4 + node-gyp: latest + safe-buffer: ^5.1.1 + checksum: ad4e1577f1a6b721c7800dcc7c733fe01f6c310732bb5bf2240245c2a5b45a38518b91d8be2c610611623160b9d1c0e91f1ce96d639f8b53e8894625cf20fa45 + languageName: node + linkType: hard + "execa@npm:^5.0.0": version: 5.1.1 resolution: "execa@npm:5.1.1" @@ -3124,6 +3378,13 @@ __metadata: languageName: node linkType: hard +"exponential-backoff@npm:^3.1.1": + version: 3.1.1 + resolution: "exponential-backoff@npm:3.1.1" + checksum: 3d21519a4f8207c99f7457287291316306255a328770d320b401114ec8481986e4e467e854cb9914dd965e0a1ca810a23ccb559c642c88f4c7f55c55778a9b48 + languageName: node + linkType: hard + "express@npm:^4.17.3": version: 4.18.2 resolution: "express@npm:4.18.2" @@ -3311,6 +3572,16 @@ __metadata: languageName: node linkType: hard +"foreground-child@npm:^3.1.0": + version: 3.1.1 + resolution: "foreground-child@npm:3.1.1" + dependencies: + cross-spawn: ^7.0.0 + signal-exit: ^4.0.1 + checksum: 139d270bc82dc9e6f8bc045fe2aae4001dc2472157044fdfad376d0a3457f77857fa883c1c8b21b491c6caade9a926a4bed3d3d2e8d3c9202b151a4cbbd0bcd5 + languageName: node + linkType: hard + "forwarded@npm:0.2.0": version: 0.2.0 resolution: "forwarded@npm:0.2.0" @@ -3325,7 +3596,7 @@ __metadata: languageName: node linkType: hard -"fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0": +"fs-minipass@npm:^2.0.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" dependencies: @@ -3334,7 +3605,16 @@ __metadata: languageName: node linkType: hard -"fs-monkey@npm:^1.0.3": +"fs-minipass@npm:^3.0.0": + version: 3.0.2 + resolution: "fs-minipass@npm:3.0.2" + dependencies: + minipass: ^5.0.0 + checksum: e9cc0e1f2d01c6f6f62f567aee59530aba65c6c7b2ae88c5027bc34c711ebcfcfaefd0caf254afa6adfe7d1fba16bc2537508a6235196bac7276747d078aef0a + languageName: node + linkType: hard + +"fs-monkey@npm:^1.0.4": version: 1.0.4 resolution: "fs-monkey@npm:1.0.4" checksum: 8b254c982905c0b7e028eab22b410dc35a5c0019c1c860456f5f54ae6a61666e1cb8c6b700d6c88cc873694c00953c935847b9959cc4dcf274aacb8673c1e8bf @@ -3455,6 +3735,21 @@ __metadata: languageName: node linkType: hard +"glob@npm:^10.2.2": + version: 10.2.7 + resolution: "glob@npm:10.2.7" + dependencies: + foreground-child: ^3.1.0 + jackspeak: ^2.0.3 + minimatch: ^9.0.1 + minipass: ^5.0.0 || ^6.0.2 + path-scurry: ^1.7.0 + bin: + glob: dist/cjs/src/bin.js + checksum: 555205a74607d6f8d9874ba888924b305b5ea1abfaa2e9ccb11ac713d040aac7edbf7d8702a2f4a1cd81b2d7666412170ce7ef061d33cddde189dae8c1a1a054 + languageName: node + linkType: hard + "glob@npm:^7.1.3, glob@npm:^7.1.4": version: 7.2.3 resolution: "glob@npm:7.2.3" @@ -3469,19 +3764,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:^8.0.1": - version: 8.1.0 - resolution: "glob@npm:8.1.0" - dependencies: - fs.realpath: ^1.0.0 - inflight: ^1.0.4 - inherits: 2 - minimatch: ^5.0.1 - once: ^1.3.0 - checksum: 92fbea3221a7d12075f26f0227abac435de868dd0736a17170663783296d0dd8d3d532a5672b4488a439bf5d7fb85cdd07c11185d6cd39184f0385cbdfb86a47 - languageName: node - linkType: hard - "globals@npm:^11.1.0": version: 11.12.0 resolution: "globals@npm:11.12.0" @@ -3597,6 +3879,27 @@ __metadata: languageName: node linkType: hard +"hash-base@npm:^3.0.0": + version: 3.1.0 + resolution: "hash-base@npm:3.1.0" + dependencies: + inherits: ^2.0.4 + readable-stream: ^3.6.0 + safe-buffer: ^5.2.0 + checksum: 26b7e97ac3de13cb23fc3145e7e3450b0530274a9562144fc2bf5c1e2983afd0e09ed7cc3b20974ba66039fad316db463da80eb452e7373e780cbee9a0d2f2dc + languageName: node + linkType: hard + +"hash.js@npm:^1.0.0, hash.js@npm:^1.0.3": + version: 1.1.7 + resolution: "hash.js@npm:1.1.7" + dependencies: + inherits: ^2.0.3 + minimalistic-assert: ^1.0.1 + checksum: e350096e659c62422b85fa508e4b3669017311aa4c49b74f19f8e1bc7f3a54a584fdfd45326d4964d6011f2b2d882e38bea775a96046f2a61b7779a979629d8f + languageName: node + linkType: hard + "he@npm:^1.2.0": version: 1.2.0 resolution: "he@npm:1.2.0" @@ -3606,6 +3909,17 @@ __metadata: languageName: node linkType: hard +"hmac-drbg@npm:^1.0.1": + version: 1.0.1 + resolution: "hmac-drbg@npm:1.0.1" + dependencies: + hash.js: ^1.0.3 + minimalistic-assert: ^1.0.0 + minimalistic-crypto-utils: ^1.0.1 + checksum: bd30b6a68d7f22d63f10e1888aee497d7c2c5c0bb469e66bbdac99f143904d1dfe95f8131f95b3e86c86dd239963c9d972fcbe147e7cffa00e55d18585c43fe0 + languageName: node + linkType: hard + "hpack.js@npm:^2.1.6": version: 2.1.6 resolution: "hpack.js@npm:2.1.6" @@ -3619,9 +3933,9 @@ __metadata: linkType: hard "html-entities@npm:^2.3.2": - version: 2.3.3 - resolution: "html-entities@npm:2.3.3" - checksum: 92521501da8aa5f66fee27f0f022d6e9ceae62667dae93aa6a2f636afa71ad530b7fb24a18d4d6c124c9885970cac5f8a52dbf1731741161002816ae43f98196 + version: 2.3.6 + resolution: "html-entities@npm:2.3.6" + checksum: 559a88dc3a2059b1e8882940dcaf996ea9d8151b9a780409ff223a79dc1d42ee8bb19b3365064f241f2e2543b0f90612d63f9b8e36d14c4c7fbb73540a8f41cb languageName: node linkType: hard @@ -3650,8 +3964,8 @@ __metadata: linkType: hard "html-webpack-plugin@npm:^5.5.1": - version: 5.5.1 - resolution: "html-webpack-plugin@npm:5.5.1" + version: 5.5.3 + resolution: "html-webpack-plugin@npm:5.5.3" dependencies: "@types/html-minifier-terser": ^6.0.0 html-minifier-terser: ^6.0.2 @@ -3660,7 +3974,7 @@ __metadata: tapable: ^2.0.0 peerDependencies: webpack: ^5.20.0 - checksum: f4b43271171e6374b10a49b5231bbab94610a344d58f4f7d95cd130520feb474f98006e1ab71ea102c57fe5a107b273ff7c19e7e1bc2314d611dbb791fcc0a98 + checksum: ccf685195739c372ad641bbd0c9100a847904f34eedc7aff3ece7856cd6c78fd3746d2d615af1bb71e5727993fe711b89e9b744f033ed3fde646540bf5d5e954 languageName: node linkType: hard @@ -3676,7 +3990,7 @@ __metadata: languageName: node linkType: hard -"http-cache-semantics@npm:^4.1.0": +"http-cache-semantics@npm:^4.1.1": version: 4.1.1 resolution: "http-cache-semantics@npm:4.1.1" checksum: 83ac0bc60b17a3a36f9953e7be55e5c8f41acc61b22583060e8dedc9dd5e3607c823a88d0926f9150e571f90946835c7fe150732801010845c72cd8bbff1a236 @@ -3863,13 +4177,6 @@ __metadata: languageName: node linkType: hard -"infer-owner@npm:^1.0.4": - version: 1.0.4 - resolution: "infer-owner@npm:1.0.4" - checksum: 181e732764e4a0611576466b4b87dac338972b839920b2a8cde43642e4ed6bd54dc1fb0b40874728f2a2df9a1b097b8ff83b56d5f8f8e3927f837fdcb47d8a89 - languageName: node - linkType: hard - "inflight@npm:^1.0.4": version: 1.0.6 resolution: "inflight@npm:1.0.6" @@ -3880,7 +4187,7 @@ __metadata: languageName: node linkType: hard -"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:~2.0.3": +"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.3": version: 2.0.4 resolution: "inherits@npm:2.0.4" checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1 @@ -4112,6 +4419,19 @@ __metadata: languageName: node linkType: hard +"jackspeak@npm:^2.0.3": + version: 2.2.1 + resolution: "jackspeak@npm:2.2.1" + dependencies: + "@isaacs/cliui": ^8.0.2 + "@pkgjs/parseargs": ^0.11.0 + dependenciesMeta: + "@pkgjs/parseargs": + optional: true + checksum: e29291c0d0f280a063fa18fbd1e891ab8c2d7519fd34052c0ebde38538a15c603140d60c2c7f432375ff7ee4c5f1c10daa8b2ae19a97c3d4affe308c8360c1df + languageName: node + linkType: hard + "jest-changed-files@npm:^29.5.0": version: 29.5.0 resolution: "jest-changed-files@npm:29.5.0" @@ -4769,6 +5089,13 @@ __metadata: languageName: node linkType: hard +"lru-cache@npm:^9.1.1": + version: 9.1.2 + resolution: "lru-cache@npm:9.1.2" + checksum: d3415634be3908909081fc4c56371a8d562d9081eba70543d86871b978702fffd0e9e362b83921b27a29ae2b37b90f55675aad770a54ac83bb3e4de5049d4b15 + languageName: node + linkType: hard + "make-dir@npm:^3.0.0": version: 3.1.0 resolution: "make-dir@npm:3.1.0" @@ -4785,27 +5112,26 @@ __metadata: languageName: node linkType: hard -"make-fetch-happen@npm:^10.0.3": - version: 10.2.1 - resolution: "make-fetch-happen@npm:10.2.1" +"make-fetch-happen@npm:^11.0.3": + version: 11.1.1 + resolution: "make-fetch-happen@npm:11.1.1" dependencies: agentkeepalive: ^4.2.1 - cacache: ^16.1.0 - http-cache-semantics: ^4.1.0 + cacache: ^17.0.0 + http-cache-semantics: ^4.1.1 http-proxy-agent: ^5.0.0 https-proxy-agent: ^5.0.0 is-lambda: ^1.0.1 lru-cache: ^7.7.1 - minipass: ^3.1.6 - minipass-collect: ^1.0.2 - minipass-fetch: ^2.0.3 + minipass: ^5.0.0 + minipass-fetch: ^3.0.0 minipass-flush: ^1.0.5 minipass-pipeline: ^1.2.4 negotiator: ^0.6.3 promise-retry: ^2.0.1 socks-proxy-agent: ^7.0.0 - ssri: ^9.0.0 - checksum: 2332eb9a8ec96f1ffeeea56ccefabcb4193693597b132cd110734d50f2928842e22b84cfa1508e921b8385cdfd06dda9ad68645fed62b50fff629a580f5fb72c + ssri: ^10.0.0 + checksum: 7268bf274a0f6dcf0343829489a4506603ff34bd0649c12058753900b0eb29191dce5dba12680719a5d0a983d3e57810f594a12f3c18494e93a1fbc6348a4540 languageName: node linkType: hard @@ -4818,6 +5144,17 @@ __metadata: languageName: node linkType: hard +"md5.js@npm:^1.3.4": + version: 1.3.5 + resolution: "md5.js@npm:1.3.5" + dependencies: + hash-base: ^3.0.0 + inherits: ^2.0.1 + safe-buffer: ^5.1.2 + checksum: 098494d885684bcc4f92294b18ba61b7bd353c23147fbc4688c75b45cb8590f5a95fd4584d742415dcc52487f7a1ef6ea611cfa1543b0dc4492fe026357f3f0c + languageName: node + linkType: hard + "media-typer@npm:0.3.0": version: 0.3.0 resolution: "media-typer@npm:0.3.0" @@ -4826,11 +5163,11 @@ __metadata: linkType: hard "memfs@npm:^3.4.3": - version: 3.5.1 - resolution: "memfs@npm:3.5.1" + version: 3.5.3 + resolution: "memfs@npm:3.5.3" dependencies: - fs-monkey: ^1.0.3 - checksum: fcd037566a4bbb00d61dc991858395ccc06267ab5fe9471aeff28433f2a210bf5dd999e64e8b5473f8244f00dfb7ff3221b5c2fe41ff98af1439e5e2168fc410 + fs-monkey: ^1.0.4 + checksum: 18dfdeacad7c8047b976a6ccd58bc98ba76e122ad3ca0e50a21837fe2075fc0d9aafc58ab9cf2576c2b6889da1dd2503083f2364191b695273f40969db2ecc44 languageName: node linkType: hard @@ -4872,6 +5209,18 @@ __metadata: languageName: node linkType: hard +"miller-rabin@npm:^4.0.0": + version: 4.0.1 + resolution: "miller-rabin@npm:4.0.1" + dependencies: + bn.js: ^4.0.0 + brorand: ^1.0.1 + bin: + miller-rabin: bin/miller-rabin + checksum: 00cd1ab838ac49b03f236cc32a14d29d7d28637a53096bf5c6246a032a37749c9bd9ce7360cbf55b41b89b7d649824949ff12bc8eee29ac77c6b38eada619ece + languageName: node + linkType: hard + "mime-db@npm:1.52.0, mime-db@npm:>= 1.43.0 < 2": version: 1.52.0 resolution: "mime-db@npm:1.52.0" @@ -4904,13 +5253,20 @@ __metadata: languageName: node linkType: hard -"minimalistic-assert@npm:^1.0.0": +"minimalistic-assert@npm:^1.0.0, minimalistic-assert@npm:^1.0.1": version: 1.0.1 resolution: "minimalistic-assert@npm:1.0.1" checksum: cc7974a9268fbf130fb055aff76700d7e2d8be5f761fb5c60318d0ed010d839ab3661a533ad29a5d37653133385204c503bfac995aaa4236f4e847461ea32ba7 languageName: node linkType: hard +"minimalistic-crypto-utils@npm:^1.0.1": + version: 1.0.1 + resolution: "minimalistic-crypto-utils@npm:1.0.1" + checksum: 6e8a0422b30039406efd4c440829ea8f988845db02a3299f372fceba56ffa94994a9c0f2fd70c17f9969eedfbd72f34b5070ead9656a34d3f71c0bd72583a0ed + languageName: node + linkType: hard + "minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": version: 3.1.2 resolution: "minimatch@npm:3.1.2" @@ -4920,12 +5276,12 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^5.0.1": - version: 5.1.6 - resolution: "minimatch@npm:5.1.6" +"minimatch@npm:^9.0.1": + version: 9.0.1 + resolution: "minimatch@npm:9.0.1" dependencies: brace-expansion: ^2.0.1 - checksum: 7564208ef81d7065a370f788d337cd80a689e981042cb9a1d0e6580b6c6a8c9279eba80010516e258835a988363f99f54a6f711a315089b8b42694f5da9d0d77 + checksum: 97f5f5284bb57dc65b9415dec7f17a0f6531a33572193991c60ff18450dcfad5c2dad24ffeaf60b5261dccd63aae58cc3306e2209d57e7f88c51295a532d8ec3 languageName: node linkType: hard @@ -4938,18 +5294,18 @@ __metadata: languageName: node linkType: hard -"minipass-fetch@npm:^2.0.3": - version: 2.1.2 - resolution: "minipass-fetch@npm:2.1.2" +"minipass-fetch@npm:^3.0.0": + version: 3.0.3 + resolution: "minipass-fetch@npm:3.0.3" dependencies: encoding: ^0.1.13 - minipass: ^3.1.6 + minipass: ^5.0.0 minipass-sized: ^1.0.3 minizlib: ^2.1.2 dependenciesMeta: encoding: optional: true - checksum: 3f216be79164e915fc91210cea1850e488793c740534985da017a4cbc7a5ff50506956d0f73bb0cb60e4fe91be08b6b61ef35101706d3ef5da2c8709b5f08f91 + checksum: af5ab2552a16fcf505d35fd7ffb84b57f4a0eeb269e6e1d9a2a75824dda48b36e527083250b7cca4a4def21d9544e2ade441e4730e233c0bc2133f6abda31e18 languageName: node linkType: hard @@ -4980,7 +5336,7 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^3.0.0, minipass@npm:^3.1.1, minipass@npm:^3.1.6": +"minipass@npm:^3.0.0": version: 3.3.6 resolution: "minipass@npm:3.3.6" dependencies: @@ -4996,6 +5352,13 @@ __metadata: languageName: node linkType: hard +"minipass@npm:^5.0.0 || ^6.0.2": + version: 6.0.2 + resolution: "minipass@npm:6.0.2" + checksum: d140b91f4ab2e5ce5a9b6c468c0e82223504acc89114c1a120d4495188b81fedf8cade72a9f4793642b4e66672f990f1e0d902dd858485216a07cd3c8a62fac9 + languageName: node + linkType: hard + "minizlib@npm:^2.1.1, minizlib@npm:^2.1.2": version: 2.1.2 resolution: "minizlib@npm:2.1.2" @@ -5006,7 +5369,7 @@ __metadata: languageName: node linkType: hard -"mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4": +"mkdirp@npm:^1.0.3": version: 1.0.4 resolution: "mkdirp@npm:1.0.4" bin: @@ -5094,13 +5457,14 @@ __metadata: linkType: hard "node-gyp@npm:latest": - version: 9.3.1 - resolution: "node-gyp@npm:9.3.1" + version: 9.4.0 + resolution: "node-gyp@npm:9.4.0" dependencies: env-paths: ^2.2.0 + exponential-backoff: ^3.1.1 glob: ^7.1.4 graceful-fs: ^4.2.6 - make-fetch-happen: ^10.0.3 + make-fetch-happen: ^11.0.3 nopt: ^6.0.0 npmlog: ^6.0.0 rimraf: ^3.0.2 @@ -5109,7 +5473,7 @@ __metadata: which: ^2.0.2 bin: node-gyp: bin/node-gyp.js - checksum: b860e9976fa645ca0789c69e25387401b4396b93c8375489b5151a6c55cf2640a3b6183c212b38625ef7c508994930b72198338e3d09b9d7ade5acc4aaf51ea7 + checksum: 78b404e2e0639d64e145845f7f5a3cb20c0520cdaf6dda2f6e025e9b644077202ea7de1232396ba5bde3fee84cdc79604feebe6ba3ec84d464c85d407bb5da99 languageName: node linkType: hard @@ -5248,6 +5612,13 @@ __metadata: languageName: node linkType: hard +"os-browserify@npm:^0.3.0": + version: 0.3.0 + resolution: "os-browserify@npm:0.3.0" + checksum: 16e37ba3c0e6a4c63443c7b55799ce4066d59104143cb637ecb9fce586d5da319cdca786ba1c867abbe3890d2cbf37953f2d51eea85e20dd6c4570d6c54bfebf + languageName: node + linkType: hard + "p-limit@npm:^2.2.0": version: 2.3.0 resolution: "p-limit@npm:2.3.0" @@ -5329,6 +5700,19 @@ __metadata: languageName: node linkType: hard +"parse-asn1@npm:^5.0.0, parse-asn1@npm:^5.1.5": + version: 5.1.6 + resolution: "parse-asn1@npm:5.1.6" + dependencies: + asn1.js: ^5.2.0 + browserify-aes: ^1.0.0 + evp_bytestokey: ^1.0.0 + pbkdf2: ^3.0.3 + safe-buffer: ^5.1.1 + checksum: 9243311d1f88089bc9f2158972aa38d1abd5452f7b7cabf84954ed766048fe574d434d82c6f5a39b988683e96fb84cd933071dda38927e03469dc8c8d14463c7 + languageName: node + linkType: hard + "parse-json@npm:^5.2.0": version: 5.2.0 resolution: "parse-json@npm:5.2.0" @@ -5358,6 +5742,13 @@ __metadata: languageName: node linkType: hard +"path-browserify@npm:^1.0.1": + version: 1.0.1 + resolution: "path-browserify@npm:1.0.1" + checksum: c6d7fa376423fe35b95b2d67990060c3ee304fc815ff0a2dc1c6c3cfaff2bd0d572ee67e18f19d0ea3bbe32e8add2a05021132ac40509416459fffee35200699 + languageName: node + linkType: hard + "path-exists@npm:^4.0.0": version: 4.0.0 resolution: "path-exists@npm:4.0.0" @@ -5386,6 +5777,16 @@ __metadata: languageName: node linkType: hard +"path-scurry@npm:^1.7.0": + version: 1.9.2 + resolution: "path-scurry@npm:1.9.2" + dependencies: + lru-cache: ^9.1.1 + minipass: ^5.0.0 || ^6.0.2 + checksum: 92888dfb68e285043c6d3291c8e971d5d2bc2f5082f4d7b5392896f34be47024c9d0a8b688dd7ae6d125acc424699195474927cb4f00049a9b1ec7c4256fa8e0 + languageName: node + linkType: hard + "path-to-regexp@npm:0.1.7": version: 0.1.7 resolution: "path-to-regexp@npm:0.1.7" @@ -5400,6 +5801,19 @@ __metadata: languageName: node linkType: hard +"pbkdf2@npm:^3.0.3": + version: 3.1.2 + resolution: "pbkdf2@npm:3.1.2" + dependencies: + create-hash: ^1.1.2 + create-hmac: ^1.1.4 + ripemd160: ^2.0.1 + safe-buffer: ^5.0.1 + sha.js: ^2.4.8 + checksum: 2c950a100b1da72123449208e231afc188d980177d021d7121e96a2de7f2abbc96ead2b87d03d8fe5c318face097f203270d7e27908af9f471c165a4e8e69c92 + languageName: node + linkType: hard + "picocolors@npm:^1.0.0": version: 1.0.0 resolution: "picocolors@npm:1.0.0" @@ -5474,13 +5888,6 @@ __metadata: languageName: node linkType: hard -"promise-inflight@npm:^1.0.1": - version: 1.0.1 - resolution: "promise-inflight@npm:1.0.1" - checksum: 22749483091d2c594261517f4f80e05226d4d5ecc1fc917e1886929da56e22b5718b7f2a75f3807e7a7d471bc3be2907fe92e6e8f373ddf5c64bae35b5af3981 - languageName: node - linkType: hard - "promise-retry@npm:^2.0.1": version: 2.0.1 resolution: "promise-retry@npm:2.0.1" @@ -5511,6 +5918,27 @@ __metadata: languageName: node linkType: hard +"public-encrypt@npm:^4.0.0": + version: 4.0.3 + resolution: "public-encrypt@npm:4.0.3" + dependencies: + bn.js: ^4.1.0 + browserify-rsa: ^4.0.0 + create-hash: ^1.1.0 + parse-asn1: ^5.0.0 + randombytes: ^2.0.1 + safe-buffer: ^5.1.2 + checksum: 215d446e43cef021a20b67c1df455e5eea134af0b1f9b8a35f9e850abf32991b0c307327bc5b9bc07162c288d5cdb3d4a783ea6c6640979ed7b5017e3e0c9935 + languageName: node + linkType: hard + +"punycode@npm:^1.4.1": + version: 1.4.1 + resolution: "punycode@npm:1.4.1" + checksum: fa6e698cb53db45e4628559e557ddaf554103d2a96a1d62892c8f4032cd3bc8871796cae9eabc1bc700e2b6677611521ce5bb1d9a27700086039965d0cf34518 + languageName: node + linkType: hard + "punycode@npm:^2.1.0": version: 2.3.0 resolution: "punycode@npm:2.3.0" @@ -5534,6 +5962,15 @@ __metadata: languageName: node linkType: hard +"qs@npm:^6.11.0": + version: 6.11.2 + resolution: "qs@npm:6.11.2" + dependencies: + side-channel: ^1.0.4 + checksum: e812f3c590b2262548647d62f1637b6989cc56656dc960b893fe2098d96e1bd633f36576f4cd7564dfbff9db42e17775884db96d846bebe4f37420d073ecdc0b + languageName: node + linkType: hard + "queue-microtask@npm:^1.2.2": version: 1.2.3 resolution: "queue-microtask@npm:1.2.3" @@ -5541,7 +5978,7 @@ __metadata: languageName: node linkType: hard -"randombytes@npm:^2.1.0": +"randombytes@npm:^2.0.0, randombytes@npm:^2.0.1, randombytes@npm:^2.0.5, randombytes@npm:^2.1.0": version: 2.1.0 resolution: "randombytes@npm:2.1.0" dependencies: @@ -5550,6 +5987,16 @@ __metadata: languageName: node linkType: hard +"randomfill@npm:^1.0.3": + version: 1.0.4 + resolution: "randomfill@npm:1.0.4" + dependencies: + randombytes: ^2.0.5 + safe-buffer: ^5.1.0 + checksum: 33734bb578a868d29ee1b8555e21a36711db084065d94e019a6d03caa67debef8d6a1bfd06a2b597e32901ddc761ab483a85393f0d9a75838f1912461d4dbfc7 + languageName: node + linkType: hard + "range-parser@npm:^1.2.1, range-parser@npm:~1.2.1": version: 1.2.1 resolution: "range-parser@npm:1.2.1" @@ -5760,6 +6207,16 @@ __metadata: languageName: node linkType: hard +"ripemd160@npm:^2.0.0, ripemd160@npm:^2.0.1": + version: 2.0.2 + resolution: "ripemd160@npm:2.0.2" + dependencies: + hash-base: ^3.0.0 + inherits: ^2.0.1 + checksum: 006accc40578ee2beae382757c4ce2908a826b27e2b079efdcd2959ee544ddf210b7b5d7d5e80467807604244e7388427330f5c6d4cd61e6edaddc5773ccc393 + languageName: node + linkType: hard + "run-parallel@npm:^1.1.9": version: 1.2.0 resolution: "run-parallel@npm:1.2.0" @@ -5776,14 +6233,14 @@ __metadata: languageName: node linkType: hard -"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.1.0, safe-buffer@npm:~5.2.0": +"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491 languageName: node linkType: hard -"safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0": +"safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.1.0": version: 2.1.2 resolution: "safer-buffer@npm:2.1.2" checksum: cab8f25ae6f1434abee8d80023d7e72b598cf1327164ddab31003c51215526801e40b66c5e65d658a0af1e9d6478cadcb4c745f4bd6751f97d8644786c0978b0 @@ -5791,25 +6248,25 @@ __metadata: linkType: hard "schema-utils@npm:^3.1.1, schema-utils@npm:^3.1.2": - version: 3.1.2 - resolution: "schema-utils@npm:3.1.2" + version: 3.3.0 + resolution: "schema-utils@npm:3.3.0" dependencies: "@types/json-schema": ^7.0.8 ajv: ^6.12.5 ajv-keywords: ^3.5.2 - checksum: 39683edfe3beff018cdb1ae4fa296fc55cea13a080aa2b4d9351895cd64b22ba4d87e2e548c2a2ac1bc76e60980670adb0f413a58104479f1a0c12e5663cb8ca + checksum: ea56971926fac2487f0757da939a871388891bc87c6a82220d125d587b388f1704788f3706e7f63a7b70e49fc2db974c41343528caea60444afd5ce0fe4b85c0 languageName: node linkType: hard "schema-utils@npm:^4.0.0": - version: 4.0.1 - resolution: "schema-utils@npm:4.0.1" + version: 4.2.0 + resolution: "schema-utils@npm:4.2.0" dependencies: "@types/json-schema": ^7.0.9 ajv: ^8.9.0 ajv-formats: ^2.1.1 ajv-keywords: ^5.1.0 - checksum: 745e7293c6b6c84940de16753c207311da821aa9911b9e2d158cfd9ffc5bf1f880147abbbe775b96cb8cd3c7f48890950fe0164f54eed9a8aabb948ebf8a3fdd + checksum: 26a0463d47683258106e6652e9aeb0823bf0b85843039e068b57da1892f7ae6b6b1094d48e9ed5ba5cbe9f7166469d880858b9d91abe8bd249421eb813850cde languageName: node linkType: hard @@ -5927,6 +6384,18 @@ __metadata: languageName: node linkType: hard +"sha.js@npm:^2.4.0, sha.js@npm:^2.4.8": + version: 2.4.11 + resolution: "sha.js@npm:2.4.11" + dependencies: + inherits: ^2.0.1 + safe-buffer: ^5.0.1 + bin: + sha.js: ./bin.js + checksum: ebd3f59d4b799000699097dadb831c8e3da3eb579144fd7eb7a19484cbcbb7aca3c68ba2bb362242eb09e33217de3b4ea56e4678184c334323eca24a58e3ad07 + languageName: node + linkType: hard + "shallow-clone@npm:^3.0.0": version: 3.0.1 resolution: "shallow-clone@npm:3.0.1" @@ -5977,6 +6446,13 @@ __metadata: languageName: node linkType: hard +"signal-exit@npm:^4.0.1": + version: 4.0.2 + resolution: "signal-exit@npm:4.0.2" + checksum: 41f5928431cc6e91087bf0343db786a6313dd7c6fd7e551dbc141c95bb5fb26663444fd9df8ea47c5d7fc202f60aa7468c3162a9365cbb0615fc5e1b1328fe31 + languageName: node + linkType: hard + "sisteransi@npm:^1.0.5": version: 1.0.5 resolution: "sisteransi@npm:1.0.5" @@ -6098,12 +6574,12 @@ __metadata: languageName: node linkType: hard -"ssri@npm:^9.0.0": - version: 9.0.1 - resolution: "ssri@npm:9.0.1" +"ssri@npm:^10.0.0": + version: 10.0.4 + resolution: "ssri@npm:10.0.4" dependencies: - minipass: ^3.1.1 - checksum: fb58f5e46b6923ae67b87ad5ef1c5ab6d427a17db0bead84570c2df3cd50b4ceb880ebdba2d60726588272890bae842a744e1ecce5bd2a2a582fccd5068309eb + minipass: ^5.0.0 + checksum: fb14da9f8a72b04eab163eb13a9dda11d5962cd2317f85457c4e0b575e9a6e0e3a6a87b5bf122c75cb36565830cd5f263fb457571bf6f1587eb5f95d095d6165 languageName: node linkType: hard @@ -6140,7 +6616,7 @@ __metadata: languageName: node linkType: hard -"string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3": +"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3": version: 4.2.3 resolution: "string-width@npm:4.2.3" dependencies: @@ -6151,6 +6627,17 @@ __metadata: languageName: node linkType: hard +"string-width@npm:^5.0.1, string-width@npm:^5.1.2": + version: 5.1.2 + resolution: "string-width@npm:5.1.2" + dependencies: + eastasianwidth: ^0.2.0 + emoji-regex: ^9.2.2 + strip-ansi: ^7.0.1 + checksum: 7369deaa29f21dda9a438686154b62c2c5f661f8dda60449088f9f980196f7908fc39fdd1803e3e01541970287cf5deae336798337e9319a7055af89dafa7193 + languageName: node + linkType: hard + "string_decoder@npm:^1.1.1": version: 1.3.0 resolution: "string_decoder@npm:1.3.0" @@ -6169,7 +6656,7 @@ __metadata: languageName: node linkType: hard -"strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1": version: 6.0.1 resolution: "strip-ansi@npm:6.0.1" dependencies: @@ -6178,6 +6665,15 @@ __metadata: languageName: node linkType: hard +"strip-ansi@npm:^7.0.1": + version: 7.1.0 + resolution: "strip-ansi@npm:7.1.0" + dependencies: + ansi-regex: ^6.0.1 + checksum: 859c73fcf27869c22a4e4d8c6acfe690064659e84bef9458aa6d13719d09ca88dcfd40cbf31fd0be63518ea1a643fe070b4827d353e09533a5b0b9fd4553d64d + languageName: node + linkType: hard + "strip-bom@npm:^4.0.0": version: 4.0.0 resolution: "strip-bom@npm:4.0.0" @@ -6277,16 +6773,16 @@ __metadata: linkType: hard "terser@npm:^5.10.0, terser@npm:^5.16.8": - version: 5.17.6 - resolution: "terser@npm:5.17.6" + version: 5.18.0 + resolution: "terser@npm:5.18.0" dependencies: - "@jridgewell/source-map": ^0.3.2 - acorn: ^8.5.0 + "@jridgewell/source-map": ^0.3.3 + acorn: ^8.8.2 commander: ^2.20.0 source-map-support: ~0.5.20 bin: terser: bin/terser - checksum: 9c0ab0261a99a61c5f53d05d4ecc7f68c552bae6af481464fdd596bc9d7e89ce8e21b1833cb3ce06ad5f658e2b226081d543e4fe6e324b2cdf03ee8b7eeec01a + checksum: d01eb9805a978b3338b68fd2d9e35c1cd4cad78ea093dc92c7b3c38965232f0af0f95e0c6d90920ecf600a74135c608aebae26302c036c01393a590e1918bb90 languageName: node linkType: hard @@ -6446,9 +6942,9 @@ __metadata: linkType: hard "tslib@npm:^2.0.3, tslib@npm:^2.4.0": - version: 2.5.2 - resolution: "tslib@npm:2.5.2" - checksum: 4d3c1e238b94127ed0e88aa0380db3c2ddae581dc0f4bae5a982345e9f50ee5eda90835b8bfba99b02df10a5734470be197158c36f9129ac49fdc14a6a9da222 + version: 2.5.3 + resolution: "tslib@npm:2.5.3" + checksum: 88902b309afaf83259131c1e13da1dceb0ad1682a213143a1346a649143924d78cf3760c448b84d796938fd76127183894f8d85cbb3bf9c4fddbfcc140c0003c languageName: node linkType: hard @@ -6504,40 +7000,40 @@ __metadata: linkType: hard "typescript@npm:^5.0.4": - version: 5.0.4 - resolution: "typescript@npm:5.0.4" + version: 5.1.3 + resolution: "typescript@npm:5.1.3" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 82b94da3f4604a8946da585f7d6c3025fff8410779e5bde2855ab130d05e4fd08938b9e593b6ebed165bda6ad9292b230984f10952cf82f0a0ca07bbeaa08172 + checksum: d9d51862d98efa46534f2800a1071a613751b1585dc78884807d0c179bcd93d6e9d4012a508e276742f5f33c480adefc52ffcafaf9e0e00ab641a14cde9a31c7 languageName: node linkType: hard "typescript@patch:typescript@^5.0.4#~builtin": - version: 5.0.4 - resolution: "typescript@patch:typescript@npm%3A5.0.4#~builtin::version=5.0.4&hash=85af82" + version: 5.1.3 + resolution: "typescript@patch:typescript@npm%3A5.1.3#~builtin::version=5.1.3&hash=85af82" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: bb309d320c59a26565fb3793dba550576ab861018ff3fd1b7fccabbe46ae4a35546bc45f342c0a0b6f265c801ccdf64ffd68f548f117ceb7f0eac4b805cd52a9 + checksum: 32a25b2e128a4616f999d4ee502aabb1525d5647bc8955e6edf05d7fbc53af8aa98252e2f6ba80bcedfc0260c982b885f3c09cfac8bb65d2924f3133ad1e1e62 languageName: node linkType: hard -"unique-filename@npm:^2.0.0": - version: 2.0.1 - resolution: "unique-filename@npm:2.0.1" +"unique-filename@npm:^3.0.0": + version: 3.0.0 + resolution: "unique-filename@npm:3.0.0" dependencies: - unique-slug: ^3.0.0 - checksum: 807acf3381aff319086b64dc7125a9a37c09c44af7620bd4f7f3247fcd5565660ac12d8b80534dcbfd067e6fe88a67e621386dd796a8af828d1337a8420a255f + unique-slug: ^4.0.0 + checksum: 8e2f59b356cb2e54aab14ff98a51ac6c45781d15ceaab6d4f1c2228b780193dc70fae4463ce9e1df4479cb9d3304d7c2043a3fb905bdeca71cc7e8ce27e063df languageName: node linkType: hard -"unique-slug@npm:^3.0.0": - version: 3.0.0 - resolution: "unique-slug@npm:3.0.0" +"unique-slug@npm:^4.0.0": + version: 4.0.0 + resolution: "unique-slug@npm:4.0.0" dependencies: imurmurhash: ^0.1.4 - checksum: 49f8d915ba7f0101801b922062ee46b7953256c93ceca74303bd8e6413ae10aa7e8216556b54dc5382895e8221d04f1efaf75f945c2e4a515b4139f77aa6640c + checksum: 0884b58365af59f89739e6f71e3feacb5b1b41f2df2d842d0757933620e6de08eff347d27e9d499b43c40476cbaf7988638d3acb2ffbcb9d35fd035591adfd15 languageName: node linkType: hard @@ -6571,6 +7067,16 @@ __metadata: languageName: node linkType: hard +"url@npm:^0.11.1": + version: 0.11.1 + resolution: "url@npm:0.11.1" + dependencies: + punycode: ^1.4.1 + qs: ^6.11.0 + checksum: a7de4b37bbcbe60ef199acda4ce437ef843c0ef3a4b34ec3e3d97e0446a5f50dc7bfeafbe33ad118cf4e5aa04805e1328f0d0126e254f2b77bb8498fa395c596 + languageName: node + linkType: hard + "util-deprecate@npm:^1.0.1, util-deprecate@npm:~1.0.1": version: 1.0.2 resolution: "util-deprecate@npm:1.0.2" @@ -6655,13 +7161,13 @@ __metadata: linkType: hard "webpack-cli@npm:^5.1.1": - version: 5.1.1 - resolution: "webpack-cli@npm:5.1.1" + version: 5.1.4 + resolution: "webpack-cli@npm:5.1.4" dependencies: "@discoveryjs/json-ext": ^0.5.0 - "@webpack-cli/configtest": ^2.1.0 - "@webpack-cli/info": ^2.0.1 - "@webpack-cli/serve": ^2.0.4 + "@webpack-cli/configtest": ^2.1.1 + "@webpack-cli/info": ^2.0.2 + "@webpack-cli/serve": ^2.0.5 colorette: ^2.0.14 commander: ^10.0.1 cross-spawn: ^7.0.3 @@ -6682,7 +7188,7 @@ __metadata: optional: true bin: webpack-cli: bin/cli.js - checksum: 7738e6a84a0098886e1e0c0fd0dab44b7dedfbb0580afbb5ef734c5109dcaee80140bebb5d9f4b40f425029563bb09bcbda8b08d904fa14e60ff632e6dcc8a17 + checksum: 3a4ad0d0342a6815c850ee4633cc2a8a5dae04f918e7847f180bf24ab400803cf8a8943707ffbed03eb20fe6ce647f996f60a2aade87b0b4a9954da3da172ce0 languageName: node linkType: hard @@ -6702,8 +7208,8 @@ __metadata: linkType: hard "webpack-dev-server@npm:^4.15.0": - version: 4.15.0 - resolution: "webpack-dev-server@npm:4.15.0" + version: 4.15.1 + resolution: "webpack-dev-server@npm:4.15.1" dependencies: "@types/bonjour": ^3.5.9 "@types/connect-history-api-fallback": ^1.3.5 @@ -6711,7 +7217,7 @@ __metadata: "@types/serve-index": ^1.9.1 "@types/serve-static": ^1.13.10 "@types/sockjs": ^0.3.33 - "@types/ws": ^8.5.1 + "@types/ws": ^8.5.5 ansi-html-community: ^0.0.8 bonjour-service: ^1.0.11 chokidar: ^3.5.3 @@ -6744,7 +7250,7 @@ __metadata: optional: true bin: webpack-dev-server: bin/webpack-dev-server.js - checksum: 6fe375089b061be2e4ed6d6a8b20743734d304cd0c34757271c6685f97642b028f253c627f899b629c97c067c294484f906e394fd1c104ee795237b8725f2701 + checksum: cd0063b068d2b938fd76c412d555374186ac2fa84bbae098265212ed50a5c15d6f03aa12a5a310c544a242943eb58c0bfde4c296d5c36765c182f53799e1bc71 languageName: node linkType: hard @@ -6766,8 +7272,8 @@ __metadata: linkType: hard "webpack@npm:^5.82.1": - version: 5.85.0 - resolution: "webpack@npm:5.85.0" + version: 5.86.0 + resolution: "webpack@npm:5.86.0" dependencies: "@types/eslint-scope": ^3.7.3 "@types/estree": ^1.0.0 @@ -6798,7 +7304,7 @@ __metadata: optional: true bin: webpack: bin/webpack.js - checksum: b013be9fbc7f6810d1f229f570c70710ddbc7290f817411acffe4214b2b6c783a041ab1f2005d9e1109f4ab21c136f0f8d8c067a5fb64f20a82dcbc1ee0d3f42 + checksum: 682b1aa8328bb9d52ae66a1d0a1078af88f9e3b3b3a9c9e1ce203e669581a8e61d522420ef253130eacd510d24d7275b840c1311d50bd048d6fd7c1af186ce55 languageName: node linkType: hard @@ -6854,7 +7360,7 @@ __metadata: languageName: node linkType: hard -"wrap-ansi@npm:^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0, wrap-ansi@npm:^7.0.0": version: 7.0.0 resolution: "wrap-ansi@npm:7.0.0" dependencies: @@ -6865,6 +7371,17 @@ __metadata: languageName: node linkType: hard +"wrap-ansi@npm:^8.1.0": + version: 8.1.0 + resolution: "wrap-ansi@npm:8.1.0" + dependencies: + ansi-styles: ^6.1.0 + string-width: ^5.0.1 + strip-ansi: ^7.0.1 + checksum: 371733296dc2d616900ce15a0049dca0ef67597d6394c57347ba334393599e800bab03c41d4d45221b6bc967b8c453ec3ae4749eff3894202d16800fdfe0e238 + languageName: node + linkType: hard + "wrappy@npm:1": version: 1.0.2 resolution: "wrappy@npm:1.0.2" From 5cda723623f027dfeca28b4bb93e5f57665dccbe Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 16 Jun 2023 23:43:14 +0000 Subject: [PATCH 06/88] Enable browser imports --- ts/src/barretenberg_wasm/barretenberg_wasm.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ts/src/barretenberg_wasm/barretenberg_wasm.ts b/ts/src/barretenberg_wasm/barretenberg_wasm.ts index 4828856e2f..6f13014f07 100644 --- a/ts/src/barretenberg_wasm/barretenberg_wasm.ts +++ b/ts/src/barretenberg_wasm/barretenberg_wasm.ts @@ -1,3 +1,5 @@ +// TODO: fix this file for browser (worker_thread and events are not compatible) + import { type Worker } from 'worker_threads'; import { EventEmitter } from 'events'; import createDebug from 'debug'; @@ -5,8 +7,15 @@ import { Remote, proxy } from 'comlink'; import { randomBytes } from '../random/index.js'; // Webpack config swaps this import with ./browser/index.js // You can toggle between these two imports to sanity check the type-safety. -import { fetchCode, getNumCpu, createWorker, getRemoteBarretenbergWasm, threadLogger, killSelf } from './node/index.js'; -// import { fetchCode, getNumCpu, createWorker, randomBytes } from './browser/index.js'; +// import { fetchCode, getNumCpu, createWorker, getRemoteBarretenbergWasm, threadLogger, killSelf } from './node/index.js'; +import { + fetchCode, + getNumCpu, + createWorker, + getRemoteBarretenbergWasm, + threadLogger, + killSelf, +} from './browser/index.js'; const debug = createDebug('bb.js:wasm'); From d5b9d561f862756e4c4ef478058dabdb1d3f1021 Mon Sep 17 00:00:00 2001 From: jonybur Date: Sun, 18 Jun 2023 18:52:35 +0000 Subject: [PATCH 07/88] Remove comment --- ts/src/types/point.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/ts/src/types/point.ts b/ts/src/types/point.ts index 830d313cbd..8ab9efbf4c 100644 --- a/ts/src/types/point.ts +++ b/ts/src/types/point.ts @@ -1,5 +1,3 @@ -// TODO: fix this file for browser (already did) - import { Fr } from './index.js'; import { BufferReader } from '../serialize/buffer_reader.js'; From 914b96ddb395bddc59f38e4d35c2100f57211602 Mon Sep 17 00:00:00 2001 From: jonybur Date: Sun, 18 Jun 2023 18:53:18 +0000 Subject: [PATCH 08/88] Fixes to allow compilation (wip) --- .../barretenberg_wasm.test.ts | 2 +- ts/src/crs/index.ts | 2 +- ts/src/examples/simple.rawtest.ts | 56 +++++++++---------- ts/src/index.html | 9 --- ts/src/random/index.ts | 2 +- ts/tsconfig.json | 14 ++--- 6 files changed, 35 insertions(+), 50 deletions(-) delete mode 100644 ts/src/index.html diff --git a/ts/src/barretenberg_wasm/barretenberg_wasm.test.ts b/ts/src/barretenberg_wasm/barretenberg_wasm.test.ts index 55d088fa13..78105e9acf 100644 --- a/ts/src/barretenberg_wasm/barretenberg_wasm.test.ts +++ b/ts/src/barretenberg_wasm/barretenberg_wasm.test.ts @@ -28,7 +28,7 @@ describe('barretenberg wasm', () => { }); describe('barretenberg wasm worker', () => { - let worker!: Worker; + let worker!: any; let wasm!: BarretenbergWasmWorker; beforeAll(async () => { diff --git a/ts/src/crs/index.ts b/ts/src/crs/index.ts index a2f1ee4ca6..ecb4869891 100644 --- a/ts/src/crs/index.ts +++ b/ts/src/crs/index.ts @@ -1 +1 @@ -export { Crs } from './node/index.js'; +export { Crs } from './browser/index.js'; diff --git a/ts/src/examples/simple.rawtest.ts b/ts/src/examples/simple.rawtest.ts index 179489ac95..b1f2ef7570 100644 --- a/ts/src/examples/simple.rawtest.ts +++ b/ts/src/examples/simple.rawtest.ts @@ -1,37 +1,37 @@ -import { Crs } from '../crs/index.js'; -import createDebug from 'debug'; -import { newBarretenbergApiAsync } from '../factory/index.js'; -import { RawBuffer } from '../types/index.js'; +// import { Crs } from '../crs/index.js'; +// import createDebug from 'debug'; +// import { newBarretenbergApiAsync } from '../factory/index.js'; +// import { RawBuffer } from '../types/index.js'; -createDebug.enable('*'); -const debug = createDebug('simple_test'); +// createDebug.enable('*'); +// const debug = createDebug('simple_test'); -async function main() { - const CIRCUIT_SIZE = 2 ** 19; +// async function main() { +// const CIRCUIT_SIZE = 2 ** 19; - debug('starting test...'); - const api = await newBarretenbergApiAsync(); +// debug('starting test...'); +// const api = await newBarretenbergApiAsync(); - // Important to init slab allocator as first thing, to ensure maximum memory efficiency. - await api.commonInitSlabAllocator(CIRCUIT_SIZE); +// // Important to init slab allocator as first thing, to ensure maximum memory efficiency. +// await api.commonInitSlabAllocator(CIRCUIT_SIZE); - // Plus 1 needed! - const crs = await Crs.new(CIRCUIT_SIZE + 1); - await api.srsInitSrs(new RawBuffer(crs.getG1Data()), crs.numPoints, new RawBuffer(crs.getG2Data())); +// // Plus 1 needed! +// const crs = await Crs.new(CIRCUIT_SIZE + 1); +// await api.srsInitSrs(new RawBuffer(crs.getG1Data()), crs.numPoints, new RawBuffer(crs.getG2Data())); - const iterations = 10; - let totalTime = 0; - for (let i = 0; i < iterations; ++i) { - const start = new Date().getTime(); - debug(`iteration ${i} starting...`); - await api.examplesSimpleCreateAndVerifyProof(); - totalTime += new Date().getTime() - start; - } +// const iterations = 10; +// let totalTime = 0; +// for (let i = 0; i < iterations; ++i) { +// const start = new Date().getTime(); +// debug(`iteration ${i} starting...`); +// await api.examplesSimpleCreateAndVerifyProof(); +// totalTime += new Date().getTime() - start; +// } - await api.destroy(); +// await api.destroy(); - debug(`avg iteration time: ${totalTime / iterations}ms`); - debug('test complete.'); -} +// debug(`avg iteration time: ${totalTime / iterations}ms`); +// debug('test complete.'); +// } -void main(); +// void main(); diff --git a/ts/src/index.html b/ts/src/index.html deleted file mode 100644 index 391918ac2e..0000000000 --- a/ts/src/index.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - My App - - - - - diff --git a/ts/src/random/index.ts b/ts/src/random/index.ts index 950c3e0067..1c1237774a 100644 --- a/ts/src/random/index.ts +++ b/ts/src/random/index.ts @@ -1 +1 @@ -export * from './node/index.js'; +export * from './browser/index.js'; diff --git a/ts/tsconfig.json b/ts/tsconfig.json index f3773993cb..8d45eba41a 100644 --- a/ts/tsconfig.json +++ b/ts/tsconfig.json @@ -1,13 +1,9 @@ { "compilerOptions": { "target": "es2020", - "lib": [ - "dom", - "esnext", - "es2017.object" - ], + "lib": ["dom", "esnext", "es2017.object"], "module": "NodeNext", - "strict": true, + "strict": false, "declaration": true, "allowSyntheticDefaultImports": true, "esModuleInterop": true, @@ -21,7 +17,5 @@ "rootDir": "src", "tsBuildInfoFile": ".tsbuildinfo" }, - "include": [ - "src" - ] -} \ No newline at end of file + "include": ["src"] +} From 068aea5b2c777998e5ed561f6fccf81311a810f0 Mon Sep 17 00:00:00 2001 From: jonybur Date: Tue, 20 Jun 2023 13:48:26 +0000 Subject: [PATCH 09/88] First working version --- ts/package.json | 2 +- .../barretenberg_wasm.test.ts | 1 - ts/src/barretenberg_wasm/barretenberg_wasm.ts | 9 ++- ts/src/barretenberg_wasm/node/index.ts | 46 -------------- .../barretenberg_wasm/node/node_endpoint.ts | 28 --------- ts/src/barretenberg_wasm/node/worker.ts | 10 ---- ts/src/crs/node/ignition_files_crs.ts | 60 ------------------- ts/src/crs/node/index.ts | 56 ----------------- ts/src/random/node/index.ts | 5 -- ts/webpack.config.cjs | 2 - 10 files changed, 5 insertions(+), 214 deletions(-) delete mode 100644 ts/src/barretenberg_wasm/node/index.ts delete mode 100644 ts/src/barretenberg_wasm/node/node_endpoint.ts delete mode 100644 ts/src/barretenberg_wasm/node/worker.ts delete mode 100644 ts/src/crs/node/ignition_files_crs.ts delete mode 100644 ts/src/crs/node/index.ts delete mode 100644 ts/src/random/node/index.ts diff --git a/ts/package.json b/ts/package.json index 479a57e825..93bb2b0c7e 100644 --- a/ts/package.json +++ b/ts/package.json @@ -55,6 +55,7 @@ "crypto-browserify": "^3.12.0", "debug": "^4.3.4", "eventemitter3": "^5.0.1", + "idb-keyval": "^6.2.1", "os-browserify": "^0.3.0", "path-browserify": "^1.0.1", "ts-node": "^10.9.1", @@ -75,7 +76,6 @@ "eslint": "^8.35.0", "eslint-config-prettier": "^8.8.0", "html-webpack-plugin": "^5.5.1", - "idb-keyval": "^6.2.1", "jest": "^29.5.0", "prettier": "^2.8.4", "resolve-typescript-plugin": "^2.0.1", diff --git a/ts/src/barretenberg_wasm/barretenberg_wasm.test.ts b/ts/src/barretenberg_wasm/barretenberg_wasm.test.ts index 78105e9acf..4c9cd87be3 100644 --- a/ts/src/barretenberg_wasm/barretenberg_wasm.test.ts +++ b/ts/src/barretenberg_wasm/barretenberg_wasm.test.ts @@ -1,4 +1,3 @@ -import { type Worker } from 'worker_threads'; import { BarretenbergWasm, BarretenbergWasmWorker } from './barretenberg_wasm.js'; describe('barretenberg wasm', () => { diff --git a/ts/src/barretenberg_wasm/barretenberg_wasm.ts b/ts/src/barretenberg_wasm/barretenberg_wasm.ts index 6f13014f07..7bdf6b674e 100644 --- a/ts/src/barretenberg_wasm/barretenberg_wasm.ts +++ b/ts/src/barretenberg_wasm/barretenberg_wasm.ts @@ -1,6 +1,5 @@ // TODO: fix this file for browser (worker_thread and events are not compatible) - -import { type Worker } from 'worker_threads'; +// HELLO! 123 import { EventEmitter } from 'events'; import createDebug from 'debug'; import { Remote, proxy } from 'comlink'; @@ -26,7 +25,7 @@ export class BarretenbergWasm { private memStore: { [key: string]: Uint8Array } = {}; private memory!: WebAssembly.Memory; private instance!: WebAssembly.Instance; - private workers: Worker[] = []; + private workers: any[] = []; private remoteWasms: BarretenbergWasmWorker[] = []; private nextWorker = 0; private nextThreadId = 1; @@ -87,8 +86,8 @@ export class BarretenbergWasm { // Create worker threads. Create 1 less than requested, as main thread counts as a thread. this.logger('creating worker threads...'); - this.workers = await Promise.all(Array.from({ length: threads - 1 }).map(createWorker)); - this.remoteWasms = await Promise.all(this.workers.map(getRemoteBarretenbergWasm)); + this.workers = (await Promise.all(Array.from({ length: threads - 1 }).map(createWorker))) as any; + this.remoteWasms = await Promise.all(this.workers.map(getRemoteBarretenbergWasm as any)); await Promise.all(this.remoteWasms.map(w => w.initThread(module, this.memory))); this.logger('init complete.'); } diff --git a/ts/src/barretenberg_wasm/node/index.ts b/ts/src/barretenberg_wasm/node/index.ts deleted file mode 100644 index 7285cbda50..0000000000 --- a/ts/src/barretenberg_wasm/node/index.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { Worker } from 'worker_threads'; -import { dirname } from 'path'; -import { fileURLToPath } from 'url'; -import { readFile } from 'fs/promises'; -import os from 'os'; -import { type BarretenbergWasm, type BarretenbergWasmWorker } from '../barretenberg_wasm.js'; -import { wrap } from 'comlink'; -import { nodeEndpoint } from './node_endpoint.js'; -import { writeSync } from 'fs'; - -export async function fetchCode(name: string) { - const __dirname = dirname(fileURLToPath(import.meta.url)); - return await readFile(__dirname + '/../../' + name); -} - -export function createWorker() { - const __dirname = dirname(fileURLToPath(import.meta.url)); - return new Worker(__dirname + `/worker.js`); -} - -export function getRemoteBarretenbergWasm(worker: Worker): BarretenbergWasmWorker { - return wrap(nodeEndpoint(worker)) as BarretenbergWasmWorker; -} - -export function getNumCpu() { - return os.cpus().length; -} - -/** - * In node, the message passing is different to the browser. When using 'debug' in the browser, we seemingly always - * get our logs, but in node it looks like it's dependent on the chain of workers from child to main thread be - * unblocked. If one of our threads aborts, we can't see it as the parent is blocked waiting on threads to join. - * To work around this in node, threads will by default write directly to stdout. - */ -export function threadLogger(): ((msg: string) => void) | undefined { - return (msg: string) => { - writeSync(1, msg + '\n'); - }; -} - -export function killSelf(): never { - // Extordinarily hard process termination. Due to how parent threads block on child threads etc, even process.exit - // doesn't seem to be able to abort the process. The following does. - process.kill(process.pid); - throw new Error(); -} diff --git a/ts/src/barretenberg_wasm/node/node_endpoint.ts b/ts/src/barretenberg_wasm/node/node_endpoint.ts deleted file mode 100644 index 63d5301b2e..0000000000 --- a/ts/src/barretenberg_wasm/node/node_endpoint.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { NodeEndpoint } from 'comlink/dist/esm/node-adapter.js'; - -export function nodeEndpoint(nep: NodeEndpoint) { - const listeners = new WeakMap(); - return { - postMessage: nep.postMessage.bind(nep), - addEventListener: (_: any, eh: any) => { - const l = (data: any) => { - if ('handleEvent' in eh) { - eh.handleEvent({ data }); - } else { - eh({ data }); - } - }; - nep.on('message', l); - listeners.set(eh, l); - }, - removeEventListener: (_: any, eh: any) => { - const l = listeners.get(eh); - if (!l) { - return; - } - nep.off('message', l); - listeners.delete(eh); - }, - start: nep.start && nep.start.bind(nep), - }; -} diff --git a/ts/src/barretenberg_wasm/node/worker.ts b/ts/src/barretenberg_wasm/node/worker.ts deleted file mode 100644 index 2785399a13..0000000000 --- a/ts/src/barretenberg_wasm/node/worker.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { parentPort } from 'worker_threads'; -import { expose } from 'comlink'; -import { BarretenbergWasm } from '../index.js'; -import { nodeEndpoint } from './node_endpoint.js'; - -if (!parentPort) { - throw new Error('No parentPort'); -} - -expose(new BarretenbergWasm(), nodeEndpoint(parentPort)); diff --git a/ts/src/crs/node/ignition_files_crs.ts b/ts/src/crs/node/ignition_files_crs.ts deleted file mode 100644 index 21a2f83512..0000000000 --- a/ts/src/crs/node/ignition_files_crs.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { existsSync } from 'fs'; -import { readFile } from 'fs/promises'; -import { dirname } from 'path'; -import { fileURLToPath } from 'url'; - -/** - * The path to our SRS object, assuming that we are in barretenberg/ts folder. - */ -export const SRS_DEV_PATH = dirname(fileURLToPath(import.meta.url)) + '/../../../cpp/srs_db/ignition/monomial'; - -/** - * Downloader for CRS from a local file (for Node). - */ -export class IgnitionFilesCrs { - private data!: Uint8Array; - private g2Data!: Uint8Array; - - constructor( - /** - * The number of circuit gates. - */ - public readonly numPoints: number, - private path = SRS_DEV_PATH, - ) {} - - static defaultExists() { - return existsSync(SRS_DEV_PATH); - } - - /** - * Read the data file. - */ - async init() { - // We need this.numPoints number of g1 points. - // numPoints should be circuitSize + 1. - const g1Start = 28; - const g1End = g1Start + this.numPoints * 64; - - const data = await readFile(this.path + '/transcript00.dat'); - this.data = data.subarray(g1Start, g1End); - - this.g2Data = await readFile(this.path + '/g2.dat'); - } - - /** - * G1 points data for prover key. - * @returns The points data. - */ - getG1Data(): Uint8Array { - return this.data; - } - - /** - * G2 points data for verification key. - * @returns The points data. - */ - getG2Data(): Uint8Array { - return this.g2Data; - } -} diff --git a/ts/src/crs/node/index.ts b/ts/src/crs/node/index.ts deleted file mode 100644 index 47cb65b197..0000000000 --- a/ts/src/crs/node/index.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { NetCrs } from '../net_crs.js'; -import { IgnitionFilesCrs } from './ignition_files_crs.js'; -import { mkdirSync, readFileSync, writeFileSync } from 'fs'; -import { readFile } from 'fs/promises'; -import createDebug from 'debug'; - -const debug = createDebug('bb.js:crs'); - -/** - * Generic CRS finder utility class. - */ -export class Crs { - constructor(public readonly numPoints: number, public readonly path: string) {} - - static async new(numPoints: number) { - const crs = new Crs(numPoints, './crs'); - await crs.init(); - return crs; - } - - async init() { - mkdirSync(this.path, { recursive: true }); - const size = await readFile(this.path + '/size', 'ascii').catch(() => undefined); - if (size && +size >= this.numPoints) { - debug(`using cached crs of size: ${size}`); - return; - } - - const crs = IgnitionFilesCrs.defaultExists() ? new IgnitionFilesCrs(this.numPoints) : new NetCrs(this.numPoints); - if (crs instanceof NetCrs) { - debug(`downloading crs of size: ${this.numPoints}`); - } else { - debug(`loading igntion file crs of size: ${this.numPoints}`); - } - await crs.init(); - writeFileSync(this.path + '/size', this.numPoints.toString()); - writeFileSync(this.path + '/g1.dat', crs.getG1Data()); - writeFileSync(this.path + '/g2.dat', crs.getG2Data()); - } - - /** - * G1 points data for prover key. - * @returns The points data. - */ - getG1Data(): Uint8Array { - return readFileSync(this.path + '/g1.dat'); - } - - /** - * G2 points data for verification key. - * @returns The points data. - */ - getG2Data(): Uint8Array { - return readFileSync(this.path + '/g2.dat'); - } -} diff --git a/ts/src/random/node/index.ts b/ts/src/random/node/index.ts deleted file mode 100644 index 746881998c..0000000000 --- a/ts/src/random/node/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { randomBytes as cryptoRandomBytes } from 'crypto'; - -export function randomBytes(len: number) { - return new Uint8Array(cryptoRandomBytes(len)); -} diff --git a/ts/webpack.config.cjs b/ts/webpack.config.cjs index b08f794cea..4385636931 100644 --- a/ts/webpack.config.cjs +++ b/ts/webpack.config.cjs @@ -45,9 +45,7 @@ module.exports = { resolve: { alias: { // TODO: this alias is not working, /dest is not exporting with ./browser/index imports - './node/index': './browser/index', 'idb-keyval': require.resolve('idb-keyval'), - worker_threads: 'browser-threads', crypto: require.resolve('crypto-browserify'), path: require.resolve('path-browserify'), url: require.resolve('url/'), From 0aa28fc5616c5f49f2d4a133657f97629549cfa8 Mon Sep 17 00:00:00 2001 From: jonybur Date: Wed, 21 Jun 2023 10:48:27 +0000 Subject: [PATCH 10/88] Readd barretenberg_wasm node code --- ts/src/barretenberg_wasm/node/index.ts | 46 +++++++++++++++++++ .../barretenberg_wasm/node/node_endpoint.ts | 28 +++++++++++ ts/src/barretenberg_wasm/node/worker.ts | 10 ++++ 3 files changed, 84 insertions(+) create mode 100644 ts/src/barretenberg_wasm/node/index.ts create mode 100644 ts/src/barretenberg_wasm/node/node_endpoint.ts create mode 100644 ts/src/barretenberg_wasm/node/worker.ts diff --git a/ts/src/barretenberg_wasm/node/index.ts b/ts/src/barretenberg_wasm/node/index.ts new file mode 100644 index 0000000000..dc11368e1f --- /dev/null +++ b/ts/src/barretenberg_wasm/node/index.ts @@ -0,0 +1,46 @@ +import { Worker } from 'worker_threads'; +import { dirname } from 'path'; +import { fileURLToPath } from 'url'; +import { readFile } from 'fs/promises'; +import os from 'os'; +import { type BarretenbergWasm, type BarretenbergWasmWorker } from '../barretenberg_wasm.js'; +import { wrap } from 'comlink'; +import { nodeEndpoint } from './node_endpoint.js'; +import { writeSync } from 'fs'; + +export async function fetchCode(name: string) { + const __dirname = dirname(fileURLToPath(import.meta.url)); + return await readFile(__dirname + '/../../' + name); +} + +export function createWorker() { + const __dirname = dirname(fileURLToPath(import.meta.url)); + return new Worker(__dirname + `/worker.js`); +} + +export function getRemoteBarretenbergWasm(worker: Worker): BarretenbergWasmWorker { + return wrap(nodeEndpoint(worker)) as BarretenbergWasmWorker; +} + +export function getNumCpu() { + return os.cpus().length; +} + +/** + * In node, the message passing is different to the browser. When using 'debug' in the browser, we seemingly always + * get our logs, but in node it looks like it's dependent on the chain of workers from child to main thread be + * unblocked. If one of our threads aborts, we can't see it as the parent is blocked waiting on threads to join. + * To work around this in node, threads will by default write directly to stdout. + */ +export function threadLogger(): ((msg: string) => void) | undefined { + return (msg: string) => { + writeSync(1, msg + '\n'); + }; +} + +export function killSelf(): never { + // Extordinarily hard process termination. Due to how parent threads block on child threads etc, even process.exit + // doesn't seem to be able to abort the process. The following does. + process.kill(process.pid); + throw new Error(); +} \ No newline at end of file diff --git a/ts/src/barretenberg_wasm/node/node_endpoint.ts b/ts/src/barretenberg_wasm/node/node_endpoint.ts new file mode 100644 index 0000000000..d32fc80eca --- /dev/null +++ b/ts/src/barretenberg_wasm/node/node_endpoint.ts @@ -0,0 +1,28 @@ +import { NodeEndpoint } from 'comlink/dist/esm/node-adapter.js'; + +export function nodeEndpoint(nep: NodeEndpoint) { + const listeners = new WeakMap(); + return { + postMessage: nep.postMessage.bind(nep), + addEventListener: (_: any, eh: any) => { + const l = (data: any) => { + if ('handleEvent' in eh) { + eh.handleEvent({ data }); + } else { + eh({ data }); + } + }; + nep.on('message', l); + listeners.set(eh, l); + }, + removeEventListener: (_: any, eh: any) => { + const l = listeners.get(eh); + if (!l) { + return; + } + nep.off('message', l); + listeners.delete(eh); + }, + start: nep.start && nep.start.bind(nep), + }; +} \ No newline at end of file diff --git a/ts/src/barretenberg_wasm/node/worker.ts b/ts/src/barretenberg_wasm/node/worker.ts new file mode 100644 index 0000000000..ff536f0404 --- /dev/null +++ b/ts/src/barretenberg_wasm/node/worker.ts @@ -0,0 +1,10 @@ +import { parentPort } from 'worker_threads'; +import { expose } from 'comlink'; +import { BarretenbergWasm } from '../index.js'; +import { nodeEndpoint } from './node_endpoint.js'; + +if (!parentPort) { + throw new Error('No parentPort'); +} + +expose(new BarretenbergWasm(), nodeEndpoint(parentPort)); From dd0cddb5eb6fe90f84dbc21b17c31dece9e247ff Mon Sep 17 00:00:00 2001 From: jonybur Date: Wed, 21 Jun 2023 10:59:30 +0000 Subject: [PATCH 11/88] Revert node files --- ts/src/barretenberg_wasm/node/index.ts | 2 +- .../barretenberg_wasm/node/node_endpoint.ts | 2 +- ts/src/barretenberg_wasm/node/worker.ts | 16 ++--- ts/src/crs/node/ignition_files_crs.ts | 60 +++++++++++++++++++ ts/src/crs/node/index.ts | 56 +++++++++++++++++ 5 files changed, 126 insertions(+), 10 deletions(-) create mode 100644 ts/src/crs/node/ignition_files_crs.ts create mode 100644 ts/src/crs/node/index.ts diff --git a/ts/src/barretenberg_wasm/node/index.ts b/ts/src/barretenberg_wasm/node/index.ts index dc11368e1f..7285cbda50 100644 --- a/ts/src/barretenberg_wasm/node/index.ts +++ b/ts/src/barretenberg_wasm/node/index.ts @@ -43,4 +43,4 @@ export function killSelf(): never { // doesn't seem to be able to abort the process. The following does. process.kill(process.pid); throw new Error(); -} \ No newline at end of file +} diff --git a/ts/src/barretenberg_wasm/node/node_endpoint.ts b/ts/src/barretenberg_wasm/node/node_endpoint.ts index d32fc80eca..63d5301b2e 100644 --- a/ts/src/barretenberg_wasm/node/node_endpoint.ts +++ b/ts/src/barretenberg_wasm/node/node_endpoint.ts @@ -25,4 +25,4 @@ export function nodeEndpoint(nep: NodeEndpoint) { }, start: nep.start && nep.start.bind(nep), }; -} \ No newline at end of file +} diff --git a/ts/src/barretenberg_wasm/node/worker.ts b/ts/src/barretenberg_wasm/node/worker.ts index ff536f0404..2785399a13 100644 --- a/ts/src/barretenberg_wasm/node/worker.ts +++ b/ts/src/barretenberg_wasm/node/worker.ts @@ -1,10 +1,10 @@ -import { parentPort } from 'worker_threads'; -import { expose } from 'comlink'; -import { BarretenbergWasm } from '../index.js'; -import { nodeEndpoint } from './node_endpoint.js'; +import { parentPort } from 'worker_threads'; +import { expose } from 'comlink'; +import { BarretenbergWasm } from '../index.js'; +import { nodeEndpoint } from './node_endpoint.js'; -if (!parentPort) { - throw new Error('No parentPort'); -} +if (!parentPort) { + throw new Error('No parentPort'); +} -expose(new BarretenbergWasm(), nodeEndpoint(parentPort)); +expose(new BarretenbergWasm(), nodeEndpoint(parentPort)); diff --git a/ts/src/crs/node/ignition_files_crs.ts b/ts/src/crs/node/ignition_files_crs.ts new file mode 100644 index 0000000000..21a2f83512 --- /dev/null +++ b/ts/src/crs/node/ignition_files_crs.ts @@ -0,0 +1,60 @@ +import { existsSync } from 'fs'; +import { readFile } from 'fs/promises'; +import { dirname } from 'path'; +import { fileURLToPath } from 'url'; + +/** + * The path to our SRS object, assuming that we are in barretenberg/ts folder. + */ +export const SRS_DEV_PATH = dirname(fileURLToPath(import.meta.url)) + '/../../../cpp/srs_db/ignition/monomial'; + +/** + * Downloader for CRS from a local file (for Node). + */ +export class IgnitionFilesCrs { + private data!: Uint8Array; + private g2Data!: Uint8Array; + + constructor( + /** + * The number of circuit gates. + */ + public readonly numPoints: number, + private path = SRS_DEV_PATH, + ) {} + + static defaultExists() { + return existsSync(SRS_DEV_PATH); + } + + /** + * Read the data file. + */ + async init() { + // We need this.numPoints number of g1 points. + // numPoints should be circuitSize + 1. + const g1Start = 28; + const g1End = g1Start + this.numPoints * 64; + + const data = await readFile(this.path + '/transcript00.dat'); + this.data = data.subarray(g1Start, g1End); + + this.g2Data = await readFile(this.path + '/g2.dat'); + } + + /** + * G1 points data for prover key. + * @returns The points data. + */ + getG1Data(): Uint8Array { + return this.data; + } + + /** + * G2 points data for verification key. + * @returns The points data. + */ + getG2Data(): Uint8Array { + return this.g2Data; + } +} diff --git a/ts/src/crs/node/index.ts b/ts/src/crs/node/index.ts new file mode 100644 index 0000000000..47cb65b197 --- /dev/null +++ b/ts/src/crs/node/index.ts @@ -0,0 +1,56 @@ +import { NetCrs } from '../net_crs.js'; +import { IgnitionFilesCrs } from './ignition_files_crs.js'; +import { mkdirSync, readFileSync, writeFileSync } from 'fs'; +import { readFile } from 'fs/promises'; +import createDebug from 'debug'; + +const debug = createDebug('bb.js:crs'); + +/** + * Generic CRS finder utility class. + */ +export class Crs { + constructor(public readonly numPoints: number, public readonly path: string) {} + + static async new(numPoints: number) { + const crs = new Crs(numPoints, './crs'); + await crs.init(); + return crs; + } + + async init() { + mkdirSync(this.path, { recursive: true }); + const size = await readFile(this.path + '/size', 'ascii').catch(() => undefined); + if (size && +size >= this.numPoints) { + debug(`using cached crs of size: ${size}`); + return; + } + + const crs = IgnitionFilesCrs.defaultExists() ? new IgnitionFilesCrs(this.numPoints) : new NetCrs(this.numPoints); + if (crs instanceof NetCrs) { + debug(`downloading crs of size: ${this.numPoints}`); + } else { + debug(`loading igntion file crs of size: ${this.numPoints}`); + } + await crs.init(); + writeFileSync(this.path + '/size', this.numPoints.toString()); + writeFileSync(this.path + '/g1.dat', crs.getG1Data()); + writeFileSync(this.path + '/g2.dat', crs.getG2Data()); + } + + /** + * G1 points data for prover key. + * @returns The points data. + */ + getG1Data(): Uint8Array { + return readFileSync(this.path + '/g1.dat'); + } + + /** + * G2 points data for verification key. + * @returns The points data. + */ + getG2Data(): Uint8Array { + return readFileSync(this.path + '/g2.dat'); + } +} From fcb81f92013122866a1c1d016b969d598e52c5b7 Mon Sep 17 00:00:00 2001 From: jonybur Date: Wed, 21 Jun 2023 11:05:44 +0000 Subject: [PATCH 12/88] Revret random file --- ts/src/random/node/index.ts | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 ts/src/random/node/index.ts diff --git a/ts/src/random/node/index.ts b/ts/src/random/node/index.ts new file mode 100644 index 0000000000..746881998c --- /dev/null +++ b/ts/src/random/node/index.ts @@ -0,0 +1,5 @@ +import { randomBytes as cryptoRandomBytes } from 'crypto'; + +export function randomBytes(len: number) { + return new Uint8Array(cryptoRandomBytes(len)); +} From 3bf4cfce9f138893be50718066a8074fa5d05dc4 Mon Sep 17 00:00:00 2001 From: jonybur Date: Wed, 21 Jun 2023 11:21:57 +0000 Subject: [PATCH 13/88] Revert barretenberg_wasm --- ts/src/barretenberg_wasm/barretenberg_wasm.test.ts | 3 ++- ts/src/barretenberg_wasm/barretenberg_wasm.ts | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ts/src/barretenberg_wasm/barretenberg_wasm.test.ts b/ts/src/barretenberg_wasm/barretenberg_wasm.test.ts index 4c9cd87be3..55d088fa13 100644 --- a/ts/src/barretenberg_wasm/barretenberg_wasm.test.ts +++ b/ts/src/barretenberg_wasm/barretenberg_wasm.test.ts @@ -1,3 +1,4 @@ +import { type Worker } from 'worker_threads'; import { BarretenbergWasm, BarretenbergWasmWorker } from './barretenberg_wasm.js'; describe('barretenberg wasm', () => { @@ -27,7 +28,7 @@ describe('barretenberg wasm', () => { }); describe('barretenberg wasm worker', () => { - let worker!: any; + let worker!: Worker; let wasm!: BarretenbergWasmWorker; beforeAll(async () => { diff --git a/ts/src/barretenberg_wasm/barretenberg_wasm.ts b/ts/src/barretenberg_wasm/barretenberg_wasm.ts index 7bdf6b674e..6a6077b0a9 100644 --- a/ts/src/barretenberg_wasm/barretenberg_wasm.ts +++ b/ts/src/barretenberg_wasm/barretenberg_wasm.ts @@ -1,5 +1,4 @@ -// TODO: fix this file for browser (worker_thread and events are not compatible) -// HELLO! 123 +import { type Worker } from 'worker_threads'; import { EventEmitter } from 'events'; import createDebug from 'debug'; import { Remote, proxy } from 'comlink'; @@ -25,7 +24,7 @@ export class BarretenbergWasm { private memStore: { [key: string]: Uint8Array } = {}; private memory!: WebAssembly.Memory; private instance!: WebAssembly.Instance; - private workers: any[] = []; + private workers: Worker[] = []; private remoteWasms: BarretenbergWasmWorker[] = []; private nextWorker = 0; private nextThreadId = 1; From 45c2fac4593ad45e25d8bcf23af1541a75629bab Mon Sep 17 00:00:00 2001 From: jonybur Date: Wed, 21 Jun 2023 11:23:13 +0000 Subject: [PATCH 14/88] Revert simple test --- ts/src/examples/simple.rawtest.ts | 56 +++++++++++++++---------------- ts/src/index.html | 9 +++++ 2 files changed, 37 insertions(+), 28 deletions(-) create mode 100644 ts/src/index.html diff --git a/ts/src/examples/simple.rawtest.ts b/ts/src/examples/simple.rawtest.ts index b1f2ef7570..179489ac95 100644 --- a/ts/src/examples/simple.rawtest.ts +++ b/ts/src/examples/simple.rawtest.ts @@ -1,37 +1,37 @@ -// import { Crs } from '../crs/index.js'; -// import createDebug from 'debug'; -// import { newBarretenbergApiAsync } from '../factory/index.js'; -// import { RawBuffer } from '../types/index.js'; +import { Crs } from '../crs/index.js'; +import createDebug from 'debug'; +import { newBarretenbergApiAsync } from '../factory/index.js'; +import { RawBuffer } from '../types/index.js'; -// createDebug.enable('*'); -// const debug = createDebug('simple_test'); +createDebug.enable('*'); +const debug = createDebug('simple_test'); -// async function main() { -// const CIRCUIT_SIZE = 2 ** 19; +async function main() { + const CIRCUIT_SIZE = 2 ** 19; -// debug('starting test...'); -// const api = await newBarretenbergApiAsync(); + debug('starting test...'); + const api = await newBarretenbergApiAsync(); -// // Important to init slab allocator as first thing, to ensure maximum memory efficiency. -// await api.commonInitSlabAllocator(CIRCUIT_SIZE); + // Important to init slab allocator as first thing, to ensure maximum memory efficiency. + await api.commonInitSlabAllocator(CIRCUIT_SIZE); -// // Plus 1 needed! -// const crs = await Crs.new(CIRCUIT_SIZE + 1); -// await api.srsInitSrs(new RawBuffer(crs.getG1Data()), crs.numPoints, new RawBuffer(crs.getG2Data())); + // Plus 1 needed! + const crs = await Crs.new(CIRCUIT_SIZE + 1); + await api.srsInitSrs(new RawBuffer(crs.getG1Data()), crs.numPoints, new RawBuffer(crs.getG2Data())); -// const iterations = 10; -// let totalTime = 0; -// for (let i = 0; i < iterations; ++i) { -// const start = new Date().getTime(); -// debug(`iteration ${i} starting...`); -// await api.examplesSimpleCreateAndVerifyProof(); -// totalTime += new Date().getTime() - start; -// } + const iterations = 10; + let totalTime = 0; + for (let i = 0; i < iterations; ++i) { + const start = new Date().getTime(); + debug(`iteration ${i} starting...`); + await api.examplesSimpleCreateAndVerifyProof(); + totalTime += new Date().getTime() - start; + } -// await api.destroy(); + await api.destroy(); -// debug(`avg iteration time: ${totalTime / iterations}ms`); -// debug('test complete.'); -// } + debug(`avg iteration time: ${totalTime / iterations}ms`); + debug('test complete.'); +} -// void main(); +void main(); diff --git a/ts/src/index.html b/ts/src/index.html new file mode 100644 index 0000000000..391918ac2e --- /dev/null +++ b/ts/src/index.html @@ -0,0 +1,9 @@ + + + + My App + + + + + From a8fbafb2c41c4714aa5cdca4e8dde304f57cc5c8 Mon Sep 17 00:00:00 2001 From: jonybur Date: Wed, 21 Jun 2023 14:05:22 +0000 Subject: [PATCH 15/88] Fix type issue --- ts/src/barretenberg_wasm/barretenberg_wasm.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/src/barretenberg_wasm/barretenberg_wasm.test.ts b/ts/src/barretenberg_wasm/barretenberg_wasm.test.ts index 55d088fa13..fb2ec053a6 100644 --- a/ts/src/barretenberg_wasm/barretenberg_wasm.test.ts +++ b/ts/src/barretenberg_wasm/barretenberg_wasm.test.ts @@ -32,7 +32,7 @@ describe('barretenberg wasm worker', () => { let wasm!: BarretenbergWasmWorker; beforeAll(async () => { - ({ wasm, worker } = await BarretenbergWasm.newWorker(2)); + ({ wasm, worker } = await BarretenbergWasm.newWorker(2) as any); }, 20000); afterAll(async () => { From 9a2131afab287e9579984981e11a71961b1482fa Mon Sep 17 00:00:00 2001 From: jonybur Date: Wed, 21 Jun 2023 14:10:40 +0000 Subject: [PATCH 16/88] Adds point for node and browser --- ts/src/types/browser/index.ts | 1 + ts/src/types/{ => browser}/point.ts | 4 ++-- ts/src/types/index.ts | 2 +- ts/src/types/node/index.ts | 1 + ts/src/types/node/point.ts | 35 +++++++++++++++++++++++++++++ 5 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 ts/src/types/browser/index.ts rename ts/src/types/{ => browser}/point.ts (93%) create mode 100644 ts/src/types/node/index.ts create mode 100644 ts/src/types/node/point.ts diff --git a/ts/src/types/browser/index.ts b/ts/src/types/browser/index.ts new file mode 100644 index 0000000000..cddd9e23e0 --- /dev/null +++ b/ts/src/types/browser/index.ts @@ -0,0 +1 @@ +export * from "./point.js" \ No newline at end of file diff --git a/ts/src/types/point.ts b/ts/src/types/browser/point.ts similarity index 93% rename from ts/src/types/point.ts rename to ts/src/types/browser/point.ts index 8ab9efbf4c..691c55a26d 100644 --- a/ts/src/types/point.ts +++ b/ts/src/types/browser/point.ts @@ -1,5 +1,5 @@ -import { Fr } from './index.js'; -import { BufferReader } from '../serialize/buffer_reader.js'; +import { Fr } from '../index.js'; +import { BufferReader } from '../../serialize/buffer_reader.js'; export class Point { static SIZE_IN_BYTES = 64; diff --git a/ts/src/types/index.ts b/ts/src/types/index.ts index cc5bba551c..8ba5664622 100644 --- a/ts/src/types/index.ts +++ b/ts/src/types/index.ts @@ -1,5 +1,5 @@ export * from './ptr.js'; export * from './fields.js'; -export * from './point.js'; +export * from './node/index.js'; export * from './fixed_size_buffer.js'; export * from './raw_buffer.js'; diff --git a/ts/src/types/node/index.ts b/ts/src/types/node/index.ts new file mode 100644 index 0000000000..cddd9e23e0 --- /dev/null +++ b/ts/src/types/node/index.ts @@ -0,0 +1 @@ +export * from "./point.js" \ No newline at end of file diff --git a/ts/src/types/node/point.ts b/ts/src/types/node/point.ts new file mode 100644 index 0000000000..8e6bb35b0b --- /dev/null +++ b/ts/src/types/node/point.ts @@ -0,0 +1,35 @@ +import { Fr } from '../index.js'; +import { BufferReader } from '../../serialize/buffer_reader.js'; + +export class Point { + static SIZE_IN_BYTES = 64; + static EMPTY = new Point(Fr.ZERO, Fr.ZERO); + + constructor(public readonly x: Fr, public readonly y: Fr) {} + + static random() { + // TODO: This is not a point on the curve! + return new Point(Fr.random(), Fr.random()); + } + + static fromBuffer(buffer: Uint8Array | BufferReader) { + const reader = BufferReader.asReader(buffer); + return new this(Fr.fromBuffer(reader), Fr.fromBuffer(reader)); + } + + static fromString(address: string) { + return Point.fromBuffer(Buffer.from(address.replace(/^0x/i, ''), 'hex')); + } + + toBuffer() { + return Buffer.concat([this.x.toBuffer(), this.y.toBuffer()]); + } + + toString() { + return '0x' + this.toBuffer().toString('hex'); + } + + equals(rhs: Point) { + return this.x.equals(rhs.x) && this.y.equals(rhs.y); + } +} From e174be9b07cd8dafedcda4bbbff4f8dbfb93f637 Mon Sep 17 00:00:00 2001 From: jonybur Date: Wed, 21 Jun 2023 14:17:58 +0000 Subject: [PATCH 17/88] Roll back web entrypoint --- ts/package.json | 2 +- ts/src/index_web.ts | 5 ----- ts/webpack.config.cjs | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 ts/src/index_web.ts diff --git a/ts/package.json b/ts/package.json index 93bb2b0c7e..48308541bc 100644 --- a/ts/package.json +++ b/ts/package.json @@ -8,7 +8,7 @@ "displayName": "bb.js", "tsconfig": "./tsconfig.json" }, - "main": "./dest/index_web.js", + "main": "./dest/index.js", "bin": "./dest/main.js", "files": [ "src/", diff --git a/ts/src/index_web.ts b/ts/src/index_web.ts deleted file mode 100644 index 686cf4af06..0000000000 --- a/ts/src/index_web.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from './crs/index.js'; -export * from './barretenberg_wasm/index.js'; -export * from './barretenberg_api/index.js'; -export * from './factory/index.js'; -export { RawBuffer } from './types/index.js'; diff --git a/ts/webpack.config.cjs b/ts/webpack.config.cjs index 4385636931..497a6b185f 100644 --- a/ts/webpack.config.cjs +++ b/ts/webpack.config.cjs @@ -12,7 +12,7 @@ module.exports = { target: 'web', mode: 'production', entry: { - index_web: './src/index_web.ts', + index: './src/index.ts', }, module: { rules: [ From 218e7c0e5993105c64d01ddeee816c3f8e5141a5 Mon Sep 17 00:00:00 2001 From: jonybur Date: Wed, 21 Jun 2023 14:52:16 +0000 Subject: [PATCH 18/88] Cleanup --- ts/package.json | 2 +- ts/src/barretenberg_wasm/barretenberg_wasm.ts | 10 +--------- ts/src/examples/simple.test.ts | 2 +- ts/src/{index.ts => index.browser.ts} | 0 ts/src/index.node.ts | 5 +++++ ts/src/main.ts | 2 +- ts/src/types/index.ts | 2 +- ts/webpack.config.cjs | 5 +++-- 8 files changed, 13 insertions(+), 15 deletions(-) rename ts/src/{index.ts => index.browser.ts} (100%) create mode 100644 ts/src/index.node.ts diff --git a/ts/package.json b/ts/package.json index 48308541bc..32399f5700 100644 --- a/ts/package.json +++ b/ts/package.json @@ -8,7 +8,7 @@ "displayName": "bb.js", "tsconfig": "./tsconfig.json" }, - "main": "./dest/index.js", + "main": "./dest/index.browser.js", "bin": "./dest/main.js", "files": [ "src/", diff --git a/ts/src/barretenberg_wasm/barretenberg_wasm.ts b/ts/src/barretenberg_wasm/barretenberg_wasm.ts index 6a6077b0a9..d6f01788db 100644 --- a/ts/src/barretenberg_wasm/barretenberg_wasm.ts +++ b/ts/src/barretenberg_wasm/barretenberg_wasm.ts @@ -5,15 +5,7 @@ import { Remote, proxy } from 'comlink'; import { randomBytes } from '../random/index.js'; // Webpack config swaps this import with ./browser/index.js // You can toggle between these two imports to sanity check the type-safety. -// import { fetchCode, getNumCpu, createWorker, getRemoteBarretenbergWasm, threadLogger, killSelf } from './node/index.js'; -import { - fetchCode, - getNumCpu, - createWorker, - getRemoteBarretenbergWasm, - threadLogger, - killSelf, -} from './browser/index.js'; +import { fetchCode, getNumCpu, createWorker, getRemoteBarretenbergWasm, threadLogger, killSelf } from './browser/index.js'; const debug = createDebug('bb.js:wasm'); diff --git a/ts/src/examples/simple.test.ts b/ts/src/examples/simple.test.ts index 828b0cb4ea..0c6d7c0d41 100644 --- a/ts/src/examples/simple.test.ts +++ b/ts/src/examples/simple.test.ts @@ -1,4 +1,4 @@ -import { Crs } from '../index.js'; +import { Crs } from '../index.browser.js'; import { BarretenbergApiAsync, newBarretenbergApiAsync } from '../factory/index.js'; import { RawBuffer } from '../types/index.js'; diff --git a/ts/src/index.ts b/ts/src/index.browser.ts similarity index 100% rename from ts/src/index.ts rename to ts/src/index.browser.ts diff --git a/ts/src/index.node.ts b/ts/src/index.node.ts new file mode 100644 index 0000000000..686cf4af06 --- /dev/null +++ b/ts/src/index.node.ts @@ -0,0 +1,5 @@ +export * from './crs/index.js'; +export * from './barretenberg_wasm/index.js'; +export * from './barretenberg_api/index.js'; +export * from './factory/index.js'; +export { RawBuffer } from './types/index.js'; diff --git a/ts/src/main.ts b/ts/src/main.ts index 4038f69a01..21bc5bcf77 100755 --- a/ts/src/main.ts +++ b/ts/src/main.ts @@ -1,5 +1,5 @@ #!/usr/bin/env -S node --no-warnings -import { Crs, BarretenbergApiAsync, newBarretenbergApiAsync, RawBuffer } from './index.js'; +import { Crs, BarretenbergApiAsync, newBarretenbergApiAsync, RawBuffer } from './index.browser.js'; import createDebug from 'debug'; import { readFileSync, writeFileSync } from 'fs'; import { gunzipSync } from 'zlib'; diff --git a/ts/src/types/index.ts b/ts/src/types/index.ts index 8ba5664622..4e698cdbc8 100644 --- a/ts/src/types/index.ts +++ b/ts/src/types/index.ts @@ -1,5 +1,5 @@ export * from './ptr.js'; export * from './fields.js'; -export * from './node/index.js'; +export * from './browser/index.js'; export * from './fixed_size_buffer.js'; export * from './raw_buffer.js'; diff --git a/ts/webpack.config.cjs b/ts/webpack.config.cjs index 497a6b185f..6e49b59500 100644 --- a/ts/webpack.config.cjs +++ b/ts/webpack.config.cjs @@ -12,7 +12,8 @@ module.exports = { target: 'web', mode: 'production', entry: { - index: './src/index.ts', + node: './src/index.node.ts', + browser: './src/index.browser.ts', }, module: { rules: [ @@ -44,7 +45,7 @@ module.exports = { ], resolve: { alias: { - // TODO: this alias is not working, /dest is not exporting with ./browser/index imports + // './node/index': resolve(__dirname, './browser/index'), 'idb-keyval': require.resolve('idb-keyval'), crypto: require.resolve('crypto-browserify'), path: require.resolve('path-browserify'), From 0697d6b0d195c44cec308fb299ebd3a76b3f2142 Mon Sep 17 00:00:00 2001 From: jonybur Date: Thu, 22 Jun 2023 10:46:23 +0000 Subject: [PATCH 19/88] Remove need for config on nextjs --- ts/src/barretenberg_wasm/browser/index.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ts/src/barretenberg_wasm/browser/index.ts b/ts/src/barretenberg_wasm/browser/index.ts index 0b89ff9505..261cc1b007 100644 --- a/ts/src/barretenberg_wasm/browser/index.ts +++ b/ts/src/barretenberg_wasm/browser/index.ts @@ -2,8 +2,9 @@ import { wrap } from 'comlink'; import { BarretenbergWasmWorker, type BarretenbergWasm } from '../barretenberg_wasm.js'; import debug from 'debug'; -export async function fetchCode(name: string) { - const res = await fetch('/' + name); +export async function fetchCode() { + const wasmModuleUrl = new URL(`../../barretenberg.wasm`, import.meta.url); + const res = await fetch(wasmModuleUrl.href); return await res.arrayBuffer(); } From a91d6f470b3dec8848cf2d2e0ddd2f6565062818 Mon Sep 17 00:00:00 2001 From: jonybur Date: Thu, 22 Jun 2023 13:44:40 +0000 Subject: [PATCH 20/88] Wasm path fix, wip double target outputs --- ts/package.json | 6 ++++++ ts/src/barretenberg_wasm/barretenberg_wasm.ts | 2 +- ts/src/barretenberg_wasm/browser/index.ts | 4 ++-- ts/webpack.config.cjs | 7 +++++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ts/package.json b/ts/package.json index 32399f5700..2c31a13d6e 100644 --- a/ts/package.json +++ b/ts/package.json @@ -10,6 +10,12 @@ }, "main": "./dest/index.browser.js", "bin": "./dest/main.js", + "exports": { + ".": { + "require": "./dest/index.node.js", + "import": "./dest/index.browser.js" + } + }, "files": [ "src/", "dest/", diff --git a/ts/src/barretenberg_wasm/barretenberg_wasm.ts b/ts/src/barretenberg_wasm/barretenberg_wasm.ts index d6f01788db..f1bfbba266 100644 --- a/ts/src/barretenberg_wasm/barretenberg_wasm.ts +++ b/ts/src/barretenberg_wasm/barretenberg_wasm.ts @@ -5,7 +5,7 @@ import { Remote, proxy } from 'comlink'; import { randomBytes } from '../random/index.js'; // Webpack config swaps this import with ./browser/index.js // You can toggle between these two imports to sanity check the type-safety. -import { fetchCode, getNumCpu, createWorker, getRemoteBarretenbergWasm, threadLogger, killSelf } from './browser/index.js'; +import { fetchCode, getNumCpu, createWorker, getRemoteBarretenbergWasm, threadLogger, killSelf } from './node/index.js'; const debug = createDebug('bb.js:wasm'); diff --git a/ts/src/barretenberg_wasm/browser/index.ts b/ts/src/barretenberg_wasm/browser/index.ts index 261cc1b007..03152494c0 100644 --- a/ts/src/barretenberg_wasm/browser/index.ts +++ b/ts/src/barretenberg_wasm/browser/index.ts @@ -2,8 +2,8 @@ import { wrap } from 'comlink'; import { BarretenbergWasmWorker, type BarretenbergWasm } from '../barretenberg_wasm.js'; import debug from 'debug'; -export async function fetchCode() { - const wasmModuleUrl = new URL(`../../barretenberg.wasm`, import.meta.url); +export async function fetchCode(name: string) { + const wasmModuleUrl = new URL(`../../${name}`, import.meta.url); const res = await fetch(wasmModuleUrl.href); return await res.arrayBuffer(); } diff --git a/ts/webpack.config.cjs b/ts/webpack.config.cjs index 6e49b59500..e109395895 100644 --- a/ts/webpack.config.cjs +++ b/ts/webpack.config.cjs @@ -1,8 +1,7 @@ /** * Builds both the web and node version of the worker, and outputs it to the dest directory. */ -const { resolve, dirname } = require('path'); -const { fileURLToPath } = require('url'); +const { resolve } = require('path'); const ResolveTypeScriptPlugin = require('resolve-typescript-plugin'); const CopyWebpackPlugin = require('copy-webpack-plugin'); const HtmlWebpackPlugin = require('html-webpack-plugin'); @@ -46,6 +45,10 @@ module.exports = { resolve: { alias: { // './node/index': resolve(__dirname, './browser/index'), + './node/index': resolve(__dirname, 'src/barretenberg_wasm/browser/index'), + './src/barrenberg_wasm/node/index': resolve(__dirname, './src/barrenberg_wasm/browser/index'), + './src/barrenberg_wasm/node/index.js': resolve(__dirname, './src/barrenberg_wasm/browser/index.js'), + './src/barrenberg_wasm/node/index.js': './src/barrenberg_wasm/browser/index.js', 'idb-keyval': require.resolve('idb-keyval'), crypto: require.resolve('crypto-browserify'), path: require.resolve('path-browserify'), From 80d6a0b47b4f2a3e28aec67277cc5e550bef8163 Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 23 Jun 2023 13:00:40 +0000 Subject: [PATCH 21/88] Allow multiple targets --- ts/dynamic_imports.cjs | 1 + ts/generate_tsconfig.cjs | 43 +++++++++ ts/package.json | 28 ++++-- ts/replace_imports.cjs | 22 +++++ ts/src/barretenberg_wasm/barretenberg_wasm.ts | 9 +- ts/src/crs/index.ts | 3 +- ts/src/examples/simple.test.ts | 2 +- ts/src/index.node.ts | 5 - ts/src/{index.browser.ts => index.ts} | 0 ts/src/main.ts | 2 +- ts/src/random/index.ts | 3 +- ts/src/types/index.ts | 3 +- ts/tsconfig.json | 29 +++++- ts/webpack.config.cjs | 21 ++--- ts/yarn.lock | 94 ++++++++++++++++++- 15 files changed, 224 insertions(+), 41 deletions(-) create mode 100644 ts/dynamic_imports.cjs create mode 100644 ts/generate_tsconfig.cjs create mode 100644 ts/replace_imports.cjs delete mode 100644 ts/src/index.node.ts rename ts/src/{index.browser.ts => index.ts} (100%) diff --git a/ts/dynamic_imports.cjs b/ts/dynamic_imports.cjs new file mode 100644 index 0000000000..9938eaba06 --- /dev/null +++ b/ts/dynamic_imports.cjs @@ -0,0 +1 @@ +module.exports = ["barretenberg_wasm", "crs", "random", "types"]; \ No newline at end of file diff --git a/ts/generate_tsconfig.cjs b/ts/generate_tsconfig.cjs new file mode 100644 index 0000000000..bd88e35a1d --- /dev/null +++ b/ts/generate_tsconfig.cjs @@ -0,0 +1,43 @@ +const fs = require('fs'); +const path = require('path'); +const dynamic_imports = require("./dynamic_imports.cjs") + +const buildTarget = process.env.BUILD_TARGET; + +function generatePaths() { + const paths = {}; + + dynamic_imports.forEach(item => { + const key = `dynamic/${item}`; + const value = [`src/${item}/${buildTarget}/index.ts`]; + paths[key] = value; + }); + + return paths; +} + +const tsconfig = { + compilerOptions: { + baseUrl: ".", + target: "es2020", + lib: ["dom", "esnext", "es2017.object"], + module: "NodeNext", + strict: false, + declaration: true, + allowSyntheticDefaultImports: true, + esModuleInterop: true, + downlevelIteration: true, + inlineSourceMap: true, + declarationMap: true, + importHelpers: true, + resolveJsonModule: true, + composite: true, + outDir: "dest", + rootDir: "src", + tsBuildInfoFile: ".tsbuildinfo", + paths: generatePaths() + }, + include: ["src"] +}; + +fs.writeFileSync(path.resolve(__dirname, 'tsconfig.json'), JSON.stringify(tsconfig, null, 2)); \ No newline at end of file diff --git a/ts/package.json b/ts/package.json index 2c31a13d6e..78d120b724 100644 --- a/ts/package.json +++ b/ts/package.json @@ -8,13 +8,26 @@ "displayName": "bb.js", "tsconfig": "./tsconfig.json" }, - "main": "./dest/index.browser.js", + "main": "./dest/index.js", "bin": "./dest/main.js", "exports": { ".": { - "require": "./dest/index.node.js", - "import": "./dest/index.browser.js" - } + "require": "./dest/index.js", + "import": "./dest/index.js" + }, + "./async_map": "./dest/async_map/index.js", + "./barretenberg_api": "./dest/barretenberg_api/index.js", + "./barretenberg_binder": "./dest/barretenberg_binder/index.js", + "./barretenberg_wasm": "./dest/barretenberg_wasm/index.js", + "./bigint-array": "./dest/bigint-array/index.js", + "./bindgen": "./dest/bindgen/index.js", + "./crs": "./dest/crs/index.js", + "./examples": "./dest/examples/index.js", + "./factory": "./dest/factory/index.js", + "./random": "./dest/random/index.js", + "./serialize": "./dest/serialize/index.js", + "./types": "./dest/types/index.js", + "./dest/types": "./dest/types/index.js" }, "files": [ "src/", @@ -23,10 +36,10 @@ ], "scripts": { "clean": "rm -rf ./dest .tsbuildinfo", - "build": "yarn clean && yarn build:wasm && yarn build:ts", + "build": "yarn clean && yarn build:wasm && yarn build:ts:browser", "build:dev": "tsc -b --watch", "build:wasm": "cd ../cpp && cmake --preset wasm-threads && cmake --build --preset wasm-threads && cmake --preset wasm && cmake --build --preset wasm", - "build:ts": "tsc -b && webpack && chmod +x ./dest/main.js", + "build:ts:browser": "BUILD_TARGET=browser node generate_tsconfig.cjs && tsc -b && webpack && chmod +x ./dest/main.js && BUILD_TARGET=browser node replace_imports.cjs", "build:bindings": "cd .. && ./scripts/bindgen.sh", "serve": "webpack serve", "formatting": "prettier --check ./src && eslint --max-warnings 0 ./src", @@ -79,14 +92,17 @@ "@typescript-eslint/parser": "^5.54.1", "buffer": "^6.0.3", "copy-webpack-plugin": "^11.0.0", + "cross-env": "^7.0.3", "eslint": "^8.35.0", "eslint-config-prettier": "^8.8.0", "html-webpack-plugin": "^5.5.1", "jest": "^29.5.0", "prettier": "^2.8.4", + "replace-in-file": "^7.0.1", "resolve-typescript-plugin": "^2.0.1", "ts-jest": "^29.1.0", "ts-loader": "^9.4.2", + "tsconfig-paths-webpack-plugin": "^4.0.1", "typescript": "^5.0.4", "webpack": "^5.82.1", "webpack-cli": "^5.1.1", diff --git a/ts/replace_imports.cjs b/ts/replace_imports.cjs new file mode 100644 index 0000000000..ae0667079c --- /dev/null +++ b/ts/replace_imports.cjs @@ -0,0 +1,22 @@ +const replaceInFile = require('replace-in-file'); +const path = require('path'); +const dynamic_imports = require("./dynamic_imports.cjs") + +const buildTarget = process.env.BUILD_TARGET; + +async function replaceImports() { + try { + dynamic_imports.forEach(async item => { + const results = await replaceInFile({ + files: path.resolve(__dirname, `dest/${item}/*`), + from: new RegExp(`'dynamic\\/${item}';`, 'g'), + to: `'./${buildTarget}/index.js';`, + }); + console.log(results.filter(r => r.hasChanged === true)) + }); + } catch (error) { + console.error('Error occurred:', error); + } +} + +replaceImports(); diff --git a/ts/src/barretenberg_wasm/barretenberg_wasm.ts b/ts/src/barretenberg_wasm/barretenberg_wasm.ts index f1bfbba266..0452246096 100644 --- a/ts/src/barretenberg_wasm/barretenberg_wasm.ts +++ b/ts/src/barretenberg_wasm/barretenberg_wasm.ts @@ -3,9 +3,8 @@ import { EventEmitter } from 'events'; import createDebug from 'debug'; import { Remote, proxy } from 'comlink'; import { randomBytes } from '../random/index.js'; -// Webpack config swaps this import with ./browser/index.js -// You can toggle between these two imports to sanity check the type-safety. -import { fetchCode, getNumCpu, createWorker, getRemoteBarretenbergWasm, threadLogger, killSelf } from './node/index.js'; +import { fetchCode, getNumCpu, createWorker, getRemoteBarretenbergWasm, threadLogger, killSelf } from 'dynamic/barretenberg_wasm'; +// import { fetchCode, getNumCpu, createWorker, getRemoteBarretenbergWasm, threadLogger, killSelf } from './browser/index.js'; const debug = createDebug('bb.js:wasm'); @@ -34,7 +33,7 @@ export class BarretenbergWasm { * Used when running in the browser, because we can't block the main thread. */ public static async newWorker(threads?: number) { - const worker = createWorker(); + const worker: any = createWorker(); const wasm = getRemoteBarretenbergWasm(worker); await wasm.init(threads, proxy(debug)); return { worker, wasm }; @@ -77,7 +76,7 @@ export class BarretenbergWasm { // Create worker threads. Create 1 less than requested, as main thread counts as a thread. this.logger('creating worker threads...'); - this.workers = (await Promise.all(Array.from({ length: threads - 1 }).map(createWorker))) as any; + this.workers = (await Promise.all(Array.from({ length: threads - 1 }).map(createWorker as any))) as any; this.remoteWasms = await Promise.all(this.workers.map(getRemoteBarretenbergWasm as any)); await Promise.all(this.remoteWasms.map(w => w.initThread(module, this.memory))); this.logger('init complete.'); diff --git a/ts/src/crs/index.ts b/ts/src/crs/index.ts index ecb4869891..c485b52252 100644 --- a/ts/src/crs/index.ts +++ b/ts/src/crs/index.ts @@ -1 +1,2 @@ -export { Crs } from './browser/index.js'; +export { Crs } from 'dynamic/crs'; +// export { Crs } from './browser/index.js'; diff --git a/ts/src/examples/simple.test.ts b/ts/src/examples/simple.test.ts index 0c6d7c0d41..828b0cb4ea 100644 --- a/ts/src/examples/simple.test.ts +++ b/ts/src/examples/simple.test.ts @@ -1,4 +1,4 @@ -import { Crs } from '../index.browser.js'; +import { Crs } from '../index.js'; import { BarretenbergApiAsync, newBarretenbergApiAsync } from '../factory/index.js'; import { RawBuffer } from '../types/index.js'; diff --git a/ts/src/index.node.ts b/ts/src/index.node.ts deleted file mode 100644 index 686cf4af06..0000000000 --- a/ts/src/index.node.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from './crs/index.js'; -export * from './barretenberg_wasm/index.js'; -export * from './barretenberg_api/index.js'; -export * from './factory/index.js'; -export { RawBuffer } from './types/index.js'; diff --git a/ts/src/index.browser.ts b/ts/src/index.ts similarity index 100% rename from ts/src/index.browser.ts rename to ts/src/index.ts diff --git a/ts/src/main.ts b/ts/src/main.ts index 21bc5bcf77..4038f69a01 100755 --- a/ts/src/main.ts +++ b/ts/src/main.ts @@ -1,5 +1,5 @@ #!/usr/bin/env -S node --no-warnings -import { Crs, BarretenbergApiAsync, newBarretenbergApiAsync, RawBuffer } from './index.browser.js'; +import { Crs, BarretenbergApiAsync, newBarretenbergApiAsync, RawBuffer } from './index.js'; import createDebug from 'debug'; import { readFileSync, writeFileSync } from 'fs'; import { gunzipSync } from 'zlib'; diff --git a/ts/src/random/index.ts b/ts/src/random/index.ts index 1c1237774a..680db00085 100644 --- a/ts/src/random/index.ts +++ b/ts/src/random/index.ts @@ -1 +1,2 @@ -export * from './browser/index.js'; +export * from 'dynamic/random'; +// export * from './browser/index.js'; diff --git a/ts/src/types/index.ts b/ts/src/types/index.ts index 4e698cdbc8..bd56535c4a 100644 --- a/ts/src/types/index.ts +++ b/ts/src/types/index.ts @@ -1,5 +1,6 @@ +export * from 'dynamic/types'; +// export * from './browser/index.js'; export * from './ptr.js'; export * from './fields.js'; -export * from './browser/index.js'; export * from './fixed_size_buffer.js'; export * from './raw_buffer.js'; diff --git a/ts/tsconfig.json b/ts/tsconfig.json index 8d45eba41a..68e87949f7 100644 --- a/ts/tsconfig.json +++ b/ts/tsconfig.json @@ -1,7 +1,12 @@ { "compilerOptions": { + "baseUrl": ".", "target": "es2020", - "lib": ["dom", "esnext", "es2017.object"], + "lib": [ + "dom", + "esnext", + "es2017.object" + ], "module": "NodeNext", "strict": false, "declaration": true, @@ -15,7 +20,23 @@ "composite": true, "outDir": "dest", "rootDir": "src", - "tsBuildInfoFile": ".tsbuildinfo" + "tsBuildInfoFile": ".tsbuildinfo", + "paths": { + "dynamic/barretenberg_wasm": [ + "src/barretenberg_wasm/browser/index.ts" + ], + "dynamic/crs": [ + "src/crs/browser/index.ts" + ], + "dynamic/random": [ + "src/random/browser/index.ts" + ], + "dynamic/types": [ + "src/types/browser/index.ts" + ] + } }, - "include": ["src"] -} + "include": [ + "src" + ] +} \ No newline at end of file diff --git a/ts/webpack.config.cjs b/ts/webpack.config.cjs index e109395895..1e176a31d6 100644 --- a/ts/webpack.config.cjs +++ b/ts/webpack.config.cjs @@ -1,19 +1,17 @@ /** * Builds both the web and node version of the worker, and outputs it to the dest directory. */ -const { resolve } = require('path'); +const path = require('path'); const ResolveTypeScriptPlugin = require('resolve-typescript-plugin'); const CopyWebpackPlugin = require('copy-webpack-plugin'); -const HtmlWebpackPlugin = require('html-webpack-plugin'); +const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin'); const webpack = require('webpack'); +const { resolve } = path; module.exports = { target: 'web', mode: 'production', - entry: { - node: './src/index.node.ts', - browser: './src/index.browser.ts', - }, + entry: './src/index.ts', module: { rules: [ { @@ -44,11 +42,6 @@ module.exports = { ], resolve: { alias: { - // './node/index': resolve(__dirname, './browser/index'), - './node/index': resolve(__dirname, 'src/barretenberg_wasm/browser/index'), - './src/barrenberg_wasm/node/index': resolve(__dirname, './src/barrenberg_wasm/browser/index'), - './src/barrenberg_wasm/node/index.js': resolve(__dirname, './src/barrenberg_wasm/browser/index.js'), - './src/barrenberg_wasm/node/index.js': './src/barrenberg_wasm/browser/index.js', 'idb-keyval': require.resolve('idb-keyval'), crypto: require.resolve('crypto-browserify'), path: require.resolve('path-browserify'), @@ -58,9 +51,13 @@ module.exports = { os: require.resolve('os-browserify/browser'), events: false, }, - plugins: [new ResolveTypeScriptPlugin()], + plugins: [ + new ResolveTypeScriptPlugin(), + new TsconfigPathsPlugin({ configFile: path.resolve(__dirname, "./tsconfig.json")}) + ], }, optimization: { minimize: false, }, + }; diff --git a/ts/yarn.lock b/ts/yarn.lock index 986eedd592..62f6d7bfc8 100644 --- a/ts/yarn.lock +++ b/ts/yarn.lock @@ -31,6 +31,7 @@ __metadata: comlink: ^4.4.1 commander: ^10.0.1 copy-webpack-plugin: ^11.0.0 + cross-env: ^7.0.3 crypto-browserify: ^3.12.0 debug: ^4.3.4 eslint: ^8.35.0 @@ -42,10 +43,12 @@ __metadata: os-browserify: ^0.3.0 path-browserify: ^1.0.1 prettier: ^2.8.4 + replace-in-file: ^7.0.1 resolve-typescript-plugin: ^2.0.1 ts-jest: ^29.1.0 ts-loader: ^9.4.2 ts-node: ^10.9.1 + tsconfig-paths-webpack-plugin: ^4.0.1 tslib: ^2.4.0 typescript: ^5.0.4 url: ^0.11.1 @@ -2357,7 +2360,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:^4.0.0, chalk@npm:^4.1.0": +"chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.2": version: 4.1.2 resolution: "chalk@npm:4.1.2" dependencies: @@ -2715,7 +2718,19 @@ __metadata: languageName: node linkType: hard -"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3": +"cross-env@npm:^7.0.3": + version: 7.0.3 + resolution: "cross-env@npm:7.0.3" + dependencies: + cross-spawn: ^7.0.1 + bin: + cross-env: src/bin/cross-env.js + cross-env-shell: src/bin/cross-env-shell.js + checksum: 26f2f3ea2ab32617f57effb70d329c2070d2f5630adc800985d8b30b56e8bf7f5f439dd3a0358b79cee6f930afc23cf8e23515f17ccfb30092c6b62c6b630a79 + languageName: node + linkType: hard + +"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3": version: 7.0.3 resolution: "cross-spawn@npm:7.0.3" dependencies: @@ -3064,7 +3079,7 @@ __metadata: languageName: node linkType: hard -"enhanced-resolve@npm:^5.0.0, enhanced-resolve@npm:^5.14.1": +"enhanced-resolve@npm:^5.0.0, enhanced-resolve@npm:^5.14.1, enhanced-resolve@npm:^5.7.0": version: 5.15.0 resolution: "enhanced-resolve@npm:5.15.0" dependencies: @@ -3764,6 +3779,19 @@ __metadata: languageName: node linkType: hard +"glob@npm:^8.1.0": + version: 8.1.0 + resolution: "glob@npm:8.1.0" + dependencies: + fs.realpath: ^1.0.0 + inflight: ^1.0.4 + inherits: 2 + minimatch: ^5.0.1 + once: ^1.3.0 + checksum: 92fbea3221a7d12075f26f0227abac435de868dd0736a17170663783296d0dd8d3d532a5672b4488a439bf5d7fb85cdd07c11185d6cd39184f0385cbdfb86a47 + languageName: node + linkType: hard + "globals@npm:^11.1.0": version: 11.12.0 resolution: "globals@npm:11.12.0" @@ -5276,6 +5304,15 @@ __metadata: languageName: node linkType: hard +"minimatch@npm:^5.0.1": + version: 5.1.6 + resolution: "minimatch@npm:5.1.6" + dependencies: + brace-expansion: ^2.0.1 + checksum: 7564208ef81d7065a370f788d337cd80a689e981042cb9a1d0e6580b6c6a8c9279eba80010516e258835a988363f99f54a6f711a315089b8b42694f5da9d0d77 + languageName: node + linkType: hard + "minimatch@npm:^9.0.1": version: 9.0.1 resolution: "minimatch@npm:9.0.1" @@ -5285,6 +5322,13 @@ __metadata: languageName: node linkType: hard +"minimist@npm:^1.2.6": + version: 1.2.8 + resolution: "minimist@npm:1.2.8" + checksum: 75a6d645fb122dad29c06a7597bddea977258957ed88d7a6df59b5cd3fe4a527e253e9bbf2e783e4b73657f9098b96a5fe96ab8a113655d4109108577ecf85b0 + languageName: node + linkType: hard + "minipass-collect@npm:^1.0.2": version: 1.0.2 resolution: "minipass-collect@npm:1.0.2" @@ -6087,6 +6131,19 @@ __metadata: languageName: node linkType: hard +"replace-in-file@npm:^7.0.1": + version: 7.0.1 + resolution: "replace-in-file@npm:7.0.1" + dependencies: + chalk: ^4.1.2 + glob: ^8.1.0 + yargs: ^17.7.2 + bin: + replace-in-file: bin/cli.js + checksum: da6115387bf79ac7fb2057a4212da4159cc85889e34212df62d86cc3b5ceb23167a7c22ce0dc0cebfe55c01a08ccd99fd496398375dfa29e30f173013c81579a + languageName: node + linkType: hard + "require-directory@npm:^2.1.1": version: 2.1.1 resolution: "require-directory@npm:2.1.1" @@ -6674,6 +6731,13 @@ __metadata: languageName: node linkType: hard +"strip-bom@npm:^3.0.0": + version: 3.0.0 + resolution: "strip-bom@npm:3.0.0" + checksum: 8d50ff27b7ebe5ecc78f1fe1e00fcdff7af014e73cf724b46fb81ef889eeb1015fc5184b64e81a2efe002180f3ba431bdd77e300da5c6685d702780fbf0c8d5b + languageName: node + linkType: hard + "strip-bom@npm:^4.0.0": version: 4.0.0 resolution: "strip-bom@npm:4.0.0" @@ -6927,6 +6991,28 @@ __metadata: languageName: node linkType: hard +"tsconfig-paths-webpack-plugin@npm:^4.0.1": + version: 4.0.1 + resolution: "tsconfig-paths-webpack-plugin@npm:4.0.1" + dependencies: + chalk: ^4.1.0 + enhanced-resolve: ^5.7.0 + tsconfig-paths: ^4.1.2 + checksum: a09e765c4939379fa060f78bbc906d0a7be541b9b49d3ad4744e99a2e87f28aa30d549a549196159bc5a50f420fdb1391b8eed360f47ee8ce40e15dcb800b5aa + languageName: node + linkType: hard + +"tsconfig-paths@npm:^4.1.2": + version: 4.2.0 + resolution: "tsconfig-paths@npm:4.2.0" + dependencies: + json5: ^2.2.2 + minimist: ^1.2.6 + strip-bom: ^3.0.0 + checksum: 28c5f7bbbcabc9dabd4117e8fdc61483f6872a1c6b02a4b1c4d68c5b79d06896c3cc9547610c4c3ba64658531caa2de13ead1ea1bf321c7b53e969c4752b98c7 + languageName: node + linkType: hard + "tslib@npm:2.5.0": version: 2.5.0 resolution: "tslib@npm:2.5.0" @@ -7442,7 +7528,7 @@ __metadata: languageName: node linkType: hard -"yargs@npm:^17.3.1": +"yargs@npm:^17.3.1, yargs@npm:^17.7.2": version: 17.7.2 resolution: "yargs@npm:17.7.2" dependencies: From 226f016999a6fa9e001fdf33a9aac077b66d5479 Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 23 Jun 2023 13:12:11 +0000 Subject: [PATCH 22/88] Readd two entrypoints --- ts/package.json | 21 ++++----------------- ts/src/examples/simple.test.ts | 2 +- ts/src/{index.ts => index.browser.ts} | 0 ts/src/index.node.ts | 5 +++++ ts/src/main.ts | 2 +- ts/webpack.config.cjs | 5 ++++- 6 files changed, 15 insertions(+), 20 deletions(-) rename ts/src/{index.ts => index.browser.ts} (100%) create mode 100644 ts/src/index.node.ts diff --git a/ts/package.json b/ts/package.json index 78d120b724..f09b3f0b73 100644 --- a/ts/package.json +++ b/ts/package.json @@ -8,26 +8,13 @@ "displayName": "bb.js", "tsconfig": "./tsconfig.json" }, - "main": "./dest/index.js", + "main": "./dest/index.browser.js", "bin": "./dest/main.js", "exports": { ".": { - "require": "./dest/index.js", - "import": "./dest/index.js" - }, - "./async_map": "./dest/async_map/index.js", - "./barretenberg_api": "./dest/barretenberg_api/index.js", - "./barretenberg_binder": "./dest/barretenberg_binder/index.js", - "./barretenberg_wasm": "./dest/barretenberg_wasm/index.js", - "./bigint-array": "./dest/bigint-array/index.js", - "./bindgen": "./dest/bindgen/index.js", - "./crs": "./dest/crs/index.js", - "./examples": "./dest/examples/index.js", - "./factory": "./dest/factory/index.js", - "./random": "./dest/random/index.js", - "./serialize": "./dest/serialize/index.js", - "./types": "./dest/types/index.js", - "./dest/types": "./dest/types/index.js" + "require": "./dest/index.node.js", + "import": "./dest/index.browser.js" + } }, "files": [ "src/", diff --git a/ts/src/examples/simple.test.ts b/ts/src/examples/simple.test.ts index 828b0cb4ea..0c6d7c0d41 100644 --- a/ts/src/examples/simple.test.ts +++ b/ts/src/examples/simple.test.ts @@ -1,4 +1,4 @@ -import { Crs } from '../index.js'; +import { Crs } from '../index.browser.js'; import { BarretenbergApiAsync, newBarretenbergApiAsync } from '../factory/index.js'; import { RawBuffer } from '../types/index.js'; diff --git a/ts/src/index.ts b/ts/src/index.browser.ts similarity index 100% rename from ts/src/index.ts rename to ts/src/index.browser.ts diff --git a/ts/src/index.node.ts b/ts/src/index.node.ts new file mode 100644 index 0000000000..686cf4af06 --- /dev/null +++ b/ts/src/index.node.ts @@ -0,0 +1,5 @@ +export * from './crs/index.js'; +export * from './barretenberg_wasm/index.js'; +export * from './barretenberg_api/index.js'; +export * from './factory/index.js'; +export { RawBuffer } from './types/index.js'; diff --git a/ts/src/main.ts b/ts/src/main.ts index 4038f69a01..21bc5bcf77 100755 --- a/ts/src/main.ts +++ b/ts/src/main.ts @@ -1,5 +1,5 @@ #!/usr/bin/env -S node --no-warnings -import { Crs, BarretenbergApiAsync, newBarretenbergApiAsync, RawBuffer } from './index.js'; +import { Crs, BarretenbergApiAsync, newBarretenbergApiAsync, RawBuffer } from './index.browser.js'; import createDebug from 'debug'; import { readFileSync, writeFileSync } from 'fs'; import { gunzipSync } from 'zlib'; diff --git a/ts/webpack.config.cjs b/ts/webpack.config.cjs index 1e176a31d6..5edf85cf1d 100644 --- a/ts/webpack.config.cjs +++ b/ts/webpack.config.cjs @@ -11,7 +11,10 @@ const { resolve } = path; module.exports = { target: 'web', mode: 'production', - entry: './src/index.ts', + entry: { + node: './src/index.node.ts', + browser: './src/index.browser.ts', + }, module: { rules: [ { From 557ce64bebefa3f269e4b0c32f6f4845d93fed76 Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 23 Jun 2023 13:13:59 +0000 Subject: [PATCH 23/88] Replace imports --- ts/src/barretenberg_wasm/barretenberg_wasm.ts | 1 - ts/src/crs/index.ts | 1 - ts/src/random/index.ts | 1 - ts/src/types/index.ts | 1 - 4 files changed, 4 deletions(-) diff --git a/ts/src/barretenberg_wasm/barretenberg_wasm.ts b/ts/src/barretenberg_wasm/barretenberg_wasm.ts index 0452246096..4fcaaf8daf 100644 --- a/ts/src/barretenberg_wasm/barretenberg_wasm.ts +++ b/ts/src/barretenberg_wasm/barretenberg_wasm.ts @@ -4,7 +4,6 @@ import createDebug from 'debug'; import { Remote, proxy } from 'comlink'; import { randomBytes } from '../random/index.js'; import { fetchCode, getNumCpu, createWorker, getRemoteBarretenbergWasm, threadLogger, killSelf } from 'dynamic/barretenberg_wasm'; -// import { fetchCode, getNumCpu, createWorker, getRemoteBarretenbergWasm, threadLogger, killSelf } from './browser/index.js'; const debug = createDebug('bb.js:wasm'); diff --git a/ts/src/crs/index.ts b/ts/src/crs/index.ts index c485b52252..9d1f929837 100644 --- a/ts/src/crs/index.ts +++ b/ts/src/crs/index.ts @@ -1,2 +1 @@ export { Crs } from 'dynamic/crs'; -// export { Crs } from './browser/index.js'; diff --git a/ts/src/random/index.ts b/ts/src/random/index.ts index 680db00085..786124d2da 100644 --- a/ts/src/random/index.ts +++ b/ts/src/random/index.ts @@ -1,2 +1 @@ export * from 'dynamic/random'; -// export * from './browser/index.js'; diff --git a/ts/src/types/index.ts b/ts/src/types/index.ts index bd56535c4a..9bf46291db 100644 --- a/ts/src/types/index.ts +++ b/ts/src/types/index.ts @@ -1,5 +1,4 @@ export * from 'dynamic/types'; -// export * from './browser/index.js'; export * from './ptr.js'; export * from './fields.js'; export * from './fixed_size_buffer.js'; From 74de0925bbf4a78eb944d0c5ad7e8dfe542c721a Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 23 Jun 2023 13:33:01 +0000 Subject: [PATCH 24/88] Add exports to package json --- ts/package.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ts/package.json b/ts/package.json index f09b3f0b73..0209d4ccf5 100644 --- a/ts/package.json +++ b/ts/package.json @@ -14,7 +14,11 @@ ".": { "require": "./dest/index.node.js", "import": "./dest/index.browser.js" - } + }, + "./dest/barretenberg_api": "./dest/barretenberg_api/index.js", + "./dest/barretenberg_binder": "./dest/barretenberg_binder/index.js", + "./dest/barretenberg_wasm": "./dest/barretenberg_wasm/index.js", + "./dest/types": "./dest/types/index.js" }, "files": [ "src/", From 6a503c5e31ad71a5533b52e88ac0c7336aa0b281 Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 23 Jun 2023 14:09:42 +0000 Subject: [PATCH 25/88] Fix build --- ts/package.json | 11 ----------- ts/src/barretenberg_wasm/barretenberg_wasm.ts | 8 ++++---- ts/src/barretenberg_wasm/browser/index.ts | 4 ++-- ts/src/types/index.ts | 2 +- ts/yarn.lock | 15 +-------------- 5 files changed, 8 insertions(+), 32 deletions(-) diff --git a/ts/package.json b/ts/package.json index 0209d4ccf5..09e6e43ba9 100644 --- a/ts/package.json +++ b/ts/package.json @@ -10,16 +10,6 @@ }, "main": "./dest/index.browser.js", "bin": "./dest/main.js", - "exports": { - ".": { - "require": "./dest/index.node.js", - "import": "./dest/index.browser.js" - }, - "./dest/barretenberg_api": "./dest/barretenberg_api/index.js", - "./dest/barretenberg_binder": "./dest/barretenberg_binder/index.js", - "./dest/barretenberg_wasm": "./dest/barretenberg_wasm/index.js", - "./dest/types": "./dest/types/index.js" - }, "files": [ "src/", "dest/", @@ -83,7 +73,6 @@ "@typescript-eslint/parser": "^5.54.1", "buffer": "^6.0.3", "copy-webpack-plugin": "^11.0.0", - "cross-env": "^7.0.3", "eslint": "^8.35.0", "eslint-config-prettier": "^8.8.0", "html-webpack-plugin": "^5.5.1", diff --git a/ts/src/barretenberg_wasm/barretenberg_wasm.ts b/ts/src/barretenberg_wasm/barretenberg_wasm.ts index 4fcaaf8daf..c894d3e2ea 100644 --- a/ts/src/barretenberg_wasm/barretenberg_wasm.ts +++ b/ts/src/barretenberg_wasm/barretenberg_wasm.ts @@ -32,7 +32,7 @@ export class BarretenbergWasm { * Used when running in the browser, because we can't block the main thread. */ public static async newWorker(threads?: number) { - const worker: any = createWorker(); + const worker = createWorker(); const wasm = getRemoteBarretenbergWasm(worker); await wasm.init(threads, proxy(debug)); return { worker, wasm }; @@ -65,7 +65,7 @@ export class BarretenbergWasm { // Annoyingly the wasm declares if it's memory is shared or not. So now we need two wasms if we want to be // able to fallback on "non shared memory" situations. - const code = await fetchCode(threads > 1 ? 'barretenberg-threads.wasm' : 'barretenberg.wasm'); + const code = await fetchCode(); const { instance, module } = await WebAssembly.instantiate(code, this.getImportObj(this.memory)); this.instance = instance; @@ -75,7 +75,7 @@ export class BarretenbergWasm { // Create worker threads. Create 1 less than requested, as main thread counts as a thread. this.logger('creating worker threads...'); - this.workers = (await Promise.all(Array.from({ length: threads - 1 }).map(createWorker as any))) as any; + this.workers = (await Promise.all(Array.from({ length: threads - 1 }).map(createWorker))) as any; this.remoteWasms = await Promise.all(this.workers.map(getRemoteBarretenbergWasm as any)); await Promise.all(this.remoteWasms.map(w => w.initThread(module, this.memory))); this.logger('init complete.'); @@ -240,4 +240,4 @@ export class BarretenbergWasm { } } -export type BarretenbergWasmWorker = Remote; +export type BarretenbergWasmWorker = Remote; \ No newline at end of file diff --git a/ts/src/barretenberg_wasm/browser/index.ts b/ts/src/barretenberg_wasm/browser/index.ts index 03152494c0..261cc1b007 100644 --- a/ts/src/barretenberg_wasm/browser/index.ts +++ b/ts/src/barretenberg_wasm/browser/index.ts @@ -2,8 +2,8 @@ import { wrap } from 'comlink'; import { BarretenbergWasmWorker, type BarretenbergWasm } from '../barretenberg_wasm.js'; import debug from 'debug'; -export async function fetchCode(name: string) { - const wasmModuleUrl = new URL(`../../${name}`, import.meta.url); +export async function fetchCode() { + const wasmModuleUrl = new URL(`../../barretenberg.wasm`, import.meta.url); const res = await fetch(wasmModuleUrl.href); return await res.arrayBuffer(); } diff --git a/ts/src/types/index.ts b/ts/src/types/index.ts index 9bf46291db..a3f36a242f 100644 --- a/ts/src/types/index.ts +++ b/ts/src/types/index.ts @@ -1,5 +1,5 @@ -export * from 'dynamic/types'; export * from './ptr.js'; export * from './fields.js'; +export * from 'dynamic/types'; export * from './fixed_size_buffer.js'; export * from './raw_buffer.js'; diff --git a/ts/yarn.lock b/ts/yarn.lock index 62f6d7bfc8..51b51f6d04 100644 --- a/ts/yarn.lock +++ b/ts/yarn.lock @@ -31,7 +31,6 @@ __metadata: comlink: ^4.4.1 commander: ^10.0.1 copy-webpack-plugin: ^11.0.0 - cross-env: ^7.0.3 crypto-browserify: ^3.12.0 debug: ^4.3.4 eslint: ^8.35.0 @@ -2718,19 +2717,7 @@ __metadata: languageName: node linkType: hard -"cross-env@npm:^7.0.3": - version: 7.0.3 - resolution: "cross-env@npm:7.0.3" - dependencies: - cross-spawn: ^7.0.1 - bin: - cross-env: src/bin/cross-env.js - cross-env-shell: src/bin/cross-env-shell.js - checksum: 26f2f3ea2ab32617f57effb70d329c2070d2f5630adc800985d8b30b56e8bf7f5f439dd3a0358b79cee6f930afc23cf8e23515f17ccfb30092c6b62c6b630a79 - languageName: node - linkType: hard - -"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3": +"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3": version: 7.0.3 resolution: "cross-spawn@npm:7.0.3" dependencies: From dc767bc4c6c681638ac9b4673d1f70527c770656 Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 23 Jun 2023 14:15:53 +0000 Subject: [PATCH 26/88] Single entrypoint --- ts/package.json | 2 +- ts/src/examples/simple.test.ts | 2 +- ts/src/index.node.ts | 5 ----- ts/src/{index.browser.ts => index.ts} | 0 ts/src/main.ts | 2 +- ts/webpack.config.cjs | 5 +---- 6 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 ts/src/index.node.ts rename ts/src/{index.browser.ts => index.ts} (100%) diff --git a/ts/package.json b/ts/package.json index 09e6e43ba9..dae1cd2915 100644 --- a/ts/package.json +++ b/ts/package.json @@ -8,7 +8,7 @@ "displayName": "bb.js", "tsconfig": "./tsconfig.json" }, - "main": "./dest/index.browser.js", + "main": "./dest/index.js", "bin": "./dest/main.js", "files": [ "src/", diff --git a/ts/src/examples/simple.test.ts b/ts/src/examples/simple.test.ts index 0c6d7c0d41..828b0cb4ea 100644 --- a/ts/src/examples/simple.test.ts +++ b/ts/src/examples/simple.test.ts @@ -1,4 +1,4 @@ -import { Crs } from '../index.browser.js'; +import { Crs } from '../index.js'; import { BarretenbergApiAsync, newBarretenbergApiAsync } from '../factory/index.js'; import { RawBuffer } from '../types/index.js'; diff --git a/ts/src/index.node.ts b/ts/src/index.node.ts deleted file mode 100644 index 686cf4af06..0000000000 --- a/ts/src/index.node.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from './crs/index.js'; -export * from './barretenberg_wasm/index.js'; -export * from './barretenberg_api/index.js'; -export * from './factory/index.js'; -export { RawBuffer } from './types/index.js'; diff --git a/ts/src/index.browser.ts b/ts/src/index.ts similarity index 100% rename from ts/src/index.browser.ts rename to ts/src/index.ts diff --git a/ts/src/main.ts b/ts/src/main.ts index 21bc5bcf77..4038f69a01 100755 --- a/ts/src/main.ts +++ b/ts/src/main.ts @@ -1,5 +1,5 @@ #!/usr/bin/env -S node --no-warnings -import { Crs, BarretenbergApiAsync, newBarretenbergApiAsync, RawBuffer } from './index.browser.js'; +import { Crs, BarretenbergApiAsync, newBarretenbergApiAsync, RawBuffer } from './index.js'; import createDebug from 'debug'; import { readFileSync, writeFileSync } from 'fs'; import { gunzipSync } from 'zlib'; diff --git a/ts/webpack.config.cjs b/ts/webpack.config.cjs index 5edf85cf1d..1e176a31d6 100644 --- a/ts/webpack.config.cjs +++ b/ts/webpack.config.cjs @@ -11,10 +11,7 @@ const { resolve } = path; module.exports = { target: 'web', mode: 'production', - entry: { - node: './src/index.node.ts', - browser: './src/index.browser.ts', - }, + entry: './src/index.ts', module: { rules: [ { From cb839ebc1b8aeaca8d12515b8975bcd89a551857 Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 23 Jun 2023 14:27:23 +0000 Subject: [PATCH 27/88] Improve webpack configuration --- ts/webpack.config.cjs | 67 +++++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 24 deletions(-) diff --git a/ts/webpack.config.cjs b/ts/webpack.config.cjs index 1e176a31d6..9705df24e7 100644 --- a/ts/webpack.config.cjs +++ b/ts/webpack.config.cjs @@ -8,8 +8,7 @@ const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin'); const webpack = require('webpack'); const { resolve } = path; -module.exports = { - target: 'web', +const common = { mode: 'production', entry: './src/index.ts', module: { @@ -20,26 +19,6 @@ module.exports = { }, ], }, - output: { - path: resolve(__dirname, './dest'), - filename: '[name].js', - }, - plugins: [ - new webpack.DefinePlugin({ 'process.env.NODE_DEBUG': false }), - new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }), - new CopyWebpackPlugin({ - patterns: [ - { - from: `../cpp/build-wasm/bin/barretenberg.wasm`, - to: 'barretenberg.wasm', - }, - { - from: `../cpp/build-wasm-threads/bin/barretenberg.wasm`, - to: 'barretenberg-threads.wasm', - }, - ], - }), - ], resolve: { alias: { 'idb-keyval': require.resolve('idb-keyval'), @@ -59,5 +38,45 @@ module.exports = { optimization: { minimize: false, }, - -}; +} + +module.exports = [ + // Webpack configuration for web output + { + ...common, + target: 'web', + output: { + path: resolve(__dirname, './dest/web'), + filename: '[name].js', + }, + plugins: [ + new webpack.DefinePlugin({ 'process.env.NODE_DEBUG': false }), + new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }), + ], + }, + // Webpack configuration for node output + { + ...common, + target: 'node', + output: { + path: resolve(__dirname, './dest/node'), + filename: '[name].js', + }, + plugins: [ + new webpack.DefinePlugin({ 'process.env.NODE_DEBUG': false }), + new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }), + new CopyWebpackPlugin({ + patterns: [ + { + from: `../cpp/build-wasm/bin/barretenberg.wasm`, + to: '../barretenberg.wasm', + }, + { + from: `../cpp/build-wasm-threads/bin/barretenberg.wasm`, + to: '../barretenberg-threads.wasm', + }, + ], + }), + ], + }, +]; From d41d42d3c4b9c5a11c014ada4a0f2cde221de7d4 Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 23 Jun 2023 15:14:20 +0000 Subject: [PATCH 28/88] Webpack improvements --- ts/generate_tsconfig.cjs | 2 +- ts/package.json | 2 +- ts/replace_imports.cjs | 2 +- ts/tsconfig.json | 2 +- ts/webpack.config.cjs | 40 ++++++++++++++++++++++++++-------------- 5 files changed, 30 insertions(+), 18 deletions(-) diff --git a/ts/generate_tsconfig.cjs b/ts/generate_tsconfig.cjs index bd88e35a1d..9ff4ba7fe0 100644 --- a/ts/generate_tsconfig.cjs +++ b/ts/generate_tsconfig.cjs @@ -32,7 +32,7 @@ const tsconfig = { importHelpers: true, resolveJsonModule: true, composite: true, - outDir: "dest", + outDir: `dest/${buildTarget}`, rootDir: "src", tsBuildInfoFile: ".tsbuildinfo", paths: generatePaths() diff --git a/ts/package.json b/ts/package.json index dae1cd2915..49797bc1f2 100644 --- a/ts/package.json +++ b/ts/package.json @@ -20,7 +20,7 @@ "build": "yarn clean && yarn build:wasm && yarn build:ts:browser", "build:dev": "tsc -b --watch", "build:wasm": "cd ../cpp && cmake --preset wasm-threads && cmake --build --preset wasm-threads && cmake --preset wasm && cmake --build --preset wasm", - "build:ts:browser": "BUILD_TARGET=browser node generate_tsconfig.cjs && tsc -b && webpack && chmod +x ./dest/main.js && BUILD_TARGET=browser node replace_imports.cjs", + "build:ts:browser": "BUILD_TARGET=browser node generate_tsconfig.cjs && tsc -b && webpack && chmod +x ./dest/browser/main.js && BUILD_TARGET=browser node replace_imports.cjs", "build:bindings": "cd .. && ./scripts/bindgen.sh", "serve": "webpack serve", "formatting": "prettier --check ./src && eslint --max-warnings 0 ./src", diff --git a/ts/replace_imports.cjs b/ts/replace_imports.cjs index ae0667079c..40d7d28c36 100644 --- a/ts/replace_imports.cjs +++ b/ts/replace_imports.cjs @@ -8,7 +8,7 @@ async function replaceImports() { try { dynamic_imports.forEach(async item => { const results = await replaceInFile({ - files: path.resolve(__dirname, `dest/${item}/*`), + files: path.resolve(__dirname, `dest/${buildTarget}/${item}/*`), from: new RegExp(`'dynamic\\/${item}';`, 'g'), to: `'./${buildTarget}/index.js';`, }); diff --git a/ts/tsconfig.json b/ts/tsconfig.json index 68e87949f7..1cc358d305 100644 --- a/ts/tsconfig.json +++ b/ts/tsconfig.json @@ -18,7 +18,7 @@ "importHelpers": true, "resolveJsonModule": true, "composite": true, - "outDir": "dest", + "outDir": "dest/browser", "rootDir": "src", "tsBuildInfoFile": ".tsbuildinfo", "paths": { diff --git a/ts/webpack.config.cjs b/ts/webpack.config.cjs index 9705df24e7..e61a7808bb 100644 --- a/ts/webpack.config.cjs +++ b/ts/webpack.config.cjs @@ -46,20 +46,7 @@ module.exports = [ ...common, target: 'web', output: { - path: resolve(__dirname, './dest/web'), - filename: '[name].js', - }, - plugins: [ - new webpack.DefinePlugin({ 'process.env.NODE_DEBUG': false }), - new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }), - ], - }, - // Webpack configuration for node output - { - ...common, - target: 'node', - output: { - path: resolve(__dirname, './dest/node'), + path: resolve(__dirname, './dest/browser'), filename: '[name].js', }, plugins: [ @@ -79,4 +66,29 @@ module.exports = [ }), ], }, + // Webpack configuration for node output + // { + // ...common, + // target: 'node', + // output: { + // path: resolve(__dirname, './dest/node'), + // filename: '[name].js', + // }, + // plugins: [ + // new webpack.DefinePlugin({ 'process.env.NODE_DEBUG': false }), + // new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }), + // new CopyWebpackPlugin({ + // patterns: [ + // { + // from: `../cpp/build-wasm/bin/barretenberg.wasm`, + // to: '../barretenberg.wasm', + // }, + // { + // from: `../cpp/build-wasm-threads/bin/barretenberg.wasm`, + // to: '../barretenberg-threads.wasm', + // }, + // ], + // }), + // ], + // }, ]; From 480c3eaf5267966e02268d299ac3ec2dc4e1cabd Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 23 Jun 2023 15:39:18 +0000 Subject: [PATCH 29/88] Fix wasm link --- ts/package.json | 6 +- ts/replace_imports.cjs | 11 ++- ts/src/barretenberg_wasm/node/index.ts | 4 +- ts/tsconfig.json | 10 +-- ts/webpack.config.cjs | 105 +++++++++++++------------ ts/yarn.lock | 8 ++ 6 files changed, 81 insertions(+), 63 deletions(-) diff --git a/ts/package.json b/ts/package.json index 49797bc1f2..4efa4c1af4 100644 --- a/ts/package.json +++ b/ts/package.json @@ -17,10 +17,11 @@ ], "scripts": { "clean": "rm -rf ./dest .tsbuildinfo", - "build": "yarn clean && yarn build:wasm && yarn build:ts:browser", + "build": "yarn clean && yarn build:wasm && yarn build:ts:browser && yarn build:ts:node", "build:dev": "tsc -b --watch", "build:wasm": "cd ../cpp && cmake --preset wasm-threads && cmake --build --preset wasm-threads && cmake --preset wasm && cmake --build --preset wasm", - "build:ts:browser": "BUILD_TARGET=browser node generate_tsconfig.cjs && tsc -b && webpack && chmod +x ./dest/browser/main.js && BUILD_TARGET=browser node replace_imports.cjs", + "build:ts:browser": "BUILD_TARGET=browser node generate_tsconfig.cjs && tsc -b && BUILD_TARGET=browser webpack && chmod +x ./dest/browser/main.js && BUILD_TARGET=browser node replace_imports.cjs", + "build:ts:node": "BUILD_TARGET=node node generate_tsconfig.cjs && tsc -b && BUILD_TARGET=node webpack && chmod +x ./dest/node/main.js && BUILD_TARGET=node node replace_imports.cjs", "build:bindings": "cd .. && ./scripts/bindgen.sh", "serve": "webpack serve", "formatting": "prettier --check ./src && eslint --max-warnings 0 ./src", @@ -55,6 +56,7 @@ "crypto-browserify": "^3.12.0", "debug": "^4.3.4", "eventemitter3": "^5.0.1", + "fs": "^0.0.1-security", "idb-keyval": "^6.2.1", "os-browserify": "^0.3.0", "path-browserify": "^1.0.1", diff --git a/ts/replace_imports.cjs b/ts/replace_imports.cjs index 40d7d28c36..cfc9c1f938 100644 --- a/ts/replace_imports.cjs +++ b/ts/replace_imports.cjs @@ -7,13 +7,20 @@ const buildTarget = process.env.BUILD_TARGET; async function replaceImports() { try { dynamic_imports.forEach(async item => { - const results = await replaceInFile({ + await replaceInFile({ files: path.resolve(__dirname, `dest/${buildTarget}/${item}/*`), from: new RegExp(`'dynamic\\/${item}';`, 'g'), to: `'./${buildTarget}/index.js';`, }); - console.log(results.filter(r => r.hasChanged === true)) }); + + // hack to allow for shared .wasm files between build targets + await replaceInFile({ + files: path.resolve(__dirname, `dest/${buildTarget}/barretenberg_wasm/${buildTarget}/index.js`), + from: /new URL\(`\.\.\/\.\.\/barretenberg\.wasm`, import\.meta\.url\)/g, + to: `new URL('../../../barretenberg.wasm', import.meta.url)`, + }); + } catch (error) { console.error('Error occurred:', error); } diff --git a/ts/src/barretenberg_wasm/node/index.ts b/ts/src/barretenberg_wasm/node/index.ts index 7285cbda50..68b42a7b0a 100644 --- a/ts/src/barretenberg_wasm/node/index.ts +++ b/ts/src/barretenberg_wasm/node/index.ts @@ -8,9 +8,9 @@ import { wrap } from 'comlink'; import { nodeEndpoint } from './node_endpoint.js'; import { writeSync } from 'fs'; -export async function fetchCode(name: string) { +export async function fetchCode() { const __dirname = dirname(fileURLToPath(import.meta.url)); - return await readFile(__dirname + '/../../' + name); + return await readFile(__dirname + '/../../barretenberg.wasm'); } export function createWorker() { diff --git a/ts/tsconfig.json b/ts/tsconfig.json index 1cc358d305..4b3dc9a80b 100644 --- a/ts/tsconfig.json +++ b/ts/tsconfig.json @@ -18,21 +18,21 @@ "importHelpers": true, "resolveJsonModule": true, "composite": true, - "outDir": "dest/browser", + "outDir": "dest/node", "rootDir": "src", "tsBuildInfoFile": ".tsbuildinfo", "paths": { "dynamic/barretenberg_wasm": [ - "src/barretenberg_wasm/browser/index.ts" + "src/barretenberg_wasm/node/index.ts" ], "dynamic/crs": [ - "src/crs/browser/index.ts" + "src/crs/node/index.ts" ], "dynamic/random": [ - "src/random/browser/index.ts" + "src/random/node/index.ts" ], "dynamic/types": [ - "src/types/browser/index.ts" + "src/types/node/index.ts" ] } }, diff --git a/ts/webpack.config.cjs b/ts/webpack.config.cjs index e61a7808bb..7186e8d5bd 100644 --- a/ts/webpack.config.cjs +++ b/ts/webpack.config.cjs @@ -8,6 +8,8 @@ const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin'); const webpack = require('webpack'); const { resolve } = path; +const isNode = process.env.BUILD_TARGET === 'node'; + const common = { mode: 'production', entry: './src/index.ts', @@ -32,7 +34,7 @@ const common = { }, plugins: [ new ResolveTypeScriptPlugin(), - new TsconfigPathsPlugin({ configFile: path.resolve(__dirname, "./tsconfig.json")}) + new TsconfigPathsPlugin({ configFile: path.resolve(__dirname, "./tsconfig.json") }) ], }, optimization: { @@ -40,55 +42,54 @@ const common = { }, } -module.exports = [ - // Webpack configuration for web output - { - ...common, - target: 'web', - output: { - path: resolve(__dirname, './dest/browser'), - filename: '[name].js', - }, - plugins: [ - new webpack.DefinePlugin({ 'process.env.NODE_DEBUG': false }), - new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }), - new CopyWebpackPlugin({ - patterns: [ - { - from: `../cpp/build-wasm/bin/barretenberg.wasm`, - to: '../barretenberg.wasm', - }, - { - from: `../cpp/build-wasm-threads/bin/barretenberg.wasm`, - to: '../barretenberg-threads.wasm', - }, - ], - }), - ], +const webConfig = { + ...common, + target: 'web', + output: { + path: resolve(__dirname, './dest/browser'), + filename: '[name].js', }, - // Webpack configuration for node output - // { - // ...common, - // target: 'node', - // output: { - // path: resolve(__dirname, './dest/node'), - // filename: '[name].js', - // }, - // plugins: [ - // new webpack.DefinePlugin({ 'process.env.NODE_DEBUG': false }), - // new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }), - // new CopyWebpackPlugin({ - // patterns: [ - // { - // from: `../cpp/build-wasm/bin/barretenberg.wasm`, - // to: '../barretenberg.wasm', - // }, - // { - // from: `../cpp/build-wasm-threads/bin/barretenberg.wasm`, - // to: '../barretenberg-threads.wasm', - // }, - // ], - // }), - // ], - // }, -]; + plugins: [ + new webpack.DefinePlugin({ 'process.env.NODE_DEBUG': false }), + new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }), + new CopyWebpackPlugin({ + patterns: [ + { + from: `../cpp/build-wasm/bin/barretenberg.wasm`, + to: '../barretenberg.wasm', + }, + { + from: `../cpp/build-wasm-threads/bin/barretenberg.wasm`, + to: '../barretenberg-threads.wasm', + }, + ], + }), + ], +} + +const nodeConfig = { + ...common, + target: 'node', + output: { + path: resolve(__dirname, './dest/node'), + filename: '[name].js', + }, + plugins: [ + new webpack.DefinePlugin({ 'process.env.NODE_DEBUG': false }), + new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }), + new CopyWebpackPlugin({ + patterns: [ + { + from: `../cpp/build-wasm/bin/barretenberg.wasm`, + to: '../barretenberg.wasm', + }, + { + from: `../cpp/build-wasm-threads/bin/barretenberg.wasm`, + to: '../barretenberg-threads.wasm', + }, + ], + }), + ], +} + +module.exports = isNode ? nodeConfig : webConfig; diff --git a/ts/yarn.lock b/ts/yarn.lock index 51b51f6d04..cc628236a6 100644 --- a/ts/yarn.lock +++ b/ts/yarn.lock @@ -36,6 +36,7 @@ __metadata: eslint: ^8.35.0 eslint-config-prettier: ^8.8.0 eventemitter3: ^5.0.1 + fs: ^0.0.1-security html-webpack-plugin: ^5.5.1 idb-keyval: ^6.2.1 jest: ^29.5.0 @@ -3630,6 +3631,13 @@ __metadata: languageName: node linkType: hard +"fs@npm:^0.0.1-security": + version: 0.0.1-security + resolution: "fs@npm:0.0.1-security" + checksum: 53c6230e1faae9fa32c1df82c16a84b51b1243d20f3da2b64bd110bb472b73b9185169b703e008356e3cdc92d155088b617d9d39a63b5227a30b3621baad7f5d + languageName: node + linkType: hard + "fsevents@npm:^2.3.2, fsevents@npm:~2.3.2": version: 2.3.2 resolution: "fsevents@npm:2.3.2" From 10fbdf4a5e77398542e14324b8bfb75429d79625 Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 23 Jun 2023 16:26:39 +0000 Subject: [PATCH 30/88] Fix wasm links --- ts/replace_imports.cjs | 5 ++--- ts/src/barretenberg_wasm/barretenberg_wasm.ts | 2 +- ts/src/barretenberg_wasm/browser/index.ts | 3 ++- ts/src/barretenberg_wasm/node/index.ts | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ts/replace_imports.cjs b/ts/replace_imports.cjs index cfc9c1f938..3dba349a34 100644 --- a/ts/replace_imports.cjs +++ b/ts/replace_imports.cjs @@ -17,10 +17,9 @@ async function replaceImports() { // hack to allow for shared .wasm files between build targets await replaceInFile({ files: path.resolve(__dirname, `dest/${buildTarget}/barretenberg_wasm/${buildTarget}/index.js`), - from: /new URL\(`\.\.\/\.\.\/barretenberg\.wasm`, import\.meta\.url\)/g, - to: `new URL('../../../barretenberg.wasm', import.meta.url)`, + from: /\.\.\/\.\.\//g, + to: `../../../`, }); - } catch (error) { console.error('Error occurred:', error); } diff --git a/ts/src/barretenberg_wasm/barretenberg_wasm.ts b/ts/src/barretenberg_wasm/barretenberg_wasm.ts index c894d3e2ea..8c8c21f295 100644 --- a/ts/src/barretenberg_wasm/barretenberg_wasm.ts +++ b/ts/src/barretenberg_wasm/barretenberg_wasm.ts @@ -65,7 +65,7 @@ export class BarretenbergWasm { // Annoyingly the wasm declares if it's memory is shared or not. So now we need two wasms if we want to be // able to fallback on "non shared memory" situations. - const code = await fetchCode(); + const code = await fetchCode(threads > 1 ? 'barretenberg-threads.wasm' : 'barretenberg.wasm'); const { instance, module } = await WebAssembly.instantiate(code, this.getImportObj(this.memory)); this.instance = instance; diff --git a/ts/src/barretenberg_wasm/browser/index.ts b/ts/src/barretenberg_wasm/browser/index.ts index 261cc1b007..86d8f8db1d 100644 --- a/ts/src/barretenberg_wasm/browser/index.ts +++ b/ts/src/barretenberg_wasm/browser/index.ts @@ -2,7 +2,8 @@ import { wrap } from 'comlink'; import { BarretenbergWasmWorker, type BarretenbergWasm } from '../barretenberg_wasm.js'; import debug from 'debug'; -export async function fetchCode() { +export async function fetchCode(_name?: string) { + // hardcoded to always use single-threaded (for now) const wasmModuleUrl = new URL(`../../barretenberg.wasm`, import.meta.url); const res = await fetch(wasmModuleUrl.href); return await res.arrayBuffer(); diff --git a/ts/src/barretenberg_wasm/node/index.ts b/ts/src/barretenberg_wasm/node/index.ts index 68b42a7b0a..ec0b696f10 100644 --- a/ts/src/barretenberg_wasm/node/index.ts +++ b/ts/src/barretenberg_wasm/node/index.ts @@ -8,9 +8,9 @@ import { wrap } from 'comlink'; import { nodeEndpoint } from './node_endpoint.js'; import { writeSync } from 'fs'; -export async function fetchCode() { +export async function fetchCode(name: string) { const __dirname = dirname(fileURLToPath(import.meta.url)); - return await readFile(__dirname + '/../../barretenberg.wasm'); + return await readFile(__dirname + "/" + `../../${name}`); } export function createWorker() { From d5bfde0f01ca3be27a1f45299cb0f997ea6ae2db Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 23 Jun 2023 16:28:23 +0000 Subject: [PATCH 31/88] Typo --- ts/src/barretenberg_wasm/node/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/src/barretenberg_wasm/node/index.ts b/ts/src/barretenberg_wasm/node/index.ts index ec0b696f10..a47974a87f 100644 --- a/ts/src/barretenberg_wasm/node/index.ts +++ b/ts/src/barretenberg_wasm/node/index.ts @@ -10,7 +10,7 @@ import { writeSync } from 'fs'; export async function fetchCode(name: string) { const __dirname = dirname(fileURLToPath(import.meta.url)); - return await readFile(__dirname + "/" + `../../${name}`); + return await readFile(__dirname + `/../../${name}`); } export function createWorker() { From 7a3271d7ed9a7296043eebe10d0f54b7dc3a6fc7 Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 23 Jun 2023 16:46:25 +0000 Subject: [PATCH 32/88] Prettier --- ts/src/barretenberg_wasm/barretenberg_wasm.test.ts | 2 +- ts/src/barretenberg_wasm/barretenberg_wasm.ts | 11 +++++++++-- ts/src/types/browser/index.ts | 2 +- ts/src/types/node/index.ts | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ts/src/barretenberg_wasm/barretenberg_wasm.test.ts b/ts/src/barretenberg_wasm/barretenberg_wasm.test.ts index fb2ec053a6..9c188b151d 100644 --- a/ts/src/barretenberg_wasm/barretenberg_wasm.test.ts +++ b/ts/src/barretenberg_wasm/barretenberg_wasm.test.ts @@ -32,7 +32,7 @@ describe('barretenberg wasm worker', () => { let wasm!: BarretenbergWasmWorker; beforeAll(async () => { - ({ wasm, worker } = await BarretenbergWasm.newWorker(2) as any); + ({ wasm, worker } = (await BarretenbergWasm.newWorker(2)) as any); }, 20000); afterAll(async () => { diff --git a/ts/src/barretenberg_wasm/barretenberg_wasm.ts b/ts/src/barretenberg_wasm/barretenberg_wasm.ts index 8c8c21f295..49fd135898 100644 --- a/ts/src/barretenberg_wasm/barretenberg_wasm.ts +++ b/ts/src/barretenberg_wasm/barretenberg_wasm.ts @@ -3,7 +3,14 @@ import { EventEmitter } from 'events'; import createDebug from 'debug'; import { Remote, proxy } from 'comlink'; import { randomBytes } from '../random/index.js'; -import { fetchCode, getNumCpu, createWorker, getRemoteBarretenbergWasm, threadLogger, killSelf } from 'dynamic/barretenberg_wasm'; +import { + fetchCode, + getNumCpu, + createWorker, + getRemoteBarretenbergWasm, + threadLogger, + killSelf, +} from 'dynamic/barretenberg_wasm'; const debug = createDebug('bb.js:wasm'); @@ -240,4 +247,4 @@ export class BarretenbergWasm { } } -export type BarretenbergWasmWorker = Remote; \ No newline at end of file +export type BarretenbergWasmWorker = Remote; diff --git a/ts/src/types/browser/index.ts b/ts/src/types/browser/index.ts index cddd9e23e0..1a2b5b3421 100644 --- a/ts/src/types/browser/index.ts +++ b/ts/src/types/browser/index.ts @@ -1 +1 @@ -export * from "./point.js" \ No newline at end of file +export * from './point.js'; diff --git a/ts/src/types/node/index.ts b/ts/src/types/node/index.ts index cddd9e23e0..1a2b5b3421 100644 --- a/ts/src/types/node/index.ts +++ b/ts/src/types/node/index.ts @@ -1 +1 @@ -export * from "./point.js" \ No newline at end of file +export * from './point.js'; From 9024a6c42a9f4166e8f76e49f453237f7cf3e8b4 Mon Sep 17 00:00:00 2001 From: jonybur Date: Mon, 26 Jun 2023 12:40:34 +0000 Subject: [PATCH 33/88] Add bbjs workflow --- .github/workflows/bbjs.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/bbjs.yml diff --git a/.github/workflows/bbjs.yml b/.github/workflows/bbjs.yml new file mode 100644 index 0000000000..e065333bf2 --- /dev/null +++ b/.github/workflows/bbjs.yml @@ -0,0 +1,37 @@ +name: Deploy to bb.js repository + +on: + push: + branches: + - jb/bbjs-cra + +jobs: + deploy: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Install dependencies and build + run: | + cd ts + yarn install + yarn build + + - name: Checkout bb.js repository + uses: actions/checkout@v3 + with: + repository: AztecProtocol/bb.js + token: ${{ secrets.GITHUB_TOKEN }} + path: bb.js + + - name: Copy build output and commit + run: | + cp -R dest/* ../bb.js/ + cd ../bb.js + # git config user.name "GitHub Actions" + # git config user.email "github-actions@github.com" + git add . + git commit -m "Deploy from barretenberg repository" + git push From 2fdf85f8d4ec94547f168e44f056779fe1c22216 Mon Sep 17 00:00:00 2001 From: jonybur Date: Mon, 26 Jun 2023 12:49:49 +0000 Subject: [PATCH 34/88] Add bb build phase --- .github/workflows/bbjs.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/bbjs.yml b/.github/workflows/bbjs.yml index e065333bf2..e1e0b06fca 100644 --- a/.github/workflows/bbjs.yml +++ b/.github/workflows/bbjs.yml @@ -13,6 +13,15 @@ jobs: - name: Checkout code uses: actions/checkout@v2 + - name: Install Nix + run: | + curl -L https://nixos.org/nix/install | sh + . /home/runner/.nix-profile/etc/profile.d/nix.sh + + - name: Run Nix flake + run: | + nix build + - name: Install dependencies and build run: | cd ts From 6f694a3bf5790440ccc38fdd71cb444248110068 Mon Sep 17 00:00:00 2001 From: jonybur Date: Mon, 26 Jun 2023 12:58:00 +0000 Subject: [PATCH 35/88] Add cpp build --- .github/workflows/bbjs.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/bbjs.yml b/.github/workflows/bbjs.yml index e1e0b06fca..c46b594a01 100644 --- a/.github/workflows/bbjs.yml +++ b/.github/workflows/bbjs.yml @@ -13,14 +13,11 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Install Nix + - name: Bootstrap cpp run: | - curl -L https://nixos.org/nix/install | sh - . /home/runner/.nix-profile/etc/profile.d/nix.sh - - - name: Run Nix flake - run: | - nix build + cd cpp + bash ./bootstrap.sh + cd .. - name: Install dependencies and build run: | From 16aef23436aa92a89627ff2841c96f964958df96 Mon Sep 17 00:00:00 2001 From: jonybur Date: Mon, 26 Jun 2023 12:59:23 +0000 Subject: [PATCH 36/88] Set up working-directory --- .github/workflows/bbjs.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bbjs.yml b/.github/workflows/bbjs.yml index c46b594a01..e68934e47d 100644 --- a/.github/workflows/bbjs.yml +++ b/.github/workflows/bbjs.yml @@ -14,14 +14,12 @@ jobs: uses: actions/checkout@v2 - name: Bootstrap cpp - run: | - cd cpp - bash ./bootstrap.sh - cd .. + working-directory: ./cpp + run: bash ./bootstrap.sh - name: Install dependencies and build + working-directory: ./ts run: | - cd ts yarn install yarn build From 60697f559addc908cf80986f20ad75da6ab1f854 Mon Sep 17 00:00:00 2001 From: jonybur Date: Mon, 26 Jun 2023 13:09:17 +0000 Subject: [PATCH 37/88] Update workflow --- .github/workflows/bbjs.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bbjs.yml b/.github/workflows/bbjs.yml index e68934e47d..3bb9f39f09 100644 --- a/.github/workflows/bbjs.yml +++ b/.github/workflows/bbjs.yml @@ -13,9 +13,19 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Bootstrap cpp - working-directory: ./cpp - run: bash ./bootstrap.sh + - uses: cachix/install-nix-action@v20 + with: + nix_path: nixpkgs=channel:nixos-22.11 + github_access_token: ${{ secrets.GITHUB_TOKEN }} + + - uses: cachix/cachix-action@v12 + with: + name: barretenberg + authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" + + - name: Run nix flake + run: | + nix flake - name: Install dependencies and build working-directory: ./ts From bf36f42909ac0bbf12518533d3a73b32146d3718 Mon Sep 17 00:00:00 2001 From: jonybur Date: Mon, 26 Jun 2023 13:24:59 +0000 Subject: [PATCH 38/88] Remove bbjs workflow --- .github/workflows/bbjs.yml | 51 -------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 .github/workflows/bbjs.yml diff --git a/.github/workflows/bbjs.yml b/.github/workflows/bbjs.yml deleted file mode 100644 index 3bb9f39f09..0000000000 --- a/.github/workflows/bbjs.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Deploy to bb.js repository - -on: - push: - branches: - - jb/bbjs-cra - -jobs: - deploy: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - uses: cachix/install-nix-action@v20 - with: - nix_path: nixpkgs=channel:nixos-22.11 - github_access_token: ${{ secrets.GITHUB_TOKEN }} - - - uses: cachix/cachix-action@v12 - with: - name: barretenberg - authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - - - name: Run nix flake - run: | - nix flake - - - name: Install dependencies and build - working-directory: ./ts - run: | - yarn install - yarn build - - - name: Checkout bb.js repository - uses: actions/checkout@v3 - with: - repository: AztecProtocol/bb.js - token: ${{ secrets.GITHUB_TOKEN }} - path: bb.js - - - name: Copy build output and commit - run: | - cp -R dest/* ../bb.js/ - cd ../bb.js - # git config user.name "GitHub Actions" - # git config user.email "github-actions@github.com" - git add . - git commit -m "Deploy from barretenberg repository" - git push From b95b162e4d87e816414a99625e3c741ff112ba71 Mon Sep 17 00:00:00 2001 From: jonybur Date: Thu, 29 Jun 2023 13:36:40 +0000 Subject: [PATCH 39/88] Improve paths to scripts --- ts/.gitignore | 1 + ts/src/barretenberg_wasm/barretenberg_wasm.ts | 2 +- ts/src/barretenberg_wasm/browser/index.ts | 11 ++--- ts/src/barretenberg_wasm/node/index.ts | 4 +- ts/yarn.lock | 42 ++++++++++++++++++- 5 files changed, 50 insertions(+), 10 deletions(-) diff --git a/ts/.gitignore b/ts/.gitignore index adffed9c01..6f9e1f941b 100644 --- a/ts/.gitignore +++ b/ts/.gitignore @@ -2,6 +2,7 @@ !.yarn/releases node_modules dest +tsconfig.json .tsbuildinfo *.log crs diff --git a/ts/src/barretenberg_wasm/barretenberg_wasm.ts b/ts/src/barretenberg_wasm/barretenberg_wasm.ts index 49fd135898..86ee1dc0fe 100644 --- a/ts/src/barretenberg_wasm/barretenberg_wasm.ts +++ b/ts/src/barretenberg_wasm/barretenberg_wasm.ts @@ -72,7 +72,7 @@ export class BarretenbergWasm { // Annoyingly the wasm declares if it's memory is shared or not. So now we need two wasms if we want to be // able to fallback on "non shared memory" situations. - const code = await fetchCode(threads > 1 ? 'barretenberg-threads.wasm' : 'barretenberg.wasm'); + const code = await fetchCode(threads > 1); const { instance, module } = await WebAssembly.instantiate(code, this.getImportObj(this.memory)); this.instance = instance; diff --git a/ts/src/barretenberg_wasm/browser/index.ts b/ts/src/barretenberg_wasm/browser/index.ts index 86d8f8db1d..d29e6fd29a 100644 --- a/ts/src/barretenberg_wasm/browser/index.ts +++ b/ts/src/barretenberg_wasm/browser/index.ts @@ -1,16 +1,17 @@ import { wrap } from 'comlink'; import { BarretenbergWasmWorker, type BarretenbergWasm } from '../barretenberg_wasm.js'; -import debug from 'debug'; +import debug from "debug"; -export async function fetchCode(_name?: string) { - // hardcoded to always use single-threaded (for now) - const wasmModuleUrl = new URL(`../../barretenberg.wasm`, import.meta.url); +export async function fetchCode(multithreading: boolean) { + const wasmModuleUrl = multithreading ? + new URL(`../../barretenberg-threads.wasm`, import.meta.url) : + new URL(`../../barretenberg.wasm`, import.meta.url); const res = await fetch(wasmModuleUrl.href); return await res.arrayBuffer(); } export function createWorker() { - const worker = new Worker('barretenberg_wasm.js'); + const worker = new Worker(new URL(`./worker.js`, import.meta.url)); const debugStr = debug.disable(); debug.enable(debugStr); worker.postMessage({ debug: debugStr }); diff --git a/ts/src/barretenberg_wasm/node/index.ts b/ts/src/barretenberg_wasm/node/index.ts index a47974a87f..d03ef376cf 100644 --- a/ts/src/barretenberg_wasm/node/index.ts +++ b/ts/src/barretenberg_wasm/node/index.ts @@ -8,9 +8,9 @@ import { wrap } from 'comlink'; import { nodeEndpoint } from './node_endpoint.js'; import { writeSync } from 'fs'; -export async function fetchCode(name: string) { +export async function fetchCode(multithreading: boolean) { const __dirname = dirname(fileURLToPath(import.meta.url)); - return await readFile(__dirname + `/../../${name}`); + return await readFile(__dirname + `/../../${multithreading ? "barretenberg-threads.wasm" : "barretenberg.wasm"}`); } export function createWorker() { diff --git a/ts/yarn.lock b/ts/yarn.lock index cc628236a6..51292a67ba 100644 --- a/ts/yarn.lock +++ b/ts/yarn.lock @@ -55,6 +55,7 @@ __metadata: webpack: ^5.82.1 webpack-cli: ^5.1.1 webpack-dev-server: ^4.15.0 + worker-loader: ^3.0.8 bin: bb.js: ./dest/main.js languageName: unknown @@ -2052,6 +2053,13 @@ __metadata: languageName: node linkType: hard +"big.js@npm:^5.2.2": + version: 5.2.2 + resolution: "big.js@npm:5.2.2" + checksum: b89b6e8419b097a8fb4ed2399a1931a68c612bce3cfd5ca8c214b2d017531191070f990598de2fc6f3f993d91c0f08aa82697717f6b3b8732c9731866d233c9e + languageName: node + linkType: hard + "binary-extensions@npm:^2.0.0": version: 2.2.0 resolution: "binary-extensions@npm:2.2.0" @@ -3051,6 +3059,13 @@ __metadata: languageName: node linkType: hard +"emojis-list@npm:^3.0.0": + version: 3.0.0 + resolution: "emojis-list@npm:3.0.0" + checksum: ddaaa02542e1e9436c03970eeed445f4ed29a5337dfba0fe0c38dfdd2af5da2429c2a0821304e8a8d1cadf27fdd5b22ff793571fa803ae16852a6975c65e8e70 + languageName: node + linkType: hard + "encodeurl@npm:~1.0.2": version: 1.0.2 resolution: "encodeurl@npm:1.0.2" @@ -4975,7 +4990,7 @@ __metadata: languageName: node linkType: hard -"json5@npm:^2.2.2, json5@npm:^2.2.3": +"json5@npm:^2.1.2, json5@npm:^2.2.2, json5@npm:^2.2.3": version: 2.2.3 resolution: "json5@npm:2.2.3" bin: @@ -5039,6 +5054,17 @@ __metadata: languageName: node linkType: hard +"loader-utils@npm:^2.0.0": + version: 2.0.4 + resolution: "loader-utils@npm:2.0.4" + dependencies: + big.js: ^5.2.2 + emojis-list: ^3.0.0 + json5: ^2.1.2 + checksum: a5281f5fff1eaa310ad5e1164095689443630f3411e927f95031ab4fb83b4a98f388185bb1fe949e8ab8d4247004336a625e9255c22122b815bb9a4c5d8fc3b7 + languageName: node + linkType: hard + "locate-path@npm:^5.0.0": version: 5.0.0 resolution: "locate-path@npm:5.0.0" @@ -6299,7 +6325,7 @@ __metadata: languageName: node linkType: hard -"schema-utils@npm:^3.1.1, schema-utils@npm:^3.1.2": +"schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.1, schema-utils@npm:^3.1.2": version: 3.3.0 resolution: "schema-utils@npm:3.3.0" dependencies: @@ -7441,6 +7467,18 @@ __metadata: languageName: node linkType: hard +"worker-loader@npm:^3.0.8": + version: 3.0.8 + resolution: "worker-loader@npm:3.0.8" + dependencies: + loader-utils: ^2.0.0 + schema-utils: ^3.0.0 + peerDependencies: + webpack: ^4.0.0 || ^5.0.0 + checksum: 84f4a7eeb2a1d8b9704425837e017c91eedfae67ac89e0b866a2dcf283323c1dcabe0258196278b7d5fd0041392da895c8a0c59ddf3a94f1b2e003df68ddfec3 + languageName: node + linkType: hard + "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0, wrap-ansi@npm:^7.0.0": version: 7.0.0 resolution: "wrap-ansi@npm:7.0.0" From 732f2698830fd1d449a727c57ec7300f19f8f454 Mon Sep 17 00:00:00 2001 From: jonybur Date: Thu, 29 Jun 2023 13:54:56 +0000 Subject: [PATCH 40/88] Update deps --- ts/yarn.lock | 42 ++---------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/ts/yarn.lock b/ts/yarn.lock index 51292a67ba..cc628236a6 100644 --- a/ts/yarn.lock +++ b/ts/yarn.lock @@ -55,7 +55,6 @@ __metadata: webpack: ^5.82.1 webpack-cli: ^5.1.1 webpack-dev-server: ^4.15.0 - worker-loader: ^3.0.8 bin: bb.js: ./dest/main.js languageName: unknown @@ -2053,13 +2052,6 @@ __metadata: languageName: node linkType: hard -"big.js@npm:^5.2.2": - version: 5.2.2 - resolution: "big.js@npm:5.2.2" - checksum: b89b6e8419b097a8fb4ed2399a1931a68c612bce3cfd5ca8c214b2d017531191070f990598de2fc6f3f993d91c0f08aa82697717f6b3b8732c9731866d233c9e - languageName: node - linkType: hard - "binary-extensions@npm:^2.0.0": version: 2.2.0 resolution: "binary-extensions@npm:2.2.0" @@ -3059,13 +3051,6 @@ __metadata: languageName: node linkType: hard -"emojis-list@npm:^3.0.0": - version: 3.0.0 - resolution: "emojis-list@npm:3.0.0" - checksum: ddaaa02542e1e9436c03970eeed445f4ed29a5337dfba0fe0c38dfdd2af5da2429c2a0821304e8a8d1cadf27fdd5b22ff793571fa803ae16852a6975c65e8e70 - languageName: node - linkType: hard - "encodeurl@npm:~1.0.2": version: 1.0.2 resolution: "encodeurl@npm:1.0.2" @@ -4990,7 +4975,7 @@ __metadata: languageName: node linkType: hard -"json5@npm:^2.1.2, json5@npm:^2.2.2, json5@npm:^2.2.3": +"json5@npm:^2.2.2, json5@npm:^2.2.3": version: 2.2.3 resolution: "json5@npm:2.2.3" bin: @@ -5054,17 +5039,6 @@ __metadata: languageName: node linkType: hard -"loader-utils@npm:^2.0.0": - version: 2.0.4 - resolution: "loader-utils@npm:2.0.4" - dependencies: - big.js: ^5.2.2 - emojis-list: ^3.0.0 - json5: ^2.1.2 - checksum: a5281f5fff1eaa310ad5e1164095689443630f3411e927f95031ab4fb83b4a98f388185bb1fe949e8ab8d4247004336a625e9255c22122b815bb9a4c5d8fc3b7 - languageName: node - linkType: hard - "locate-path@npm:^5.0.0": version: 5.0.0 resolution: "locate-path@npm:5.0.0" @@ -6325,7 +6299,7 @@ __metadata: languageName: node linkType: hard -"schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.1, schema-utils@npm:^3.1.2": +"schema-utils@npm:^3.1.1, schema-utils@npm:^3.1.2": version: 3.3.0 resolution: "schema-utils@npm:3.3.0" dependencies: @@ -7467,18 +7441,6 @@ __metadata: languageName: node linkType: hard -"worker-loader@npm:^3.0.8": - version: 3.0.8 - resolution: "worker-loader@npm:3.0.8" - dependencies: - loader-utils: ^2.0.0 - schema-utils: ^3.0.0 - peerDependencies: - webpack: ^4.0.0 || ^5.0.0 - checksum: 84f4a7eeb2a1d8b9704425837e017c91eedfae67ac89e0b866a2dcf283323c1dcabe0258196278b7d5fd0041392da895c8a0c59ddf3a94f1b2e003df68ddfec3 - languageName: node - linkType: hard - "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0, wrap-ansi@npm:^7.0.0": version: 7.0.0 resolution: "wrap-ansi@npm:7.0.0" From 921a579cdaf22cf43a26a998c40f95745fde34b4 Mon Sep 17 00:00:00 2001 From: jonybur Date: Wed, 12 Jul 2023 13:44:08 +0000 Subject: [PATCH 41/88] Refactor --- ts/.tsbuildinfo.browser | 1 + ts/.tsbuildinfo.node | 1 + ts/bb.js-dev | 2 +- ts/dynamic_imports.cjs | 1 - ts/generate_tsconfig.cjs | 43 ---------------- ts/package.json | 6 +-- ts/replace_imports.cjs | 2 +- ts/tsconfig.browser.json | 42 +++++++++++++++ ts/{tsconfig.json => tsconfig.node.json} | 2 +- ts/webpack.config.cjs | 65 +++++------------------- 10 files changed, 63 insertions(+), 102 deletions(-) create mode 100644 ts/.tsbuildinfo.browser create mode 100644 ts/.tsbuildinfo.node delete mode 100644 ts/dynamic_imports.cjs delete mode 100644 ts/generate_tsconfig.cjs create mode 100644 ts/tsconfig.browser.json rename ts/{tsconfig.json => tsconfig.node.json} (95%) diff --git a/ts/.tsbuildinfo.browser b/ts/.tsbuildinfo.browser new file mode 100644 index 0000000000..ca7b07521b --- /dev/null +++ b/ts/.tsbuildinfo.browser @@ -0,0 +1 @@ +{"program":{"fileNames":["./node_modules/typescript/lib/lib.es5.d.ts","./node_modules/typescript/lib/lib.es2015.d.ts","./node_modules/typescript/lib/lib.es2016.d.ts","./node_modules/typescript/lib/lib.es2017.d.ts","./node_modules/typescript/lib/lib.es2018.d.ts","./node_modules/typescript/lib/lib.es2019.d.ts","./node_modules/typescript/lib/lib.es2020.d.ts","./node_modules/typescript/lib/lib.es2021.d.ts","./node_modules/typescript/lib/lib.es2022.d.ts","./node_modules/typescript/lib/lib.es2023.d.ts","./node_modules/typescript/lib/lib.esnext.d.ts","./node_modules/typescript/lib/lib.dom.d.ts","./node_modules/typescript/lib/lib.es2015.core.d.ts","./node_modules/typescript/lib/lib.es2015.collection.d.ts","./node_modules/typescript/lib/lib.es2015.generator.d.ts","./node_modules/typescript/lib/lib.es2015.iterable.d.ts","./node_modules/typescript/lib/lib.es2015.promise.d.ts","./node_modules/typescript/lib/lib.es2015.proxy.d.ts","./node_modules/typescript/lib/lib.es2015.reflect.d.ts","./node_modules/typescript/lib/lib.es2015.symbol.d.ts","./node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","./node_modules/typescript/lib/lib.es2016.array.include.d.ts","./node_modules/typescript/lib/lib.es2017.object.d.ts","./node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","./node_modules/typescript/lib/lib.es2017.string.d.ts","./node_modules/typescript/lib/lib.es2017.intl.d.ts","./node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","./node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","./node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","./node_modules/typescript/lib/lib.es2018.intl.d.ts","./node_modules/typescript/lib/lib.es2018.promise.d.ts","./node_modules/typescript/lib/lib.es2018.regexp.d.ts","./node_modules/typescript/lib/lib.es2019.array.d.ts","./node_modules/typescript/lib/lib.es2019.object.d.ts","./node_modules/typescript/lib/lib.es2019.string.d.ts","./node_modules/typescript/lib/lib.es2019.symbol.d.ts","./node_modules/typescript/lib/lib.es2019.intl.d.ts","./node_modules/typescript/lib/lib.es2020.bigint.d.ts","./node_modules/typescript/lib/lib.es2020.date.d.ts","./node_modules/typescript/lib/lib.es2020.promise.d.ts","./node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","./node_modules/typescript/lib/lib.es2020.string.d.ts","./node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","./node_modules/typescript/lib/lib.es2020.intl.d.ts","./node_modules/typescript/lib/lib.es2020.number.d.ts","./node_modules/typescript/lib/lib.es2021.promise.d.ts","./node_modules/typescript/lib/lib.es2021.string.d.ts","./node_modules/typescript/lib/lib.es2021.weakref.d.ts","./node_modules/typescript/lib/lib.es2021.intl.d.ts","./node_modules/typescript/lib/lib.es2022.array.d.ts","./node_modules/typescript/lib/lib.es2022.error.d.ts","./node_modules/typescript/lib/lib.es2022.intl.d.ts","./node_modules/typescript/lib/lib.es2022.object.d.ts","./node_modules/typescript/lib/lib.es2022.sharedmemory.d.ts","./node_modules/typescript/lib/lib.es2022.string.d.ts","./node_modules/typescript/lib/lib.es2022.regexp.d.ts","./node_modules/typescript/lib/lib.es2023.array.d.ts","./node_modules/typescript/lib/lib.esnext.intl.d.ts","./node_modules/typescript/lib/lib.decorators.d.ts","./node_modules/typescript/lib/lib.decorators.legacy.d.ts","./node_modules/tslib/tslib.d.ts","./node_modules/tslib/modules/index.d.ts","./src/crs/net_crs.ts","./node_modules/idb-keyval/dist/index.d.ts","./src/crs/browser/cached_net_crs.ts","./src/crs/browser/index.ts","./src/crs/index.ts","./node_modules/@types/ms/index.d.ts","./node_modules/@types/debug/index.d.ts","./node_modules/comlink/dist/umd/protocol.d.ts","./node_modules/comlink/dist/umd/comlink.d.ts","./src/random/browser/index.ts","./src/random/index.ts","./src/barretenberg_wasm/browser/index.ts","./src/barretenberg_wasm/barretenberg_wasm.ts","./src/barretenberg_wasm/index.ts","./src/serialize/buffer_reader.ts","./src/serialize/output_type.ts","./src/types/raw_buffer.ts","./src/serialize/serialize.ts","./src/serialize/index.ts","./src/async_map/index.ts","./src/barretenberg_binder/heap_allocator.ts","./src/barretenberg_binder/heap_allocator_sync.ts","./src/barretenberg_binder/index.ts","./src/types/ptr.ts","./src/bigint-array/index.ts","./src/types/fields.ts","./src/types/browser/point.ts","./src/types/browser/index.ts","./src/types/fixed_size_buffer.ts","./src/types/index.ts","./src/barretenberg_api/index.ts","./src/factory/index.ts","./src/index.ts","./node_modules/commander/typings/index.d.ts","./src/main.ts","./src/barretenberg_api/blake2s.test.ts","./src/barretenberg_api/common.test.ts","./src/barretenberg_api/pedersen.test.ts","./src/barretenberg_api/schnorr.test.ts","./src/barretenberg_wasm/barretenberg_wasm.test.ts","./src/barretenberg_wasm/browser/worker.ts","./node_modules/comlink/dist/esm/protocol.d.ts","./node_modules/comlink/dist/esm/node-adapter.d.ts","./src/barretenberg_wasm/node/node_endpoint.ts","./src/barretenberg_wasm/node/index.ts","./src/barretenberg_wasm/node/worker.ts","./src/bindgen/function_declaration.ts","./src/bindgen/mappings.ts","./src/bindgen/rust.ts","./src/bindgen/to_camel_case.ts","./src/bindgen/typescript.ts","./src/bindgen/index.ts","./src/crs/node/ignition_files_crs.ts","./src/crs/node/index.ts","./src/examples/simple.rawtest.ts","./src/examples/simple.test.ts","./src/random/node/index.ts","./src/types/node/point.ts","./src/types/node/index.ts","./node_modules/@babel/types/lib/index.d.ts","./node_modules/@types/babel__generator/index.d.ts","./node_modules/@babel/parser/typings/babel-parser.d.ts","./node_modules/@types/babel__template/index.d.ts","./node_modules/@types/babel__traverse/index.d.ts","./node_modules/@types/babel__core/index.d.ts","./node_modules/@types/node/assert.d.ts","./node_modules/@types/node/assert/strict.d.ts","./node_modules/@types/node/globals.d.ts","./node_modules/@types/node/async_hooks.d.ts","./node_modules/@types/node/buffer.d.ts","./node_modules/@types/node/child_process.d.ts","./node_modules/@types/node/cluster.d.ts","./node_modules/@types/node/console.d.ts","./node_modules/@types/node/constants.d.ts","./node_modules/@types/node/crypto.d.ts","./node_modules/@types/node/dgram.d.ts","./node_modules/@types/node/diagnostics_channel.d.ts","./node_modules/@types/node/dns.d.ts","./node_modules/@types/node/dns/promises.d.ts","./node_modules/@types/node/domain.d.ts","./node_modules/@types/node/dom-events.d.ts","./node_modules/@types/node/events.d.ts","./node_modules/@types/node/fs.d.ts","./node_modules/@types/node/fs/promises.d.ts","./node_modules/@types/node/http.d.ts","./node_modules/@types/node/http2.d.ts","./node_modules/@types/node/https.d.ts","./node_modules/@types/node/inspector.d.ts","./node_modules/@types/node/module.d.ts","./node_modules/@types/node/net.d.ts","./node_modules/@types/node/os.d.ts","./node_modules/@types/node/path.d.ts","./node_modules/@types/node/perf_hooks.d.ts","./node_modules/@types/node/process.d.ts","./node_modules/@types/node/punycode.d.ts","./node_modules/@types/node/querystring.d.ts","./node_modules/@types/node/readline.d.ts","./node_modules/@types/node/readline/promises.d.ts","./node_modules/@types/node/repl.d.ts","./node_modules/@types/node/stream.d.ts","./node_modules/@types/node/stream/promises.d.ts","./node_modules/@types/node/stream/consumers.d.ts","./node_modules/@types/node/stream/web.d.ts","./node_modules/@types/node/string_decoder.d.ts","./node_modules/@types/node/test.d.ts","./node_modules/@types/node/timers.d.ts","./node_modules/@types/node/timers/promises.d.ts","./node_modules/@types/node/tls.d.ts","./node_modules/@types/node/trace_events.d.ts","./node_modules/@types/node/tty.d.ts","./node_modules/@types/node/url.d.ts","./node_modules/@types/node/util.d.ts","./node_modules/@types/node/v8.d.ts","./node_modules/@types/node/vm.d.ts","./node_modules/@types/node/wasi.d.ts","./node_modules/@types/node/worker_threads.d.ts","./node_modules/@types/node/zlib.d.ts","./node_modules/@types/node/globals.global.d.ts","./node_modules/@types/node/index.d.ts","./node_modules/@types/connect/index.d.ts","./node_modules/@types/body-parser/index.d.ts","./node_modules/@types/bonjour/index.d.ts","./node_modules/@types/mime/index.d.ts","./node_modules/@types/send/index.d.ts","./node_modules/@types/range-parser/index.d.ts","./node_modules/@types/qs/index.d.ts","./node_modules/@types/express-serve-static-core/index.d.ts","./node_modules/@types/connect-history-api-fallback/index.d.ts","./node_modules/@types/detect-node/index.d.ts","./node_modules/@types/eslint/helpers.d.ts","./node_modules/@types/estree/index.d.ts","./node_modules/@types/json-schema/index.d.ts","./node_modules/@types/eslint/index.d.ts","./node_modules/@types/eslint-scope/index.d.ts","./node_modules/@types/serve-static/node_modules/@types/mime/Mime.d.ts","./node_modules/@types/serve-static/node_modules/@types/mime/index.d.ts","./node_modules/@types/serve-static/index.d.ts","./node_modules/@types/express/index.d.ts","./node_modules/@types/graceful-fs/index.d.ts","./node_modules/@types/html-minifier-terser/index.d.ts","./node_modules/@types/http-proxy/index.d.ts","./node_modules/@types/istanbul-lib-coverage/index.d.ts","./node_modules/@types/istanbul-lib-report/index.d.ts","./node_modules/@types/istanbul-reports/index.d.ts","./node_modules/@jest/expect-utils/build/index.d.ts","./node_modules/chalk/index.d.ts","./node_modules/@sinclair/typebox/typebox.d.ts","./node_modules/@jest/schemas/build/index.d.ts","./node_modules/pretty-format/build/index.d.ts","./node_modules/jest-diff/build/index.d.ts","./node_modules/jest-matcher-utils/build/index.d.ts","./node_modules/expect/build/index.d.ts","./node_modules/@types/jest/index.d.ts","./node_modules/@types/prettier/index.d.ts","./node_modules/@types/retry/index.d.ts","./node_modules/@types/semver/classes/semver.d.ts","./node_modules/@types/semver/functions/parse.d.ts","./node_modules/@types/semver/functions/valid.d.ts","./node_modules/@types/semver/functions/clean.d.ts","./node_modules/@types/semver/functions/inc.d.ts","./node_modules/@types/semver/functions/diff.d.ts","./node_modules/@types/semver/functions/major.d.ts","./node_modules/@types/semver/functions/minor.d.ts","./node_modules/@types/semver/functions/patch.d.ts","./node_modules/@types/semver/functions/prerelease.d.ts","./node_modules/@types/semver/functions/compare.d.ts","./node_modules/@types/semver/functions/rcompare.d.ts","./node_modules/@types/semver/functions/compare-loose.d.ts","./node_modules/@types/semver/functions/compare-build.d.ts","./node_modules/@types/semver/functions/sort.d.ts","./node_modules/@types/semver/functions/rsort.d.ts","./node_modules/@types/semver/functions/gt.d.ts","./node_modules/@types/semver/functions/lt.d.ts","./node_modules/@types/semver/functions/eq.d.ts","./node_modules/@types/semver/functions/neq.d.ts","./node_modules/@types/semver/functions/gte.d.ts","./node_modules/@types/semver/functions/lte.d.ts","./node_modules/@types/semver/functions/cmp.d.ts","./node_modules/@types/semver/functions/coerce.d.ts","./node_modules/@types/semver/classes/comparator.d.ts","./node_modules/@types/semver/classes/range.d.ts","./node_modules/@types/semver/functions/satisfies.d.ts","./node_modules/@types/semver/ranges/max-satisfying.d.ts","./node_modules/@types/semver/ranges/min-satisfying.d.ts","./node_modules/@types/semver/ranges/to-comparators.d.ts","./node_modules/@types/semver/ranges/min-version.d.ts","./node_modules/@types/semver/ranges/valid.d.ts","./node_modules/@types/semver/ranges/outside.d.ts","./node_modules/@types/semver/ranges/gtr.d.ts","./node_modules/@types/semver/ranges/ltr.d.ts","./node_modules/@types/semver/ranges/intersects.d.ts","./node_modules/@types/semver/ranges/simplify.d.ts","./node_modules/@types/semver/ranges/subset.d.ts","./node_modules/@types/semver/internals/identifiers.d.ts","./node_modules/@types/semver/index.d.ts","./node_modules/@types/serve-index/index.d.ts","./node_modules/@types/sockjs/index.d.ts","./node_modules/source-map/source-map.d.ts","./node_modules/@types/source-map-support/index.d.ts","./node_modules/@types/stack-utils/index.d.ts","./node_modules/@types/ws/index.d.ts","./node_modules/@types/yargs-parser/index.d.ts","./node_modules/@types/yargs/index.d.ts"],"fileInfos":[{"version":"f59215c5f1d886b05395ee7aca73e0ac69ddfad2843aa88530e797879d511bad","affectsGlobalScope":true,"impliedFormat":1},{"version":"45b7ab580deca34ae9729e97c13cfd999df04416a79116c3bfb483804f85ded4","impliedFormat":1},{"version":"dc48272d7c333ccf58034c0026162576b7d50ea0e69c3b9292f803fc20720fd5","impliedFormat":1},{"version":"27147504487dc1159369da4f4da8a26406364624fa9bc3db632f7d94a5bae2c3","impliedFormat":1},{"version":"5e1c4c362065a6b95ff952c0eab010f04dcd2c3494e813b493ecfd4fcb9fc0d8","impliedFormat":1},{"version":"68d73b4a11549f9c0b7d352d10e91e5dca8faa3322bfb77b661839c42b1ddec7","impliedFormat":1},{"version":"5efce4fc3c29ea84e8928f97adec086e3dc876365e0982cc8479a07954a3efd4","impliedFormat":1},{"version":"feecb1be483ed332fad555aff858affd90a48ab19ba7272ee084704eb7167569","impliedFormat":1},{"version":"5514e54f17d6d74ecefedc73c504eadffdeda79c7ea205cf9febead32d45c4bc","impliedFormat":1},{"version":"f4e736d6c8d69ae5b3ab0ddfcaa3dc365c3e76909d6660af5b4e979b3934ac20","impliedFormat":1},{"version":"eeeb3aca31fbadef8b82502484499dfd1757204799a6f5b33116201c810676ec","impliedFormat":1},{"version":"3dda5344576193a4ae48b8d03f105c86f20b2f2aff0a1d1fd7935f5d68649654","affectsGlobalScope":true,"impliedFormat":1},{"version":"9d9885c728913c1d16e0d2831b40341d6ad9a0ceecaabc55209b306ad9c736a5","affectsGlobalScope":true,"impliedFormat":1},{"version":"17bea081b9c0541f39dd1ae9bc8c78bdd561879a682e60e2f25f688c0ecab248","affectsGlobalScope":true,"impliedFormat":1},{"version":"4443e68b35f3332f753eacc66a04ac1d2053b8b035a0e0ac1d455392b5e243b3","affectsGlobalScope":true,"impliedFormat":1},{"version":"ab22100fdd0d24cfc2cc59d0a00fc8cf449830d9c4030dc54390a46bd562e929","affectsGlobalScope":true,"impliedFormat":1},{"version":"f7bd636ae3a4623c503359ada74510c4005df5b36de7f23e1db8a5c543fd176b","affectsGlobalScope":true,"impliedFormat":1},{"version":"ce691fb9e5c64efb9547083e4a34091bcbe5bdb41027e310ebba8f7d96a98671","affectsGlobalScope":true,"impliedFormat":1},{"version":"8d697a2a929a5fcb38b7a65594020fcef05ec1630804a33748829c5ff53640d0","affectsGlobalScope":true,"impliedFormat":1},{"version":"0c20f4d2358eb679e4ae8a4432bdd96c857a2960fd6800b21ec4008ec59d60ea","affectsGlobalScope":true,"impliedFormat":1},{"version":"36ae84ccc0633f7c0787bc6108386c8b773e95d3b052d9464a99cd9b8795fbec","affectsGlobalScope":true,"impliedFormat":1},{"version":"82d0d8e269b9eeac02c3bd1c9e884e85d483fcb2cd168bccd6bc54df663da031","affectsGlobalScope":true,"impliedFormat":1},{"version":"b8deab98702588840be73d67f02412a2d45a417a3c097b2e96f7f3a42ac483d1","affectsGlobalScope":true,"impliedFormat":1},{"version":"4738f2420687fd85629c9efb470793bb753709c2379e5f85bc1815d875ceadcd","affectsGlobalScope":true,"impliedFormat":1},{"version":"2f11ff796926e0832f9ae148008138ad583bd181899ab7dd768a2666700b1893","affectsGlobalScope":true,"impliedFormat":1},{"version":"376d554d042fb409cb55b5cbaf0b2b4b7e669619493c5d18d5fa8bd67273f82a","affectsGlobalScope":true,"impliedFormat":1},{"version":"9fc46429fbe091ac5ad2608c657201eb68b6f1b8341bd6d670047d32ed0a88fa","affectsGlobalScope":true,"impliedFormat":1},{"version":"61c37c1de663cf4171e1192466e52c7a382afa58da01b1dc75058f032ddf0839","affectsGlobalScope":true,"impliedFormat":1},{"version":"c4138a3dd7cd6cf1f363ca0f905554e8d81b45844feea17786cdf1626cb8ea06","affectsGlobalScope":true,"impliedFormat":1},{"version":"6ff3e2452b055d8f0ec026511c6582b55d935675af67cdb67dd1dc671e8065df","affectsGlobalScope":true,"impliedFormat":1},{"version":"03de17b810f426a2f47396b0b99b53a82c1b60e9cba7a7edda47f9bb077882f4","affectsGlobalScope":true,"impliedFormat":1},{"version":"8184c6ddf48f0c98429326b428478ecc6143c27f79b79e85740f17e6feb090f1","affectsGlobalScope":true,"impliedFormat":1},{"version":"261c4d2cf86ac5a89ad3fb3fafed74cbb6f2f7c1d139b0540933df567d64a6ca","affectsGlobalScope":true,"impliedFormat":1},{"version":"6af1425e9973f4924fca986636ac19a0cf9909a7e0d9d3009c349e6244e957b6","affectsGlobalScope":true,"impliedFormat":1},{"version":"576711e016cf4f1804676043e6a0a5414252560eb57de9faceee34d79798c850","affectsGlobalScope":true,"impliedFormat":1},{"version":"89c1b1281ba7b8a96efc676b11b264de7a8374c5ea1e6617f11880a13fc56dc6","affectsGlobalScope":true,"impliedFormat":1},{"version":"15a630d6817718a2ddd7088c4f83e4673fde19fa992d2eae2cf51132a302a5d3","affectsGlobalScope":true,"impliedFormat":1},{"version":"f06948deb2a51aae25184561c9640fb66afeddb34531a9212d011792b1d19e0a","affectsGlobalScope":true,"impliedFormat":1},{"version":"01e0ee7e1f661acedb08b51f8a9b7d7f959e9cdb6441360f06522cc3aea1bf2e","affectsGlobalScope":true,"impliedFormat":1},{"version":"ac17a97f816d53d9dd79b0d235e1c0ed54a8cc6a0677e9a3d61efb480b2a3e4e","affectsGlobalScope":true,"impliedFormat":1},{"version":"bf14a426dbbf1022d11bd08d6b8e709a2e9d246f0c6c1032f3b2edb9a902adbe","affectsGlobalScope":true,"impliedFormat":1},{"version":"ec0104fee478075cb5171e5f4e3f23add8e02d845ae0165bfa3f1099241fa2aa","affectsGlobalScope":true,"impliedFormat":1},{"version":"2b72d528b2e2fe3c57889ca7baef5e13a56c957b946906d03767c642f386bbc3","affectsGlobalScope":true,"impliedFormat":1},{"version":"9cc66b0513ad41cb5f5372cca86ef83a0d37d1c1017580b7dace3ea5661836df","affectsGlobalScope":true,"impliedFormat":1},{"version":"368af93f74c9c932edd84c58883e736c9e3d53cec1fe24c0b0ff451f529ceab1","affectsGlobalScope":true,"impliedFormat":1},{"version":"709efdae0cb5df5f49376cde61daacc95cdd44ae4671da13a540da5088bf3f30","affectsGlobalScope":true,"impliedFormat":1},{"version":"995c005ab91a498455ea8dfb63aa9f83fa2ea793c3d8aa344be4a1678d06d399","affectsGlobalScope":true,"impliedFormat":1},{"version":"61ed9b6d07af959e745fb11f9593ecd743b279418cc8a99448ea3cd5f3b3eb22","affectsGlobalScope":true,"impliedFormat":1},{"version":"038a2f66a34ee7a9c2fbc3584c8ab43dff2995f8c68e3f566f4c300d2175e31e","affectsGlobalScope":true,"impliedFormat":1},{"version":"4fa6ed14e98aa80b91f61b9805c653ee82af3502dc21c9da5268d3857772ca05","affectsGlobalScope":true,"impliedFormat":1},{"version":"f5c92f2c27b06c1a41b88f6db8299205aee52c2a2943f7ed29bd585977f254e8","affectsGlobalScope":true,"impliedFormat":1},{"version":"930b0e15811f84e203d3c23508674d5ded88266df4b10abee7b31b2ac77632d2","affectsGlobalScope":true,"impliedFormat":1},{"version":"8444af78980e3b20b49324f4a16ba35024fef3ee069a0eb67616ea6ca821c47a","affectsGlobalScope":true,"impliedFormat":1},{"version":"b9ea5778ff8b50d7c04c9890170db34c26a5358cccba36844fe319f50a43a61a","affectsGlobalScope":true,"impliedFormat":1},{"version":"3287d9d085fbd618c3971944b65b4be57859f5415f495b33a6adc994edd2f004","affectsGlobalScope":true,"impliedFormat":1},{"version":"50d53ccd31f6667aff66e3d62adf948879a3a16f05d89882d1188084ee415bbc","affectsGlobalScope":true,"impliedFormat":1},{"version":"25de46552b782d43cb7284df22fe2a265de387cf0248b747a7a1b647d81861f6","affectsGlobalScope":true,"impliedFormat":1},{"version":"307c8b7ebbd7f23a92b73a4c6c0a697beca05b06b036c23a34553e5fe65e4fdc","affectsGlobalScope":true,"impliedFormat":1},{"version":"189c0703923150aa30673fa3de411346d727cc44a11c75d05d7cf9ef095daa22","affectsGlobalScope":true,"impliedFormat":1},{"version":"782dec38049b92d4e85c1585fbea5474a219c6984a35b004963b00beb1aab538","affectsGlobalScope":true,"impliedFormat":1},{"version":"f1c9fe42b65437a61104e601eb298c5c859fb522b483f1bdb700eed67a16f980","impliedFormat":1},{"version":"0734467ebd328b91af92eff2af9c97f6079bc4736c4992f8a5e47123680cf21b","impliedFormat":99},{"version":"54ef53ed24e29fa69ca2dbbdf232afe6409f34719c95922aa6b0500b6eea24ed","signature":"fce7d12a7270a73f059f4a568b0097d7704576b5ef95e026b1255df3c67f4bf2","impliedFormat":99},{"version":"f08728a9b464da7a195ca5a197837c2384ab78979737105f97a63b2cade30fa7","impliedFormat":99},{"version":"d81c05cb919bfa33ff72778a5197fba166991a4b6e4f59afe66a1b298f31cc30","signature":"5297b9e028bc5a1b653afb0021ff28fe5902fa43ddb43bd6588af8b126ef1dbf","impliedFormat":99},{"version":"b60a66c8ee67213bd70bdf2c3f7dc3033879595e2002c3ec5cc4b30840422cdc","impliedFormat":99},{"version":"998c4553111d407c0d9f48041d1e4f3b1d3528f0ecb0020db31e9c2ad7a3fa12","impliedFormat":99},{"version":"6a9c5127096b35264eb7cd21b2417bfc1d42cceca9ba4ce2bb0c3410b7816042","impliedFormat":1},{"version":"93b7325b49dfbf613d940ed0e471216657b2d77459dac34f1b5b1678f08f884c","impliedFormat":1},{"version":"c0a456eb21680eca96d5e836e2a5cc74730a2c0e03f18eb17a7f652b30c993e4","impliedFormat":1},{"version":"9426d1cc15328fcbb59adb88880ccfd79f2bc959334d485273da743aac083eaa","impliedFormat":1},{"version":"8a15b4b148c236900888f742a1bd43e42520cfc3289eeeefeb3fc11fc944224a","signature":"c5b39ac78a1fca4a0c1920910746120b4ebada220a1a736146ad2e3101075ba4","impliedFormat":99},{"version":"3ccadcb9bd4b1879b9a20c62d5069badb616823e9cf6f977abfb92fcae3e5e2c","impliedFormat":99},{"version":"92f1666b3cf937d89a911ebecf3d8a842f84bd635aca5ed99432561e544a5d7f","signature":"2cc29293ba85b4b4629b1837e1f6cbc301c73a3523bc3f9d7887391413c0a7a1","impliedFormat":99},{"version":"7711b75c075dcb28b4e837b5a43ef0051061bda8c62d84bb11e4c87b37b9e11f","signature":"53db2cce1818886d5c090755f99f03e1ee5d75e48855a18a3121b930d51436e1","impliedFormat":99},{"version":"49fa852bdd3a1d4542fc8c9cd85a467cc5586a98d6129de2cbaf574ba2a024c5","impliedFormat":99},{"version":"3698ed08bb485b7f978ac61466deb43fd6736cba1c0aefcf188854e15b119aa4","signature":"310103e8e0efd044334e5b5aa8ada787fa010fb38ac982b47fdbb24e931fbae5","impliedFormat":99},{"version":"56696d83ee1bf9af82d2ad284663677aac8171fdbf5223390aa0784d491caf85","signature":"686bbb1e2df2881893498bcc9d251b8a7d4b4ca0f1718f4cc091f4b0ae82d88e","impliedFormat":99},{"version":"9243bdf41fa069f91ced599db3af72f9ec1d7454de03906a280d04b4470af2d2","signature":"b85d91d3d26b95a3833d96c38c3e35fd30f9b6fbc7bd55b29e884bac178437d1","impliedFormat":99},{"version":"2ec936f5989089f15de3fbfad1f2f2842b0b6e6276bea4283872b23a37251a7d","signature":"c34990a8094f0a876461ab18980a5415477c9741a9fd3cc0f00c0ff1084cee61","impliedFormat":99},{"version":"31a3b2cd4cda44ef15cdbada4a78a49c0668c140104a22d0e4e4f1b995bca2f6","impliedFormat":99},{"version":"76b922387f8ddc0384d2b915b3715c64aea4e67df6c1d272bdedc867a10707b7","signature":"21f8c5dd8bcc7c44976954d1e4c2006095c37fa2fd16c1bf928ac329fb4cb52a","impliedFormat":99},{"version":"c62d74da17bc3bc50d13cf6445f647d0e04b0720e9e90b8de76b47f9302b59af","signature":"d4c2b6fe05f65ccf6a42711b1a9f1649970e2a4305ce5febc9834b382a8d87f0","impliedFormat":99},{"version":"9f2265033c4a94144d0bc511cdcf368980394e86bc3426da86f2c3a9215f69c1","signature":"61e2b2d5d16cf22811733a20e075c441fb34ba84f007e0cc072c5a3657bee52a","impliedFormat":99},{"version":"6165276e8aa979f080d9675fd1b5852040bcde681fb673e96294baf1f528bd88","signature":"e3d6acca5d37d2abcf27f71c864780a7f6d20189f35bc4bf6280267c5079fa57","impliedFormat":99},{"version":"4f3d5156dc1d6103ab8f9bae661d244c17c00ea0d0afe0cc80f03f33f3133ea6","signature":"38520572ecabb509abba228c1ed55caa2493dcc525c2db31642a02129a02de5c","impliedFormat":99},{"version":"e6e800212362230a3edf4fa4967d0bf7972da420ec0aec811d88982b492fc6d0","signature":"f6198c46a5788f370cce98b094d622047e592eedef23a18ab477aad458bc85ac","impliedFormat":99},{"version":"c9ebdfb52f07525e2317e46271218dc024b9939ca05f93577ef8c5892485857f","signature":"0cc62062a493830aa903636202dbb93364d3dc0266f7e0fe6abb7922c9aa8517","impliedFormat":99},{"version":"84f8beacd38616e6a61020b246d74eaa1f2ad6335c4c7fb545a7952c8f8d520f","signature":"1fd7f81918d3c8f5093b59152af9609a22d384f88e711936eb8e8fdc7818efc1","impliedFormat":99},{"version":"af0f5e0955e6f30edc39b2f893928e046b939fd8120917bef0cda2b2b0cfe3f5","impliedFormat":99},{"version":"9abb9a1617d87760ee919776c6d6b75aa8f04135e91d302abe7e6f28d595c69b","signature":"5cb26573fe01920ae3a98b7ef0d6e8da7af406208bef6aa34d38a7d5fea42494","impliedFormat":99},{"version":"c9262a0ab059a722207c441e741fb44e8d0dae048edcaf9c36fc5599fdb311bd","impliedFormat":99},{"version":"ac6d7cd8a82d1cd671805a229bdec5b802baf8e01acb84ca1bc37909d52e7cdf","signature":"ab70d2035a823e618685ea73bb1c4062645ff8c579e6c79ee4eaa4ee39720a38","impliedFormat":99},{"version":"12623e0f26cbbc9e23a2acd9869996fce986b8818bcd1ed4e52b30e8789a01e7","signature":"042a6a95e4892131b242ffdcfe97cdc6142a9843695712638360d81d4120599b","impliedFormat":99},{"version":"846c9e49f2399db4cb63a7d91473f555fca00aad086009fb4289b1028f4a077c","impliedFormat":99},{"version":"fe3fd03f6dd87b469b770256897cd1f85e7a259c1a448d80237e47285be0bd2f","impliedFormat":1},{"version":"bdf6985c7fae0895cf149945de85ea88636de46587aee28805888f88f8fd30f3","signature":"ebb0ed2e606edbd97c69024c6fb2c899f63a26e20e444b78cdd73132e1a0ca06","impliedFormat":99},{"version":"d086e84318b16d517c21df1c0e818e0389fc288bfea53d5c9ba58c795cac1867","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"52547a58957799d44e5a1d8a7b2627d9a6be0bdf81b06763ef3579efd531f523","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"12656f2cf5a3c9596595232da20f58082161103ac09f6a3ce7de86130bd07b5f","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"bdcdb9c30b8ad107b5171ead82175859cb7abea62e232d759a1a81635206decc","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"eef6069bb688f1bd49f69238a141183853f7d0051b16ca70ad1c0b1dee601452","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"bd857eaa3aaae43ded2b9f86df6b1e0a6c906e1115b4cc6e9abdf2c599afe676","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"c0a456eb21680eca96d5e836e2a5cc74730a2c0e03f18eb17a7f652b30c993e4","impliedFormat":1},{"version":"316d13742983f0698714b9c9d0d1a3de6d79cdab24e3b732f910f88eb9df01c1","impliedFormat":1},{"version":"70e2bd933c87f16fad94c2cd0392c73e92f08451abf1fe56d5a9780552321d67","signature":"7d3137555fe2f8da1fe077d58cce9f8e1f9bef7a78c3e6dbe86bac0e27c69f62","impliedFormat":99},{"version":"1da2933d763ee824a1b645c5dd624260808739bf8b34b0695700c80d6df777b1","signature":"736c0107791709d49991dc58146b6c1f87147eefce420cdbdfa6fb8939569e47","impliedFormat":99},{"version":"b66d2e88daac364adff28f8785e14c9afe812d92b19471c420223a0073eea27c","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"831001a245490e1538ddb5ae33ffcf8be05bb77abbcf4701c93694fb2e6f18ec","signature":"0d504e37ff56acc7ca34aadead6dc21e35b9960c38be27738a68fb731a6375cf","impliedFormat":99},{"version":"0ca43656e266ea9a54371e030353dfdc6cf6bc2e77cc7d7b81cf1161d6e1dba4","signature":"73e3660695f1f95fc8ab383fb2dce37070113d919ab7a46c5e3fbef4ab8ad141","impliedFormat":99},{"version":"b6333120902e3e9c5414a9bf3140cc3723ae384a454ca5b43c2d2dccae43b045","signature":"788fd471de2db75ab7ca33b984bfe23fe21050c0a44c96663ea480fc3bbeef41","impliedFormat":99},{"version":"9ae5a552049c2d064a4117b7f3294283aafcec480967aeb90e4944dbb6edcd65","signature":"0783d03fe0e744927298d2671b3ce3490abcd9896de02766940a606a602991c3","impliedFormat":99},{"version":"fab7ac6bba8690acae0fa852ebde4bddfea2de5eb710e9fedb5e572d3d2b88a8","signature":"73ebda1c41386f7597b0c30b33e7d758892db16c62f0123c203b3170940a1634","impliedFormat":99},{"version":"fb85ed98930154465f8c902692ea477f18c8892bc6a8d86fc9e4b3ff8d0cc0d7","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"e99801f8fdd04387fea6f73eb37ae9e7447226f3caed45dbe3128f55c22eec87","signature":"2dc206e233e0e5537afb478f788aede2620c08d7f85f0b89561be1243f6e2545","impliedFormat":99},{"version":"f819b74f2571645cab7074e176ca9fbd21c6b091ba7aa9d415c4a8e8e962edfc","signature":"24d590b9e56c28c3a9836bb8e1cf8667071b41b8bb0fac26e705222670b7f07a","impliedFormat":99},{"version":"905f2c61f55088929b51b9d083d36dbef07e41ef677ba8af6ff7a80fbfe6c51a","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"679bf5ccf904e497617ae7f16a8d743f9735e22cee4606dce3b46bd68fd69f6d","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"045cfecf0e99b1202ff9b59c8bb4f14dbe9b4e459df6119517bd4952c183c11a","signature":"a225e368309b34115188593cc653791d2a989c3d155852dea7eb8adafc7cffa8","impliedFormat":99},{"version":"ea971c6785d533bedf150c100ca2586bed41600b93d6c949721b5e33d0858e12","signature":"e0497122f4964168ba6a6bae7add138fb9d9292fe58c49b89870fc628bf9feb5","impliedFormat":99},{"version":"af0f5e0955e6f30edc39b2f893928e046b939fd8120917bef0cda2b2b0cfe3f5","impliedFormat":99},{"version":"ac65f04c2df0218cb8e54f012745cbfcc3c0e67c1f6b1e557d88842bbb72e2db","impliedFormat":1},{"version":"cc957354aa3c94c9961ebf46282cfde1e81d107fc5785a61f62c67f1dd3ac2eb","impliedFormat":1},{"version":"a2e86df4db576d80704e25293cec6f20fc6101a11f4747440e2eef58fb3c860c","impliedFormat":1},{"version":"93de1c6dab503f053efe8d304cb522bb3a89feab8c98f307a674a4fae04773e9","impliedFormat":1},{"version":"6704f0b54df85640baaeebd86c9d4a1dbb661d5a4d57a75bc84162f562f6531d","impliedFormat":1},{"version":"9d255af1b09c6697089d3c9bf438292a298d8b7a95c68793c9aae80afc9e5ca7","impliedFormat":1},{"version":"ba8691cf6bea9d53e6bf6cbc22af964a9633a21793981a1be3dce65e7a714d8b","impliedFormat":1},{"version":"a69c09dbea52352f479d3e7ac949fde3d17b195abe90b045d619f747b38d6d1a","impliedFormat":1},{"version":"bce910d9164785c9f0d4dcea4be359f5f92130c7c7833dea6138ab1db310a1f9","affectsGlobalScope":true,"impliedFormat":1},{"version":"7d2e3fea24c712c99c03ad8f556abedbfe105f87f1be10b95dbd409d24bc05a3","impliedFormat":1},{"version":"c7a976828c7acb8ada184935195aef0f389c4e37d87daa52eb4f2f3df3edcdea","affectsGlobalScope":true,"impliedFormat":1},{"version":"3719525a8f6ab731e3dfd585d9f87df55ec7d50d461df84f74eb4d68bb165244","impliedFormat":1},{"version":"f993522fd7d01ae1ead930091fe35130b8415720d6c2123dc2a7e8eb11bb3cba","impliedFormat":1},{"version":"d5135ad93b33adcce80b18f8065087934cdc1730d63db58562edcf017e1aad9b","affectsGlobalScope":true,"impliedFormat":1},{"version":"82408ed3e959ddc60d3e9904481b5a8dc16469928257af22a3f7d1a3bc7fd8c4","impliedFormat":1},{"version":"b787b5b54349a24f07d089b612a9fb8ff024dbbe991ff52ea2b188a6b1230644","impliedFormat":1},{"version":"bb9c4ffa5e6290c6980b63c815cdd1625876dadb2efaf77edbe82984be93e55e","impliedFormat":1},{"version":"1cdcfc1f624d6c08aa12c73935f6e13f095919cd99edf95752951796eb225729","impliedFormat":1},{"version":"4eaff3d8e10676fd7913d8c108890e71c688e1e7d52f6d1d55c39514f493dc47","impliedFormat":1},{"version":"14b5aa23c5d0ae1907bc696ac7b6915d88f7d85799cc0dc2dcf98fbce2c5a67c","impliedFormat":1},{"version":"5c439dafdc09abe4d6c260a96b822fa0ba5be7203c71a63ab1f1423cd9e838ea","impliedFormat":1},{"version":"6b526a5ec4a401ca7c26cfe6a48e641d8f30af76673bad3b06a1b4504594a960","affectsGlobalScope":true,"impliedFormat":1},{"version":"00dee7cdca8b8420c47ea4a31a34b8e8294013ebc4f463fd941e867e7bf05029","affectsGlobalScope":true,"impliedFormat":1},{"version":"7abd2623cdd8148233c0c6b9da0289e124f1718bc58dcb8da4262432e9ce0f0a","impliedFormat":1},{"version":"f4a3088770ba56a4c72e9907bc9798706ab1575097cd024503f57966df2d3d3a","impliedFormat":1},{"version":"7f138842074d0a40681775af008c8452093b68c383c94de31759e853c6d06b5c","impliedFormat":1},{"version":"a3d541d303ee505053f5dcbf9fafb65cac3d5631037501cd616195863a6c5740","impliedFormat":1},{"version":"8d3c583a07e0c37e876908c2d5da575019f689df8d9fa4c081d99119d53dba22","impliedFormat":1},{"version":"2c828a5405191d006115ab34e191b8474bc6c86ffdc401d1a9864b1b6e088a58","impliedFormat":1},{"version":"e630e5528e899219ae319e83bef54bf3bcb91b01d76861ecf881e8e614b167f0","affectsGlobalScope":true,"impliedFormat":1},{"version":"bcebb922784739bdb34c18ee51095d25a92b560c78ccd2eaacd6bd00f7443d83","impliedFormat":1},{"version":"7ee6ed878c4528215c82b664fe0cfe80e8b4da6c0d4cc80869367868774db8b1","impliedFormat":1},{"version":"b0973c3cbcdc59b37bf477731d468696ecaf442593ec51bab497a613a580fe30","impliedFormat":1},{"version":"4989e92ba5b69b182d2caaea6295af52b7dc73a4f7a2e336a676722884e7139d","affectsGlobalScope":true,"impliedFormat":1},{"version":"0715e4cd28ad471b2a93f3e552ff51a3ae423417a01a10aa1d3bc7c6b95059d6","affectsGlobalScope":true,"impliedFormat":1},{"version":"5153a2fd150e46ce57bb3f8db1318d33f6ad3261ed70ceeff92281c0608c74a3","impliedFormat":1},{"version":"210d54cd652ec0fec8c8916e4af59bb341065576ecda039842f9ffb2e908507c","impliedFormat":1},{"version":"36b03690b628eab08703d63f04eaa89c5df202e5f1edf3989f13ad389cd2c091","impliedFormat":1},{"version":"0effadd232a20498b11308058e334d3339cc5bf8c4c858393e38d9d4c0013dcf","impliedFormat":1},{"version":"25846d43937c672bab7e8195f3d881f93495df712ee901860effc109918938cc","impliedFormat":1},{"version":"4f3fdeba4e28e21aa719c081b8dc8f91d47e12e773389b9d35679c08151c9d37","impliedFormat":1},{"version":"1b952304137851e45bc009785de89ada562d9376177c97e37702e39e60c2f1ff","impliedFormat":1},{"version":"69ee23dd0d215b09907ad30d23f88b7790c93329d1faf31d7835552a10cf7cbf","impliedFormat":1},{"version":"44b8b584a338b190a59f4f6929d072431950c7bd92ec2694821c11bce180c8a5","impliedFormat":1},{"version":"23b89798789dffbd437c0c423f5d02d11f9736aea73d6abf16db4f812ff36eda","impliedFormat":1},{"version":"5629c03c44d1e07698c31d04318c9950d78940461269c0f692a42091cedea142","impliedFormat":1},{"version":"3c4ba1dd9b12ffa284b565063108f2f031d150ea15b8fafbdc17f5d2a07251f3","affectsGlobalScope":true,"impliedFormat":1},{"version":"e10177274a35a9d07c825615340b2fcde2f610f53f3fb40269fd196b4288dda6","impliedFormat":1},{"version":"1422cd9e705adcc09088fda85a900c2b70e3ad36ea85846f68bd1a884cdf4e2b","impliedFormat":1},{"version":"3c13ef48634e7b5012fcf7e8fce7496352c2d779a7201389ca96a2a81ee4314d","impliedFormat":1},{"version":"5d0a25ec910fa36595f85a67ac992d7a53dd4064a1ba6aea1c9f14ab73a023f2","impliedFormat":1},{"version":"c6b124041039647ff446e19ea0e90a7a83256593d64f23c66b4fda6e0c5b968e","affectsGlobalScope":true,"impliedFormat":1},{"version":"a9fc1469744055a3435f203123246b96c094e7ff8c4e1c3863829d9b705b7a34","affectsGlobalScope":true,"impliedFormat":1},{"version":"868831cab82b65dfe1d68180e898af1f2101e89ba9b754d1db6fb8cc2fac1921","impliedFormat":1},{"version":"0fe8985a28f82c450a04a6edf1279d7181c0893f37da7d2a27f8efd4fd5edb03","impliedFormat":1},{"version":"e59a892d87e72733e2a9ca21611b9beb52977be2696c7ba4b216cbbb9a48f5aa","impliedFormat":1},{"version":"52120bb7e4583612225bdf08e7c12559548170f11e660d33a33623bae9bbdbba","affectsGlobalScope":true,"impliedFormat":1},{"version":"8a300fa9b698845a1f9c41ecbe2c5966634582a8e2020d51abcace9b55aa959e","impliedFormat":1},{"version":"ab9b9a36e5284fd8d3bf2f7d5fcbc60052f25f27e4d20954782099282c60d23e","affectsGlobalScope":true,"impliedFormat":1},{"version":"a6dd3dba8e665ac43d279e0fdf5219edda0eed69b5e9a5061f46cd6a65c4f7a1","impliedFormat":1},{"version":"6d829824ead8999f87b6df21200df3c6150391b894b4e80662caa462bd48d073","impliedFormat":1},{"version":"afc559c1b93df37c25aef6b3dfa2d64325b0e112e887ee18bf7e6f4ec383fc90","impliedFormat":1},{"version":"d78e5898c8de5e0f934eee83f680262de005caa268d137101b833fd932f95e07","impliedFormat":1},{"version":"84e3bbd6f80983d468260fdbfeeb431cc81f7ea98d284d836e4d168e36875e86","impliedFormat":1},{"version":"aad5ffa61406b8e19524738fcf0e6fda8b3485bba98626268fdf252d1b2b630a","impliedFormat":1},{"version":"16d51f964ec125ad2024cf03f0af444b3bc3ec3614d9345cc54d09bab45c9a4c","impliedFormat":1},{"version":"ba601641fac98c229ccd4a303f747de376d761babb33229bb7153bed9356c9cc","impliedFormat":1},{"version":"352fc8497a30bc806d7defa0043d85802e5f35a7688731ee9a21456f5cb32a94","affectsGlobalScope":true,"impliedFormat":1},{"version":"9c230a07d657b3c65ad79e819b0c362a8ebcc0730f9a3d552a26ea632e2bfd53","impliedFormat":1},{"version":"3896464bb7e25fceebbd9c8a0b443caaa9b68ec323f46191c36b84293c852a19","impliedFormat":1},{"version":"64d4b35c5456adf258d2cf56c341e203a073253f229ef3208fc0d5020253b241","affectsGlobalScope":true,"impliedFormat":1},{"version":"bee89e1eb6425eb49894f3f25e4562dc2564e84e5aa7610b7e13d8ecddf8f5db","impliedFormat":1},{"version":"dca41e86e89dfb2e85e6935260250f02eb6683b86c2fa16bec729ddd1bcd9b4b","impliedFormat":1},{"version":"894e2eb01e3ac0dda3722dc520d804faa863fd6e2938c801e4c8561e7b0c8a40","impliedFormat":1},{"version":"e050a0afcdbb269720a900c85076d18e0c1ab73e580202a2bf6964978181222a","impliedFormat":1},{"version":"5b9ecf7da4d71cf3832dbb8336150fa924631811f488ad4690c2dfec2b4fb1d7","impliedFormat":1},{"version":"951c85f75aac041dddbedfedf565886a7b494e29ec1532e2a9b4a6180560b50e","impliedFormat":1},{"version":"e6f0cb9d8cb2e38bec66e032e73caa3e7c6671f21ed7196acb821aec462051f2","impliedFormat":1},{"version":"43cdd474c5aa3340da4816bb8f1ae7f3b1bcf9e70d997afc36a0f2c432378c84","impliedFormat":1},{"version":"bf88ef4208a770ca39a844b182b3695df536326ea566893fdc5b8418702a331e","impliedFormat":1},{"version":"ee65fe452abe1309389c5f50710f24114e08a302d40708101c4aa950a2a7d044","impliedFormat":1},{"version":"1d96568a72657f762763c920d3804868db48d638abd87ddcd82bcb200ef9625c","impliedFormat":1},{"version":"8b06ac3faeacb8484d84ddb44571d8f410697f98d7bfa86c0fda60373a9f5215","impliedFormat":1},{"version":"7eb06594824ada538b1d8b48c3925a83e7db792f47a081a62cf3e5c4e23cf0ee","impliedFormat":1},{"version":"f5638f7c2f12a9a1a57b5c41b3c1ea7db3876c003bab68e6a57afd6bcc169af0","impliedFormat":1},{"version":"6c1e688f95fcaf53b1e41c0fdadf2c1cfc96fa924eaf7f9fdb60f96deb0a4986","impliedFormat":1},{"version":"0d14fa22c41fdc7277e6f71473b20ebc07f40f00e38875142335d5b63cdfc9d2","impliedFormat":1},{"version":"db25694be959314fd1e868d72e567746db1db9e2001fae545d12d2a8c1bba1b8","impliedFormat":1},{"version":"43883cf3635bb1846cbdc6c363787b76227677388c74f7313e3f0edb380840fa","impliedFormat":1},{"version":"2d47012580f859dae201d2eef898a416bdae719dffc087dfd06aefe3de2f9c8d","impliedFormat":1},{"version":"3e70a7e67c2cb16f8cd49097360c0309fe9d1e3210ff9222e9dac1f8df9d4fb6","impliedFormat":1},{"version":"ab68d2a3e3e8767c3fba8f80de099a1cfc18c0de79e42cb02ae66e22dfe14a66","impliedFormat":1},{"version":"2cec1a31729b9b01e9294c33fc9425d336eff067282809761ad2e74425d6d2a5","impliedFormat":1},{"version":"240c702fb4b3bd54d83ee167d80fa7f0cd7300fef7eea0b32cef33129740893c","affectsGlobalScope":true,"impliedFormat":1},{"version":"d88a5e779faf033be3d52142a04fbe1cb96009868e3bbdd296b2bc6c59e06c0e","impliedFormat":1},{"version":"199f9ead0daf25ae4c5632e3d1f42570af59685294a38123eef457407e13f365","impliedFormat":1},{"version":"2b93035328f7778d200252681c1d86285d501ed424825a18f81e4c3028aa51d9","impliedFormat":1},{"version":"2ac9c8332c5f8510b8bdd571f8271e0f39b0577714d5e95c1e79a12b2616f069","impliedFormat":1},{"version":"42c21aa963e7b86fa00801d96e88b36803188018d5ad91db2a9101bccd40b3ff","impliedFormat":1},{"version":"d31eb848cdebb4c55b4893b335a7c0cca95ad66dee13cbb7d0893810c0a9c301","impliedFormat":1},{"version":"b9f96255e1048ed2ea33ec553122716f0e57fc1c3ad778e9aa15f5b46547bd23","impliedFormat":1},{"version":"7a9e0a564fee396cacf706523b5aeed96e04c6b871a8bebefad78499fbffc5bc","impliedFormat":1},{"version":"906c751ef5822ec0dadcea2f0e9db64a33fb4ee926cc9f7efa38afe5d5371b2a","impliedFormat":1},{"version":"5387c049e9702f2d2d7ece1a74836a14b47fbebe9bbeb19f94c580a37c855351","impliedFormat":1},{"version":"c68391fb9efad5d99ff332c65b1606248c4e4a9f1dd9a087204242b56c7126d6","impliedFormat":1},{"version":"e9cf02252d3a0ced987d24845dcb1f11c1be5541f17e5daa44c6de2d18138d0c","impliedFormat":1},{"version":"e8b02b879754d85f48489294f99147aeccc352c760d95a6fe2b6e49cd400b2fe","impliedFormat":1},{"version":"9f6908ab3d8a86c68b86e38578afc7095114e66b2fc36a2a96e9252aac3998e0","impliedFormat":1},{"version":"0eedb2344442b143ddcd788f87096961cd8572b64f10b4afc3356aa0460171c6","impliedFormat":1},{"version":"71405cc70f183d029cc5018375f6c35117ffdaf11846c35ebf85ee3956b1b2a6","impliedFormat":1},{"version":"c68baff4d8ba346130e9753cefe2e487a16731bf17e05fdacc81e8c9a26aae9d","impliedFormat":1},{"version":"2cd15528d8bb5d0453aa339b4b52e0696e8b07e790c153831c642c3dea5ac8af","impliedFormat":1},{"version":"479d622e66283ffa9883fbc33e441f7fc928b2277ff30aacbec7b7761b4e9579","impliedFormat":1},{"version":"ade307876dc5ca267ca308d09e737b611505e015c535863f22420a11fffc1c54","impliedFormat":1},{"version":"f8cdefa3e0dee639eccbe9794b46f90291e5fd3989fcba60d2f08fde56179fb9","impliedFormat":1},{"version":"86c5a62f99aac7053976e317dbe9acb2eaf903aaf3d2e5bb1cafe5c2df7b37a8","impliedFormat":1},{"version":"2b300954ce01a8343866f737656e13243e86e5baef51bd0631b21dcef1f6e954","impliedFormat":1},{"version":"a2d409a9ffd872d6b9d78ead00baa116bbc73cfa959fce9a2f29d3227876b2a1","impliedFormat":1},{"version":"b288936f560cd71f4a6002953290de9ff8dfbfbf37f5a9391be5c83322324898","impliedFormat":1},{"version":"61178a781ef82e0ff54f9430397e71e8f365fc1e3725e0e5346f2de7b0d50dfa","impliedFormat":1},{"version":"6a6ccb37feb3aad32d9be026a3337db195979cd5727a616fc0f557e974101a54","impliedFormat":1},{"version":"c649ea79205c029a02272ef55b7ab14ada0903db26144d2205021f24727ac7a3","impliedFormat":1},{"version":"38e2b02897c6357bbcff729ef84c736727b45cc152abe95a7567caccdfad2a1d","impliedFormat":1},{"version":"d6610ea7e0b1a7686dba062a1e5544dd7d34140f4545305b7c6afaebfb348341","impliedFormat":1},{"version":"3dee35db743bdba2c8d19aece7ac049bde6fa587e195d86547c882784e6ba34c","impliedFormat":1},{"version":"b15e55c5fa977c2f25ca0b1db52cfa2d1fd4bf0baf90a8b90d4a7678ca462ff1","impliedFormat":1},{"version":"f41d30972724714763a2698ae949fbc463afb203b5fa7c4ad7e4de0871129a17","impliedFormat":1},{"version":"843dd7b6a7c6269fd43827303f5cbe65c1fecabc30b4670a50d5a15d57daeeb9","impliedFormat":1},{"version":"f06d8b8567ee9fd799bf7f806efe93b67683ef24f4dea5b23ef12edff4434d9d","impliedFormat":1},{"version":"6017384f697ff38bc3ef6a546df5b230c3c31329db84cbfe686c83bec011e2b2","impliedFormat":1},{"version":"e1a5b30d9248549ca0c0bb1d653bafae20c64c4aa5928cc4cd3017b55c2177b0","impliedFormat":1},{"version":"a593632d5878f17295bd53e1c77f27bf4c15212822f764a2bfc1702f4b413fa0","impliedFormat":1},{"version":"a868a534ba1c2ca9060b8a13b0ffbbbf78b4be7b0ff80d8c75b02773f7192c29","impliedFormat":1},{"version":"da7545aba8f54a50fde23e2ede00158dc8112560d934cee58098dfb03aae9b9d","impliedFormat":1},{"version":"34baf65cfee92f110d6653322e2120c2d368ee64b3c7981dff08ed105c4f19b0","impliedFormat":1},{"version":"a1a261624efb3a00ff346b13580f70f3463b8cdcc58b60f5793ff11785d52cab","impliedFormat":1},{"version":"acebfe99678cf7cddcddc3435222cf132052b1226e902daac9fbb495c321a9b5","impliedFormat":1},{"version":"82b1f9a6eefef7386aebe22ac49f23b806421e82dbf35c6e5b7132d79e4165da","impliedFormat":1},{"version":"2887592574fcdfd087647c539dcb0fbe5af2521270dad4a37f9d17c16190d579","impliedFormat":1},{"version":"ce99fd4b37ce2dbf9adfc06c1722271c926adb408b1f6413763ae9253d922823","impliedFormat":1},{"version":"b0d10e46cfe3f6c476b69af02eaa38e4ccc7430221ce3109ae84bb9fb8282298","impliedFormat":1},{"version":"2dd1d4cea14cead7a7fc9eec8f40593089dff0de8c0199458446143c9b8c4ea9","impliedFormat":1},{"version":"70e9a18da08294f75bf23e46c7d69e67634c0765d355887b9b41f0d959e1426e","impliedFormat":1},{"version":"e9eb1b173aa166892f3eddab182e49cfe59aa2e14d33aedb6b49d175ed6a3750","impliedFormat":1}],"root":[63,[65,67],[72,95],[97,103],[106,121]],"options":{"allowSyntheticDefaultImports":true,"composite":true,"declaration":true,"declarationMap":true,"downlevelIteration":true,"esModuleInterop":true,"importHelpers":true,"inlineSourceMap":true,"module":199,"outDir":"./dest/browser","rootDir":"./src","strict":false,"target":7,"tsBuildInfoFile":"./.tsbuildinfo.browser"},"fileIdsList":[[122,174],[174],[174,209],[122,123,124,125,126,174],[122,124,174],[147,174,181,182],[138,174,181],[173,174,181,189],[147,174,181],[68,174],[174,193,195],[174,192,193,194],[144,147,174,181,186,187,188],[174,183,188,189,199],[145,174,181],[144,147,149,152,162,173,174,181],[174,204],[174,205],[174,211,214],[128,174],[131,174],[132,137,165,174],[133,144,145,152,162,173,174],[133,134,144,152,174],[135,174],[136,137,145,153,174],[137,162,170,174],[138,140,144,152,174],[139,174],[140,141,174],[144,174],[142,144,174],[144,145,146,162,173,174],[144,145,146,159,162,165,174],[174,178],[140,144,147,152,162,173,174],[144,145,147,148,152,162,170,173,174],[147,149,162,170,173,174],[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180],[144,150,174],[151,173,174],[140,144,152,162,174],[153,174],[154,174],[131,155,174],[156,172,174,178],[157,174],[158,174],[144,159,160,174],[159,161,174,176],[132,144,162,163,164,165,174],[132,162,164,174],[162,163,174],[165,174],[166,174],[144,168,169,174],[168,169,174],[137,152,162,170,174],[171,174],[152,172,174],[132,147,158,173,174],[137,174],[162,174,175],[174,176],[174,177],[132,137,144,146,155,162,173,174,176,178],[162,174,179],[174,218,257],[174,218,242,257],[174,257],[174,218],[174,218,243,257],[174,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256],[174,243,257],[145,162,174,181,185],[145,174,200],[147,174,181,198],[174,198],[174,197],[174,260],[144,147,149,162,170,173,174,179,181],[174,264],[104,174],[70,174],[174,207,213],[174,211],[174,208,212],[174,210],[61,174],[62,174],[62,92,93,94,174],[62,94,174],[62,81,85,92,174],[62,75,81,82,174],[62,75,81,174],[62,75,81,82,83,84,174],[62,75,174,178],[62,69,71,73,74,144,174,178],[62,69,71,75,174],[62,69,71,76,174],[62,75,174],[62,71,75,106,145,146,153,154,173,174,178],[62,105,174],[62,71,76,106,174,178],[62,111,113,174],[62,109,110,145,174],[62,109,110,112,145,174],[62,63,64,174],[62,65,174],[62,66,174],[62,145,146,154,173,174],[62,63,69,115,145,146,174],[62,67,69,92,94,174],[62,92,94,95,174],[62,76,85,93,174],[62,67,76,92,93,94,174],[62,69,80,95,96,145,174,179],[62,72,174],[62,137,174],[62,77,78,80,174],[62,77,174],[62,79,174],[62,89,174],[62,77,92,174],[62,73,81,87,174],[62,73,81,174],[62,79,86,88,90,91,174],[62,120,174],[62,81,174],[85,92],[75,81],[71],[75],[75,178],[105],[76,93],[77],[77,92],[81]],"referencedMap":[[124,1],[122,2],[207,2],[210,3],[209,2],[127,4],[123,1],[125,5],[126,1],[183,6],[184,7],[190,8],[182,9],[69,10],[191,2],[196,11],[192,2],[195,12],[193,2],[189,13],[200,14],[201,15],[202,2],[203,16],[204,2],[205,17],[206,18],[215,19],[194,2],[185,2],[68,2],[128,20],[129,20],[131,21],[132,22],[133,23],[134,24],[135,25],[136,26],[137,27],[138,28],[139,29],[140,30],[141,30],[143,31],[142,32],[144,31],[145,33],[146,34],[130,35],[180,2],[147,36],[148,37],[149,38],[181,39],[150,40],[151,41],[152,42],[153,43],[154,44],[155,45],[156,46],[157,47],[158,48],[159,49],[160,49],[161,50],[162,51],[164,52],[163,53],[165,54],[166,55],[167,2],[168,56],[169,57],[170,58],[171,59],[172,60],[173,61],[174,62],[175,63],[176,64],[177,65],[178,66],[179,67],[216,2],[188,2],[187,2],[217,2],[242,68],[243,69],[218,70],[221,70],[240,68],[241,68],[231,68],[230,71],[228,68],[223,68],[236,68],[234,68],[238,68],[222,68],[235,68],[239,68],[224,68],[225,68],[237,68],[219,68],[226,68],[227,68],[229,68],[233,68],[244,72],[232,68],[220,68],[257,73],[256,2],[251,72],[253,74],[252,72],[245,72],[246,72],[248,72],[250,72],[254,74],[255,74],[247,74],[249,74],[186,75],[258,76],[199,77],[197,78],[198,79],[259,9],[261,80],[262,2],[263,81],[264,2],[265,82],[208,2],[105,83],[104,2],[71,84],[70,2],[96,2],[214,85],[64,2],[212,86],[213,87],[211,88],[260,2],[62,89],[61,2],[59,2],[60,2],[12,2],[14,2],[13,2],[2,2],[15,2],[16,2],[17,2],[18,2],[19,2],[20,2],[21,2],[22,2],[3,2],[4,2],[26,2],[23,2],[24,2],[25,2],[27,2],[28,2],[29,2],[5,2],[30,2],[31,2],[32,2],[33,2],[6,2],[37,2],[34,2],[35,2],[36,2],[38,2],[7,2],[39,2],[44,2],[45,2],[40,2],[41,2],[42,2],[43,2],[8,2],[49,2],[46,2],[47,2],[48,2],[50,2],[9,2],[51,2],[52,2],[53,2],[56,2],[54,2],[55,2],[57,2],[10,2],[1,2],[11,2],[58,2],[82,90],[98,91],[99,92],[93,93],[100,91],[101,91],[83,94],[84,95],[85,96],[102,97],[75,98],[74,99],[103,100],[76,101],[107,102],[106,103],[108,104],[87,90],[109,90],[114,105],[110,90],[111,106],[112,90],[113,107],[65,108],[66,109],[67,110],[63,90],[115,111],[116,112],[117,113],[118,114],[94,115],[95,116],[97,117],[72,90],[73,118],[119,119],[77,90],[81,120],[78,121],[80,122],[90,123],[89,124],[88,125],[91,126],[92,127],[121,128],[120,124],[86,129],[79,90]],"exportedModulesMap":[[124,1],[122,2],[207,2],[210,3],[209,2],[127,4],[123,1],[125,5],[126,1],[183,6],[184,7],[190,8],[182,9],[69,10],[191,2],[196,11],[192,2],[195,12],[193,2],[189,13],[200,14],[201,15],[202,2],[203,16],[204,2],[205,17],[206,18],[215,19],[194,2],[185,2],[68,2],[128,20],[129,20],[131,21],[132,22],[133,23],[134,24],[135,25],[136,26],[137,27],[138,28],[139,29],[140,30],[141,30],[143,31],[142,32],[144,31],[145,33],[146,34],[130,35],[180,2],[147,36],[148,37],[149,38],[181,39],[150,40],[151,41],[152,42],[153,43],[154,44],[155,45],[156,46],[157,47],[158,48],[159,49],[160,49],[161,50],[162,51],[164,52],[163,53],[165,54],[166,55],[167,2],[168,56],[169,57],[170,58],[171,59],[172,60],[173,61],[174,62],[175,63],[176,64],[177,65],[178,66],[179,67],[216,2],[188,2],[187,2],[217,2],[242,68],[243,69],[218,70],[221,70],[240,68],[241,68],[231,68],[230,71],[228,68],[223,68],[236,68],[234,68],[238,68],[222,68],[235,68],[239,68],[224,68],[225,68],[237,68],[219,68],[226,68],[227,68],[229,68],[233,68],[244,72],[232,68],[220,68],[257,73],[256,2],[251,72],[253,74],[252,72],[245,72],[246,72],[248,72],[250,72],[254,74],[255,74],[247,74],[249,74],[186,75],[258,76],[199,77],[197,78],[198,79],[259,9],[261,80],[262,2],[263,81],[264,2],[265,82],[208,2],[105,83],[104,2],[71,84],[70,2],[96,2],[214,85],[64,2],[212,86],[213,87],[211,88],[260,2],[62,89],[61,2],[59,2],[60,2],[12,2],[14,2],[13,2],[2,2],[15,2],[16,2],[17,2],[18,2],[19,2],[20,2],[21,2],[22,2],[3,2],[4,2],[26,2],[23,2],[24,2],[25,2],[27,2],[28,2],[29,2],[5,2],[30,2],[31,2],[32,2],[33,2],[6,2],[37,2],[34,2],[35,2],[36,2],[38,2],[7,2],[39,2],[44,2],[45,2],[40,2],[41,2],[42,2],[43,2],[8,2],[49,2],[46,2],[47,2],[48,2],[50,2],[9,2],[51,2],[52,2],[53,2],[56,2],[54,2],[55,2],[57,2],[10,2],[1,2],[11,2],[58,2],[93,130],[83,131],[84,131],[85,131],[75,132],[74,133],[76,101],[107,134],[106,135],[66,109],[67,110],[94,136],[95,116],[73,118],[81,120],[78,137],[90,123],[89,138],[88,139],[91,139],[92,127],[121,128],[120,138],[86,139]],"semanticDiagnosticsPerFile":[124,122,207,210,209,127,123,125,126,183,184,190,182,69,191,196,192,195,193,189,200,201,202,203,204,205,206,215,194,185,68,128,129,131,132,133,134,135,136,137,138,139,140,141,143,142,144,145,146,130,180,147,148,149,181,150,151,152,153,154,155,156,157,158,159,160,161,162,164,163,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,216,188,187,217,242,243,218,221,240,241,231,230,228,223,236,234,238,222,235,239,224,225,237,219,226,227,229,233,244,232,220,257,256,251,253,252,245,246,248,250,254,255,247,249,186,258,199,197,198,259,261,262,263,264,265,208,105,104,71,70,96,214,64,212,213,211,260,62,61,59,60,12,14,13,2,15,16,17,18,19,20,21,22,3,4,26,23,24,25,27,28,29,5,30,31,32,33,6,37,34,35,36,38,7,39,44,45,40,41,42,43,8,49,46,47,48,50,9,51,52,53,56,54,55,57,10,1,11,58,82,98,99,93,100,101,83,84,85,102,75,74,103,76,107,106,108,87,109,114,110,111,112,113,65,66,67,63,115,116,117,118,94,95,97,72,73,119,77,81,78,80,90,89,88,91,92,121,120,86,79],"latestChangedDtsFile":"./dest/browser/types/node/index.d.ts"},"version":"5.1.3"} \ No newline at end of file diff --git a/ts/.tsbuildinfo.node b/ts/.tsbuildinfo.node new file mode 100644 index 0000000000..0ec0d93bc8 --- /dev/null +++ b/ts/.tsbuildinfo.node @@ -0,0 +1 @@ +{"program":{"fileNames":["./node_modules/typescript/lib/lib.es5.d.ts","./node_modules/typescript/lib/lib.es2015.d.ts","./node_modules/typescript/lib/lib.es2016.d.ts","./node_modules/typescript/lib/lib.es2017.d.ts","./node_modules/typescript/lib/lib.es2018.d.ts","./node_modules/typescript/lib/lib.es2019.d.ts","./node_modules/typescript/lib/lib.es2020.d.ts","./node_modules/typescript/lib/lib.es2021.d.ts","./node_modules/typescript/lib/lib.es2022.d.ts","./node_modules/typescript/lib/lib.es2023.d.ts","./node_modules/typescript/lib/lib.esnext.d.ts","./node_modules/typescript/lib/lib.dom.d.ts","./node_modules/typescript/lib/lib.es2015.core.d.ts","./node_modules/typescript/lib/lib.es2015.collection.d.ts","./node_modules/typescript/lib/lib.es2015.generator.d.ts","./node_modules/typescript/lib/lib.es2015.iterable.d.ts","./node_modules/typescript/lib/lib.es2015.promise.d.ts","./node_modules/typescript/lib/lib.es2015.proxy.d.ts","./node_modules/typescript/lib/lib.es2015.reflect.d.ts","./node_modules/typescript/lib/lib.es2015.symbol.d.ts","./node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","./node_modules/typescript/lib/lib.es2016.array.include.d.ts","./node_modules/typescript/lib/lib.es2017.object.d.ts","./node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","./node_modules/typescript/lib/lib.es2017.string.d.ts","./node_modules/typescript/lib/lib.es2017.intl.d.ts","./node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","./node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","./node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","./node_modules/typescript/lib/lib.es2018.intl.d.ts","./node_modules/typescript/lib/lib.es2018.promise.d.ts","./node_modules/typescript/lib/lib.es2018.regexp.d.ts","./node_modules/typescript/lib/lib.es2019.array.d.ts","./node_modules/typescript/lib/lib.es2019.object.d.ts","./node_modules/typescript/lib/lib.es2019.string.d.ts","./node_modules/typescript/lib/lib.es2019.symbol.d.ts","./node_modules/typescript/lib/lib.es2019.intl.d.ts","./node_modules/typescript/lib/lib.es2020.bigint.d.ts","./node_modules/typescript/lib/lib.es2020.date.d.ts","./node_modules/typescript/lib/lib.es2020.promise.d.ts","./node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","./node_modules/typescript/lib/lib.es2020.string.d.ts","./node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","./node_modules/typescript/lib/lib.es2020.intl.d.ts","./node_modules/typescript/lib/lib.es2020.number.d.ts","./node_modules/typescript/lib/lib.es2021.promise.d.ts","./node_modules/typescript/lib/lib.es2021.string.d.ts","./node_modules/typescript/lib/lib.es2021.weakref.d.ts","./node_modules/typescript/lib/lib.es2021.intl.d.ts","./node_modules/typescript/lib/lib.es2022.array.d.ts","./node_modules/typescript/lib/lib.es2022.error.d.ts","./node_modules/typescript/lib/lib.es2022.intl.d.ts","./node_modules/typescript/lib/lib.es2022.object.d.ts","./node_modules/typescript/lib/lib.es2022.sharedmemory.d.ts","./node_modules/typescript/lib/lib.es2022.string.d.ts","./node_modules/typescript/lib/lib.es2022.regexp.d.ts","./node_modules/typescript/lib/lib.es2023.array.d.ts","./node_modules/typescript/lib/lib.esnext.intl.d.ts","./node_modules/typescript/lib/lib.decorators.d.ts","./node_modules/typescript/lib/lib.decorators.legacy.d.ts","./node_modules/tslib/tslib.d.ts","./node_modules/tslib/modules/index.d.ts","./src/crs/net_crs.ts","./src/crs/node/ignition_files_crs.ts","./node_modules/@types/ms/index.d.ts","./node_modules/@types/debug/index.d.ts","./src/crs/node/index.ts","./src/crs/index.ts","./node_modules/comlink/dist/umd/protocol.d.ts","./node_modules/comlink/dist/umd/comlink.d.ts","./src/random/node/index.ts","./src/random/index.ts","./node_modules/comlink/dist/esm/protocol.d.ts","./node_modules/comlink/dist/esm/node-adapter.d.ts","./src/barretenberg_wasm/node/node_endpoint.ts","./src/barretenberg_wasm/node/index.ts","./src/barretenberg_wasm/barretenberg_wasm.ts","./src/barretenberg_wasm/index.ts","./src/serialize/buffer_reader.ts","./src/serialize/output_type.ts","./src/types/raw_buffer.ts","./src/serialize/serialize.ts","./src/serialize/index.ts","./src/async_map/index.ts","./src/barretenberg_binder/heap_allocator.ts","./src/barretenberg_binder/heap_allocator_sync.ts","./src/barretenberg_binder/index.ts","./src/types/ptr.ts","./src/bigint-array/index.ts","./src/types/fields.ts","./src/types/node/point.ts","./src/types/node/index.ts","./src/types/fixed_size_buffer.ts","./src/types/index.ts","./src/barretenberg_api/index.ts","./src/factory/index.ts","./src/index.ts","./node_modules/commander/typings/index.d.ts","./src/main.ts","./src/barretenberg_api/blake2s.test.ts","./src/barretenberg_api/common.test.ts","./src/barretenberg_api/pedersen.test.ts","./src/barretenberg_api/schnorr.test.ts","./src/barretenberg_wasm/barretenberg_wasm.test.ts","./src/barretenberg_wasm/browser/index.ts","./src/barretenberg_wasm/browser/worker.ts","./src/barretenberg_wasm/node/worker.ts","./src/bindgen/function_declaration.ts","./src/bindgen/mappings.ts","./src/bindgen/rust.ts","./src/bindgen/to_camel_case.ts","./src/bindgen/typescript.ts","./src/bindgen/index.ts","./node_modules/idb-keyval/dist/index.d.ts","./src/crs/browser/cached_net_crs.ts","./src/crs/browser/index.ts","./src/examples/simple.rawtest.ts","./src/examples/simple.test.ts","./src/random/browser/index.ts","./src/types/browser/point.ts","./src/types/browser/index.ts","./node_modules/@babel/types/lib/index.d.ts","./node_modules/@types/babel__generator/index.d.ts","./node_modules/@babel/parser/typings/babel-parser.d.ts","./node_modules/@types/babel__template/index.d.ts","./node_modules/@types/babel__traverse/index.d.ts","./node_modules/@types/babel__core/index.d.ts","./node_modules/@types/node/assert.d.ts","./node_modules/@types/node/assert/strict.d.ts","./node_modules/@types/node/globals.d.ts","./node_modules/@types/node/async_hooks.d.ts","./node_modules/@types/node/buffer.d.ts","./node_modules/@types/node/child_process.d.ts","./node_modules/@types/node/cluster.d.ts","./node_modules/@types/node/console.d.ts","./node_modules/@types/node/constants.d.ts","./node_modules/@types/node/crypto.d.ts","./node_modules/@types/node/dgram.d.ts","./node_modules/@types/node/diagnostics_channel.d.ts","./node_modules/@types/node/dns.d.ts","./node_modules/@types/node/dns/promises.d.ts","./node_modules/@types/node/domain.d.ts","./node_modules/@types/node/dom-events.d.ts","./node_modules/@types/node/events.d.ts","./node_modules/@types/node/fs.d.ts","./node_modules/@types/node/fs/promises.d.ts","./node_modules/@types/node/http.d.ts","./node_modules/@types/node/http2.d.ts","./node_modules/@types/node/https.d.ts","./node_modules/@types/node/inspector.d.ts","./node_modules/@types/node/module.d.ts","./node_modules/@types/node/net.d.ts","./node_modules/@types/node/os.d.ts","./node_modules/@types/node/path.d.ts","./node_modules/@types/node/perf_hooks.d.ts","./node_modules/@types/node/process.d.ts","./node_modules/@types/node/punycode.d.ts","./node_modules/@types/node/querystring.d.ts","./node_modules/@types/node/readline.d.ts","./node_modules/@types/node/readline/promises.d.ts","./node_modules/@types/node/repl.d.ts","./node_modules/@types/node/stream.d.ts","./node_modules/@types/node/stream/promises.d.ts","./node_modules/@types/node/stream/consumers.d.ts","./node_modules/@types/node/stream/web.d.ts","./node_modules/@types/node/string_decoder.d.ts","./node_modules/@types/node/test.d.ts","./node_modules/@types/node/timers.d.ts","./node_modules/@types/node/timers/promises.d.ts","./node_modules/@types/node/tls.d.ts","./node_modules/@types/node/trace_events.d.ts","./node_modules/@types/node/tty.d.ts","./node_modules/@types/node/url.d.ts","./node_modules/@types/node/util.d.ts","./node_modules/@types/node/v8.d.ts","./node_modules/@types/node/vm.d.ts","./node_modules/@types/node/wasi.d.ts","./node_modules/@types/node/worker_threads.d.ts","./node_modules/@types/node/zlib.d.ts","./node_modules/@types/node/globals.global.d.ts","./node_modules/@types/node/index.d.ts","./node_modules/@types/connect/index.d.ts","./node_modules/@types/body-parser/index.d.ts","./node_modules/@types/bonjour/index.d.ts","./node_modules/@types/mime/index.d.ts","./node_modules/@types/send/index.d.ts","./node_modules/@types/range-parser/index.d.ts","./node_modules/@types/qs/index.d.ts","./node_modules/@types/express-serve-static-core/index.d.ts","./node_modules/@types/connect-history-api-fallback/index.d.ts","./node_modules/@types/detect-node/index.d.ts","./node_modules/@types/eslint/helpers.d.ts","./node_modules/@types/estree/index.d.ts","./node_modules/@types/json-schema/index.d.ts","./node_modules/@types/eslint/index.d.ts","./node_modules/@types/eslint-scope/index.d.ts","./node_modules/@types/serve-static/node_modules/@types/mime/Mime.d.ts","./node_modules/@types/serve-static/node_modules/@types/mime/index.d.ts","./node_modules/@types/serve-static/index.d.ts","./node_modules/@types/express/index.d.ts","./node_modules/@types/graceful-fs/index.d.ts","./node_modules/@types/html-minifier-terser/index.d.ts","./node_modules/@types/http-proxy/index.d.ts","./node_modules/@types/istanbul-lib-coverage/index.d.ts","./node_modules/@types/istanbul-lib-report/index.d.ts","./node_modules/@types/istanbul-reports/index.d.ts","./node_modules/@jest/expect-utils/build/index.d.ts","./node_modules/chalk/index.d.ts","./node_modules/@sinclair/typebox/typebox.d.ts","./node_modules/@jest/schemas/build/index.d.ts","./node_modules/pretty-format/build/index.d.ts","./node_modules/jest-diff/build/index.d.ts","./node_modules/jest-matcher-utils/build/index.d.ts","./node_modules/expect/build/index.d.ts","./node_modules/@types/jest/index.d.ts","./node_modules/@types/prettier/index.d.ts","./node_modules/@types/retry/index.d.ts","./node_modules/@types/semver/classes/semver.d.ts","./node_modules/@types/semver/functions/parse.d.ts","./node_modules/@types/semver/functions/valid.d.ts","./node_modules/@types/semver/functions/clean.d.ts","./node_modules/@types/semver/functions/inc.d.ts","./node_modules/@types/semver/functions/diff.d.ts","./node_modules/@types/semver/functions/major.d.ts","./node_modules/@types/semver/functions/minor.d.ts","./node_modules/@types/semver/functions/patch.d.ts","./node_modules/@types/semver/functions/prerelease.d.ts","./node_modules/@types/semver/functions/compare.d.ts","./node_modules/@types/semver/functions/rcompare.d.ts","./node_modules/@types/semver/functions/compare-loose.d.ts","./node_modules/@types/semver/functions/compare-build.d.ts","./node_modules/@types/semver/functions/sort.d.ts","./node_modules/@types/semver/functions/rsort.d.ts","./node_modules/@types/semver/functions/gt.d.ts","./node_modules/@types/semver/functions/lt.d.ts","./node_modules/@types/semver/functions/eq.d.ts","./node_modules/@types/semver/functions/neq.d.ts","./node_modules/@types/semver/functions/gte.d.ts","./node_modules/@types/semver/functions/lte.d.ts","./node_modules/@types/semver/functions/cmp.d.ts","./node_modules/@types/semver/functions/coerce.d.ts","./node_modules/@types/semver/classes/comparator.d.ts","./node_modules/@types/semver/classes/range.d.ts","./node_modules/@types/semver/functions/satisfies.d.ts","./node_modules/@types/semver/ranges/max-satisfying.d.ts","./node_modules/@types/semver/ranges/min-satisfying.d.ts","./node_modules/@types/semver/ranges/to-comparators.d.ts","./node_modules/@types/semver/ranges/min-version.d.ts","./node_modules/@types/semver/ranges/valid.d.ts","./node_modules/@types/semver/ranges/outside.d.ts","./node_modules/@types/semver/ranges/gtr.d.ts","./node_modules/@types/semver/ranges/ltr.d.ts","./node_modules/@types/semver/ranges/intersects.d.ts","./node_modules/@types/semver/ranges/simplify.d.ts","./node_modules/@types/semver/ranges/subset.d.ts","./node_modules/@types/semver/internals/identifiers.d.ts","./node_modules/@types/semver/index.d.ts","./node_modules/@types/serve-index/index.d.ts","./node_modules/@types/sockjs/index.d.ts","./node_modules/source-map/source-map.d.ts","./node_modules/@types/source-map-support/index.d.ts","./node_modules/@types/stack-utils/index.d.ts","./node_modules/@types/ws/index.d.ts","./node_modules/@types/yargs-parser/index.d.ts","./node_modules/@types/yargs/index.d.ts"],"fileInfos":[{"version":"f59215c5f1d886b05395ee7aca73e0ac69ddfad2843aa88530e797879d511bad","affectsGlobalScope":true,"impliedFormat":1},{"version":"45b7ab580deca34ae9729e97c13cfd999df04416a79116c3bfb483804f85ded4","impliedFormat":1},{"version":"dc48272d7c333ccf58034c0026162576b7d50ea0e69c3b9292f803fc20720fd5","impliedFormat":1},{"version":"27147504487dc1159369da4f4da8a26406364624fa9bc3db632f7d94a5bae2c3","impliedFormat":1},{"version":"5e1c4c362065a6b95ff952c0eab010f04dcd2c3494e813b493ecfd4fcb9fc0d8","impliedFormat":1},{"version":"68d73b4a11549f9c0b7d352d10e91e5dca8faa3322bfb77b661839c42b1ddec7","impliedFormat":1},{"version":"5efce4fc3c29ea84e8928f97adec086e3dc876365e0982cc8479a07954a3efd4","impliedFormat":1},{"version":"feecb1be483ed332fad555aff858affd90a48ab19ba7272ee084704eb7167569","impliedFormat":1},{"version":"5514e54f17d6d74ecefedc73c504eadffdeda79c7ea205cf9febead32d45c4bc","impliedFormat":1},{"version":"f4e736d6c8d69ae5b3ab0ddfcaa3dc365c3e76909d6660af5b4e979b3934ac20","impliedFormat":1},{"version":"eeeb3aca31fbadef8b82502484499dfd1757204799a6f5b33116201c810676ec","impliedFormat":1},{"version":"3dda5344576193a4ae48b8d03f105c86f20b2f2aff0a1d1fd7935f5d68649654","affectsGlobalScope":true,"impliedFormat":1},{"version":"9d9885c728913c1d16e0d2831b40341d6ad9a0ceecaabc55209b306ad9c736a5","affectsGlobalScope":true,"impliedFormat":1},{"version":"17bea081b9c0541f39dd1ae9bc8c78bdd561879a682e60e2f25f688c0ecab248","affectsGlobalScope":true,"impliedFormat":1},{"version":"4443e68b35f3332f753eacc66a04ac1d2053b8b035a0e0ac1d455392b5e243b3","affectsGlobalScope":true,"impliedFormat":1},{"version":"ab22100fdd0d24cfc2cc59d0a00fc8cf449830d9c4030dc54390a46bd562e929","affectsGlobalScope":true,"impliedFormat":1},{"version":"f7bd636ae3a4623c503359ada74510c4005df5b36de7f23e1db8a5c543fd176b","affectsGlobalScope":true,"impliedFormat":1},{"version":"ce691fb9e5c64efb9547083e4a34091bcbe5bdb41027e310ebba8f7d96a98671","affectsGlobalScope":true,"impliedFormat":1},{"version":"8d697a2a929a5fcb38b7a65594020fcef05ec1630804a33748829c5ff53640d0","affectsGlobalScope":true,"impliedFormat":1},{"version":"0c20f4d2358eb679e4ae8a4432bdd96c857a2960fd6800b21ec4008ec59d60ea","affectsGlobalScope":true,"impliedFormat":1},{"version":"36ae84ccc0633f7c0787bc6108386c8b773e95d3b052d9464a99cd9b8795fbec","affectsGlobalScope":true,"impliedFormat":1},{"version":"82d0d8e269b9eeac02c3bd1c9e884e85d483fcb2cd168bccd6bc54df663da031","affectsGlobalScope":true,"impliedFormat":1},{"version":"b8deab98702588840be73d67f02412a2d45a417a3c097b2e96f7f3a42ac483d1","affectsGlobalScope":true,"impliedFormat":1},{"version":"4738f2420687fd85629c9efb470793bb753709c2379e5f85bc1815d875ceadcd","affectsGlobalScope":true,"impliedFormat":1},{"version":"2f11ff796926e0832f9ae148008138ad583bd181899ab7dd768a2666700b1893","affectsGlobalScope":true,"impliedFormat":1},{"version":"376d554d042fb409cb55b5cbaf0b2b4b7e669619493c5d18d5fa8bd67273f82a","affectsGlobalScope":true,"impliedFormat":1},{"version":"9fc46429fbe091ac5ad2608c657201eb68b6f1b8341bd6d670047d32ed0a88fa","affectsGlobalScope":true,"impliedFormat":1},{"version":"61c37c1de663cf4171e1192466e52c7a382afa58da01b1dc75058f032ddf0839","affectsGlobalScope":true,"impliedFormat":1},{"version":"c4138a3dd7cd6cf1f363ca0f905554e8d81b45844feea17786cdf1626cb8ea06","affectsGlobalScope":true,"impliedFormat":1},{"version":"6ff3e2452b055d8f0ec026511c6582b55d935675af67cdb67dd1dc671e8065df","affectsGlobalScope":true,"impliedFormat":1},{"version":"03de17b810f426a2f47396b0b99b53a82c1b60e9cba7a7edda47f9bb077882f4","affectsGlobalScope":true,"impliedFormat":1},{"version":"8184c6ddf48f0c98429326b428478ecc6143c27f79b79e85740f17e6feb090f1","affectsGlobalScope":true,"impliedFormat":1},{"version":"261c4d2cf86ac5a89ad3fb3fafed74cbb6f2f7c1d139b0540933df567d64a6ca","affectsGlobalScope":true,"impliedFormat":1},{"version":"6af1425e9973f4924fca986636ac19a0cf9909a7e0d9d3009c349e6244e957b6","affectsGlobalScope":true,"impliedFormat":1},{"version":"576711e016cf4f1804676043e6a0a5414252560eb57de9faceee34d79798c850","affectsGlobalScope":true,"impliedFormat":1},{"version":"89c1b1281ba7b8a96efc676b11b264de7a8374c5ea1e6617f11880a13fc56dc6","affectsGlobalScope":true,"impliedFormat":1},{"version":"15a630d6817718a2ddd7088c4f83e4673fde19fa992d2eae2cf51132a302a5d3","affectsGlobalScope":true,"impliedFormat":1},{"version":"f06948deb2a51aae25184561c9640fb66afeddb34531a9212d011792b1d19e0a","affectsGlobalScope":true,"impliedFormat":1},{"version":"01e0ee7e1f661acedb08b51f8a9b7d7f959e9cdb6441360f06522cc3aea1bf2e","affectsGlobalScope":true,"impliedFormat":1},{"version":"ac17a97f816d53d9dd79b0d235e1c0ed54a8cc6a0677e9a3d61efb480b2a3e4e","affectsGlobalScope":true,"impliedFormat":1},{"version":"bf14a426dbbf1022d11bd08d6b8e709a2e9d246f0c6c1032f3b2edb9a902adbe","affectsGlobalScope":true,"impliedFormat":1},{"version":"ec0104fee478075cb5171e5f4e3f23add8e02d845ae0165bfa3f1099241fa2aa","affectsGlobalScope":true,"impliedFormat":1},{"version":"2b72d528b2e2fe3c57889ca7baef5e13a56c957b946906d03767c642f386bbc3","affectsGlobalScope":true,"impliedFormat":1},{"version":"9cc66b0513ad41cb5f5372cca86ef83a0d37d1c1017580b7dace3ea5661836df","affectsGlobalScope":true,"impliedFormat":1},{"version":"368af93f74c9c932edd84c58883e736c9e3d53cec1fe24c0b0ff451f529ceab1","affectsGlobalScope":true,"impliedFormat":1},{"version":"709efdae0cb5df5f49376cde61daacc95cdd44ae4671da13a540da5088bf3f30","affectsGlobalScope":true,"impliedFormat":1},{"version":"995c005ab91a498455ea8dfb63aa9f83fa2ea793c3d8aa344be4a1678d06d399","affectsGlobalScope":true,"impliedFormat":1},{"version":"61ed9b6d07af959e745fb11f9593ecd743b279418cc8a99448ea3cd5f3b3eb22","affectsGlobalScope":true,"impliedFormat":1},{"version":"038a2f66a34ee7a9c2fbc3584c8ab43dff2995f8c68e3f566f4c300d2175e31e","affectsGlobalScope":true,"impliedFormat":1},{"version":"4fa6ed14e98aa80b91f61b9805c653ee82af3502dc21c9da5268d3857772ca05","affectsGlobalScope":true,"impliedFormat":1},{"version":"f5c92f2c27b06c1a41b88f6db8299205aee52c2a2943f7ed29bd585977f254e8","affectsGlobalScope":true,"impliedFormat":1},{"version":"930b0e15811f84e203d3c23508674d5ded88266df4b10abee7b31b2ac77632d2","affectsGlobalScope":true,"impliedFormat":1},{"version":"8444af78980e3b20b49324f4a16ba35024fef3ee069a0eb67616ea6ca821c47a","affectsGlobalScope":true,"impliedFormat":1},{"version":"b9ea5778ff8b50d7c04c9890170db34c26a5358cccba36844fe319f50a43a61a","affectsGlobalScope":true,"impliedFormat":1},{"version":"3287d9d085fbd618c3971944b65b4be57859f5415f495b33a6adc994edd2f004","affectsGlobalScope":true,"impliedFormat":1},{"version":"50d53ccd31f6667aff66e3d62adf948879a3a16f05d89882d1188084ee415bbc","affectsGlobalScope":true,"impliedFormat":1},{"version":"25de46552b782d43cb7284df22fe2a265de387cf0248b747a7a1b647d81861f6","affectsGlobalScope":true,"impliedFormat":1},{"version":"307c8b7ebbd7f23a92b73a4c6c0a697beca05b06b036c23a34553e5fe65e4fdc","affectsGlobalScope":true,"impliedFormat":1},{"version":"189c0703923150aa30673fa3de411346d727cc44a11c75d05d7cf9ef095daa22","affectsGlobalScope":true,"impliedFormat":1},{"version":"782dec38049b92d4e85c1585fbea5474a219c6984a35b004963b00beb1aab538","affectsGlobalScope":true,"impliedFormat":1},{"version":"f1c9fe42b65437a61104e601eb298c5c859fb522b483f1bdb700eed67a16f980","impliedFormat":1},{"version":"0734467ebd328b91af92eff2af9c97f6079bc4736c4992f8a5e47123680cf21b","impliedFormat":99},{"version":"54ef53ed24e29fa69ca2dbbdf232afe6409f34719c95922aa6b0500b6eea24ed","signature":"fce7d12a7270a73f059f4a568b0097d7704576b5ef95e026b1255df3c67f4bf2","impliedFormat":99},{"version":"e99801f8fdd04387fea6f73eb37ae9e7447226f3caed45dbe3128f55c22eec87","signature":"2dc206e233e0e5537afb478f788aede2620c08d7f85f0b89561be1243f6e2545","impliedFormat":99},{"version":"6a9c5127096b35264eb7cd21b2417bfc1d42cceca9ba4ce2bb0c3410b7816042","impliedFormat":1},{"version":"93b7325b49dfbf613d940ed0e471216657b2d77459dac34f1b5b1678f08f884c","impliedFormat":1},{"version":"f819b74f2571645cab7074e176ca9fbd21c6b091ba7aa9d415c4a8e8e962edfc","signature":"24d590b9e56c28c3a9836bb8e1cf8667071b41b8bb0fac26e705222670b7f07a","impliedFormat":99},{"version":"998c4553111d407c0d9f48041d1e4f3b1d3528f0ecb0020db31e9c2ad7a3fa12","impliedFormat":99},{"version":"c0a456eb21680eca96d5e836e2a5cc74730a2c0e03f18eb17a7f652b30c993e4","impliedFormat":1},{"version":"9426d1cc15328fcbb59adb88880ccfd79f2bc959334d485273da743aac083eaa","impliedFormat":1},{"version":"045cfecf0e99b1202ff9b59c8bb4f14dbe9b4e459df6119517bd4952c183c11a","signature":"a225e368309b34115188593cc653791d2a989c3d155852dea7eb8adafc7cffa8","impliedFormat":99},{"version":"3ccadcb9bd4b1879b9a20c62d5069badb616823e9cf6f977abfb92fcae3e5e2c","impliedFormat":99},{"version":"c0a456eb21680eca96d5e836e2a5cc74730a2c0e03f18eb17a7f652b30c993e4","impliedFormat":1},{"version":"316d13742983f0698714b9c9d0d1a3de6d79cdab24e3b732f910f88eb9df01c1","impliedFormat":1},{"version":"70e2bd933c87f16fad94c2cd0392c73e92f08451abf1fe56d5a9780552321d67","signature":"7d3137555fe2f8da1fe077d58cce9f8e1f9bef7a78c3e6dbe86bac0e27c69f62","impliedFormat":99},{"version":"1da2933d763ee824a1b645c5dd624260808739bf8b34b0695700c80d6df777b1","signature":"736c0107791709d49991dc58146b6c1f87147eefce420cdbdfa6fb8939569e47","impliedFormat":99},{"version":"7711b75c075dcb28b4e837b5a43ef0051061bda8c62d84bb11e4c87b37b9e11f","signature":"b82c5cb6e53b30d8209f792d52542c3db6efdbcfdad2c9433fbc32fc6bc72043","impliedFormat":99},{"version":"49fa852bdd3a1d4542fc8c9cd85a467cc5586a98d6129de2cbaf574ba2a024c5","impliedFormat":99},{"version":"3698ed08bb485b7f978ac61466deb43fd6736cba1c0aefcf188854e15b119aa4","signature":"310103e8e0efd044334e5b5aa8ada787fa010fb38ac982b47fdbb24e931fbae5","impliedFormat":99},{"version":"56696d83ee1bf9af82d2ad284663677aac8171fdbf5223390aa0784d491caf85","signature":"686bbb1e2df2881893498bcc9d251b8a7d4b4ca0f1718f4cc091f4b0ae82d88e","impliedFormat":99},{"version":"9243bdf41fa069f91ced599db3af72f9ec1d7454de03906a280d04b4470af2d2","signature":"b85d91d3d26b95a3833d96c38c3e35fd30f9b6fbc7bd55b29e884bac178437d1","impliedFormat":99},{"version":"2ec936f5989089f15de3fbfad1f2f2842b0b6e6276bea4283872b23a37251a7d","signature":"c34990a8094f0a876461ab18980a5415477c9741a9fd3cc0f00c0ff1084cee61","impliedFormat":99},{"version":"31a3b2cd4cda44ef15cdbada4a78a49c0668c140104a22d0e4e4f1b995bca2f6","impliedFormat":99},{"version":"76b922387f8ddc0384d2b915b3715c64aea4e67df6c1d272bdedc867a10707b7","signature":"21f8c5dd8bcc7c44976954d1e4c2006095c37fa2fd16c1bf928ac329fb4cb52a","impliedFormat":99},{"version":"c62d74da17bc3bc50d13cf6445f647d0e04b0720e9e90b8de76b47f9302b59af","signature":"d4c2b6fe05f65ccf6a42711b1a9f1649970e2a4305ce5febc9834b382a8d87f0","impliedFormat":99},{"version":"9f2265033c4a94144d0bc511cdcf368980394e86bc3426da86f2c3a9215f69c1","signature":"61e2b2d5d16cf22811733a20e075c441fb34ba84f007e0cc072c5a3657bee52a","impliedFormat":99},{"version":"6165276e8aa979f080d9675fd1b5852040bcde681fb673e96294baf1f528bd88","signature":"e3d6acca5d37d2abcf27f71c864780a7f6d20189f35bc4bf6280267c5079fa57","impliedFormat":99},{"version":"4f3d5156dc1d6103ab8f9bae661d244c17c00ea0d0afe0cc80f03f33f3133ea6","signature":"38520572ecabb509abba228c1ed55caa2493dcc525c2db31642a02129a02de5c","impliedFormat":99},{"version":"e6e800212362230a3edf4fa4967d0bf7972da420ec0aec811d88982b492fc6d0","signature":"f6198c46a5788f370cce98b094d622047e592eedef23a18ab477aad458bc85ac","impliedFormat":99},{"version":"c9ebdfb52f07525e2317e46271218dc024b9939ca05f93577ef8c5892485857f","signature":"0cc62062a493830aa903636202dbb93364d3dc0266f7e0fe6abb7922c9aa8517","impliedFormat":99},{"version":"ea971c6785d533bedf150c100ca2586bed41600b93d6c949721b5e33d0858e12","signature":"e0497122f4964168ba6a6bae7add138fb9d9292fe58c49b89870fc628bf9feb5","impliedFormat":99},{"version":"af0f5e0955e6f30edc39b2f893928e046b939fd8120917bef0cda2b2b0cfe3f5","impliedFormat":99},{"version":"9abb9a1617d87760ee919776c6d6b75aa8f04135e91d302abe7e6f28d595c69b","signature":"5cb26573fe01920ae3a98b7ef0d6e8da7af406208bef6aa34d38a7d5fea42494","impliedFormat":99},{"version":"c9262a0ab059a722207c441e741fb44e8d0dae048edcaf9c36fc5599fdb311bd","impliedFormat":99},{"version":"ac6d7cd8a82d1cd671805a229bdec5b802baf8e01acb84ca1bc37909d52e7cdf","signature":"ab70d2035a823e618685ea73bb1c4062645ff8c579e6c79ee4eaa4ee39720a38","impliedFormat":99},{"version":"12623e0f26cbbc9e23a2acd9869996fce986b8818bcd1ed4e52b30e8789a01e7","signature":"042a6a95e4892131b242ffdcfe97cdc6142a9843695712638360d81d4120599b","impliedFormat":99},{"version":"846c9e49f2399db4cb63a7d91473f555fca00aad086009fb4289b1028f4a077c","impliedFormat":99},{"version":"fe3fd03f6dd87b469b770256897cd1f85e7a259c1a448d80237e47285be0bd2f","impliedFormat":1},{"version":"bdf6985c7fae0895cf149945de85ea88636de46587aee28805888f88f8fd30f3","signature":"ebb0ed2e606edbd97c69024c6fb2c899f63a26e20e444b78cdd73132e1a0ca06","impliedFormat":99},{"version":"d086e84318b16d517c21df1c0e818e0389fc288bfea53d5c9ba58c795cac1867","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"52547a58957799d44e5a1d8a7b2627d9a6be0bdf81b06763ef3579efd531f523","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"12656f2cf5a3c9596595232da20f58082161103ac09f6a3ce7de86130bd07b5f","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"bdcdb9c30b8ad107b5171ead82175859cb7abea62e232d759a1a81635206decc","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"eef6069bb688f1bd49f69238a141183853f7d0051b16ca70ad1c0b1dee601452","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"92f1666b3cf937d89a911ebecf3d8a842f84bd635aca5ed99432561e544a5d7f","signature":"2cc29293ba85b4b4629b1837e1f6cbc301c73a3523bc3f9d7887391413c0a7a1","impliedFormat":99},{"version":"bd857eaa3aaae43ded2b9f86df6b1e0a6c906e1115b4cc6e9abdf2c599afe676","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"b66d2e88daac364adff28f8785e14c9afe812d92b19471c420223a0073eea27c","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"831001a245490e1538ddb5ae33ffcf8be05bb77abbcf4701c93694fb2e6f18ec","signature":"0d504e37ff56acc7ca34aadead6dc21e35b9960c38be27738a68fb731a6375cf","impliedFormat":99},{"version":"0ca43656e266ea9a54371e030353dfdc6cf6bc2e77cc7d7b81cf1161d6e1dba4","signature":"73e3660695f1f95fc8ab383fb2dce37070113d919ab7a46c5e3fbef4ab8ad141","impliedFormat":99},{"version":"b6333120902e3e9c5414a9bf3140cc3723ae384a454ca5b43c2d2dccae43b045","signature":"788fd471de2db75ab7ca33b984bfe23fe21050c0a44c96663ea480fc3bbeef41","impliedFormat":99},{"version":"9ae5a552049c2d064a4117b7f3294283aafcec480967aeb90e4944dbb6edcd65","signature":"0783d03fe0e744927298d2671b3ce3490abcd9896de02766940a606a602991c3","impliedFormat":99},{"version":"fab7ac6bba8690acae0fa852ebde4bddfea2de5eb710e9fedb5e572d3d2b88a8","signature":"73ebda1c41386f7597b0c30b33e7d758892db16c62f0123c203b3170940a1634","impliedFormat":99},{"version":"fb85ed98930154465f8c902692ea477f18c8892bc6a8d86fc9e4b3ff8d0cc0d7","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"f08728a9b464da7a195ca5a197837c2384ab78979737105f97a63b2cade30fa7","impliedFormat":99},{"version":"d81c05cb919bfa33ff72778a5197fba166991a4b6e4f59afe66a1b298f31cc30","signature":"5297b9e028bc5a1b653afb0021ff28fe5902fa43ddb43bd6588af8b126ef1dbf","impliedFormat":99},{"version":"b60a66c8ee67213bd70bdf2c3f7dc3033879595e2002c3ec5cc4b30840422cdc","impliedFormat":99},{"version":"905f2c61f55088929b51b9d083d36dbef07e41ef677ba8af6ff7a80fbfe6c51a","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"679bf5ccf904e497617ae7f16a8d743f9735e22cee4606dce3b46bd68fd69f6d","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"8a15b4b148c236900888f742a1bd43e42520cfc3289eeeefeb3fc11fc944224a","signature":"c5b39ac78a1fca4a0c1920910746120b4ebada220a1a736146ad2e3101075ba4","impliedFormat":99},{"version":"84f8beacd38616e6a61020b246d74eaa1f2ad6335c4c7fb545a7952c8f8d520f","signature":"1fd7f81918d3c8f5093b59152af9609a22d384f88e711936eb8e8fdc7818efc1","impliedFormat":99},{"version":"af0f5e0955e6f30edc39b2f893928e046b939fd8120917bef0cda2b2b0cfe3f5","impliedFormat":99},{"version":"ac65f04c2df0218cb8e54f012745cbfcc3c0e67c1f6b1e557d88842bbb72e2db","impliedFormat":1},{"version":"cc957354aa3c94c9961ebf46282cfde1e81d107fc5785a61f62c67f1dd3ac2eb","impliedFormat":1},{"version":"a2e86df4db576d80704e25293cec6f20fc6101a11f4747440e2eef58fb3c860c","impliedFormat":1},{"version":"93de1c6dab503f053efe8d304cb522bb3a89feab8c98f307a674a4fae04773e9","impliedFormat":1},{"version":"6704f0b54df85640baaeebd86c9d4a1dbb661d5a4d57a75bc84162f562f6531d","impliedFormat":1},{"version":"9d255af1b09c6697089d3c9bf438292a298d8b7a95c68793c9aae80afc9e5ca7","impliedFormat":1},{"version":"ba8691cf6bea9d53e6bf6cbc22af964a9633a21793981a1be3dce65e7a714d8b","impliedFormat":1},{"version":"a69c09dbea52352f479d3e7ac949fde3d17b195abe90b045d619f747b38d6d1a","impliedFormat":1},{"version":"bce910d9164785c9f0d4dcea4be359f5f92130c7c7833dea6138ab1db310a1f9","affectsGlobalScope":true,"impliedFormat":1},{"version":"7d2e3fea24c712c99c03ad8f556abedbfe105f87f1be10b95dbd409d24bc05a3","impliedFormat":1},{"version":"c7a976828c7acb8ada184935195aef0f389c4e37d87daa52eb4f2f3df3edcdea","affectsGlobalScope":true,"impliedFormat":1},{"version":"3719525a8f6ab731e3dfd585d9f87df55ec7d50d461df84f74eb4d68bb165244","impliedFormat":1},{"version":"f993522fd7d01ae1ead930091fe35130b8415720d6c2123dc2a7e8eb11bb3cba","impliedFormat":1},{"version":"d5135ad93b33adcce80b18f8065087934cdc1730d63db58562edcf017e1aad9b","affectsGlobalScope":true,"impliedFormat":1},{"version":"82408ed3e959ddc60d3e9904481b5a8dc16469928257af22a3f7d1a3bc7fd8c4","impliedFormat":1},{"version":"b787b5b54349a24f07d089b612a9fb8ff024dbbe991ff52ea2b188a6b1230644","impliedFormat":1},{"version":"bb9c4ffa5e6290c6980b63c815cdd1625876dadb2efaf77edbe82984be93e55e","impliedFormat":1},{"version":"1cdcfc1f624d6c08aa12c73935f6e13f095919cd99edf95752951796eb225729","impliedFormat":1},{"version":"4eaff3d8e10676fd7913d8c108890e71c688e1e7d52f6d1d55c39514f493dc47","impliedFormat":1},{"version":"14b5aa23c5d0ae1907bc696ac7b6915d88f7d85799cc0dc2dcf98fbce2c5a67c","impliedFormat":1},{"version":"5c439dafdc09abe4d6c260a96b822fa0ba5be7203c71a63ab1f1423cd9e838ea","impliedFormat":1},{"version":"6b526a5ec4a401ca7c26cfe6a48e641d8f30af76673bad3b06a1b4504594a960","affectsGlobalScope":true,"impliedFormat":1},{"version":"00dee7cdca8b8420c47ea4a31a34b8e8294013ebc4f463fd941e867e7bf05029","affectsGlobalScope":true,"impliedFormat":1},{"version":"7abd2623cdd8148233c0c6b9da0289e124f1718bc58dcb8da4262432e9ce0f0a","impliedFormat":1},{"version":"f4a3088770ba56a4c72e9907bc9798706ab1575097cd024503f57966df2d3d3a","impliedFormat":1},{"version":"7f138842074d0a40681775af008c8452093b68c383c94de31759e853c6d06b5c","impliedFormat":1},{"version":"a3d541d303ee505053f5dcbf9fafb65cac3d5631037501cd616195863a6c5740","impliedFormat":1},{"version":"8d3c583a07e0c37e876908c2d5da575019f689df8d9fa4c081d99119d53dba22","impliedFormat":1},{"version":"2c828a5405191d006115ab34e191b8474bc6c86ffdc401d1a9864b1b6e088a58","impliedFormat":1},{"version":"e630e5528e899219ae319e83bef54bf3bcb91b01d76861ecf881e8e614b167f0","affectsGlobalScope":true,"impliedFormat":1},{"version":"bcebb922784739bdb34c18ee51095d25a92b560c78ccd2eaacd6bd00f7443d83","impliedFormat":1},{"version":"7ee6ed878c4528215c82b664fe0cfe80e8b4da6c0d4cc80869367868774db8b1","impliedFormat":1},{"version":"b0973c3cbcdc59b37bf477731d468696ecaf442593ec51bab497a613a580fe30","impliedFormat":1},{"version":"4989e92ba5b69b182d2caaea6295af52b7dc73a4f7a2e336a676722884e7139d","affectsGlobalScope":true,"impliedFormat":1},{"version":"0715e4cd28ad471b2a93f3e552ff51a3ae423417a01a10aa1d3bc7c6b95059d6","affectsGlobalScope":true,"impliedFormat":1},{"version":"5153a2fd150e46ce57bb3f8db1318d33f6ad3261ed70ceeff92281c0608c74a3","impliedFormat":1},{"version":"210d54cd652ec0fec8c8916e4af59bb341065576ecda039842f9ffb2e908507c","impliedFormat":1},{"version":"36b03690b628eab08703d63f04eaa89c5df202e5f1edf3989f13ad389cd2c091","impliedFormat":1},{"version":"0effadd232a20498b11308058e334d3339cc5bf8c4c858393e38d9d4c0013dcf","impliedFormat":1},{"version":"25846d43937c672bab7e8195f3d881f93495df712ee901860effc109918938cc","impliedFormat":1},{"version":"4f3fdeba4e28e21aa719c081b8dc8f91d47e12e773389b9d35679c08151c9d37","impliedFormat":1},{"version":"1b952304137851e45bc009785de89ada562d9376177c97e37702e39e60c2f1ff","impliedFormat":1},{"version":"69ee23dd0d215b09907ad30d23f88b7790c93329d1faf31d7835552a10cf7cbf","impliedFormat":1},{"version":"44b8b584a338b190a59f4f6929d072431950c7bd92ec2694821c11bce180c8a5","impliedFormat":1},{"version":"23b89798789dffbd437c0c423f5d02d11f9736aea73d6abf16db4f812ff36eda","impliedFormat":1},{"version":"5629c03c44d1e07698c31d04318c9950d78940461269c0f692a42091cedea142","impliedFormat":1},{"version":"3c4ba1dd9b12ffa284b565063108f2f031d150ea15b8fafbdc17f5d2a07251f3","affectsGlobalScope":true,"impliedFormat":1},{"version":"e10177274a35a9d07c825615340b2fcde2f610f53f3fb40269fd196b4288dda6","impliedFormat":1},{"version":"1422cd9e705adcc09088fda85a900c2b70e3ad36ea85846f68bd1a884cdf4e2b","impliedFormat":1},{"version":"3c13ef48634e7b5012fcf7e8fce7496352c2d779a7201389ca96a2a81ee4314d","impliedFormat":1},{"version":"5d0a25ec910fa36595f85a67ac992d7a53dd4064a1ba6aea1c9f14ab73a023f2","impliedFormat":1},{"version":"c6b124041039647ff446e19ea0e90a7a83256593d64f23c66b4fda6e0c5b968e","affectsGlobalScope":true,"impliedFormat":1},{"version":"a9fc1469744055a3435f203123246b96c094e7ff8c4e1c3863829d9b705b7a34","affectsGlobalScope":true,"impliedFormat":1},{"version":"868831cab82b65dfe1d68180e898af1f2101e89ba9b754d1db6fb8cc2fac1921","impliedFormat":1},{"version":"0fe8985a28f82c450a04a6edf1279d7181c0893f37da7d2a27f8efd4fd5edb03","impliedFormat":1},{"version":"e59a892d87e72733e2a9ca21611b9beb52977be2696c7ba4b216cbbb9a48f5aa","impliedFormat":1},{"version":"52120bb7e4583612225bdf08e7c12559548170f11e660d33a33623bae9bbdbba","affectsGlobalScope":true,"impliedFormat":1},{"version":"8a300fa9b698845a1f9c41ecbe2c5966634582a8e2020d51abcace9b55aa959e","impliedFormat":1},{"version":"ab9b9a36e5284fd8d3bf2f7d5fcbc60052f25f27e4d20954782099282c60d23e","affectsGlobalScope":true,"impliedFormat":1},{"version":"a6dd3dba8e665ac43d279e0fdf5219edda0eed69b5e9a5061f46cd6a65c4f7a1","impliedFormat":1},{"version":"6d829824ead8999f87b6df21200df3c6150391b894b4e80662caa462bd48d073","impliedFormat":1},{"version":"afc559c1b93df37c25aef6b3dfa2d64325b0e112e887ee18bf7e6f4ec383fc90","impliedFormat":1},{"version":"d78e5898c8de5e0f934eee83f680262de005caa268d137101b833fd932f95e07","impliedFormat":1},{"version":"84e3bbd6f80983d468260fdbfeeb431cc81f7ea98d284d836e4d168e36875e86","impliedFormat":1},{"version":"aad5ffa61406b8e19524738fcf0e6fda8b3485bba98626268fdf252d1b2b630a","impliedFormat":1},{"version":"16d51f964ec125ad2024cf03f0af444b3bc3ec3614d9345cc54d09bab45c9a4c","impliedFormat":1},{"version":"ba601641fac98c229ccd4a303f747de376d761babb33229bb7153bed9356c9cc","impliedFormat":1},{"version":"352fc8497a30bc806d7defa0043d85802e5f35a7688731ee9a21456f5cb32a94","affectsGlobalScope":true,"impliedFormat":1},{"version":"9c230a07d657b3c65ad79e819b0c362a8ebcc0730f9a3d552a26ea632e2bfd53","impliedFormat":1},{"version":"3896464bb7e25fceebbd9c8a0b443caaa9b68ec323f46191c36b84293c852a19","impliedFormat":1},{"version":"64d4b35c5456adf258d2cf56c341e203a073253f229ef3208fc0d5020253b241","affectsGlobalScope":true,"impliedFormat":1},{"version":"bee89e1eb6425eb49894f3f25e4562dc2564e84e5aa7610b7e13d8ecddf8f5db","impliedFormat":1},{"version":"dca41e86e89dfb2e85e6935260250f02eb6683b86c2fa16bec729ddd1bcd9b4b","impliedFormat":1},{"version":"894e2eb01e3ac0dda3722dc520d804faa863fd6e2938c801e4c8561e7b0c8a40","impliedFormat":1},{"version":"e050a0afcdbb269720a900c85076d18e0c1ab73e580202a2bf6964978181222a","impliedFormat":1},{"version":"5b9ecf7da4d71cf3832dbb8336150fa924631811f488ad4690c2dfec2b4fb1d7","impliedFormat":1},{"version":"951c85f75aac041dddbedfedf565886a7b494e29ec1532e2a9b4a6180560b50e","impliedFormat":1},{"version":"e6f0cb9d8cb2e38bec66e032e73caa3e7c6671f21ed7196acb821aec462051f2","impliedFormat":1},{"version":"43cdd474c5aa3340da4816bb8f1ae7f3b1bcf9e70d997afc36a0f2c432378c84","impliedFormat":1},{"version":"bf88ef4208a770ca39a844b182b3695df536326ea566893fdc5b8418702a331e","impliedFormat":1},{"version":"ee65fe452abe1309389c5f50710f24114e08a302d40708101c4aa950a2a7d044","impliedFormat":1},{"version":"1d96568a72657f762763c920d3804868db48d638abd87ddcd82bcb200ef9625c","impliedFormat":1},{"version":"8b06ac3faeacb8484d84ddb44571d8f410697f98d7bfa86c0fda60373a9f5215","impliedFormat":1},{"version":"7eb06594824ada538b1d8b48c3925a83e7db792f47a081a62cf3e5c4e23cf0ee","impliedFormat":1},{"version":"f5638f7c2f12a9a1a57b5c41b3c1ea7db3876c003bab68e6a57afd6bcc169af0","impliedFormat":1},{"version":"6c1e688f95fcaf53b1e41c0fdadf2c1cfc96fa924eaf7f9fdb60f96deb0a4986","impliedFormat":1},{"version":"0d14fa22c41fdc7277e6f71473b20ebc07f40f00e38875142335d5b63cdfc9d2","impliedFormat":1},{"version":"db25694be959314fd1e868d72e567746db1db9e2001fae545d12d2a8c1bba1b8","impliedFormat":1},{"version":"43883cf3635bb1846cbdc6c363787b76227677388c74f7313e3f0edb380840fa","impliedFormat":1},{"version":"2d47012580f859dae201d2eef898a416bdae719dffc087dfd06aefe3de2f9c8d","impliedFormat":1},{"version":"3e70a7e67c2cb16f8cd49097360c0309fe9d1e3210ff9222e9dac1f8df9d4fb6","impliedFormat":1},{"version":"ab68d2a3e3e8767c3fba8f80de099a1cfc18c0de79e42cb02ae66e22dfe14a66","impliedFormat":1},{"version":"2cec1a31729b9b01e9294c33fc9425d336eff067282809761ad2e74425d6d2a5","impliedFormat":1},{"version":"240c702fb4b3bd54d83ee167d80fa7f0cd7300fef7eea0b32cef33129740893c","affectsGlobalScope":true,"impliedFormat":1},{"version":"d88a5e779faf033be3d52142a04fbe1cb96009868e3bbdd296b2bc6c59e06c0e","impliedFormat":1},{"version":"199f9ead0daf25ae4c5632e3d1f42570af59685294a38123eef457407e13f365","impliedFormat":1},{"version":"2b93035328f7778d200252681c1d86285d501ed424825a18f81e4c3028aa51d9","impliedFormat":1},{"version":"2ac9c8332c5f8510b8bdd571f8271e0f39b0577714d5e95c1e79a12b2616f069","impliedFormat":1},{"version":"42c21aa963e7b86fa00801d96e88b36803188018d5ad91db2a9101bccd40b3ff","impliedFormat":1},{"version":"d31eb848cdebb4c55b4893b335a7c0cca95ad66dee13cbb7d0893810c0a9c301","impliedFormat":1},{"version":"b9f96255e1048ed2ea33ec553122716f0e57fc1c3ad778e9aa15f5b46547bd23","impliedFormat":1},{"version":"7a9e0a564fee396cacf706523b5aeed96e04c6b871a8bebefad78499fbffc5bc","impliedFormat":1},{"version":"906c751ef5822ec0dadcea2f0e9db64a33fb4ee926cc9f7efa38afe5d5371b2a","impliedFormat":1},{"version":"5387c049e9702f2d2d7ece1a74836a14b47fbebe9bbeb19f94c580a37c855351","impliedFormat":1},{"version":"c68391fb9efad5d99ff332c65b1606248c4e4a9f1dd9a087204242b56c7126d6","impliedFormat":1},{"version":"e9cf02252d3a0ced987d24845dcb1f11c1be5541f17e5daa44c6de2d18138d0c","impliedFormat":1},{"version":"e8b02b879754d85f48489294f99147aeccc352c760d95a6fe2b6e49cd400b2fe","impliedFormat":1},{"version":"9f6908ab3d8a86c68b86e38578afc7095114e66b2fc36a2a96e9252aac3998e0","impliedFormat":1},{"version":"0eedb2344442b143ddcd788f87096961cd8572b64f10b4afc3356aa0460171c6","impliedFormat":1},{"version":"71405cc70f183d029cc5018375f6c35117ffdaf11846c35ebf85ee3956b1b2a6","impliedFormat":1},{"version":"c68baff4d8ba346130e9753cefe2e487a16731bf17e05fdacc81e8c9a26aae9d","impliedFormat":1},{"version":"2cd15528d8bb5d0453aa339b4b52e0696e8b07e790c153831c642c3dea5ac8af","impliedFormat":1},{"version":"479d622e66283ffa9883fbc33e441f7fc928b2277ff30aacbec7b7761b4e9579","impliedFormat":1},{"version":"ade307876dc5ca267ca308d09e737b611505e015c535863f22420a11fffc1c54","impliedFormat":1},{"version":"f8cdefa3e0dee639eccbe9794b46f90291e5fd3989fcba60d2f08fde56179fb9","impliedFormat":1},{"version":"86c5a62f99aac7053976e317dbe9acb2eaf903aaf3d2e5bb1cafe5c2df7b37a8","impliedFormat":1},{"version":"2b300954ce01a8343866f737656e13243e86e5baef51bd0631b21dcef1f6e954","impliedFormat":1},{"version":"a2d409a9ffd872d6b9d78ead00baa116bbc73cfa959fce9a2f29d3227876b2a1","impliedFormat":1},{"version":"b288936f560cd71f4a6002953290de9ff8dfbfbf37f5a9391be5c83322324898","impliedFormat":1},{"version":"61178a781ef82e0ff54f9430397e71e8f365fc1e3725e0e5346f2de7b0d50dfa","impliedFormat":1},{"version":"6a6ccb37feb3aad32d9be026a3337db195979cd5727a616fc0f557e974101a54","impliedFormat":1},{"version":"c649ea79205c029a02272ef55b7ab14ada0903db26144d2205021f24727ac7a3","impliedFormat":1},{"version":"38e2b02897c6357bbcff729ef84c736727b45cc152abe95a7567caccdfad2a1d","impliedFormat":1},{"version":"d6610ea7e0b1a7686dba062a1e5544dd7d34140f4545305b7c6afaebfb348341","impliedFormat":1},{"version":"3dee35db743bdba2c8d19aece7ac049bde6fa587e195d86547c882784e6ba34c","impliedFormat":1},{"version":"b15e55c5fa977c2f25ca0b1db52cfa2d1fd4bf0baf90a8b90d4a7678ca462ff1","impliedFormat":1},{"version":"f41d30972724714763a2698ae949fbc463afb203b5fa7c4ad7e4de0871129a17","impliedFormat":1},{"version":"843dd7b6a7c6269fd43827303f5cbe65c1fecabc30b4670a50d5a15d57daeeb9","impliedFormat":1},{"version":"f06d8b8567ee9fd799bf7f806efe93b67683ef24f4dea5b23ef12edff4434d9d","impliedFormat":1},{"version":"6017384f697ff38bc3ef6a546df5b230c3c31329db84cbfe686c83bec011e2b2","impliedFormat":1},{"version":"e1a5b30d9248549ca0c0bb1d653bafae20c64c4aa5928cc4cd3017b55c2177b0","impliedFormat":1},{"version":"a593632d5878f17295bd53e1c77f27bf4c15212822f764a2bfc1702f4b413fa0","impliedFormat":1},{"version":"a868a534ba1c2ca9060b8a13b0ffbbbf78b4be7b0ff80d8c75b02773f7192c29","impliedFormat":1},{"version":"da7545aba8f54a50fde23e2ede00158dc8112560d934cee58098dfb03aae9b9d","impliedFormat":1},{"version":"34baf65cfee92f110d6653322e2120c2d368ee64b3c7981dff08ed105c4f19b0","impliedFormat":1},{"version":"a1a261624efb3a00ff346b13580f70f3463b8cdcc58b60f5793ff11785d52cab","impliedFormat":1},{"version":"acebfe99678cf7cddcddc3435222cf132052b1226e902daac9fbb495c321a9b5","impliedFormat":1},{"version":"82b1f9a6eefef7386aebe22ac49f23b806421e82dbf35c6e5b7132d79e4165da","impliedFormat":1},{"version":"2887592574fcdfd087647c539dcb0fbe5af2521270dad4a37f9d17c16190d579","impliedFormat":1},{"version":"ce99fd4b37ce2dbf9adfc06c1722271c926adb408b1f6413763ae9253d922823","impliedFormat":1},{"version":"b0d10e46cfe3f6c476b69af02eaa38e4ccc7430221ce3109ae84bb9fb8282298","impliedFormat":1},{"version":"2dd1d4cea14cead7a7fc9eec8f40593089dff0de8c0199458446143c9b8c4ea9","impliedFormat":1},{"version":"70e9a18da08294f75bf23e46c7d69e67634c0765d355887b9b41f0d959e1426e","impliedFormat":1},{"version":"e9eb1b173aa166892f3eddab182e49cfe59aa2e14d33aedb6b49d175ed6a3750","impliedFormat":1}],"root":[63,64,67,68,71,72,[75,97],[99,113],[115,121]],"options":{"allowSyntheticDefaultImports":true,"composite":true,"declaration":true,"declarationMap":true,"downlevelIteration":true,"esModuleInterop":true,"importHelpers":true,"inlineSourceMap":true,"module":199,"outDir":"./dest/node","rootDir":"./src","strict":false,"target":7,"tsBuildInfoFile":"./.tsbuildinfo.node"},"fileIdsList":[[122,174],[174],[174,209],[122,123,124,125,126,174],[122,124,174],[147,174,181,182],[138,174,181],[173,174,181,189],[147,174,181],[65,174],[174,193,195],[174,192,193,194],[144,147,174,181,186,187,188],[174,183,188,189,199],[145,174,181],[144,147,149,152,162,173,174,181],[174,204],[174,205],[174,211,214],[128,174],[131,174],[132,137,165,174],[133,144,145,152,162,173,174],[133,134,144,152,174],[135,174],[136,137,145,153,174],[137,162,170,174],[138,140,144,152,174],[139,174],[140,141,174],[144,174],[142,144,174],[144,145,146,162,173,174],[144,145,146,159,162,165,174],[174,178],[140,144,147,152,162,173,174],[144,145,147,148,152,162,170,173,174],[147,149,162,170,173,174],[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180],[144,150,174],[151,173,174],[140,144,152,162,174],[153,174],[154,174],[131,155,174],[156,172,174,178],[157,174],[158,174],[144,159,160,174],[159,161,174,176],[132,144,162,163,164,165,174],[132,162,164,174],[162,163,174],[165,174],[166,174],[144,168,169,174],[168,169,174],[137,152,162,170,174],[171,174],[152,172,174],[132,147,158,173,174],[137,174],[162,174,175],[174,176],[174,177],[132,137,144,146,155,162,173,174,176,178],[162,174,179],[174,218,257],[174,218,242,257],[174,257],[174,218],[174,218,243,257],[174,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256],[174,243,257],[145,162,174,181,185],[145,174,200],[147,174,181,198],[174,198],[174,197],[174,260],[144,147,149,162,170,173,174,179,181],[174,264],[73,174],[69,174],[174,207,213],[174,211],[174,208,212],[174,210],[61,174],[62,174],[62,94,95,96,174],[62,96,174],[62,83,87,94,174],[62,77,83,84,174],[62,77,83,174],[62,77,83,84,85,86,174],[62,77,174,178],[62,66,70,72,76,144,174,178],[62,66,70,77,174],[62,66,70,78,174],[62,77,174],[62,70,75,77,145,146,153,154,173,174,178],[62,74,174],[62,70,75,78,174,178],[62,110,112,174],[62,108,109,145,174],[62,108,109,111,145,174],[62,63,114,174],[62,115,174],[62,67,174],[62,145,146,154,173,174],[62,63,64,66,145,146,174],[62,66,68,94,96,174],[62,94,96,97,174],[62,78,87,95,174],[62,68,78,94,95,96,174],[62,66,82,97,98,145,174,179],[62,71,174],[62,137,174],[62,79,80,82,174],[62,79,174],[62,81,174],[62,120,174],[62,79,94,174],[62,72,83,89,174],[62,72,83,174],[62,81,88,90,92,93,174],[62,91,174],[62,83,174],[87,94],[77,83],[70,178],[77],[77,178],[74],[78,95],[79],[79,94],[83]],"referencedMap":[[124,1],[122,2],[207,2],[210,3],[209,2],[127,4],[123,1],[125,5],[126,1],[183,6],[184,7],[190,8],[182,9],[66,10],[191,2],[196,11],[192,2],[195,12],[193,2],[189,13],[200,14],[201,15],[202,2],[203,16],[204,2],[205,17],[206,18],[215,19],[194,2],[185,2],[65,2],[128,20],[129,20],[131,21],[132,22],[133,23],[134,24],[135,25],[136,26],[137,27],[138,28],[139,29],[140,30],[141,30],[143,31],[142,32],[144,31],[145,33],[146,34],[130,35],[180,2],[147,36],[148,37],[149,38],[181,39],[150,40],[151,41],[152,42],[153,43],[154,44],[155,45],[156,46],[157,47],[158,48],[159,49],[160,49],[161,50],[162,51],[164,52],[163,53],[165,54],[166,55],[167,2],[168,56],[169,57],[170,58],[171,59],[172,60],[173,61],[174,62],[175,63],[176,64],[177,65],[178,66],[179,67],[216,2],[188,2],[187,2],[217,2],[242,68],[243,69],[218,70],[221,70],[240,68],[241,68],[231,68],[230,71],[228,68],[223,68],[236,68],[234,68],[238,68],[222,68],[235,68],[239,68],[224,68],[225,68],[237,68],[219,68],[226,68],[227,68],[229,68],[233,68],[244,72],[232,68],[220,68],[257,73],[256,2],[251,72],[253,74],[252,72],[245,72],[246,72],[248,72],[250,72],[254,74],[255,74],[247,74],[249,74],[186,75],[258,76],[199,77],[197,78],[198,79],[259,9],[261,80],[262,2],[263,81],[264,2],[265,82],[208,2],[74,83],[73,2],[70,84],[69,2],[98,2],[214,85],[114,2],[212,86],[213,87],[211,88],[260,2],[62,89],[61,2],[59,2],[60,2],[12,2],[14,2],[13,2],[2,2],[15,2],[16,2],[17,2],[18,2],[19,2],[20,2],[21,2],[22,2],[3,2],[4,2],[26,2],[23,2],[24,2],[25,2],[27,2],[28,2],[29,2],[5,2],[30,2],[31,2],[32,2],[33,2],[6,2],[37,2],[34,2],[35,2],[36,2],[38,2],[7,2],[39,2],[44,2],[45,2],[40,2],[41,2],[42,2],[43,2],[8,2],[49,2],[46,2],[47,2],[48,2],[50,2],[9,2],[51,2],[52,2],[53,2],[56,2],[54,2],[55,2],[57,2],[10,2],[1,2],[11,2],[58,2],[84,90],[100,91],[101,92],[95,93],[102,91],[103,91],[85,94],[86,95],[87,96],[104,97],[77,98],[105,99],[106,100],[78,101],[76,102],[75,103],[107,104],[89,90],[108,90],[113,105],[109,90],[110,106],[111,90],[112,107],[115,108],[116,109],[68,110],[63,90],[64,111],[67,112],[117,113],[118,114],[96,115],[97,116],[99,117],[119,90],[72,118],[71,119],[79,90],[83,120],[80,121],[82,122],[121,123],[120,124],[90,125],[93,126],[94,127],[92,128],[91,124],[88,129],[81,90]],"exportedModulesMap":[[124,1],[122,2],[207,2],[210,3],[209,2],[127,4],[123,1],[125,5],[126,1],[183,6],[184,7],[190,8],[182,9],[66,10],[191,2],[196,11],[192,2],[195,12],[193,2],[189,13],[200,14],[201,15],[202,2],[203,16],[204,2],[205,17],[206,18],[215,19],[194,2],[185,2],[65,2],[128,20],[129,20],[131,21],[132,22],[133,23],[134,24],[135,25],[136,26],[137,27],[138,28],[139,29],[140,30],[141,30],[143,31],[142,32],[144,31],[145,33],[146,34],[130,35],[180,2],[147,36],[148,37],[149,38],[181,39],[150,40],[151,41],[152,42],[153,43],[154,44],[155,45],[156,46],[157,47],[158,48],[159,49],[160,49],[161,50],[162,51],[164,52],[163,53],[165,54],[166,55],[167,2],[168,56],[169,57],[170,58],[171,59],[172,60],[173,61],[174,62],[175,63],[176,64],[177,65],[178,66],[179,67],[216,2],[188,2],[187,2],[217,2],[242,68],[243,69],[218,70],[221,70],[240,68],[241,68],[231,68],[230,71],[228,68],[223,68],[236,68],[234,68],[238,68],[222,68],[235,68],[239,68],[224,68],[225,68],[237,68],[219,68],[226,68],[227,68],[229,68],[233,68],[244,72],[232,68],[220,68],[257,73],[256,2],[251,72],[253,74],[252,72],[245,72],[246,72],[248,72],[250,72],[254,74],[255,74],[247,74],[249,74],[186,75],[258,76],[199,77],[197,78],[198,79],[259,9],[261,80],[262,2],[263,81],[264,2],[265,82],[208,2],[74,83],[73,2],[70,84],[69,2],[98,2],[214,85],[114,2],[212,86],[213,87],[211,88],[260,2],[62,89],[61,2],[59,2],[60,2],[12,2],[14,2],[13,2],[2,2],[15,2],[16,2],[17,2],[18,2],[19,2],[20,2],[21,2],[22,2],[3,2],[4,2],[26,2],[23,2],[24,2],[25,2],[27,2],[28,2],[29,2],[5,2],[30,2],[31,2],[32,2],[33,2],[6,2],[37,2],[34,2],[35,2],[36,2],[38,2],[7,2],[39,2],[44,2],[45,2],[40,2],[41,2],[42,2],[43,2],[8,2],[49,2],[46,2],[47,2],[48,2],[50,2],[9,2],[51,2],[52,2],[53,2],[56,2],[54,2],[55,2],[57,2],[10,2],[1,2],[11,2],[58,2],[95,130],[85,131],[86,131],[87,131],[77,132],[105,133],[78,101],[76,134],[75,135],[116,109],[68,110],[96,136],[97,116],[72,118],[83,120],[80,137],[121,123],[120,138],[90,139],[93,139],[94,127],[92,128],[91,138],[88,139]],"semanticDiagnosticsPerFile":[124,122,207,210,209,127,123,125,126,183,184,190,182,66,191,196,192,195,193,189,200,201,202,203,204,205,206,215,194,185,65,128,129,131,132,133,134,135,136,137,138,139,140,141,143,142,144,145,146,130,180,147,148,149,181,150,151,152,153,154,155,156,157,158,159,160,161,162,164,163,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,216,188,187,217,242,243,218,221,240,241,231,230,228,223,236,234,238,222,235,239,224,225,237,219,226,227,229,233,244,232,220,257,256,251,253,252,245,246,248,250,254,255,247,249,186,258,199,197,198,259,261,262,263,264,265,208,74,73,70,69,98,214,114,212,213,211,260,62,61,59,60,12,14,13,2,15,16,17,18,19,20,21,22,3,4,26,23,24,25,27,28,29,5,30,31,32,33,6,37,34,35,36,38,7,39,44,45,40,41,42,43,8,49,46,47,48,50,9,51,52,53,56,54,55,57,10,1,11,58,84,100,101,95,102,103,85,86,87,104,77,105,106,78,76,75,107,89,108,113,109,110,111,112,115,116,68,63,64,67,117,118,96,97,99,119,72,71,79,83,80,82,121,120,90,93,94,92,91,88,81],"latestChangedDtsFile":"./dest/node/types/browser/index.d.ts"},"version":"5.1.3"} \ No newline at end of file diff --git a/ts/bb.js-dev b/ts/bb.js-dev index 5255fe4b37..daddc96424 100755 --- a/ts/bb.js-dev +++ b/ts/bb.js-dev @@ -2,5 +2,5 @@ # Add a symlink to this somewhere in your path. # Now you can run bb.js-dev anywhere to execute latest code, no 'yarn build' required. SCRIPT_PATH=$(dirname $(realpath $0)) -export TS_NODE_PROJECT="$SCRIPT_PATH/tsconfig.json" +export TS_NODE_PROJECT="$SCRIPT_PATH/tsconfig.node.json" NODE_OPTIONS="--loader $SCRIPT_PATH/node_modules/ts-node/esm/transpile-only.mjs --no-warnings" node $SCRIPT_PATH/src/main.ts $@ diff --git a/ts/dynamic_imports.cjs b/ts/dynamic_imports.cjs deleted file mode 100644 index 9938eaba06..0000000000 --- a/ts/dynamic_imports.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = ["barretenberg_wasm", "crs", "random", "types"]; \ No newline at end of file diff --git a/ts/generate_tsconfig.cjs b/ts/generate_tsconfig.cjs deleted file mode 100644 index 9ff4ba7fe0..0000000000 --- a/ts/generate_tsconfig.cjs +++ /dev/null @@ -1,43 +0,0 @@ -const fs = require('fs'); -const path = require('path'); -const dynamic_imports = require("./dynamic_imports.cjs") - -const buildTarget = process.env.BUILD_TARGET; - -function generatePaths() { - const paths = {}; - - dynamic_imports.forEach(item => { - const key = `dynamic/${item}`; - const value = [`src/${item}/${buildTarget}/index.ts`]; - paths[key] = value; - }); - - return paths; -} - -const tsconfig = { - compilerOptions: { - baseUrl: ".", - target: "es2020", - lib: ["dom", "esnext", "es2017.object"], - module: "NodeNext", - strict: false, - declaration: true, - allowSyntheticDefaultImports: true, - esModuleInterop: true, - downlevelIteration: true, - inlineSourceMap: true, - declarationMap: true, - importHelpers: true, - resolveJsonModule: true, - composite: true, - outDir: `dest/${buildTarget}`, - rootDir: "src", - tsBuildInfoFile: ".tsbuildinfo", - paths: generatePaths() - }, - include: ["src"] -}; - -fs.writeFileSync(path.resolve(__dirname, 'tsconfig.json'), JSON.stringify(tsconfig, null, 2)); \ No newline at end of file diff --git a/ts/package.json b/ts/package.json index 4efa4c1af4..35a95b5597 100644 --- a/ts/package.json +++ b/ts/package.json @@ -16,12 +16,12 @@ "README.md" ], "scripts": { - "clean": "rm -rf ./dest .tsbuildinfo", + "clean": "rm -rf ./dest .tsbuildinfo.browser .tsbuildinfo.node", "build": "yarn clean && yarn build:wasm && yarn build:ts:browser && yarn build:ts:node", "build:dev": "tsc -b --watch", "build:wasm": "cd ../cpp && cmake --preset wasm-threads && cmake --build --preset wasm-threads && cmake --preset wasm && cmake --build --preset wasm", - "build:ts:browser": "BUILD_TARGET=browser node generate_tsconfig.cjs && tsc -b && BUILD_TARGET=browser webpack && chmod +x ./dest/browser/main.js && BUILD_TARGET=browser node replace_imports.cjs", - "build:ts:node": "BUILD_TARGET=node node generate_tsconfig.cjs && tsc -b && BUILD_TARGET=node webpack && chmod +x ./dest/node/main.js && BUILD_TARGET=node node replace_imports.cjs", + "build:ts:browser": "tsc -b tsconfig.browser.json && BUILD_TARGET=browser webpack && chmod +x ./dest/browser/main.js && BUILD_TARGET=browser node replace_imports.cjs", + "build:ts:node": "tsc -b tsconfig.node.json && BUILD_TARGET=node webpack && chmod +x ./dest/node/main.js && BUILD_TARGET=node node replace_imports.cjs", "build:bindings": "cd .. && ./scripts/bindgen.sh", "serve": "webpack serve", "formatting": "prettier --check ./src && eslint --max-warnings 0 ./src", diff --git a/ts/replace_imports.cjs b/ts/replace_imports.cjs index 3dba349a34..87620ec4c2 100644 --- a/ts/replace_imports.cjs +++ b/ts/replace_imports.cjs @@ -1,8 +1,8 @@ const replaceInFile = require('replace-in-file'); const path = require('path'); -const dynamic_imports = require("./dynamic_imports.cjs") const buildTarget = process.env.BUILD_TARGET; +const dynamic_imports = ['barretenberg_wasm', 'crs', 'random', 'types']; async function replaceImports() { try { diff --git a/ts/tsconfig.browser.json b/ts/tsconfig.browser.json new file mode 100644 index 0000000000..0278c3ec4c --- /dev/null +++ b/ts/tsconfig.browser.json @@ -0,0 +1,42 @@ +{ + "compilerOptions": { + "baseUrl": ".", + "target": "es2020", + "lib": [ + "dom", + "esnext", + "es2017.object" + ], + "module": "NodeNext", + "strict": false, + "declaration": true, + "allowSyntheticDefaultImports": true, + "esModuleInterop": true, + "downlevelIteration": true, + "inlineSourceMap": true, + "declarationMap": true, + "importHelpers": true, + "resolveJsonModule": true, + "composite": true, + "outDir": "dest/browser", + "rootDir": "src", + "tsBuildInfoFile": ".tsbuildinfo.browser", + "paths": { + "dynamic/barretenberg_wasm": [ + "src/barretenberg_wasm/browser/index.ts" + ], + "dynamic/crs": [ + "src/crs/browser/index.ts" + ], + "dynamic/random": [ + "src/random/browser/index.ts" + ], + "dynamic/types": [ + "src/types/browser/index.ts" + ] + } + }, + "include": [ + "src" + ] +} \ No newline at end of file diff --git a/ts/tsconfig.json b/ts/tsconfig.node.json similarity index 95% rename from ts/tsconfig.json rename to ts/tsconfig.node.json index 4b3dc9a80b..729d9e85e8 100644 --- a/ts/tsconfig.json +++ b/ts/tsconfig.node.json @@ -20,7 +20,7 @@ "composite": true, "outDir": "dest/node", "rootDir": "src", - "tsBuildInfoFile": ".tsbuildinfo", + "tsBuildInfoFile": ".tsbuildinfo.node", "paths": { "dynamic/barretenberg_wasm": [ "src/barretenberg_wasm/node/index.ts" diff --git a/ts/webpack.config.cjs b/ts/webpack.config.cjs index 7186e8d5bd..7a7a7a458f 100644 --- a/ts/webpack.config.cjs +++ b/ts/webpack.config.cjs @@ -8,71 +8,34 @@ const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin'); const webpack = require('webpack'); const { resolve } = path; -const isNode = process.env.BUILD_TARGET === 'node'; +const buildTarget = process.env.BUILD_TARGET; +const isNode = buildTarget === 'node'; +const configFile = path.resolve(__dirname, `./tsconfig.${buildTarget}.json`) ; -const common = { +module.exports = { mode: 'production', entry: './src/index.ts', + target: isNode ? "node" : "web", + output: { + path: resolve(__dirname, `./dest/${buildTarget}`), + filename: '[name].js', + }, module: { rules: [ { - test: /\.tsx?$/, - use: [{ loader: 'ts-loader', options: { transpileOnly: true, onlyCompileBundledFiles: true } }], + test: /\.ts?$/, + use: [{ loader: 'ts-loader', options: { transpileOnly: true, onlyCompileBundledFiles: true, configFile } }], }, ], }, resolve: { - alias: { - 'idb-keyval': require.resolve('idb-keyval'), - crypto: require.resolve('crypto-browserify'), - path: require.resolve('path-browserify'), - url: require.resolve('url/'), - }, - fallback: { - os: require.resolve('os-browserify/browser'), - events: false, - }, plugins: [ new ResolveTypeScriptPlugin(), - new TsconfigPathsPlugin({ configFile: path.resolve(__dirname, "./tsconfig.json") }) + new TsconfigPathsPlugin({ configFile }) ], }, optimization: { - minimize: false, - }, -} - -const webConfig = { - ...common, - target: 'web', - output: { - path: resolve(__dirname, './dest/browser'), - filename: '[name].js', - }, - plugins: [ - new webpack.DefinePlugin({ 'process.env.NODE_DEBUG': false }), - new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }), - new CopyWebpackPlugin({ - patterns: [ - { - from: `../cpp/build-wasm/bin/barretenberg.wasm`, - to: '../barretenberg.wasm', - }, - { - from: `../cpp/build-wasm-threads/bin/barretenberg.wasm`, - to: '../barretenberg-threads.wasm', - }, - ], - }), - ], -} - -const nodeConfig = { - ...common, - target: 'node', - output: { - path: resolve(__dirname, './dest/node'), - filename: '[name].js', + minimize: isNode, }, plugins: [ new webpack.DefinePlugin({ 'process.env.NODE_DEBUG': false }), @@ -91,5 +54,3 @@ const nodeConfig = { }), ], } - -module.exports = isNode ? nodeConfig : webConfig; From 0725a19511a3f99fb1781c2295cfc2ac5cdec3b6 Mon Sep 17 00:00:00 2001 From: jonybur Date: Wed, 12 Jul 2023 15:02:32 +0000 Subject: [PATCH 42/88] Add tsconfig reference file --- ts/.gitignore | 1 - ts/tsconfig.json | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 ts/tsconfig.json diff --git a/ts/.gitignore b/ts/.gitignore index 6f9e1f941b..adffed9c01 100644 --- a/ts/.gitignore +++ b/ts/.gitignore @@ -2,7 +2,6 @@ !.yarn/releases node_modules dest -tsconfig.json .tsbuildinfo *.log crs diff --git a/ts/tsconfig.json b/ts/tsconfig.json new file mode 100644 index 0000000000..fcc71952b4 --- /dev/null +++ b/ts/tsconfig.json @@ -0,0 +1,8 @@ +{ + "files": [], + "references": [ + {"path": "./tsconfig.browser.json"}, + {"path": "./tsconfig.node.json"} + ] + } + \ No newline at end of file From 1997a3a793ec44228b1c2cee2b46a26849b16c17 Mon Sep 17 00:00:00 2001 From: jonybur Date: Wed, 12 Jul 2023 15:03:56 +0000 Subject: [PATCH 43/88] Ignore tsbuildinfo --- ts/.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ts/.gitignore b/ts/.gitignore index adffed9c01..d0c7e24581 100644 --- a/ts/.gitignore +++ b/ts/.gitignore @@ -3,5 +3,7 @@ node_modules dest .tsbuildinfo +.tsbuildinfo.browser +.tsbuildinfo.node *.log crs From 68157a9409c3ad49fd026b3e758e48ba6543b6e3 Mon Sep 17 00:00:00 2001 From: jonybur Date: Wed, 12 Jul 2023 15:04:17 +0000 Subject: [PATCH 44/88] Remove tsbuildinfo files --- ts/.tsbuildinfo.browser | 1 - ts/.tsbuildinfo.node | 1 - 2 files changed, 2 deletions(-) delete mode 100644 ts/.tsbuildinfo.browser delete mode 100644 ts/.tsbuildinfo.node diff --git a/ts/.tsbuildinfo.browser b/ts/.tsbuildinfo.browser deleted file mode 100644 index ca7b07521b..0000000000 --- a/ts/.tsbuildinfo.browser +++ /dev/null @@ -1 +0,0 @@ -{"program":{"fileNames":["./node_modules/typescript/lib/lib.es5.d.ts","./node_modules/typescript/lib/lib.es2015.d.ts","./node_modules/typescript/lib/lib.es2016.d.ts","./node_modules/typescript/lib/lib.es2017.d.ts","./node_modules/typescript/lib/lib.es2018.d.ts","./node_modules/typescript/lib/lib.es2019.d.ts","./node_modules/typescript/lib/lib.es2020.d.ts","./node_modules/typescript/lib/lib.es2021.d.ts","./node_modules/typescript/lib/lib.es2022.d.ts","./node_modules/typescript/lib/lib.es2023.d.ts","./node_modules/typescript/lib/lib.esnext.d.ts","./node_modules/typescript/lib/lib.dom.d.ts","./node_modules/typescript/lib/lib.es2015.core.d.ts","./node_modules/typescript/lib/lib.es2015.collection.d.ts","./node_modules/typescript/lib/lib.es2015.generator.d.ts","./node_modules/typescript/lib/lib.es2015.iterable.d.ts","./node_modules/typescript/lib/lib.es2015.promise.d.ts","./node_modules/typescript/lib/lib.es2015.proxy.d.ts","./node_modules/typescript/lib/lib.es2015.reflect.d.ts","./node_modules/typescript/lib/lib.es2015.symbol.d.ts","./node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","./node_modules/typescript/lib/lib.es2016.array.include.d.ts","./node_modules/typescript/lib/lib.es2017.object.d.ts","./node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","./node_modules/typescript/lib/lib.es2017.string.d.ts","./node_modules/typescript/lib/lib.es2017.intl.d.ts","./node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","./node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","./node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","./node_modules/typescript/lib/lib.es2018.intl.d.ts","./node_modules/typescript/lib/lib.es2018.promise.d.ts","./node_modules/typescript/lib/lib.es2018.regexp.d.ts","./node_modules/typescript/lib/lib.es2019.array.d.ts","./node_modules/typescript/lib/lib.es2019.object.d.ts","./node_modules/typescript/lib/lib.es2019.string.d.ts","./node_modules/typescript/lib/lib.es2019.symbol.d.ts","./node_modules/typescript/lib/lib.es2019.intl.d.ts","./node_modules/typescript/lib/lib.es2020.bigint.d.ts","./node_modules/typescript/lib/lib.es2020.date.d.ts","./node_modules/typescript/lib/lib.es2020.promise.d.ts","./node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","./node_modules/typescript/lib/lib.es2020.string.d.ts","./node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","./node_modules/typescript/lib/lib.es2020.intl.d.ts","./node_modules/typescript/lib/lib.es2020.number.d.ts","./node_modules/typescript/lib/lib.es2021.promise.d.ts","./node_modules/typescript/lib/lib.es2021.string.d.ts","./node_modules/typescript/lib/lib.es2021.weakref.d.ts","./node_modules/typescript/lib/lib.es2021.intl.d.ts","./node_modules/typescript/lib/lib.es2022.array.d.ts","./node_modules/typescript/lib/lib.es2022.error.d.ts","./node_modules/typescript/lib/lib.es2022.intl.d.ts","./node_modules/typescript/lib/lib.es2022.object.d.ts","./node_modules/typescript/lib/lib.es2022.sharedmemory.d.ts","./node_modules/typescript/lib/lib.es2022.string.d.ts","./node_modules/typescript/lib/lib.es2022.regexp.d.ts","./node_modules/typescript/lib/lib.es2023.array.d.ts","./node_modules/typescript/lib/lib.esnext.intl.d.ts","./node_modules/typescript/lib/lib.decorators.d.ts","./node_modules/typescript/lib/lib.decorators.legacy.d.ts","./node_modules/tslib/tslib.d.ts","./node_modules/tslib/modules/index.d.ts","./src/crs/net_crs.ts","./node_modules/idb-keyval/dist/index.d.ts","./src/crs/browser/cached_net_crs.ts","./src/crs/browser/index.ts","./src/crs/index.ts","./node_modules/@types/ms/index.d.ts","./node_modules/@types/debug/index.d.ts","./node_modules/comlink/dist/umd/protocol.d.ts","./node_modules/comlink/dist/umd/comlink.d.ts","./src/random/browser/index.ts","./src/random/index.ts","./src/barretenberg_wasm/browser/index.ts","./src/barretenberg_wasm/barretenberg_wasm.ts","./src/barretenberg_wasm/index.ts","./src/serialize/buffer_reader.ts","./src/serialize/output_type.ts","./src/types/raw_buffer.ts","./src/serialize/serialize.ts","./src/serialize/index.ts","./src/async_map/index.ts","./src/barretenberg_binder/heap_allocator.ts","./src/barretenberg_binder/heap_allocator_sync.ts","./src/barretenberg_binder/index.ts","./src/types/ptr.ts","./src/bigint-array/index.ts","./src/types/fields.ts","./src/types/browser/point.ts","./src/types/browser/index.ts","./src/types/fixed_size_buffer.ts","./src/types/index.ts","./src/barretenberg_api/index.ts","./src/factory/index.ts","./src/index.ts","./node_modules/commander/typings/index.d.ts","./src/main.ts","./src/barretenberg_api/blake2s.test.ts","./src/barretenberg_api/common.test.ts","./src/barretenberg_api/pedersen.test.ts","./src/barretenberg_api/schnorr.test.ts","./src/barretenberg_wasm/barretenberg_wasm.test.ts","./src/barretenberg_wasm/browser/worker.ts","./node_modules/comlink/dist/esm/protocol.d.ts","./node_modules/comlink/dist/esm/node-adapter.d.ts","./src/barretenberg_wasm/node/node_endpoint.ts","./src/barretenberg_wasm/node/index.ts","./src/barretenberg_wasm/node/worker.ts","./src/bindgen/function_declaration.ts","./src/bindgen/mappings.ts","./src/bindgen/rust.ts","./src/bindgen/to_camel_case.ts","./src/bindgen/typescript.ts","./src/bindgen/index.ts","./src/crs/node/ignition_files_crs.ts","./src/crs/node/index.ts","./src/examples/simple.rawtest.ts","./src/examples/simple.test.ts","./src/random/node/index.ts","./src/types/node/point.ts","./src/types/node/index.ts","./node_modules/@babel/types/lib/index.d.ts","./node_modules/@types/babel__generator/index.d.ts","./node_modules/@babel/parser/typings/babel-parser.d.ts","./node_modules/@types/babel__template/index.d.ts","./node_modules/@types/babel__traverse/index.d.ts","./node_modules/@types/babel__core/index.d.ts","./node_modules/@types/node/assert.d.ts","./node_modules/@types/node/assert/strict.d.ts","./node_modules/@types/node/globals.d.ts","./node_modules/@types/node/async_hooks.d.ts","./node_modules/@types/node/buffer.d.ts","./node_modules/@types/node/child_process.d.ts","./node_modules/@types/node/cluster.d.ts","./node_modules/@types/node/console.d.ts","./node_modules/@types/node/constants.d.ts","./node_modules/@types/node/crypto.d.ts","./node_modules/@types/node/dgram.d.ts","./node_modules/@types/node/diagnostics_channel.d.ts","./node_modules/@types/node/dns.d.ts","./node_modules/@types/node/dns/promises.d.ts","./node_modules/@types/node/domain.d.ts","./node_modules/@types/node/dom-events.d.ts","./node_modules/@types/node/events.d.ts","./node_modules/@types/node/fs.d.ts","./node_modules/@types/node/fs/promises.d.ts","./node_modules/@types/node/http.d.ts","./node_modules/@types/node/http2.d.ts","./node_modules/@types/node/https.d.ts","./node_modules/@types/node/inspector.d.ts","./node_modules/@types/node/module.d.ts","./node_modules/@types/node/net.d.ts","./node_modules/@types/node/os.d.ts","./node_modules/@types/node/path.d.ts","./node_modules/@types/node/perf_hooks.d.ts","./node_modules/@types/node/process.d.ts","./node_modules/@types/node/punycode.d.ts","./node_modules/@types/node/querystring.d.ts","./node_modules/@types/node/readline.d.ts","./node_modules/@types/node/readline/promises.d.ts","./node_modules/@types/node/repl.d.ts","./node_modules/@types/node/stream.d.ts","./node_modules/@types/node/stream/promises.d.ts","./node_modules/@types/node/stream/consumers.d.ts","./node_modules/@types/node/stream/web.d.ts","./node_modules/@types/node/string_decoder.d.ts","./node_modules/@types/node/test.d.ts","./node_modules/@types/node/timers.d.ts","./node_modules/@types/node/timers/promises.d.ts","./node_modules/@types/node/tls.d.ts","./node_modules/@types/node/trace_events.d.ts","./node_modules/@types/node/tty.d.ts","./node_modules/@types/node/url.d.ts","./node_modules/@types/node/util.d.ts","./node_modules/@types/node/v8.d.ts","./node_modules/@types/node/vm.d.ts","./node_modules/@types/node/wasi.d.ts","./node_modules/@types/node/worker_threads.d.ts","./node_modules/@types/node/zlib.d.ts","./node_modules/@types/node/globals.global.d.ts","./node_modules/@types/node/index.d.ts","./node_modules/@types/connect/index.d.ts","./node_modules/@types/body-parser/index.d.ts","./node_modules/@types/bonjour/index.d.ts","./node_modules/@types/mime/index.d.ts","./node_modules/@types/send/index.d.ts","./node_modules/@types/range-parser/index.d.ts","./node_modules/@types/qs/index.d.ts","./node_modules/@types/express-serve-static-core/index.d.ts","./node_modules/@types/connect-history-api-fallback/index.d.ts","./node_modules/@types/detect-node/index.d.ts","./node_modules/@types/eslint/helpers.d.ts","./node_modules/@types/estree/index.d.ts","./node_modules/@types/json-schema/index.d.ts","./node_modules/@types/eslint/index.d.ts","./node_modules/@types/eslint-scope/index.d.ts","./node_modules/@types/serve-static/node_modules/@types/mime/Mime.d.ts","./node_modules/@types/serve-static/node_modules/@types/mime/index.d.ts","./node_modules/@types/serve-static/index.d.ts","./node_modules/@types/express/index.d.ts","./node_modules/@types/graceful-fs/index.d.ts","./node_modules/@types/html-minifier-terser/index.d.ts","./node_modules/@types/http-proxy/index.d.ts","./node_modules/@types/istanbul-lib-coverage/index.d.ts","./node_modules/@types/istanbul-lib-report/index.d.ts","./node_modules/@types/istanbul-reports/index.d.ts","./node_modules/@jest/expect-utils/build/index.d.ts","./node_modules/chalk/index.d.ts","./node_modules/@sinclair/typebox/typebox.d.ts","./node_modules/@jest/schemas/build/index.d.ts","./node_modules/pretty-format/build/index.d.ts","./node_modules/jest-diff/build/index.d.ts","./node_modules/jest-matcher-utils/build/index.d.ts","./node_modules/expect/build/index.d.ts","./node_modules/@types/jest/index.d.ts","./node_modules/@types/prettier/index.d.ts","./node_modules/@types/retry/index.d.ts","./node_modules/@types/semver/classes/semver.d.ts","./node_modules/@types/semver/functions/parse.d.ts","./node_modules/@types/semver/functions/valid.d.ts","./node_modules/@types/semver/functions/clean.d.ts","./node_modules/@types/semver/functions/inc.d.ts","./node_modules/@types/semver/functions/diff.d.ts","./node_modules/@types/semver/functions/major.d.ts","./node_modules/@types/semver/functions/minor.d.ts","./node_modules/@types/semver/functions/patch.d.ts","./node_modules/@types/semver/functions/prerelease.d.ts","./node_modules/@types/semver/functions/compare.d.ts","./node_modules/@types/semver/functions/rcompare.d.ts","./node_modules/@types/semver/functions/compare-loose.d.ts","./node_modules/@types/semver/functions/compare-build.d.ts","./node_modules/@types/semver/functions/sort.d.ts","./node_modules/@types/semver/functions/rsort.d.ts","./node_modules/@types/semver/functions/gt.d.ts","./node_modules/@types/semver/functions/lt.d.ts","./node_modules/@types/semver/functions/eq.d.ts","./node_modules/@types/semver/functions/neq.d.ts","./node_modules/@types/semver/functions/gte.d.ts","./node_modules/@types/semver/functions/lte.d.ts","./node_modules/@types/semver/functions/cmp.d.ts","./node_modules/@types/semver/functions/coerce.d.ts","./node_modules/@types/semver/classes/comparator.d.ts","./node_modules/@types/semver/classes/range.d.ts","./node_modules/@types/semver/functions/satisfies.d.ts","./node_modules/@types/semver/ranges/max-satisfying.d.ts","./node_modules/@types/semver/ranges/min-satisfying.d.ts","./node_modules/@types/semver/ranges/to-comparators.d.ts","./node_modules/@types/semver/ranges/min-version.d.ts","./node_modules/@types/semver/ranges/valid.d.ts","./node_modules/@types/semver/ranges/outside.d.ts","./node_modules/@types/semver/ranges/gtr.d.ts","./node_modules/@types/semver/ranges/ltr.d.ts","./node_modules/@types/semver/ranges/intersects.d.ts","./node_modules/@types/semver/ranges/simplify.d.ts","./node_modules/@types/semver/ranges/subset.d.ts","./node_modules/@types/semver/internals/identifiers.d.ts","./node_modules/@types/semver/index.d.ts","./node_modules/@types/serve-index/index.d.ts","./node_modules/@types/sockjs/index.d.ts","./node_modules/source-map/source-map.d.ts","./node_modules/@types/source-map-support/index.d.ts","./node_modules/@types/stack-utils/index.d.ts","./node_modules/@types/ws/index.d.ts","./node_modules/@types/yargs-parser/index.d.ts","./node_modules/@types/yargs/index.d.ts"],"fileInfos":[{"version":"f59215c5f1d886b05395ee7aca73e0ac69ddfad2843aa88530e797879d511bad","affectsGlobalScope":true,"impliedFormat":1},{"version":"45b7ab580deca34ae9729e97c13cfd999df04416a79116c3bfb483804f85ded4","impliedFormat":1},{"version":"dc48272d7c333ccf58034c0026162576b7d50ea0e69c3b9292f803fc20720fd5","impliedFormat":1},{"version":"27147504487dc1159369da4f4da8a26406364624fa9bc3db632f7d94a5bae2c3","impliedFormat":1},{"version":"5e1c4c362065a6b95ff952c0eab010f04dcd2c3494e813b493ecfd4fcb9fc0d8","impliedFormat":1},{"version":"68d73b4a11549f9c0b7d352d10e91e5dca8faa3322bfb77b661839c42b1ddec7","impliedFormat":1},{"version":"5efce4fc3c29ea84e8928f97adec086e3dc876365e0982cc8479a07954a3efd4","impliedFormat":1},{"version":"feecb1be483ed332fad555aff858affd90a48ab19ba7272ee084704eb7167569","impliedFormat":1},{"version":"5514e54f17d6d74ecefedc73c504eadffdeda79c7ea205cf9febead32d45c4bc","impliedFormat":1},{"version":"f4e736d6c8d69ae5b3ab0ddfcaa3dc365c3e76909d6660af5b4e979b3934ac20","impliedFormat":1},{"version":"eeeb3aca31fbadef8b82502484499dfd1757204799a6f5b33116201c810676ec","impliedFormat":1},{"version":"3dda5344576193a4ae48b8d03f105c86f20b2f2aff0a1d1fd7935f5d68649654","affectsGlobalScope":true,"impliedFormat":1},{"version":"9d9885c728913c1d16e0d2831b40341d6ad9a0ceecaabc55209b306ad9c736a5","affectsGlobalScope":true,"impliedFormat":1},{"version":"17bea081b9c0541f39dd1ae9bc8c78bdd561879a682e60e2f25f688c0ecab248","affectsGlobalScope":true,"impliedFormat":1},{"version":"4443e68b35f3332f753eacc66a04ac1d2053b8b035a0e0ac1d455392b5e243b3","affectsGlobalScope":true,"impliedFormat":1},{"version":"ab22100fdd0d24cfc2cc59d0a00fc8cf449830d9c4030dc54390a46bd562e929","affectsGlobalScope":true,"impliedFormat":1},{"version":"f7bd636ae3a4623c503359ada74510c4005df5b36de7f23e1db8a5c543fd176b","affectsGlobalScope":true,"impliedFormat":1},{"version":"ce691fb9e5c64efb9547083e4a34091bcbe5bdb41027e310ebba8f7d96a98671","affectsGlobalScope":true,"impliedFormat":1},{"version":"8d697a2a929a5fcb38b7a65594020fcef05ec1630804a33748829c5ff53640d0","affectsGlobalScope":true,"impliedFormat":1},{"version":"0c20f4d2358eb679e4ae8a4432bdd96c857a2960fd6800b21ec4008ec59d60ea","affectsGlobalScope":true,"impliedFormat":1},{"version":"36ae84ccc0633f7c0787bc6108386c8b773e95d3b052d9464a99cd9b8795fbec","affectsGlobalScope":true,"impliedFormat":1},{"version":"82d0d8e269b9eeac02c3bd1c9e884e85d483fcb2cd168bccd6bc54df663da031","affectsGlobalScope":true,"impliedFormat":1},{"version":"b8deab98702588840be73d67f02412a2d45a417a3c097b2e96f7f3a42ac483d1","affectsGlobalScope":true,"impliedFormat":1},{"version":"4738f2420687fd85629c9efb470793bb753709c2379e5f85bc1815d875ceadcd","affectsGlobalScope":true,"impliedFormat":1},{"version":"2f11ff796926e0832f9ae148008138ad583bd181899ab7dd768a2666700b1893","affectsGlobalScope":true,"impliedFormat":1},{"version":"376d554d042fb409cb55b5cbaf0b2b4b7e669619493c5d18d5fa8bd67273f82a","affectsGlobalScope":true,"impliedFormat":1},{"version":"9fc46429fbe091ac5ad2608c657201eb68b6f1b8341bd6d670047d32ed0a88fa","affectsGlobalScope":true,"impliedFormat":1},{"version":"61c37c1de663cf4171e1192466e52c7a382afa58da01b1dc75058f032ddf0839","affectsGlobalScope":true,"impliedFormat":1},{"version":"c4138a3dd7cd6cf1f363ca0f905554e8d81b45844feea17786cdf1626cb8ea06","affectsGlobalScope":true,"impliedFormat":1},{"version":"6ff3e2452b055d8f0ec026511c6582b55d935675af67cdb67dd1dc671e8065df","affectsGlobalScope":true,"impliedFormat":1},{"version":"03de17b810f426a2f47396b0b99b53a82c1b60e9cba7a7edda47f9bb077882f4","affectsGlobalScope":true,"impliedFormat":1},{"version":"8184c6ddf48f0c98429326b428478ecc6143c27f79b79e85740f17e6feb090f1","affectsGlobalScope":true,"impliedFormat":1},{"version":"261c4d2cf86ac5a89ad3fb3fafed74cbb6f2f7c1d139b0540933df567d64a6ca","affectsGlobalScope":true,"impliedFormat":1},{"version":"6af1425e9973f4924fca986636ac19a0cf9909a7e0d9d3009c349e6244e957b6","affectsGlobalScope":true,"impliedFormat":1},{"version":"576711e016cf4f1804676043e6a0a5414252560eb57de9faceee34d79798c850","affectsGlobalScope":true,"impliedFormat":1},{"version":"89c1b1281ba7b8a96efc676b11b264de7a8374c5ea1e6617f11880a13fc56dc6","affectsGlobalScope":true,"impliedFormat":1},{"version":"15a630d6817718a2ddd7088c4f83e4673fde19fa992d2eae2cf51132a302a5d3","affectsGlobalScope":true,"impliedFormat":1},{"version":"f06948deb2a51aae25184561c9640fb66afeddb34531a9212d011792b1d19e0a","affectsGlobalScope":true,"impliedFormat":1},{"version":"01e0ee7e1f661acedb08b51f8a9b7d7f959e9cdb6441360f06522cc3aea1bf2e","affectsGlobalScope":true,"impliedFormat":1},{"version":"ac17a97f816d53d9dd79b0d235e1c0ed54a8cc6a0677e9a3d61efb480b2a3e4e","affectsGlobalScope":true,"impliedFormat":1},{"version":"bf14a426dbbf1022d11bd08d6b8e709a2e9d246f0c6c1032f3b2edb9a902adbe","affectsGlobalScope":true,"impliedFormat":1},{"version":"ec0104fee478075cb5171e5f4e3f23add8e02d845ae0165bfa3f1099241fa2aa","affectsGlobalScope":true,"impliedFormat":1},{"version":"2b72d528b2e2fe3c57889ca7baef5e13a56c957b946906d03767c642f386bbc3","affectsGlobalScope":true,"impliedFormat":1},{"version":"9cc66b0513ad41cb5f5372cca86ef83a0d37d1c1017580b7dace3ea5661836df","affectsGlobalScope":true,"impliedFormat":1},{"version":"368af93f74c9c932edd84c58883e736c9e3d53cec1fe24c0b0ff451f529ceab1","affectsGlobalScope":true,"impliedFormat":1},{"version":"709efdae0cb5df5f49376cde61daacc95cdd44ae4671da13a540da5088bf3f30","affectsGlobalScope":true,"impliedFormat":1},{"version":"995c005ab91a498455ea8dfb63aa9f83fa2ea793c3d8aa344be4a1678d06d399","affectsGlobalScope":true,"impliedFormat":1},{"version":"61ed9b6d07af959e745fb11f9593ecd743b279418cc8a99448ea3cd5f3b3eb22","affectsGlobalScope":true,"impliedFormat":1},{"version":"038a2f66a34ee7a9c2fbc3584c8ab43dff2995f8c68e3f566f4c300d2175e31e","affectsGlobalScope":true,"impliedFormat":1},{"version":"4fa6ed14e98aa80b91f61b9805c653ee82af3502dc21c9da5268d3857772ca05","affectsGlobalScope":true,"impliedFormat":1},{"version":"f5c92f2c27b06c1a41b88f6db8299205aee52c2a2943f7ed29bd585977f254e8","affectsGlobalScope":true,"impliedFormat":1},{"version":"930b0e15811f84e203d3c23508674d5ded88266df4b10abee7b31b2ac77632d2","affectsGlobalScope":true,"impliedFormat":1},{"version":"8444af78980e3b20b49324f4a16ba35024fef3ee069a0eb67616ea6ca821c47a","affectsGlobalScope":true,"impliedFormat":1},{"version":"b9ea5778ff8b50d7c04c9890170db34c26a5358cccba36844fe319f50a43a61a","affectsGlobalScope":true,"impliedFormat":1},{"version":"3287d9d085fbd618c3971944b65b4be57859f5415f495b33a6adc994edd2f004","affectsGlobalScope":true,"impliedFormat":1},{"version":"50d53ccd31f6667aff66e3d62adf948879a3a16f05d89882d1188084ee415bbc","affectsGlobalScope":true,"impliedFormat":1},{"version":"25de46552b782d43cb7284df22fe2a265de387cf0248b747a7a1b647d81861f6","affectsGlobalScope":true,"impliedFormat":1},{"version":"307c8b7ebbd7f23a92b73a4c6c0a697beca05b06b036c23a34553e5fe65e4fdc","affectsGlobalScope":true,"impliedFormat":1},{"version":"189c0703923150aa30673fa3de411346d727cc44a11c75d05d7cf9ef095daa22","affectsGlobalScope":true,"impliedFormat":1},{"version":"782dec38049b92d4e85c1585fbea5474a219c6984a35b004963b00beb1aab538","affectsGlobalScope":true,"impliedFormat":1},{"version":"f1c9fe42b65437a61104e601eb298c5c859fb522b483f1bdb700eed67a16f980","impliedFormat":1},{"version":"0734467ebd328b91af92eff2af9c97f6079bc4736c4992f8a5e47123680cf21b","impliedFormat":99},{"version":"54ef53ed24e29fa69ca2dbbdf232afe6409f34719c95922aa6b0500b6eea24ed","signature":"fce7d12a7270a73f059f4a568b0097d7704576b5ef95e026b1255df3c67f4bf2","impliedFormat":99},{"version":"f08728a9b464da7a195ca5a197837c2384ab78979737105f97a63b2cade30fa7","impliedFormat":99},{"version":"d81c05cb919bfa33ff72778a5197fba166991a4b6e4f59afe66a1b298f31cc30","signature":"5297b9e028bc5a1b653afb0021ff28fe5902fa43ddb43bd6588af8b126ef1dbf","impliedFormat":99},{"version":"b60a66c8ee67213bd70bdf2c3f7dc3033879595e2002c3ec5cc4b30840422cdc","impliedFormat":99},{"version":"998c4553111d407c0d9f48041d1e4f3b1d3528f0ecb0020db31e9c2ad7a3fa12","impliedFormat":99},{"version":"6a9c5127096b35264eb7cd21b2417bfc1d42cceca9ba4ce2bb0c3410b7816042","impliedFormat":1},{"version":"93b7325b49dfbf613d940ed0e471216657b2d77459dac34f1b5b1678f08f884c","impliedFormat":1},{"version":"c0a456eb21680eca96d5e836e2a5cc74730a2c0e03f18eb17a7f652b30c993e4","impliedFormat":1},{"version":"9426d1cc15328fcbb59adb88880ccfd79f2bc959334d485273da743aac083eaa","impliedFormat":1},{"version":"8a15b4b148c236900888f742a1bd43e42520cfc3289eeeefeb3fc11fc944224a","signature":"c5b39ac78a1fca4a0c1920910746120b4ebada220a1a736146ad2e3101075ba4","impliedFormat":99},{"version":"3ccadcb9bd4b1879b9a20c62d5069badb616823e9cf6f977abfb92fcae3e5e2c","impliedFormat":99},{"version":"92f1666b3cf937d89a911ebecf3d8a842f84bd635aca5ed99432561e544a5d7f","signature":"2cc29293ba85b4b4629b1837e1f6cbc301c73a3523bc3f9d7887391413c0a7a1","impliedFormat":99},{"version":"7711b75c075dcb28b4e837b5a43ef0051061bda8c62d84bb11e4c87b37b9e11f","signature":"53db2cce1818886d5c090755f99f03e1ee5d75e48855a18a3121b930d51436e1","impliedFormat":99},{"version":"49fa852bdd3a1d4542fc8c9cd85a467cc5586a98d6129de2cbaf574ba2a024c5","impliedFormat":99},{"version":"3698ed08bb485b7f978ac61466deb43fd6736cba1c0aefcf188854e15b119aa4","signature":"310103e8e0efd044334e5b5aa8ada787fa010fb38ac982b47fdbb24e931fbae5","impliedFormat":99},{"version":"56696d83ee1bf9af82d2ad284663677aac8171fdbf5223390aa0784d491caf85","signature":"686bbb1e2df2881893498bcc9d251b8a7d4b4ca0f1718f4cc091f4b0ae82d88e","impliedFormat":99},{"version":"9243bdf41fa069f91ced599db3af72f9ec1d7454de03906a280d04b4470af2d2","signature":"b85d91d3d26b95a3833d96c38c3e35fd30f9b6fbc7bd55b29e884bac178437d1","impliedFormat":99},{"version":"2ec936f5989089f15de3fbfad1f2f2842b0b6e6276bea4283872b23a37251a7d","signature":"c34990a8094f0a876461ab18980a5415477c9741a9fd3cc0f00c0ff1084cee61","impliedFormat":99},{"version":"31a3b2cd4cda44ef15cdbada4a78a49c0668c140104a22d0e4e4f1b995bca2f6","impliedFormat":99},{"version":"76b922387f8ddc0384d2b915b3715c64aea4e67df6c1d272bdedc867a10707b7","signature":"21f8c5dd8bcc7c44976954d1e4c2006095c37fa2fd16c1bf928ac329fb4cb52a","impliedFormat":99},{"version":"c62d74da17bc3bc50d13cf6445f647d0e04b0720e9e90b8de76b47f9302b59af","signature":"d4c2b6fe05f65ccf6a42711b1a9f1649970e2a4305ce5febc9834b382a8d87f0","impliedFormat":99},{"version":"9f2265033c4a94144d0bc511cdcf368980394e86bc3426da86f2c3a9215f69c1","signature":"61e2b2d5d16cf22811733a20e075c441fb34ba84f007e0cc072c5a3657bee52a","impliedFormat":99},{"version":"6165276e8aa979f080d9675fd1b5852040bcde681fb673e96294baf1f528bd88","signature":"e3d6acca5d37d2abcf27f71c864780a7f6d20189f35bc4bf6280267c5079fa57","impliedFormat":99},{"version":"4f3d5156dc1d6103ab8f9bae661d244c17c00ea0d0afe0cc80f03f33f3133ea6","signature":"38520572ecabb509abba228c1ed55caa2493dcc525c2db31642a02129a02de5c","impliedFormat":99},{"version":"e6e800212362230a3edf4fa4967d0bf7972da420ec0aec811d88982b492fc6d0","signature":"f6198c46a5788f370cce98b094d622047e592eedef23a18ab477aad458bc85ac","impliedFormat":99},{"version":"c9ebdfb52f07525e2317e46271218dc024b9939ca05f93577ef8c5892485857f","signature":"0cc62062a493830aa903636202dbb93364d3dc0266f7e0fe6abb7922c9aa8517","impliedFormat":99},{"version":"84f8beacd38616e6a61020b246d74eaa1f2ad6335c4c7fb545a7952c8f8d520f","signature":"1fd7f81918d3c8f5093b59152af9609a22d384f88e711936eb8e8fdc7818efc1","impliedFormat":99},{"version":"af0f5e0955e6f30edc39b2f893928e046b939fd8120917bef0cda2b2b0cfe3f5","impliedFormat":99},{"version":"9abb9a1617d87760ee919776c6d6b75aa8f04135e91d302abe7e6f28d595c69b","signature":"5cb26573fe01920ae3a98b7ef0d6e8da7af406208bef6aa34d38a7d5fea42494","impliedFormat":99},{"version":"c9262a0ab059a722207c441e741fb44e8d0dae048edcaf9c36fc5599fdb311bd","impliedFormat":99},{"version":"ac6d7cd8a82d1cd671805a229bdec5b802baf8e01acb84ca1bc37909d52e7cdf","signature":"ab70d2035a823e618685ea73bb1c4062645ff8c579e6c79ee4eaa4ee39720a38","impliedFormat":99},{"version":"12623e0f26cbbc9e23a2acd9869996fce986b8818bcd1ed4e52b30e8789a01e7","signature":"042a6a95e4892131b242ffdcfe97cdc6142a9843695712638360d81d4120599b","impliedFormat":99},{"version":"846c9e49f2399db4cb63a7d91473f555fca00aad086009fb4289b1028f4a077c","impliedFormat":99},{"version":"fe3fd03f6dd87b469b770256897cd1f85e7a259c1a448d80237e47285be0bd2f","impliedFormat":1},{"version":"bdf6985c7fae0895cf149945de85ea88636de46587aee28805888f88f8fd30f3","signature":"ebb0ed2e606edbd97c69024c6fb2c899f63a26e20e444b78cdd73132e1a0ca06","impliedFormat":99},{"version":"d086e84318b16d517c21df1c0e818e0389fc288bfea53d5c9ba58c795cac1867","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"52547a58957799d44e5a1d8a7b2627d9a6be0bdf81b06763ef3579efd531f523","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"12656f2cf5a3c9596595232da20f58082161103ac09f6a3ce7de86130bd07b5f","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"bdcdb9c30b8ad107b5171ead82175859cb7abea62e232d759a1a81635206decc","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"eef6069bb688f1bd49f69238a141183853f7d0051b16ca70ad1c0b1dee601452","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"bd857eaa3aaae43ded2b9f86df6b1e0a6c906e1115b4cc6e9abdf2c599afe676","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"c0a456eb21680eca96d5e836e2a5cc74730a2c0e03f18eb17a7f652b30c993e4","impliedFormat":1},{"version":"316d13742983f0698714b9c9d0d1a3de6d79cdab24e3b732f910f88eb9df01c1","impliedFormat":1},{"version":"70e2bd933c87f16fad94c2cd0392c73e92f08451abf1fe56d5a9780552321d67","signature":"7d3137555fe2f8da1fe077d58cce9f8e1f9bef7a78c3e6dbe86bac0e27c69f62","impliedFormat":99},{"version":"1da2933d763ee824a1b645c5dd624260808739bf8b34b0695700c80d6df777b1","signature":"736c0107791709d49991dc58146b6c1f87147eefce420cdbdfa6fb8939569e47","impliedFormat":99},{"version":"b66d2e88daac364adff28f8785e14c9afe812d92b19471c420223a0073eea27c","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"831001a245490e1538ddb5ae33ffcf8be05bb77abbcf4701c93694fb2e6f18ec","signature":"0d504e37ff56acc7ca34aadead6dc21e35b9960c38be27738a68fb731a6375cf","impliedFormat":99},{"version":"0ca43656e266ea9a54371e030353dfdc6cf6bc2e77cc7d7b81cf1161d6e1dba4","signature":"73e3660695f1f95fc8ab383fb2dce37070113d919ab7a46c5e3fbef4ab8ad141","impliedFormat":99},{"version":"b6333120902e3e9c5414a9bf3140cc3723ae384a454ca5b43c2d2dccae43b045","signature":"788fd471de2db75ab7ca33b984bfe23fe21050c0a44c96663ea480fc3bbeef41","impliedFormat":99},{"version":"9ae5a552049c2d064a4117b7f3294283aafcec480967aeb90e4944dbb6edcd65","signature":"0783d03fe0e744927298d2671b3ce3490abcd9896de02766940a606a602991c3","impliedFormat":99},{"version":"fab7ac6bba8690acae0fa852ebde4bddfea2de5eb710e9fedb5e572d3d2b88a8","signature":"73ebda1c41386f7597b0c30b33e7d758892db16c62f0123c203b3170940a1634","impliedFormat":99},{"version":"fb85ed98930154465f8c902692ea477f18c8892bc6a8d86fc9e4b3ff8d0cc0d7","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"e99801f8fdd04387fea6f73eb37ae9e7447226f3caed45dbe3128f55c22eec87","signature":"2dc206e233e0e5537afb478f788aede2620c08d7f85f0b89561be1243f6e2545","impliedFormat":99},{"version":"f819b74f2571645cab7074e176ca9fbd21c6b091ba7aa9d415c4a8e8e962edfc","signature":"24d590b9e56c28c3a9836bb8e1cf8667071b41b8bb0fac26e705222670b7f07a","impliedFormat":99},{"version":"905f2c61f55088929b51b9d083d36dbef07e41ef677ba8af6ff7a80fbfe6c51a","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"679bf5ccf904e497617ae7f16a8d743f9735e22cee4606dce3b46bd68fd69f6d","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"045cfecf0e99b1202ff9b59c8bb4f14dbe9b4e459df6119517bd4952c183c11a","signature":"a225e368309b34115188593cc653791d2a989c3d155852dea7eb8adafc7cffa8","impliedFormat":99},{"version":"ea971c6785d533bedf150c100ca2586bed41600b93d6c949721b5e33d0858e12","signature":"e0497122f4964168ba6a6bae7add138fb9d9292fe58c49b89870fc628bf9feb5","impliedFormat":99},{"version":"af0f5e0955e6f30edc39b2f893928e046b939fd8120917bef0cda2b2b0cfe3f5","impliedFormat":99},{"version":"ac65f04c2df0218cb8e54f012745cbfcc3c0e67c1f6b1e557d88842bbb72e2db","impliedFormat":1},{"version":"cc957354aa3c94c9961ebf46282cfde1e81d107fc5785a61f62c67f1dd3ac2eb","impliedFormat":1},{"version":"a2e86df4db576d80704e25293cec6f20fc6101a11f4747440e2eef58fb3c860c","impliedFormat":1},{"version":"93de1c6dab503f053efe8d304cb522bb3a89feab8c98f307a674a4fae04773e9","impliedFormat":1},{"version":"6704f0b54df85640baaeebd86c9d4a1dbb661d5a4d57a75bc84162f562f6531d","impliedFormat":1},{"version":"9d255af1b09c6697089d3c9bf438292a298d8b7a95c68793c9aae80afc9e5ca7","impliedFormat":1},{"version":"ba8691cf6bea9d53e6bf6cbc22af964a9633a21793981a1be3dce65e7a714d8b","impliedFormat":1},{"version":"a69c09dbea52352f479d3e7ac949fde3d17b195abe90b045d619f747b38d6d1a","impliedFormat":1},{"version":"bce910d9164785c9f0d4dcea4be359f5f92130c7c7833dea6138ab1db310a1f9","affectsGlobalScope":true,"impliedFormat":1},{"version":"7d2e3fea24c712c99c03ad8f556abedbfe105f87f1be10b95dbd409d24bc05a3","impliedFormat":1},{"version":"c7a976828c7acb8ada184935195aef0f389c4e37d87daa52eb4f2f3df3edcdea","affectsGlobalScope":true,"impliedFormat":1},{"version":"3719525a8f6ab731e3dfd585d9f87df55ec7d50d461df84f74eb4d68bb165244","impliedFormat":1},{"version":"f993522fd7d01ae1ead930091fe35130b8415720d6c2123dc2a7e8eb11bb3cba","impliedFormat":1},{"version":"d5135ad93b33adcce80b18f8065087934cdc1730d63db58562edcf017e1aad9b","affectsGlobalScope":true,"impliedFormat":1},{"version":"82408ed3e959ddc60d3e9904481b5a8dc16469928257af22a3f7d1a3bc7fd8c4","impliedFormat":1},{"version":"b787b5b54349a24f07d089b612a9fb8ff024dbbe991ff52ea2b188a6b1230644","impliedFormat":1},{"version":"bb9c4ffa5e6290c6980b63c815cdd1625876dadb2efaf77edbe82984be93e55e","impliedFormat":1},{"version":"1cdcfc1f624d6c08aa12c73935f6e13f095919cd99edf95752951796eb225729","impliedFormat":1},{"version":"4eaff3d8e10676fd7913d8c108890e71c688e1e7d52f6d1d55c39514f493dc47","impliedFormat":1},{"version":"14b5aa23c5d0ae1907bc696ac7b6915d88f7d85799cc0dc2dcf98fbce2c5a67c","impliedFormat":1},{"version":"5c439dafdc09abe4d6c260a96b822fa0ba5be7203c71a63ab1f1423cd9e838ea","impliedFormat":1},{"version":"6b526a5ec4a401ca7c26cfe6a48e641d8f30af76673bad3b06a1b4504594a960","affectsGlobalScope":true,"impliedFormat":1},{"version":"00dee7cdca8b8420c47ea4a31a34b8e8294013ebc4f463fd941e867e7bf05029","affectsGlobalScope":true,"impliedFormat":1},{"version":"7abd2623cdd8148233c0c6b9da0289e124f1718bc58dcb8da4262432e9ce0f0a","impliedFormat":1},{"version":"f4a3088770ba56a4c72e9907bc9798706ab1575097cd024503f57966df2d3d3a","impliedFormat":1},{"version":"7f138842074d0a40681775af008c8452093b68c383c94de31759e853c6d06b5c","impliedFormat":1},{"version":"a3d541d303ee505053f5dcbf9fafb65cac3d5631037501cd616195863a6c5740","impliedFormat":1},{"version":"8d3c583a07e0c37e876908c2d5da575019f689df8d9fa4c081d99119d53dba22","impliedFormat":1},{"version":"2c828a5405191d006115ab34e191b8474bc6c86ffdc401d1a9864b1b6e088a58","impliedFormat":1},{"version":"e630e5528e899219ae319e83bef54bf3bcb91b01d76861ecf881e8e614b167f0","affectsGlobalScope":true,"impliedFormat":1},{"version":"bcebb922784739bdb34c18ee51095d25a92b560c78ccd2eaacd6bd00f7443d83","impliedFormat":1},{"version":"7ee6ed878c4528215c82b664fe0cfe80e8b4da6c0d4cc80869367868774db8b1","impliedFormat":1},{"version":"b0973c3cbcdc59b37bf477731d468696ecaf442593ec51bab497a613a580fe30","impliedFormat":1},{"version":"4989e92ba5b69b182d2caaea6295af52b7dc73a4f7a2e336a676722884e7139d","affectsGlobalScope":true,"impliedFormat":1},{"version":"0715e4cd28ad471b2a93f3e552ff51a3ae423417a01a10aa1d3bc7c6b95059d6","affectsGlobalScope":true,"impliedFormat":1},{"version":"5153a2fd150e46ce57bb3f8db1318d33f6ad3261ed70ceeff92281c0608c74a3","impliedFormat":1},{"version":"210d54cd652ec0fec8c8916e4af59bb341065576ecda039842f9ffb2e908507c","impliedFormat":1},{"version":"36b03690b628eab08703d63f04eaa89c5df202e5f1edf3989f13ad389cd2c091","impliedFormat":1},{"version":"0effadd232a20498b11308058e334d3339cc5bf8c4c858393e38d9d4c0013dcf","impliedFormat":1},{"version":"25846d43937c672bab7e8195f3d881f93495df712ee901860effc109918938cc","impliedFormat":1},{"version":"4f3fdeba4e28e21aa719c081b8dc8f91d47e12e773389b9d35679c08151c9d37","impliedFormat":1},{"version":"1b952304137851e45bc009785de89ada562d9376177c97e37702e39e60c2f1ff","impliedFormat":1},{"version":"69ee23dd0d215b09907ad30d23f88b7790c93329d1faf31d7835552a10cf7cbf","impliedFormat":1},{"version":"44b8b584a338b190a59f4f6929d072431950c7bd92ec2694821c11bce180c8a5","impliedFormat":1},{"version":"23b89798789dffbd437c0c423f5d02d11f9736aea73d6abf16db4f812ff36eda","impliedFormat":1},{"version":"5629c03c44d1e07698c31d04318c9950d78940461269c0f692a42091cedea142","impliedFormat":1},{"version":"3c4ba1dd9b12ffa284b565063108f2f031d150ea15b8fafbdc17f5d2a07251f3","affectsGlobalScope":true,"impliedFormat":1},{"version":"e10177274a35a9d07c825615340b2fcde2f610f53f3fb40269fd196b4288dda6","impliedFormat":1},{"version":"1422cd9e705adcc09088fda85a900c2b70e3ad36ea85846f68bd1a884cdf4e2b","impliedFormat":1},{"version":"3c13ef48634e7b5012fcf7e8fce7496352c2d779a7201389ca96a2a81ee4314d","impliedFormat":1},{"version":"5d0a25ec910fa36595f85a67ac992d7a53dd4064a1ba6aea1c9f14ab73a023f2","impliedFormat":1},{"version":"c6b124041039647ff446e19ea0e90a7a83256593d64f23c66b4fda6e0c5b968e","affectsGlobalScope":true,"impliedFormat":1},{"version":"a9fc1469744055a3435f203123246b96c094e7ff8c4e1c3863829d9b705b7a34","affectsGlobalScope":true,"impliedFormat":1},{"version":"868831cab82b65dfe1d68180e898af1f2101e89ba9b754d1db6fb8cc2fac1921","impliedFormat":1},{"version":"0fe8985a28f82c450a04a6edf1279d7181c0893f37da7d2a27f8efd4fd5edb03","impliedFormat":1},{"version":"e59a892d87e72733e2a9ca21611b9beb52977be2696c7ba4b216cbbb9a48f5aa","impliedFormat":1},{"version":"52120bb7e4583612225bdf08e7c12559548170f11e660d33a33623bae9bbdbba","affectsGlobalScope":true,"impliedFormat":1},{"version":"8a300fa9b698845a1f9c41ecbe2c5966634582a8e2020d51abcace9b55aa959e","impliedFormat":1},{"version":"ab9b9a36e5284fd8d3bf2f7d5fcbc60052f25f27e4d20954782099282c60d23e","affectsGlobalScope":true,"impliedFormat":1},{"version":"a6dd3dba8e665ac43d279e0fdf5219edda0eed69b5e9a5061f46cd6a65c4f7a1","impliedFormat":1},{"version":"6d829824ead8999f87b6df21200df3c6150391b894b4e80662caa462bd48d073","impliedFormat":1},{"version":"afc559c1b93df37c25aef6b3dfa2d64325b0e112e887ee18bf7e6f4ec383fc90","impliedFormat":1},{"version":"d78e5898c8de5e0f934eee83f680262de005caa268d137101b833fd932f95e07","impliedFormat":1},{"version":"84e3bbd6f80983d468260fdbfeeb431cc81f7ea98d284d836e4d168e36875e86","impliedFormat":1},{"version":"aad5ffa61406b8e19524738fcf0e6fda8b3485bba98626268fdf252d1b2b630a","impliedFormat":1},{"version":"16d51f964ec125ad2024cf03f0af444b3bc3ec3614d9345cc54d09bab45c9a4c","impliedFormat":1},{"version":"ba601641fac98c229ccd4a303f747de376d761babb33229bb7153bed9356c9cc","impliedFormat":1},{"version":"352fc8497a30bc806d7defa0043d85802e5f35a7688731ee9a21456f5cb32a94","affectsGlobalScope":true,"impliedFormat":1},{"version":"9c230a07d657b3c65ad79e819b0c362a8ebcc0730f9a3d552a26ea632e2bfd53","impliedFormat":1},{"version":"3896464bb7e25fceebbd9c8a0b443caaa9b68ec323f46191c36b84293c852a19","impliedFormat":1},{"version":"64d4b35c5456adf258d2cf56c341e203a073253f229ef3208fc0d5020253b241","affectsGlobalScope":true,"impliedFormat":1},{"version":"bee89e1eb6425eb49894f3f25e4562dc2564e84e5aa7610b7e13d8ecddf8f5db","impliedFormat":1},{"version":"dca41e86e89dfb2e85e6935260250f02eb6683b86c2fa16bec729ddd1bcd9b4b","impliedFormat":1},{"version":"894e2eb01e3ac0dda3722dc520d804faa863fd6e2938c801e4c8561e7b0c8a40","impliedFormat":1},{"version":"e050a0afcdbb269720a900c85076d18e0c1ab73e580202a2bf6964978181222a","impliedFormat":1},{"version":"5b9ecf7da4d71cf3832dbb8336150fa924631811f488ad4690c2dfec2b4fb1d7","impliedFormat":1},{"version":"951c85f75aac041dddbedfedf565886a7b494e29ec1532e2a9b4a6180560b50e","impliedFormat":1},{"version":"e6f0cb9d8cb2e38bec66e032e73caa3e7c6671f21ed7196acb821aec462051f2","impliedFormat":1},{"version":"43cdd474c5aa3340da4816bb8f1ae7f3b1bcf9e70d997afc36a0f2c432378c84","impliedFormat":1},{"version":"bf88ef4208a770ca39a844b182b3695df536326ea566893fdc5b8418702a331e","impliedFormat":1},{"version":"ee65fe452abe1309389c5f50710f24114e08a302d40708101c4aa950a2a7d044","impliedFormat":1},{"version":"1d96568a72657f762763c920d3804868db48d638abd87ddcd82bcb200ef9625c","impliedFormat":1},{"version":"8b06ac3faeacb8484d84ddb44571d8f410697f98d7bfa86c0fda60373a9f5215","impliedFormat":1},{"version":"7eb06594824ada538b1d8b48c3925a83e7db792f47a081a62cf3e5c4e23cf0ee","impliedFormat":1},{"version":"f5638f7c2f12a9a1a57b5c41b3c1ea7db3876c003bab68e6a57afd6bcc169af0","impliedFormat":1},{"version":"6c1e688f95fcaf53b1e41c0fdadf2c1cfc96fa924eaf7f9fdb60f96deb0a4986","impliedFormat":1},{"version":"0d14fa22c41fdc7277e6f71473b20ebc07f40f00e38875142335d5b63cdfc9d2","impliedFormat":1},{"version":"db25694be959314fd1e868d72e567746db1db9e2001fae545d12d2a8c1bba1b8","impliedFormat":1},{"version":"43883cf3635bb1846cbdc6c363787b76227677388c74f7313e3f0edb380840fa","impliedFormat":1},{"version":"2d47012580f859dae201d2eef898a416bdae719dffc087dfd06aefe3de2f9c8d","impliedFormat":1},{"version":"3e70a7e67c2cb16f8cd49097360c0309fe9d1e3210ff9222e9dac1f8df9d4fb6","impliedFormat":1},{"version":"ab68d2a3e3e8767c3fba8f80de099a1cfc18c0de79e42cb02ae66e22dfe14a66","impliedFormat":1},{"version":"2cec1a31729b9b01e9294c33fc9425d336eff067282809761ad2e74425d6d2a5","impliedFormat":1},{"version":"240c702fb4b3bd54d83ee167d80fa7f0cd7300fef7eea0b32cef33129740893c","affectsGlobalScope":true,"impliedFormat":1},{"version":"d88a5e779faf033be3d52142a04fbe1cb96009868e3bbdd296b2bc6c59e06c0e","impliedFormat":1},{"version":"199f9ead0daf25ae4c5632e3d1f42570af59685294a38123eef457407e13f365","impliedFormat":1},{"version":"2b93035328f7778d200252681c1d86285d501ed424825a18f81e4c3028aa51d9","impliedFormat":1},{"version":"2ac9c8332c5f8510b8bdd571f8271e0f39b0577714d5e95c1e79a12b2616f069","impliedFormat":1},{"version":"42c21aa963e7b86fa00801d96e88b36803188018d5ad91db2a9101bccd40b3ff","impliedFormat":1},{"version":"d31eb848cdebb4c55b4893b335a7c0cca95ad66dee13cbb7d0893810c0a9c301","impliedFormat":1},{"version":"b9f96255e1048ed2ea33ec553122716f0e57fc1c3ad778e9aa15f5b46547bd23","impliedFormat":1},{"version":"7a9e0a564fee396cacf706523b5aeed96e04c6b871a8bebefad78499fbffc5bc","impliedFormat":1},{"version":"906c751ef5822ec0dadcea2f0e9db64a33fb4ee926cc9f7efa38afe5d5371b2a","impliedFormat":1},{"version":"5387c049e9702f2d2d7ece1a74836a14b47fbebe9bbeb19f94c580a37c855351","impliedFormat":1},{"version":"c68391fb9efad5d99ff332c65b1606248c4e4a9f1dd9a087204242b56c7126d6","impliedFormat":1},{"version":"e9cf02252d3a0ced987d24845dcb1f11c1be5541f17e5daa44c6de2d18138d0c","impliedFormat":1},{"version":"e8b02b879754d85f48489294f99147aeccc352c760d95a6fe2b6e49cd400b2fe","impliedFormat":1},{"version":"9f6908ab3d8a86c68b86e38578afc7095114e66b2fc36a2a96e9252aac3998e0","impliedFormat":1},{"version":"0eedb2344442b143ddcd788f87096961cd8572b64f10b4afc3356aa0460171c6","impliedFormat":1},{"version":"71405cc70f183d029cc5018375f6c35117ffdaf11846c35ebf85ee3956b1b2a6","impliedFormat":1},{"version":"c68baff4d8ba346130e9753cefe2e487a16731bf17e05fdacc81e8c9a26aae9d","impliedFormat":1},{"version":"2cd15528d8bb5d0453aa339b4b52e0696e8b07e790c153831c642c3dea5ac8af","impliedFormat":1},{"version":"479d622e66283ffa9883fbc33e441f7fc928b2277ff30aacbec7b7761b4e9579","impliedFormat":1},{"version":"ade307876dc5ca267ca308d09e737b611505e015c535863f22420a11fffc1c54","impliedFormat":1},{"version":"f8cdefa3e0dee639eccbe9794b46f90291e5fd3989fcba60d2f08fde56179fb9","impliedFormat":1},{"version":"86c5a62f99aac7053976e317dbe9acb2eaf903aaf3d2e5bb1cafe5c2df7b37a8","impliedFormat":1},{"version":"2b300954ce01a8343866f737656e13243e86e5baef51bd0631b21dcef1f6e954","impliedFormat":1},{"version":"a2d409a9ffd872d6b9d78ead00baa116bbc73cfa959fce9a2f29d3227876b2a1","impliedFormat":1},{"version":"b288936f560cd71f4a6002953290de9ff8dfbfbf37f5a9391be5c83322324898","impliedFormat":1},{"version":"61178a781ef82e0ff54f9430397e71e8f365fc1e3725e0e5346f2de7b0d50dfa","impliedFormat":1},{"version":"6a6ccb37feb3aad32d9be026a3337db195979cd5727a616fc0f557e974101a54","impliedFormat":1},{"version":"c649ea79205c029a02272ef55b7ab14ada0903db26144d2205021f24727ac7a3","impliedFormat":1},{"version":"38e2b02897c6357bbcff729ef84c736727b45cc152abe95a7567caccdfad2a1d","impliedFormat":1},{"version":"d6610ea7e0b1a7686dba062a1e5544dd7d34140f4545305b7c6afaebfb348341","impliedFormat":1},{"version":"3dee35db743bdba2c8d19aece7ac049bde6fa587e195d86547c882784e6ba34c","impliedFormat":1},{"version":"b15e55c5fa977c2f25ca0b1db52cfa2d1fd4bf0baf90a8b90d4a7678ca462ff1","impliedFormat":1},{"version":"f41d30972724714763a2698ae949fbc463afb203b5fa7c4ad7e4de0871129a17","impliedFormat":1},{"version":"843dd7b6a7c6269fd43827303f5cbe65c1fecabc30b4670a50d5a15d57daeeb9","impliedFormat":1},{"version":"f06d8b8567ee9fd799bf7f806efe93b67683ef24f4dea5b23ef12edff4434d9d","impliedFormat":1},{"version":"6017384f697ff38bc3ef6a546df5b230c3c31329db84cbfe686c83bec011e2b2","impliedFormat":1},{"version":"e1a5b30d9248549ca0c0bb1d653bafae20c64c4aa5928cc4cd3017b55c2177b0","impliedFormat":1},{"version":"a593632d5878f17295bd53e1c77f27bf4c15212822f764a2bfc1702f4b413fa0","impliedFormat":1},{"version":"a868a534ba1c2ca9060b8a13b0ffbbbf78b4be7b0ff80d8c75b02773f7192c29","impliedFormat":1},{"version":"da7545aba8f54a50fde23e2ede00158dc8112560d934cee58098dfb03aae9b9d","impliedFormat":1},{"version":"34baf65cfee92f110d6653322e2120c2d368ee64b3c7981dff08ed105c4f19b0","impliedFormat":1},{"version":"a1a261624efb3a00ff346b13580f70f3463b8cdcc58b60f5793ff11785d52cab","impliedFormat":1},{"version":"acebfe99678cf7cddcddc3435222cf132052b1226e902daac9fbb495c321a9b5","impliedFormat":1},{"version":"82b1f9a6eefef7386aebe22ac49f23b806421e82dbf35c6e5b7132d79e4165da","impliedFormat":1},{"version":"2887592574fcdfd087647c539dcb0fbe5af2521270dad4a37f9d17c16190d579","impliedFormat":1},{"version":"ce99fd4b37ce2dbf9adfc06c1722271c926adb408b1f6413763ae9253d922823","impliedFormat":1},{"version":"b0d10e46cfe3f6c476b69af02eaa38e4ccc7430221ce3109ae84bb9fb8282298","impliedFormat":1},{"version":"2dd1d4cea14cead7a7fc9eec8f40593089dff0de8c0199458446143c9b8c4ea9","impliedFormat":1},{"version":"70e9a18da08294f75bf23e46c7d69e67634c0765d355887b9b41f0d959e1426e","impliedFormat":1},{"version":"e9eb1b173aa166892f3eddab182e49cfe59aa2e14d33aedb6b49d175ed6a3750","impliedFormat":1}],"root":[63,[65,67],[72,95],[97,103],[106,121]],"options":{"allowSyntheticDefaultImports":true,"composite":true,"declaration":true,"declarationMap":true,"downlevelIteration":true,"esModuleInterop":true,"importHelpers":true,"inlineSourceMap":true,"module":199,"outDir":"./dest/browser","rootDir":"./src","strict":false,"target":7,"tsBuildInfoFile":"./.tsbuildinfo.browser"},"fileIdsList":[[122,174],[174],[174,209],[122,123,124,125,126,174],[122,124,174],[147,174,181,182],[138,174,181],[173,174,181,189],[147,174,181],[68,174],[174,193,195],[174,192,193,194],[144,147,174,181,186,187,188],[174,183,188,189,199],[145,174,181],[144,147,149,152,162,173,174,181],[174,204],[174,205],[174,211,214],[128,174],[131,174],[132,137,165,174],[133,144,145,152,162,173,174],[133,134,144,152,174],[135,174],[136,137,145,153,174],[137,162,170,174],[138,140,144,152,174],[139,174],[140,141,174],[144,174],[142,144,174],[144,145,146,162,173,174],[144,145,146,159,162,165,174],[174,178],[140,144,147,152,162,173,174],[144,145,147,148,152,162,170,173,174],[147,149,162,170,173,174],[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180],[144,150,174],[151,173,174],[140,144,152,162,174],[153,174],[154,174],[131,155,174],[156,172,174,178],[157,174],[158,174],[144,159,160,174],[159,161,174,176],[132,144,162,163,164,165,174],[132,162,164,174],[162,163,174],[165,174],[166,174],[144,168,169,174],[168,169,174],[137,152,162,170,174],[171,174],[152,172,174],[132,147,158,173,174],[137,174],[162,174,175],[174,176],[174,177],[132,137,144,146,155,162,173,174,176,178],[162,174,179],[174,218,257],[174,218,242,257],[174,257],[174,218],[174,218,243,257],[174,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256],[174,243,257],[145,162,174,181,185],[145,174,200],[147,174,181,198],[174,198],[174,197],[174,260],[144,147,149,162,170,173,174,179,181],[174,264],[104,174],[70,174],[174,207,213],[174,211],[174,208,212],[174,210],[61,174],[62,174],[62,92,93,94,174],[62,94,174],[62,81,85,92,174],[62,75,81,82,174],[62,75,81,174],[62,75,81,82,83,84,174],[62,75,174,178],[62,69,71,73,74,144,174,178],[62,69,71,75,174],[62,69,71,76,174],[62,75,174],[62,71,75,106,145,146,153,154,173,174,178],[62,105,174],[62,71,76,106,174,178],[62,111,113,174],[62,109,110,145,174],[62,109,110,112,145,174],[62,63,64,174],[62,65,174],[62,66,174],[62,145,146,154,173,174],[62,63,69,115,145,146,174],[62,67,69,92,94,174],[62,92,94,95,174],[62,76,85,93,174],[62,67,76,92,93,94,174],[62,69,80,95,96,145,174,179],[62,72,174],[62,137,174],[62,77,78,80,174],[62,77,174],[62,79,174],[62,89,174],[62,77,92,174],[62,73,81,87,174],[62,73,81,174],[62,79,86,88,90,91,174],[62,120,174],[62,81,174],[85,92],[75,81],[71],[75],[75,178],[105],[76,93],[77],[77,92],[81]],"referencedMap":[[124,1],[122,2],[207,2],[210,3],[209,2],[127,4],[123,1],[125,5],[126,1],[183,6],[184,7],[190,8],[182,9],[69,10],[191,2],[196,11],[192,2],[195,12],[193,2],[189,13],[200,14],[201,15],[202,2],[203,16],[204,2],[205,17],[206,18],[215,19],[194,2],[185,2],[68,2],[128,20],[129,20],[131,21],[132,22],[133,23],[134,24],[135,25],[136,26],[137,27],[138,28],[139,29],[140,30],[141,30],[143,31],[142,32],[144,31],[145,33],[146,34],[130,35],[180,2],[147,36],[148,37],[149,38],[181,39],[150,40],[151,41],[152,42],[153,43],[154,44],[155,45],[156,46],[157,47],[158,48],[159,49],[160,49],[161,50],[162,51],[164,52],[163,53],[165,54],[166,55],[167,2],[168,56],[169,57],[170,58],[171,59],[172,60],[173,61],[174,62],[175,63],[176,64],[177,65],[178,66],[179,67],[216,2],[188,2],[187,2],[217,2],[242,68],[243,69],[218,70],[221,70],[240,68],[241,68],[231,68],[230,71],[228,68],[223,68],[236,68],[234,68],[238,68],[222,68],[235,68],[239,68],[224,68],[225,68],[237,68],[219,68],[226,68],[227,68],[229,68],[233,68],[244,72],[232,68],[220,68],[257,73],[256,2],[251,72],[253,74],[252,72],[245,72],[246,72],[248,72],[250,72],[254,74],[255,74],[247,74],[249,74],[186,75],[258,76],[199,77],[197,78],[198,79],[259,9],[261,80],[262,2],[263,81],[264,2],[265,82],[208,2],[105,83],[104,2],[71,84],[70,2],[96,2],[214,85],[64,2],[212,86],[213,87],[211,88],[260,2],[62,89],[61,2],[59,2],[60,2],[12,2],[14,2],[13,2],[2,2],[15,2],[16,2],[17,2],[18,2],[19,2],[20,2],[21,2],[22,2],[3,2],[4,2],[26,2],[23,2],[24,2],[25,2],[27,2],[28,2],[29,2],[5,2],[30,2],[31,2],[32,2],[33,2],[6,2],[37,2],[34,2],[35,2],[36,2],[38,2],[7,2],[39,2],[44,2],[45,2],[40,2],[41,2],[42,2],[43,2],[8,2],[49,2],[46,2],[47,2],[48,2],[50,2],[9,2],[51,2],[52,2],[53,2],[56,2],[54,2],[55,2],[57,2],[10,2],[1,2],[11,2],[58,2],[82,90],[98,91],[99,92],[93,93],[100,91],[101,91],[83,94],[84,95],[85,96],[102,97],[75,98],[74,99],[103,100],[76,101],[107,102],[106,103],[108,104],[87,90],[109,90],[114,105],[110,90],[111,106],[112,90],[113,107],[65,108],[66,109],[67,110],[63,90],[115,111],[116,112],[117,113],[118,114],[94,115],[95,116],[97,117],[72,90],[73,118],[119,119],[77,90],[81,120],[78,121],[80,122],[90,123],[89,124],[88,125],[91,126],[92,127],[121,128],[120,124],[86,129],[79,90]],"exportedModulesMap":[[124,1],[122,2],[207,2],[210,3],[209,2],[127,4],[123,1],[125,5],[126,1],[183,6],[184,7],[190,8],[182,9],[69,10],[191,2],[196,11],[192,2],[195,12],[193,2],[189,13],[200,14],[201,15],[202,2],[203,16],[204,2],[205,17],[206,18],[215,19],[194,2],[185,2],[68,2],[128,20],[129,20],[131,21],[132,22],[133,23],[134,24],[135,25],[136,26],[137,27],[138,28],[139,29],[140,30],[141,30],[143,31],[142,32],[144,31],[145,33],[146,34],[130,35],[180,2],[147,36],[148,37],[149,38],[181,39],[150,40],[151,41],[152,42],[153,43],[154,44],[155,45],[156,46],[157,47],[158,48],[159,49],[160,49],[161,50],[162,51],[164,52],[163,53],[165,54],[166,55],[167,2],[168,56],[169,57],[170,58],[171,59],[172,60],[173,61],[174,62],[175,63],[176,64],[177,65],[178,66],[179,67],[216,2],[188,2],[187,2],[217,2],[242,68],[243,69],[218,70],[221,70],[240,68],[241,68],[231,68],[230,71],[228,68],[223,68],[236,68],[234,68],[238,68],[222,68],[235,68],[239,68],[224,68],[225,68],[237,68],[219,68],[226,68],[227,68],[229,68],[233,68],[244,72],[232,68],[220,68],[257,73],[256,2],[251,72],[253,74],[252,72],[245,72],[246,72],[248,72],[250,72],[254,74],[255,74],[247,74],[249,74],[186,75],[258,76],[199,77],[197,78],[198,79],[259,9],[261,80],[262,2],[263,81],[264,2],[265,82],[208,2],[105,83],[104,2],[71,84],[70,2],[96,2],[214,85],[64,2],[212,86],[213,87],[211,88],[260,2],[62,89],[61,2],[59,2],[60,2],[12,2],[14,2],[13,2],[2,2],[15,2],[16,2],[17,2],[18,2],[19,2],[20,2],[21,2],[22,2],[3,2],[4,2],[26,2],[23,2],[24,2],[25,2],[27,2],[28,2],[29,2],[5,2],[30,2],[31,2],[32,2],[33,2],[6,2],[37,2],[34,2],[35,2],[36,2],[38,2],[7,2],[39,2],[44,2],[45,2],[40,2],[41,2],[42,2],[43,2],[8,2],[49,2],[46,2],[47,2],[48,2],[50,2],[9,2],[51,2],[52,2],[53,2],[56,2],[54,2],[55,2],[57,2],[10,2],[1,2],[11,2],[58,2],[93,130],[83,131],[84,131],[85,131],[75,132],[74,133],[76,101],[107,134],[106,135],[66,109],[67,110],[94,136],[95,116],[73,118],[81,120],[78,137],[90,123],[89,138],[88,139],[91,139],[92,127],[121,128],[120,138],[86,139]],"semanticDiagnosticsPerFile":[124,122,207,210,209,127,123,125,126,183,184,190,182,69,191,196,192,195,193,189,200,201,202,203,204,205,206,215,194,185,68,128,129,131,132,133,134,135,136,137,138,139,140,141,143,142,144,145,146,130,180,147,148,149,181,150,151,152,153,154,155,156,157,158,159,160,161,162,164,163,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,216,188,187,217,242,243,218,221,240,241,231,230,228,223,236,234,238,222,235,239,224,225,237,219,226,227,229,233,244,232,220,257,256,251,253,252,245,246,248,250,254,255,247,249,186,258,199,197,198,259,261,262,263,264,265,208,105,104,71,70,96,214,64,212,213,211,260,62,61,59,60,12,14,13,2,15,16,17,18,19,20,21,22,3,4,26,23,24,25,27,28,29,5,30,31,32,33,6,37,34,35,36,38,7,39,44,45,40,41,42,43,8,49,46,47,48,50,9,51,52,53,56,54,55,57,10,1,11,58,82,98,99,93,100,101,83,84,85,102,75,74,103,76,107,106,108,87,109,114,110,111,112,113,65,66,67,63,115,116,117,118,94,95,97,72,73,119,77,81,78,80,90,89,88,91,92,121,120,86,79],"latestChangedDtsFile":"./dest/browser/types/node/index.d.ts"},"version":"5.1.3"} \ No newline at end of file diff --git a/ts/.tsbuildinfo.node b/ts/.tsbuildinfo.node deleted file mode 100644 index 0ec0d93bc8..0000000000 --- a/ts/.tsbuildinfo.node +++ /dev/null @@ -1 +0,0 @@ -{"program":{"fileNames":["./node_modules/typescript/lib/lib.es5.d.ts","./node_modules/typescript/lib/lib.es2015.d.ts","./node_modules/typescript/lib/lib.es2016.d.ts","./node_modules/typescript/lib/lib.es2017.d.ts","./node_modules/typescript/lib/lib.es2018.d.ts","./node_modules/typescript/lib/lib.es2019.d.ts","./node_modules/typescript/lib/lib.es2020.d.ts","./node_modules/typescript/lib/lib.es2021.d.ts","./node_modules/typescript/lib/lib.es2022.d.ts","./node_modules/typescript/lib/lib.es2023.d.ts","./node_modules/typescript/lib/lib.esnext.d.ts","./node_modules/typescript/lib/lib.dom.d.ts","./node_modules/typescript/lib/lib.es2015.core.d.ts","./node_modules/typescript/lib/lib.es2015.collection.d.ts","./node_modules/typescript/lib/lib.es2015.generator.d.ts","./node_modules/typescript/lib/lib.es2015.iterable.d.ts","./node_modules/typescript/lib/lib.es2015.promise.d.ts","./node_modules/typescript/lib/lib.es2015.proxy.d.ts","./node_modules/typescript/lib/lib.es2015.reflect.d.ts","./node_modules/typescript/lib/lib.es2015.symbol.d.ts","./node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","./node_modules/typescript/lib/lib.es2016.array.include.d.ts","./node_modules/typescript/lib/lib.es2017.object.d.ts","./node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","./node_modules/typescript/lib/lib.es2017.string.d.ts","./node_modules/typescript/lib/lib.es2017.intl.d.ts","./node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","./node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","./node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","./node_modules/typescript/lib/lib.es2018.intl.d.ts","./node_modules/typescript/lib/lib.es2018.promise.d.ts","./node_modules/typescript/lib/lib.es2018.regexp.d.ts","./node_modules/typescript/lib/lib.es2019.array.d.ts","./node_modules/typescript/lib/lib.es2019.object.d.ts","./node_modules/typescript/lib/lib.es2019.string.d.ts","./node_modules/typescript/lib/lib.es2019.symbol.d.ts","./node_modules/typescript/lib/lib.es2019.intl.d.ts","./node_modules/typescript/lib/lib.es2020.bigint.d.ts","./node_modules/typescript/lib/lib.es2020.date.d.ts","./node_modules/typescript/lib/lib.es2020.promise.d.ts","./node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","./node_modules/typescript/lib/lib.es2020.string.d.ts","./node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","./node_modules/typescript/lib/lib.es2020.intl.d.ts","./node_modules/typescript/lib/lib.es2020.number.d.ts","./node_modules/typescript/lib/lib.es2021.promise.d.ts","./node_modules/typescript/lib/lib.es2021.string.d.ts","./node_modules/typescript/lib/lib.es2021.weakref.d.ts","./node_modules/typescript/lib/lib.es2021.intl.d.ts","./node_modules/typescript/lib/lib.es2022.array.d.ts","./node_modules/typescript/lib/lib.es2022.error.d.ts","./node_modules/typescript/lib/lib.es2022.intl.d.ts","./node_modules/typescript/lib/lib.es2022.object.d.ts","./node_modules/typescript/lib/lib.es2022.sharedmemory.d.ts","./node_modules/typescript/lib/lib.es2022.string.d.ts","./node_modules/typescript/lib/lib.es2022.regexp.d.ts","./node_modules/typescript/lib/lib.es2023.array.d.ts","./node_modules/typescript/lib/lib.esnext.intl.d.ts","./node_modules/typescript/lib/lib.decorators.d.ts","./node_modules/typescript/lib/lib.decorators.legacy.d.ts","./node_modules/tslib/tslib.d.ts","./node_modules/tslib/modules/index.d.ts","./src/crs/net_crs.ts","./src/crs/node/ignition_files_crs.ts","./node_modules/@types/ms/index.d.ts","./node_modules/@types/debug/index.d.ts","./src/crs/node/index.ts","./src/crs/index.ts","./node_modules/comlink/dist/umd/protocol.d.ts","./node_modules/comlink/dist/umd/comlink.d.ts","./src/random/node/index.ts","./src/random/index.ts","./node_modules/comlink/dist/esm/protocol.d.ts","./node_modules/comlink/dist/esm/node-adapter.d.ts","./src/barretenberg_wasm/node/node_endpoint.ts","./src/barretenberg_wasm/node/index.ts","./src/barretenberg_wasm/barretenberg_wasm.ts","./src/barretenberg_wasm/index.ts","./src/serialize/buffer_reader.ts","./src/serialize/output_type.ts","./src/types/raw_buffer.ts","./src/serialize/serialize.ts","./src/serialize/index.ts","./src/async_map/index.ts","./src/barretenberg_binder/heap_allocator.ts","./src/barretenberg_binder/heap_allocator_sync.ts","./src/barretenberg_binder/index.ts","./src/types/ptr.ts","./src/bigint-array/index.ts","./src/types/fields.ts","./src/types/node/point.ts","./src/types/node/index.ts","./src/types/fixed_size_buffer.ts","./src/types/index.ts","./src/barretenberg_api/index.ts","./src/factory/index.ts","./src/index.ts","./node_modules/commander/typings/index.d.ts","./src/main.ts","./src/barretenberg_api/blake2s.test.ts","./src/barretenberg_api/common.test.ts","./src/barretenberg_api/pedersen.test.ts","./src/barretenberg_api/schnorr.test.ts","./src/barretenberg_wasm/barretenberg_wasm.test.ts","./src/barretenberg_wasm/browser/index.ts","./src/barretenberg_wasm/browser/worker.ts","./src/barretenberg_wasm/node/worker.ts","./src/bindgen/function_declaration.ts","./src/bindgen/mappings.ts","./src/bindgen/rust.ts","./src/bindgen/to_camel_case.ts","./src/bindgen/typescript.ts","./src/bindgen/index.ts","./node_modules/idb-keyval/dist/index.d.ts","./src/crs/browser/cached_net_crs.ts","./src/crs/browser/index.ts","./src/examples/simple.rawtest.ts","./src/examples/simple.test.ts","./src/random/browser/index.ts","./src/types/browser/point.ts","./src/types/browser/index.ts","./node_modules/@babel/types/lib/index.d.ts","./node_modules/@types/babel__generator/index.d.ts","./node_modules/@babel/parser/typings/babel-parser.d.ts","./node_modules/@types/babel__template/index.d.ts","./node_modules/@types/babel__traverse/index.d.ts","./node_modules/@types/babel__core/index.d.ts","./node_modules/@types/node/assert.d.ts","./node_modules/@types/node/assert/strict.d.ts","./node_modules/@types/node/globals.d.ts","./node_modules/@types/node/async_hooks.d.ts","./node_modules/@types/node/buffer.d.ts","./node_modules/@types/node/child_process.d.ts","./node_modules/@types/node/cluster.d.ts","./node_modules/@types/node/console.d.ts","./node_modules/@types/node/constants.d.ts","./node_modules/@types/node/crypto.d.ts","./node_modules/@types/node/dgram.d.ts","./node_modules/@types/node/diagnostics_channel.d.ts","./node_modules/@types/node/dns.d.ts","./node_modules/@types/node/dns/promises.d.ts","./node_modules/@types/node/domain.d.ts","./node_modules/@types/node/dom-events.d.ts","./node_modules/@types/node/events.d.ts","./node_modules/@types/node/fs.d.ts","./node_modules/@types/node/fs/promises.d.ts","./node_modules/@types/node/http.d.ts","./node_modules/@types/node/http2.d.ts","./node_modules/@types/node/https.d.ts","./node_modules/@types/node/inspector.d.ts","./node_modules/@types/node/module.d.ts","./node_modules/@types/node/net.d.ts","./node_modules/@types/node/os.d.ts","./node_modules/@types/node/path.d.ts","./node_modules/@types/node/perf_hooks.d.ts","./node_modules/@types/node/process.d.ts","./node_modules/@types/node/punycode.d.ts","./node_modules/@types/node/querystring.d.ts","./node_modules/@types/node/readline.d.ts","./node_modules/@types/node/readline/promises.d.ts","./node_modules/@types/node/repl.d.ts","./node_modules/@types/node/stream.d.ts","./node_modules/@types/node/stream/promises.d.ts","./node_modules/@types/node/stream/consumers.d.ts","./node_modules/@types/node/stream/web.d.ts","./node_modules/@types/node/string_decoder.d.ts","./node_modules/@types/node/test.d.ts","./node_modules/@types/node/timers.d.ts","./node_modules/@types/node/timers/promises.d.ts","./node_modules/@types/node/tls.d.ts","./node_modules/@types/node/trace_events.d.ts","./node_modules/@types/node/tty.d.ts","./node_modules/@types/node/url.d.ts","./node_modules/@types/node/util.d.ts","./node_modules/@types/node/v8.d.ts","./node_modules/@types/node/vm.d.ts","./node_modules/@types/node/wasi.d.ts","./node_modules/@types/node/worker_threads.d.ts","./node_modules/@types/node/zlib.d.ts","./node_modules/@types/node/globals.global.d.ts","./node_modules/@types/node/index.d.ts","./node_modules/@types/connect/index.d.ts","./node_modules/@types/body-parser/index.d.ts","./node_modules/@types/bonjour/index.d.ts","./node_modules/@types/mime/index.d.ts","./node_modules/@types/send/index.d.ts","./node_modules/@types/range-parser/index.d.ts","./node_modules/@types/qs/index.d.ts","./node_modules/@types/express-serve-static-core/index.d.ts","./node_modules/@types/connect-history-api-fallback/index.d.ts","./node_modules/@types/detect-node/index.d.ts","./node_modules/@types/eslint/helpers.d.ts","./node_modules/@types/estree/index.d.ts","./node_modules/@types/json-schema/index.d.ts","./node_modules/@types/eslint/index.d.ts","./node_modules/@types/eslint-scope/index.d.ts","./node_modules/@types/serve-static/node_modules/@types/mime/Mime.d.ts","./node_modules/@types/serve-static/node_modules/@types/mime/index.d.ts","./node_modules/@types/serve-static/index.d.ts","./node_modules/@types/express/index.d.ts","./node_modules/@types/graceful-fs/index.d.ts","./node_modules/@types/html-minifier-terser/index.d.ts","./node_modules/@types/http-proxy/index.d.ts","./node_modules/@types/istanbul-lib-coverage/index.d.ts","./node_modules/@types/istanbul-lib-report/index.d.ts","./node_modules/@types/istanbul-reports/index.d.ts","./node_modules/@jest/expect-utils/build/index.d.ts","./node_modules/chalk/index.d.ts","./node_modules/@sinclair/typebox/typebox.d.ts","./node_modules/@jest/schemas/build/index.d.ts","./node_modules/pretty-format/build/index.d.ts","./node_modules/jest-diff/build/index.d.ts","./node_modules/jest-matcher-utils/build/index.d.ts","./node_modules/expect/build/index.d.ts","./node_modules/@types/jest/index.d.ts","./node_modules/@types/prettier/index.d.ts","./node_modules/@types/retry/index.d.ts","./node_modules/@types/semver/classes/semver.d.ts","./node_modules/@types/semver/functions/parse.d.ts","./node_modules/@types/semver/functions/valid.d.ts","./node_modules/@types/semver/functions/clean.d.ts","./node_modules/@types/semver/functions/inc.d.ts","./node_modules/@types/semver/functions/diff.d.ts","./node_modules/@types/semver/functions/major.d.ts","./node_modules/@types/semver/functions/minor.d.ts","./node_modules/@types/semver/functions/patch.d.ts","./node_modules/@types/semver/functions/prerelease.d.ts","./node_modules/@types/semver/functions/compare.d.ts","./node_modules/@types/semver/functions/rcompare.d.ts","./node_modules/@types/semver/functions/compare-loose.d.ts","./node_modules/@types/semver/functions/compare-build.d.ts","./node_modules/@types/semver/functions/sort.d.ts","./node_modules/@types/semver/functions/rsort.d.ts","./node_modules/@types/semver/functions/gt.d.ts","./node_modules/@types/semver/functions/lt.d.ts","./node_modules/@types/semver/functions/eq.d.ts","./node_modules/@types/semver/functions/neq.d.ts","./node_modules/@types/semver/functions/gte.d.ts","./node_modules/@types/semver/functions/lte.d.ts","./node_modules/@types/semver/functions/cmp.d.ts","./node_modules/@types/semver/functions/coerce.d.ts","./node_modules/@types/semver/classes/comparator.d.ts","./node_modules/@types/semver/classes/range.d.ts","./node_modules/@types/semver/functions/satisfies.d.ts","./node_modules/@types/semver/ranges/max-satisfying.d.ts","./node_modules/@types/semver/ranges/min-satisfying.d.ts","./node_modules/@types/semver/ranges/to-comparators.d.ts","./node_modules/@types/semver/ranges/min-version.d.ts","./node_modules/@types/semver/ranges/valid.d.ts","./node_modules/@types/semver/ranges/outside.d.ts","./node_modules/@types/semver/ranges/gtr.d.ts","./node_modules/@types/semver/ranges/ltr.d.ts","./node_modules/@types/semver/ranges/intersects.d.ts","./node_modules/@types/semver/ranges/simplify.d.ts","./node_modules/@types/semver/ranges/subset.d.ts","./node_modules/@types/semver/internals/identifiers.d.ts","./node_modules/@types/semver/index.d.ts","./node_modules/@types/serve-index/index.d.ts","./node_modules/@types/sockjs/index.d.ts","./node_modules/source-map/source-map.d.ts","./node_modules/@types/source-map-support/index.d.ts","./node_modules/@types/stack-utils/index.d.ts","./node_modules/@types/ws/index.d.ts","./node_modules/@types/yargs-parser/index.d.ts","./node_modules/@types/yargs/index.d.ts"],"fileInfos":[{"version":"f59215c5f1d886b05395ee7aca73e0ac69ddfad2843aa88530e797879d511bad","affectsGlobalScope":true,"impliedFormat":1},{"version":"45b7ab580deca34ae9729e97c13cfd999df04416a79116c3bfb483804f85ded4","impliedFormat":1},{"version":"dc48272d7c333ccf58034c0026162576b7d50ea0e69c3b9292f803fc20720fd5","impliedFormat":1},{"version":"27147504487dc1159369da4f4da8a26406364624fa9bc3db632f7d94a5bae2c3","impliedFormat":1},{"version":"5e1c4c362065a6b95ff952c0eab010f04dcd2c3494e813b493ecfd4fcb9fc0d8","impliedFormat":1},{"version":"68d73b4a11549f9c0b7d352d10e91e5dca8faa3322bfb77b661839c42b1ddec7","impliedFormat":1},{"version":"5efce4fc3c29ea84e8928f97adec086e3dc876365e0982cc8479a07954a3efd4","impliedFormat":1},{"version":"feecb1be483ed332fad555aff858affd90a48ab19ba7272ee084704eb7167569","impliedFormat":1},{"version":"5514e54f17d6d74ecefedc73c504eadffdeda79c7ea205cf9febead32d45c4bc","impliedFormat":1},{"version":"f4e736d6c8d69ae5b3ab0ddfcaa3dc365c3e76909d6660af5b4e979b3934ac20","impliedFormat":1},{"version":"eeeb3aca31fbadef8b82502484499dfd1757204799a6f5b33116201c810676ec","impliedFormat":1},{"version":"3dda5344576193a4ae48b8d03f105c86f20b2f2aff0a1d1fd7935f5d68649654","affectsGlobalScope":true,"impliedFormat":1},{"version":"9d9885c728913c1d16e0d2831b40341d6ad9a0ceecaabc55209b306ad9c736a5","affectsGlobalScope":true,"impliedFormat":1},{"version":"17bea081b9c0541f39dd1ae9bc8c78bdd561879a682e60e2f25f688c0ecab248","affectsGlobalScope":true,"impliedFormat":1},{"version":"4443e68b35f3332f753eacc66a04ac1d2053b8b035a0e0ac1d455392b5e243b3","affectsGlobalScope":true,"impliedFormat":1},{"version":"ab22100fdd0d24cfc2cc59d0a00fc8cf449830d9c4030dc54390a46bd562e929","affectsGlobalScope":true,"impliedFormat":1},{"version":"f7bd636ae3a4623c503359ada74510c4005df5b36de7f23e1db8a5c543fd176b","affectsGlobalScope":true,"impliedFormat":1},{"version":"ce691fb9e5c64efb9547083e4a34091bcbe5bdb41027e310ebba8f7d96a98671","affectsGlobalScope":true,"impliedFormat":1},{"version":"8d697a2a929a5fcb38b7a65594020fcef05ec1630804a33748829c5ff53640d0","affectsGlobalScope":true,"impliedFormat":1},{"version":"0c20f4d2358eb679e4ae8a4432bdd96c857a2960fd6800b21ec4008ec59d60ea","affectsGlobalScope":true,"impliedFormat":1},{"version":"36ae84ccc0633f7c0787bc6108386c8b773e95d3b052d9464a99cd9b8795fbec","affectsGlobalScope":true,"impliedFormat":1},{"version":"82d0d8e269b9eeac02c3bd1c9e884e85d483fcb2cd168bccd6bc54df663da031","affectsGlobalScope":true,"impliedFormat":1},{"version":"b8deab98702588840be73d67f02412a2d45a417a3c097b2e96f7f3a42ac483d1","affectsGlobalScope":true,"impliedFormat":1},{"version":"4738f2420687fd85629c9efb470793bb753709c2379e5f85bc1815d875ceadcd","affectsGlobalScope":true,"impliedFormat":1},{"version":"2f11ff796926e0832f9ae148008138ad583bd181899ab7dd768a2666700b1893","affectsGlobalScope":true,"impliedFormat":1},{"version":"376d554d042fb409cb55b5cbaf0b2b4b7e669619493c5d18d5fa8bd67273f82a","affectsGlobalScope":true,"impliedFormat":1},{"version":"9fc46429fbe091ac5ad2608c657201eb68b6f1b8341bd6d670047d32ed0a88fa","affectsGlobalScope":true,"impliedFormat":1},{"version":"61c37c1de663cf4171e1192466e52c7a382afa58da01b1dc75058f032ddf0839","affectsGlobalScope":true,"impliedFormat":1},{"version":"c4138a3dd7cd6cf1f363ca0f905554e8d81b45844feea17786cdf1626cb8ea06","affectsGlobalScope":true,"impliedFormat":1},{"version":"6ff3e2452b055d8f0ec026511c6582b55d935675af67cdb67dd1dc671e8065df","affectsGlobalScope":true,"impliedFormat":1},{"version":"03de17b810f426a2f47396b0b99b53a82c1b60e9cba7a7edda47f9bb077882f4","affectsGlobalScope":true,"impliedFormat":1},{"version":"8184c6ddf48f0c98429326b428478ecc6143c27f79b79e85740f17e6feb090f1","affectsGlobalScope":true,"impliedFormat":1},{"version":"261c4d2cf86ac5a89ad3fb3fafed74cbb6f2f7c1d139b0540933df567d64a6ca","affectsGlobalScope":true,"impliedFormat":1},{"version":"6af1425e9973f4924fca986636ac19a0cf9909a7e0d9d3009c349e6244e957b6","affectsGlobalScope":true,"impliedFormat":1},{"version":"576711e016cf4f1804676043e6a0a5414252560eb57de9faceee34d79798c850","affectsGlobalScope":true,"impliedFormat":1},{"version":"89c1b1281ba7b8a96efc676b11b264de7a8374c5ea1e6617f11880a13fc56dc6","affectsGlobalScope":true,"impliedFormat":1},{"version":"15a630d6817718a2ddd7088c4f83e4673fde19fa992d2eae2cf51132a302a5d3","affectsGlobalScope":true,"impliedFormat":1},{"version":"f06948deb2a51aae25184561c9640fb66afeddb34531a9212d011792b1d19e0a","affectsGlobalScope":true,"impliedFormat":1},{"version":"01e0ee7e1f661acedb08b51f8a9b7d7f959e9cdb6441360f06522cc3aea1bf2e","affectsGlobalScope":true,"impliedFormat":1},{"version":"ac17a97f816d53d9dd79b0d235e1c0ed54a8cc6a0677e9a3d61efb480b2a3e4e","affectsGlobalScope":true,"impliedFormat":1},{"version":"bf14a426dbbf1022d11bd08d6b8e709a2e9d246f0c6c1032f3b2edb9a902adbe","affectsGlobalScope":true,"impliedFormat":1},{"version":"ec0104fee478075cb5171e5f4e3f23add8e02d845ae0165bfa3f1099241fa2aa","affectsGlobalScope":true,"impliedFormat":1},{"version":"2b72d528b2e2fe3c57889ca7baef5e13a56c957b946906d03767c642f386bbc3","affectsGlobalScope":true,"impliedFormat":1},{"version":"9cc66b0513ad41cb5f5372cca86ef83a0d37d1c1017580b7dace3ea5661836df","affectsGlobalScope":true,"impliedFormat":1},{"version":"368af93f74c9c932edd84c58883e736c9e3d53cec1fe24c0b0ff451f529ceab1","affectsGlobalScope":true,"impliedFormat":1},{"version":"709efdae0cb5df5f49376cde61daacc95cdd44ae4671da13a540da5088bf3f30","affectsGlobalScope":true,"impliedFormat":1},{"version":"995c005ab91a498455ea8dfb63aa9f83fa2ea793c3d8aa344be4a1678d06d399","affectsGlobalScope":true,"impliedFormat":1},{"version":"61ed9b6d07af959e745fb11f9593ecd743b279418cc8a99448ea3cd5f3b3eb22","affectsGlobalScope":true,"impliedFormat":1},{"version":"038a2f66a34ee7a9c2fbc3584c8ab43dff2995f8c68e3f566f4c300d2175e31e","affectsGlobalScope":true,"impliedFormat":1},{"version":"4fa6ed14e98aa80b91f61b9805c653ee82af3502dc21c9da5268d3857772ca05","affectsGlobalScope":true,"impliedFormat":1},{"version":"f5c92f2c27b06c1a41b88f6db8299205aee52c2a2943f7ed29bd585977f254e8","affectsGlobalScope":true,"impliedFormat":1},{"version":"930b0e15811f84e203d3c23508674d5ded88266df4b10abee7b31b2ac77632d2","affectsGlobalScope":true,"impliedFormat":1},{"version":"8444af78980e3b20b49324f4a16ba35024fef3ee069a0eb67616ea6ca821c47a","affectsGlobalScope":true,"impliedFormat":1},{"version":"b9ea5778ff8b50d7c04c9890170db34c26a5358cccba36844fe319f50a43a61a","affectsGlobalScope":true,"impliedFormat":1},{"version":"3287d9d085fbd618c3971944b65b4be57859f5415f495b33a6adc994edd2f004","affectsGlobalScope":true,"impliedFormat":1},{"version":"50d53ccd31f6667aff66e3d62adf948879a3a16f05d89882d1188084ee415bbc","affectsGlobalScope":true,"impliedFormat":1},{"version":"25de46552b782d43cb7284df22fe2a265de387cf0248b747a7a1b647d81861f6","affectsGlobalScope":true,"impliedFormat":1},{"version":"307c8b7ebbd7f23a92b73a4c6c0a697beca05b06b036c23a34553e5fe65e4fdc","affectsGlobalScope":true,"impliedFormat":1},{"version":"189c0703923150aa30673fa3de411346d727cc44a11c75d05d7cf9ef095daa22","affectsGlobalScope":true,"impliedFormat":1},{"version":"782dec38049b92d4e85c1585fbea5474a219c6984a35b004963b00beb1aab538","affectsGlobalScope":true,"impliedFormat":1},{"version":"f1c9fe42b65437a61104e601eb298c5c859fb522b483f1bdb700eed67a16f980","impliedFormat":1},{"version":"0734467ebd328b91af92eff2af9c97f6079bc4736c4992f8a5e47123680cf21b","impliedFormat":99},{"version":"54ef53ed24e29fa69ca2dbbdf232afe6409f34719c95922aa6b0500b6eea24ed","signature":"fce7d12a7270a73f059f4a568b0097d7704576b5ef95e026b1255df3c67f4bf2","impliedFormat":99},{"version":"e99801f8fdd04387fea6f73eb37ae9e7447226f3caed45dbe3128f55c22eec87","signature":"2dc206e233e0e5537afb478f788aede2620c08d7f85f0b89561be1243f6e2545","impliedFormat":99},{"version":"6a9c5127096b35264eb7cd21b2417bfc1d42cceca9ba4ce2bb0c3410b7816042","impliedFormat":1},{"version":"93b7325b49dfbf613d940ed0e471216657b2d77459dac34f1b5b1678f08f884c","impliedFormat":1},{"version":"f819b74f2571645cab7074e176ca9fbd21c6b091ba7aa9d415c4a8e8e962edfc","signature":"24d590b9e56c28c3a9836bb8e1cf8667071b41b8bb0fac26e705222670b7f07a","impliedFormat":99},{"version":"998c4553111d407c0d9f48041d1e4f3b1d3528f0ecb0020db31e9c2ad7a3fa12","impliedFormat":99},{"version":"c0a456eb21680eca96d5e836e2a5cc74730a2c0e03f18eb17a7f652b30c993e4","impliedFormat":1},{"version":"9426d1cc15328fcbb59adb88880ccfd79f2bc959334d485273da743aac083eaa","impliedFormat":1},{"version":"045cfecf0e99b1202ff9b59c8bb4f14dbe9b4e459df6119517bd4952c183c11a","signature":"a225e368309b34115188593cc653791d2a989c3d155852dea7eb8adafc7cffa8","impliedFormat":99},{"version":"3ccadcb9bd4b1879b9a20c62d5069badb616823e9cf6f977abfb92fcae3e5e2c","impliedFormat":99},{"version":"c0a456eb21680eca96d5e836e2a5cc74730a2c0e03f18eb17a7f652b30c993e4","impliedFormat":1},{"version":"316d13742983f0698714b9c9d0d1a3de6d79cdab24e3b732f910f88eb9df01c1","impliedFormat":1},{"version":"70e2bd933c87f16fad94c2cd0392c73e92f08451abf1fe56d5a9780552321d67","signature":"7d3137555fe2f8da1fe077d58cce9f8e1f9bef7a78c3e6dbe86bac0e27c69f62","impliedFormat":99},{"version":"1da2933d763ee824a1b645c5dd624260808739bf8b34b0695700c80d6df777b1","signature":"736c0107791709d49991dc58146b6c1f87147eefce420cdbdfa6fb8939569e47","impliedFormat":99},{"version":"7711b75c075dcb28b4e837b5a43ef0051061bda8c62d84bb11e4c87b37b9e11f","signature":"b82c5cb6e53b30d8209f792d52542c3db6efdbcfdad2c9433fbc32fc6bc72043","impliedFormat":99},{"version":"49fa852bdd3a1d4542fc8c9cd85a467cc5586a98d6129de2cbaf574ba2a024c5","impliedFormat":99},{"version":"3698ed08bb485b7f978ac61466deb43fd6736cba1c0aefcf188854e15b119aa4","signature":"310103e8e0efd044334e5b5aa8ada787fa010fb38ac982b47fdbb24e931fbae5","impliedFormat":99},{"version":"56696d83ee1bf9af82d2ad284663677aac8171fdbf5223390aa0784d491caf85","signature":"686bbb1e2df2881893498bcc9d251b8a7d4b4ca0f1718f4cc091f4b0ae82d88e","impliedFormat":99},{"version":"9243bdf41fa069f91ced599db3af72f9ec1d7454de03906a280d04b4470af2d2","signature":"b85d91d3d26b95a3833d96c38c3e35fd30f9b6fbc7bd55b29e884bac178437d1","impliedFormat":99},{"version":"2ec936f5989089f15de3fbfad1f2f2842b0b6e6276bea4283872b23a37251a7d","signature":"c34990a8094f0a876461ab18980a5415477c9741a9fd3cc0f00c0ff1084cee61","impliedFormat":99},{"version":"31a3b2cd4cda44ef15cdbada4a78a49c0668c140104a22d0e4e4f1b995bca2f6","impliedFormat":99},{"version":"76b922387f8ddc0384d2b915b3715c64aea4e67df6c1d272bdedc867a10707b7","signature":"21f8c5dd8bcc7c44976954d1e4c2006095c37fa2fd16c1bf928ac329fb4cb52a","impliedFormat":99},{"version":"c62d74da17bc3bc50d13cf6445f647d0e04b0720e9e90b8de76b47f9302b59af","signature":"d4c2b6fe05f65ccf6a42711b1a9f1649970e2a4305ce5febc9834b382a8d87f0","impliedFormat":99},{"version":"9f2265033c4a94144d0bc511cdcf368980394e86bc3426da86f2c3a9215f69c1","signature":"61e2b2d5d16cf22811733a20e075c441fb34ba84f007e0cc072c5a3657bee52a","impliedFormat":99},{"version":"6165276e8aa979f080d9675fd1b5852040bcde681fb673e96294baf1f528bd88","signature":"e3d6acca5d37d2abcf27f71c864780a7f6d20189f35bc4bf6280267c5079fa57","impliedFormat":99},{"version":"4f3d5156dc1d6103ab8f9bae661d244c17c00ea0d0afe0cc80f03f33f3133ea6","signature":"38520572ecabb509abba228c1ed55caa2493dcc525c2db31642a02129a02de5c","impliedFormat":99},{"version":"e6e800212362230a3edf4fa4967d0bf7972da420ec0aec811d88982b492fc6d0","signature":"f6198c46a5788f370cce98b094d622047e592eedef23a18ab477aad458bc85ac","impliedFormat":99},{"version":"c9ebdfb52f07525e2317e46271218dc024b9939ca05f93577ef8c5892485857f","signature":"0cc62062a493830aa903636202dbb93364d3dc0266f7e0fe6abb7922c9aa8517","impliedFormat":99},{"version":"ea971c6785d533bedf150c100ca2586bed41600b93d6c949721b5e33d0858e12","signature":"e0497122f4964168ba6a6bae7add138fb9d9292fe58c49b89870fc628bf9feb5","impliedFormat":99},{"version":"af0f5e0955e6f30edc39b2f893928e046b939fd8120917bef0cda2b2b0cfe3f5","impliedFormat":99},{"version":"9abb9a1617d87760ee919776c6d6b75aa8f04135e91d302abe7e6f28d595c69b","signature":"5cb26573fe01920ae3a98b7ef0d6e8da7af406208bef6aa34d38a7d5fea42494","impliedFormat":99},{"version":"c9262a0ab059a722207c441e741fb44e8d0dae048edcaf9c36fc5599fdb311bd","impliedFormat":99},{"version":"ac6d7cd8a82d1cd671805a229bdec5b802baf8e01acb84ca1bc37909d52e7cdf","signature":"ab70d2035a823e618685ea73bb1c4062645ff8c579e6c79ee4eaa4ee39720a38","impliedFormat":99},{"version":"12623e0f26cbbc9e23a2acd9869996fce986b8818bcd1ed4e52b30e8789a01e7","signature":"042a6a95e4892131b242ffdcfe97cdc6142a9843695712638360d81d4120599b","impliedFormat":99},{"version":"846c9e49f2399db4cb63a7d91473f555fca00aad086009fb4289b1028f4a077c","impliedFormat":99},{"version":"fe3fd03f6dd87b469b770256897cd1f85e7a259c1a448d80237e47285be0bd2f","impliedFormat":1},{"version":"bdf6985c7fae0895cf149945de85ea88636de46587aee28805888f88f8fd30f3","signature":"ebb0ed2e606edbd97c69024c6fb2c899f63a26e20e444b78cdd73132e1a0ca06","impliedFormat":99},{"version":"d086e84318b16d517c21df1c0e818e0389fc288bfea53d5c9ba58c795cac1867","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"52547a58957799d44e5a1d8a7b2627d9a6be0bdf81b06763ef3579efd531f523","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"12656f2cf5a3c9596595232da20f58082161103ac09f6a3ce7de86130bd07b5f","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"bdcdb9c30b8ad107b5171ead82175859cb7abea62e232d759a1a81635206decc","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"eef6069bb688f1bd49f69238a141183853f7d0051b16ca70ad1c0b1dee601452","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"92f1666b3cf937d89a911ebecf3d8a842f84bd635aca5ed99432561e544a5d7f","signature":"2cc29293ba85b4b4629b1837e1f6cbc301c73a3523bc3f9d7887391413c0a7a1","impliedFormat":99},{"version":"bd857eaa3aaae43ded2b9f86df6b1e0a6c906e1115b4cc6e9abdf2c599afe676","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"b66d2e88daac364adff28f8785e14c9afe812d92b19471c420223a0073eea27c","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"831001a245490e1538ddb5ae33ffcf8be05bb77abbcf4701c93694fb2e6f18ec","signature":"0d504e37ff56acc7ca34aadead6dc21e35b9960c38be27738a68fb731a6375cf","impliedFormat":99},{"version":"0ca43656e266ea9a54371e030353dfdc6cf6bc2e77cc7d7b81cf1161d6e1dba4","signature":"73e3660695f1f95fc8ab383fb2dce37070113d919ab7a46c5e3fbef4ab8ad141","impliedFormat":99},{"version":"b6333120902e3e9c5414a9bf3140cc3723ae384a454ca5b43c2d2dccae43b045","signature":"788fd471de2db75ab7ca33b984bfe23fe21050c0a44c96663ea480fc3bbeef41","impliedFormat":99},{"version":"9ae5a552049c2d064a4117b7f3294283aafcec480967aeb90e4944dbb6edcd65","signature":"0783d03fe0e744927298d2671b3ce3490abcd9896de02766940a606a602991c3","impliedFormat":99},{"version":"fab7ac6bba8690acae0fa852ebde4bddfea2de5eb710e9fedb5e572d3d2b88a8","signature":"73ebda1c41386f7597b0c30b33e7d758892db16c62f0123c203b3170940a1634","impliedFormat":99},{"version":"fb85ed98930154465f8c902692ea477f18c8892bc6a8d86fc9e4b3ff8d0cc0d7","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"f08728a9b464da7a195ca5a197837c2384ab78979737105f97a63b2cade30fa7","impliedFormat":99},{"version":"d81c05cb919bfa33ff72778a5197fba166991a4b6e4f59afe66a1b298f31cc30","signature":"5297b9e028bc5a1b653afb0021ff28fe5902fa43ddb43bd6588af8b126ef1dbf","impliedFormat":99},{"version":"b60a66c8ee67213bd70bdf2c3f7dc3033879595e2002c3ec5cc4b30840422cdc","impliedFormat":99},{"version":"905f2c61f55088929b51b9d083d36dbef07e41ef677ba8af6ff7a80fbfe6c51a","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"679bf5ccf904e497617ae7f16a8d743f9735e22cee4606dce3b46bd68fd69f6d","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":99},{"version":"8a15b4b148c236900888f742a1bd43e42520cfc3289eeeefeb3fc11fc944224a","signature":"c5b39ac78a1fca4a0c1920910746120b4ebada220a1a736146ad2e3101075ba4","impliedFormat":99},{"version":"84f8beacd38616e6a61020b246d74eaa1f2ad6335c4c7fb545a7952c8f8d520f","signature":"1fd7f81918d3c8f5093b59152af9609a22d384f88e711936eb8e8fdc7818efc1","impliedFormat":99},{"version":"af0f5e0955e6f30edc39b2f893928e046b939fd8120917bef0cda2b2b0cfe3f5","impliedFormat":99},{"version":"ac65f04c2df0218cb8e54f012745cbfcc3c0e67c1f6b1e557d88842bbb72e2db","impliedFormat":1},{"version":"cc957354aa3c94c9961ebf46282cfde1e81d107fc5785a61f62c67f1dd3ac2eb","impliedFormat":1},{"version":"a2e86df4db576d80704e25293cec6f20fc6101a11f4747440e2eef58fb3c860c","impliedFormat":1},{"version":"93de1c6dab503f053efe8d304cb522bb3a89feab8c98f307a674a4fae04773e9","impliedFormat":1},{"version":"6704f0b54df85640baaeebd86c9d4a1dbb661d5a4d57a75bc84162f562f6531d","impliedFormat":1},{"version":"9d255af1b09c6697089d3c9bf438292a298d8b7a95c68793c9aae80afc9e5ca7","impliedFormat":1},{"version":"ba8691cf6bea9d53e6bf6cbc22af964a9633a21793981a1be3dce65e7a714d8b","impliedFormat":1},{"version":"a69c09dbea52352f479d3e7ac949fde3d17b195abe90b045d619f747b38d6d1a","impliedFormat":1},{"version":"bce910d9164785c9f0d4dcea4be359f5f92130c7c7833dea6138ab1db310a1f9","affectsGlobalScope":true,"impliedFormat":1},{"version":"7d2e3fea24c712c99c03ad8f556abedbfe105f87f1be10b95dbd409d24bc05a3","impliedFormat":1},{"version":"c7a976828c7acb8ada184935195aef0f389c4e37d87daa52eb4f2f3df3edcdea","affectsGlobalScope":true,"impliedFormat":1},{"version":"3719525a8f6ab731e3dfd585d9f87df55ec7d50d461df84f74eb4d68bb165244","impliedFormat":1},{"version":"f993522fd7d01ae1ead930091fe35130b8415720d6c2123dc2a7e8eb11bb3cba","impliedFormat":1},{"version":"d5135ad93b33adcce80b18f8065087934cdc1730d63db58562edcf017e1aad9b","affectsGlobalScope":true,"impliedFormat":1},{"version":"82408ed3e959ddc60d3e9904481b5a8dc16469928257af22a3f7d1a3bc7fd8c4","impliedFormat":1},{"version":"b787b5b54349a24f07d089b612a9fb8ff024dbbe991ff52ea2b188a6b1230644","impliedFormat":1},{"version":"bb9c4ffa5e6290c6980b63c815cdd1625876dadb2efaf77edbe82984be93e55e","impliedFormat":1},{"version":"1cdcfc1f624d6c08aa12c73935f6e13f095919cd99edf95752951796eb225729","impliedFormat":1},{"version":"4eaff3d8e10676fd7913d8c108890e71c688e1e7d52f6d1d55c39514f493dc47","impliedFormat":1},{"version":"14b5aa23c5d0ae1907bc696ac7b6915d88f7d85799cc0dc2dcf98fbce2c5a67c","impliedFormat":1},{"version":"5c439dafdc09abe4d6c260a96b822fa0ba5be7203c71a63ab1f1423cd9e838ea","impliedFormat":1},{"version":"6b526a5ec4a401ca7c26cfe6a48e641d8f30af76673bad3b06a1b4504594a960","affectsGlobalScope":true,"impliedFormat":1},{"version":"00dee7cdca8b8420c47ea4a31a34b8e8294013ebc4f463fd941e867e7bf05029","affectsGlobalScope":true,"impliedFormat":1},{"version":"7abd2623cdd8148233c0c6b9da0289e124f1718bc58dcb8da4262432e9ce0f0a","impliedFormat":1},{"version":"f4a3088770ba56a4c72e9907bc9798706ab1575097cd024503f57966df2d3d3a","impliedFormat":1},{"version":"7f138842074d0a40681775af008c8452093b68c383c94de31759e853c6d06b5c","impliedFormat":1},{"version":"a3d541d303ee505053f5dcbf9fafb65cac3d5631037501cd616195863a6c5740","impliedFormat":1},{"version":"8d3c583a07e0c37e876908c2d5da575019f689df8d9fa4c081d99119d53dba22","impliedFormat":1},{"version":"2c828a5405191d006115ab34e191b8474bc6c86ffdc401d1a9864b1b6e088a58","impliedFormat":1},{"version":"e630e5528e899219ae319e83bef54bf3bcb91b01d76861ecf881e8e614b167f0","affectsGlobalScope":true,"impliedFormat":1},{"version":"bcebb922784739bdb34c18ee51095d25a92b560c78ccd2eaacd6bd00f7443d83","impliedFormat":1},{"version":"7ee6ed878c4528215c82b664fe0cfe80e8b4da6c0d4cc80869367868774db8b1","impliedFormat":1},{"version":"b0973c3cbcdc59b37bf477731d468696ecaf442593ec51bab497a613a580fe30","impliedFormat":1},{"version":"4989e92ba5b69b182d2caaea6295af52b7dc73a4f7a2e336a676722884e7139d","affectsGlobalScope":true,"impliedFormat":1},{"version":"0715e4cd28ad471b2a93f3e552ff51a3ae423417a01a10aa1d3bc7c6b95059d6","affectsGlobalScope":true,"impliedFormat":1},{"version":"5153a2fd150e46ce57bb3f8db1318d33f6ad3261ed70ceeff92281c0608c74a3","impliedFormat":1},{"version":"210d54cd652ec0fec8c8916e4af59bb341065576ecda039842f9ffb2e908507c","impliedFormat":1},{"version":"36b03690b628eab08703d63f04eaa89c5df202e5f1edf3989f13ad389cd2c091","impliedFormat":1},{"version":"0effadd232a20498b11308058e334d3339cc5bf8c4c858393e38d9d4c0013dcf","impliedFormat":1},{"version":"25846d43937c672bab7e8195f3d881f93495df712ee901860effc109918938cc","impliedFormat":1},{"version":"4f3fdeba4e28e21aa719c081b8dc8f91d47e12e773389b9d35679c08151c9d37","impliedFormat":1},{"version":"1b952304137851e45bc009785de89ada562d9376177c97e37702e39e60c2f1ff","impliedFormat":1},{"version":"69ee23dd0d215b09907ad30d23f88b7790c93329d1faf31d7835552a10cf7cbf","impliedFormat":1},{"version":"44b8b584a338b190a59f4f6929d072431950c7bd92ec2694821c11bce180c8a5","impliedFormat":1},{"version":"23b89798789dffbd437c0c423f5d02d11f9736aea73d6abf16db4f812ff36eda","impliedFormat":1},{"version":"5629c03c44d1e07698c31d04318c9950d78940461269c0f692a42091cedea142","impliedFormat":1},{"version":"3c4ba1dd9b12ffa284b565063108f2f031d150ea15b8fafbdc17f5d2a07251f3","affectsGlobalScope":true,"impliedFormat":1},{"version":"e10177274a35a9d07c825615340b2fcde2f610f53f3fb40269fd196b4288dda6","impliedFormat":1},{"version":"1422cd9e705adcc09088fda85a900c2b70e3ad36ea85846f68bd1a884cdf4e2b","impliedFormat":1},{"version":"3c13ef48634e7b5012fcf7e8fce7496352c2d779a7201389ca96a2a81ee4314d","impliedFormat":1},{"version":"5d0a25ec910fa36595f85a67ac992d7a53dd4064a1ba6aea1c9f14ab73a023f2","impliedFormat":1},{"version":"c6b124041039647ff446e19ea0e90a7a83256593d64f23c66b4fda6e0c5b968e","affectsGlobalScope":true,"impliedFormat":1},{"version":"a9fc1469744055a3435f203123246b96c094e7ff8c4e1c3863829d9b705b7a34","affectsGlobalScope":true,"impliedFormat":1},{"version":"868831cab82b65dfe1d68180e898af1f2101e89ba9b754d1db6fb8cc2fac1921","impliedFormat":1},{"version":"0fe8985a28f82c450a04a6edf1279d7181c0893f37da7d2a27f8efd4fd5edb03","impliedFormat":1},{"version":"e59a892d87e72733e2a9ca21611b9beb52977be2696c7ba4b216cbbb9a48f5aa","impliedFormat":1},{"version":"52120bb7e4583612225bdf08e7c12559548170f11e660d33a33623bae9bbdbba","affectsGlobalScope":true,"impliedFormat":1},{"version":"8a300fa9b698845a1f9c41ecbe2c5966634582a8e2020d51abcace9b55aa959e","impliedFormat":1},{"version":"ab9b9a36e5284fd8d3bf2f7d5fcbc60052f25f27e4d20954782099282c60d23e","affectsGlobalScope":true,"impliedFormat":1},{"version":"a6dd3dba8e665ac43d279e0fdf5219edda0eed69b5e9a5061f46cd6a65c4f7a1","impliedFormat":1},{"version":"6d829824ead8999f87b6df21200df3c6150391b894b4e80662caa462bd48d073","impliedFormat":1},{"version":"afc559c1b93df37c25aef6b3dfa2d64325b0e112e887ee18bf7e6f4ec383fc90","impliedFormat":1},{"version":"d78e5898c8de5e0f934eee83f680262de005caa268d137101b833fd932f95e07","impliedFormat":1},{"version":"84e3bbd6f80983d468260fdbfeeb431cc81f7ea98d284d836e4d168e36875e86","impliedFormat":1},{"version":"aad5ffa61406b8e19524738fcf0e6fda8b3485bba98626268fdf252d1b2b630a","impliedFormat":1},{"version":"16d51f964ec125ad2024cf03f0af444b3bc3ec3614d9345cc54d09bab45c9a4c","impliedFormat":1},{"version":"ba601641fac98c229ccd4a303f747de376d761babb33229bb7153bed9356c9cc","impliedFormat":1},{"version":"352fc8497a30bc806d7defa0043d85802e5f35a7688731ee9a21456f5cb32a94","affectsGlobalScope":true,"impliedFormat":1},{"version":"9c230a07d657b3c65ad79e819b0c362a8ebcc0730f9a3d552a26ea632e2bfd53","impliedFormat":1},{"version":"3896464bb7e25fceebbd9c8a0b443caaa9b68ec323f46191c36b84293c852a19","impliedFormat":1},{"version":"64d4b35c5456adf258d2cf56c341e203a073253f229ef3208fc0d5020253b241","affectsGlobalScope":true,"impliedFormat":1},{"version":"bee89e1eb6425eb49894f3f25e4562dc2564e84e5aa7610b7e13d8ecddf8f5db","impliedFormat":1},{"version":"dca41e86e89dfb2e85e6935260250f02eb6683b86c2fa16bec729ddd1bcd9b4b","impliedFormat":1},{"version":"894e2eb01e3ac0dda3722dc520d804faa863fd6e2938c801e4c8561e7b0c8a40","impliedFormat":1},{"version":"e050a0afcdbb269720a900c85076d18e0c1ab73e580202a2bf6964978181222a","impliedFormat":1},{"version":"5b9ecf7da4d71cf3832dbb8336150fa924631811f488ad4690c2dfec2b4fb1d7","impliedFormat":1},{"version":"951c85f75aac041dddbedfedf565886a7b494e29ec1532e2a9b4a6180560b50e","impliedFormat":1},{"version":"e6f0cb9d8cb2e38bec66e032e73caa3e7c6671f21ed7196acb821aec462051f2","impliedFormat":1},{"version":"43cdd474c5aa3340da4816bb8f1ae7f3b1bcf9e70d997afc36a0f2c432378c84","impliedFormat":1},{"version":"bf88ef4208a770ca39a844b182b3695df536326ea566893fdc5b8418702a331e","impliedFormat":1},{"version":"ee65fe452abe1309389c5f50710f24114e08a302d40708101c4aa950a2a7d044","impliedFormat":1},{"version":"1d96568a72657f762763c920d3804868db48d638abd87ddcd82bcb200ef9625c","impliedFormat":1},{"version":"8b06ac3faeacb8484d84ddb44571d8f410697f98d7bfa86c0fda60373a9f5215","impliedFormat":1},{"version":"7eb06594824ada538b1d8b48c3925a83e7db792f47a081a62cf3e5c4e23cf0ee","impliedFormat":1},{"version":"f5638f7c2f12a9a1a57b5c41b3c1ea7db3876c003bab68e6a57afd6bcc169af0","impliedFormat":1},{"version":"6c1e688f95fcaf53b1e41c0fdadf2c1cfc96fa924eaf7f9fdb60f96deb0a4986","impliedFormat":1},{"version":"0d14fa22c41fdc7277e6f71473b20ebc07f40f00e38875142335d5b63cdfc9d2","impliedFormat":1},{"version":"db25694be959314fd1e868d72e567746db1db9e2001fae545d12d2a8c1bba1b8","impliedFormat":1},{"version":"43883cf3635bb1846cbdc6c363787b76227677388c74f7313e3f0edb380840fa","impliedFormat":1},{"version":"2d47012580f859dae201d2eef898a416bdae719dffc087dfd06aefe3de2f9c8d","impliedFormat":1},{"version":"3e70a7e67c2cb16f8cd49097360c0309fe9d1e3210ff9222e9dac1f8df9d4fb6","impliedFormat":1},{"version":"ab68d2a3e3e8767c3fba8f80de099a1cfc18c0de79e42cb02ae66e22dfe14a66","impliedFormat":1},{"version":"2cec1a31729b9b01e9294c33fc9425d336eff067282809761ad2e74425d6d2a5","impliedFormat":1},{"version":"240c702fb4b3bd54d83ee167d80fa7f0cd7300fef7eea0b32cef33129740893c","affectsGlobalScope":true,"impliedFormat":1},{"version":"d88a5e779faf033be3d52142a04fbe1cb96009868e3bbdd296b2bc6c59e06c0e","impliedFormat":1},{"version":"199f9ead0daf25ae4c5632e3d1f42570af59685294a38123eef457407e13f365","impliedFormat":1},{"version":"2b93035328f7778d200252681c1d86285d501ed424825a18f81e4c3028aa51d9","impliedFormat":1},{"version":"2ac9c8332c5f8510b8bdd571f8271e0f39b0577714d5e95c1e79a12b2616f069","impliedFormat":1},{"version":"42c21aa963e7b86fa00801d96e88b36803188018d5ad91db2a9101bccd40b3ff","impliedFormat":1},{"version":"d31eb848cdebb4c55b4893b335a7c0cca95ad66dee13cbb7d0893810c0a9c301","impliedFormat":1},{"version":"b9f96255e1048ed2ea33ec553122716f0e57fc1c3ad778e9aa15f5b46547bd23","impliedFormat":1},{"version":"7a9e0a564fee396cacf706523b5aeed96e04c6b871a8bebefad78499fbffc5bc","impliedFormat":1},{"version":"906c751ef5822ec0dadcea2f0e9db64a33fb4ee926cc9f7efa38afe5d5371b2a","impliedFormat":1},{"version":"5387c049e9702f2d2d7ece1a74836a14b47fbebe9bbeb19f94c580a37c855351","impliedFormat":1},{"version":"c68391fb9efad5d99ff332c65b1606248c4e4a9f1dd9a087204242b56c7126d6","impliedFormat":1},{"version":"e9cf02252d3a0ced987d24845dcb1f11c1be5541f17e5daa44c6de2d18138d0c","impliedFormat":1},{"version":"e8b02b879754d85f48489294f99147aeccc352c760d95a6fe2b6e49cd400b2fe","impliedFormat":1},{"version":"9f6908ab3d8a86c68b86e38578afc7095114e66b2fc36a2a96e9252aac3998e0","impliedFormat":1},{"version":"0eedb2344442b143ddcd788f87096961cd8572b64f10b4afc3356aa0460171c6","impliedFormat":1},{"version":"71405cc70f183d029cc5018375f6c35117ffdaf11846c35ebf85ee3956b1b2a6","impliedFormat":1},{"version":"c68baff4d8ba346130e9753cefe2e487a16731bf17e05fdacc81e8c9a26aae9d","impliedFormat":1},{"version":"2cd15528d8bb5d0453aa339b4b52e0696e8b07e790c153831c642c3dea5ac8af","impliedFormat":1},{"version":"479d622e66283ffa9883fbc33e441f7fc928b2277ff30aacbec7b7761b4e9579","impliedFormat":1},{"version":"ade307876dc5ca267ca308d09e737b611505e015c535863f22420a11fffc1c54","impliedFormat":1},{"version":"f8cdefa3e0dee639eccbe9794b46f90291e5fd3989fcba60d2f08fde56179fb9","impliedFormat":1},{"version":"86c5a62f99aac7053976e317dbe9acb2eaf903aaf3d2e5bb1cafe5c2df7b37a8","impliedFormat":1},{"version":"2b300954ce01a8343866f737656e13243e86e5baef51bd0631b21dcef1f6e954","impliedFormat":1},{"version":"a2d409a9ffd872d6b9d78ead00baa116bbc73cfa959fce9a2f29d3227876b2a1","impliedFormat":1},{"version":"b288936f560cd71f4a6002953290de9ff8dfbfbf37f5a9391be5c83322324898","impliedFormat":1},{"version":"61178a781ef82e0ff54f9430397e71e8f365fc1e3725e0e5346f2de7b0d50dfa","impliedFormat":1},{"version":"6a6ccb37feb3aad32d9be026a3337db195979cd5727a616fc0f557e974101a54","impliedFormat":1},{"version":"c649ea79205c029a02272ef55b7ab14ada0903db26144d2205021f24727ac7a3","impliedFormat":1},{"version":"38e2b02897c6357bbcff729ef84c736727b45cc152abe95a7567caccdfad2a1d","impliedFormat":1},{"version":"d6610ea7e0b1a7686dba062a1e5544dd7d34140f4545305b7c6afaebfb348341","impliedFormat":1},{"version":"3dee35db743bdba2c8d19aece7ac049bde6fa587e195d86547c882784e6ba34c","impliedFormat":1},{"version":"b15e55c5fa977c2f25ca0b1db52cfa2d1fd4bf0baf90a8b90d4a7678ca462ff1","impliedFormat":1},{"version":"f41d30972724714763a2698ae949fbc463afb203b5fa7c4ad7e4de0871129a17","impliedFormat":1},{"version":"843dd7b6a7c6269fd43827303f5cbe65c1fecabc30b4670a50d5a15d57daeeb9","impliedFormat":1},{"version":"f06d8b8567ee9fd799bf7f806efe93b67683ef24f4dea5b23ef12edff4434d9d","impliedFormat":1},{"version":"6017384f697ff38bc3ef6a546df5b230c3c31329db84cbfe686c83bec011e2b2","impliedFormat":1},{"version":"e1a5b30d9248549ca0c0bb1d653bafae20c64c4aa5928cc4cd3017b55c2177b0","impliedFormat":1},{"version":"a593632d5878f17295bd53e1c77f27bf4c15212822f764a2bfc1702f4b413fa0","impliedFormat":1},{"version":"a868a534ba1c2ca9060b8a13b0ffbbbf78b4be7b0ff80d8c75b02773f7192c29","impliedFormat":1},{"version":"da7545aba8f54a50fde23e2ede00158dc8112560d934cee58098dfb03aae9b9d","impliedFormat":1},{"version":"34baf65cfee92f110d6653322e2120c2d368ee64b3c7981dff08ed105c4f19b0","impliedFormat":1},{"version":"a1a261624efb3a00ff346b13580f70f3463b8cdcc58b60f5793ff11785d52cab","impliedFormat":1},{"version":"acebfe99678cf7cddcddc3435222cf132052b1226e902daac9fbb495c321a9b5","impliedFormat":1},{"version":"82b1f9a6eefef7386aebe22ac49f23b806421e82dbf35c6e5b7132d79e4165da","impliedFormat":1},{"version":"2887592574fcdfd087647c539dcb0fbe5af2521270dad4a37f9d17c16190d579","impliedFormat":1},{"version":"ce99fd4b37ce2dbf9adfc06c1722271c926adb408b1f6413763ae9253d922823","impliedFormat":1},{"version":"b0d10e46cfe3f6c476b69af02eaa38e4ccc7430221ce3109ae84bb9fb8282298","impliedFormat":1},{"version":"2dd1d4cea14cead7a7fc9eec8f40593089dff0de8c0199458446143c9b8c4ea9","impliedFormat":1},{"version":"70e9a18da08294f75bf23e46c7d69e67634c0765d355887b9b41f0d959e1426e","impliedFormat":1},{"version":"e9eb1b173aa166892f3eddab182e49cfe59aa2e14d33aedb6b49d175ed6a3750","impliedFormat":1}],"root":[63,64,67,68,71,72,[75,97],[99,113],[115,121]],"options":{"allowSyntheticDefaultImports":true,"composite":true,"declaration":true,"declarationMap":true,"downlevelIteration":true,"esModuleInterop":true,"importHelpers":true,"inlineSourceMap":true,"module":199,"outDir":"./dest/node","rootDir":"./src","strict":false,"target":7,"tsBuildInfoFile":"./.tsbuildinfo.node"},"fileIdsList":[[122,174],[174],[174,209],[122,123,124,125,126,174],[122,124,174],[147,174,181,182],[138,174,181],[173,174,181,189],[147,174,181],[65,174],[174,193,195],[174,192,193,194],[144,147,174,181,186,187,188],[174,183,188,189,199],[145,174,181],[144,147,149,152,162,173,174,181],[174,204],[174,205],[174,211,214],[128,174],[131,174],[132,137,165,174],[133,144,145,152,162,173,174],[133,134,144,152,174],[135,174],[136,137,145,153,174],[137,162,170,174],[138,140,144,152,174],[139,174],[140,141,174],[144,174],[142,144,174],[144,145,146,162,173,174],[144,145,146,159,162,165,174],[174,178],[140,144,147,152,162,173,174],[144,145,147,148,152,162,170,173,174],[147,149,162,170,173,174],[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180],[144,150,174],[151,173,174],[140,144,152,162,174],[153,174],[154,174],[131,155,174],[156,172,174,178],[157,174],[158,174],[144,159,160,174],[159,161,174,176],[132,144,162,163,164,165,174],[132,162,164,174],[162,163,174],[165,174],[166,174],[144,168,169,174],[168,169,174],[137,152,162,170,174],[171,174],[152,172,174],[132,147,158,173,174],[137,174],[162,174,175],[174,176],[174,177],[132,137,144,146,155,162,173,174,176,178],[162,174,179],[174,218,257],[174,218,242,257],[174,257],[174,218],[174,218,243,257],[174,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256],[174,243,257],[145,162,174,181,185],[145,174,200],[147,174,181,198],[174,198],[174,197],[174,260],[144,147,149,162,170,173,174,179,181],[174,264],[73,174],[69,174],[174,207,213],[174,211],[174,208,212],[174,210],[61,174],[62,174],[62,94,95,96,174],[62,96,174],[62,83,87,94,174],[62,77,83,84,174],[62,77,83,174],[62,77,83,84,85,86,174],[62,77,174,178],[62,66,70,72,76,144,174,178],[62,66,70,77,174],[62,66,70,78,174],[62,77,174],[62,70,75,77,145,146,153,154,173,174,178],[62,74,174],[62,70,75,78,174,178],[62,110,112,174],[62,108,109,145,174],[62,108,109,111,145,174],[62,63,114,174],[62,115,174],[62,67,174],[62,145,146,154,173,174],[62,63,64,66,145,146,174],[62,66,68,94,96,174],[62,94,96,97,174],[62,78,87,95,174],[62,68,78,94,95,96,174],[62,66,82,97,98,145,174,179],[62,71,174],[62,137,174],[62,79,80,82,174],[62,79,174],[62,81,174],[62,120,174],[62,79,94,174],[62,72,83,89,174],[62,72,83,174],[62,81,88,90,92,93,174],[62,91,174],[62,83,174],[87,94],[77,83],[70,178],[77],[77,178],[74],[78,95],[79],[79,94],[83]],"referencedMap":[[124,1],[122,2],[207,2],[210,3],[209,2],[127,4],[123,1],[125,5],[126,1],[183,6],[184,7],[190,8],[182,9],[66,10],[191,2],[196,11],[192,2],[195,12],[193,2],[189,13],[200,14],[201,15],[202,2],[203,16],[204,2],[205,17],[206,18],[215,19],[194,2],[185,2],[65,2],[128,20],[129,20],[131,21],[132,22],[133,23],[134,24],[135,25],[136,26],[137,27],[138,28],[139,29],[140,30],[141,30],[143,31],[142,32],[144,31],[145,33],[146,34],[130,35],[180,2],[147,36],[148,37],[149,38],[181,39],[150,40],[151,41],[152,42],[153,43],[154,44],[155,45],[156,46],[157,47],[158,48],[159,49],[160,49],[161,50],[162,51],[164,52],[163,53],[165,54],[166,55],[167,2],[168,56],[169,57],[170,58],[171,59],[172,60],[173,61],[174,62],[175,63],[176,64],[177,65],[178,66],[179,67],[216,2],[188,2],[187,2],[217,2],[242,68],[243,69],[218,70],[221,70],[240,68],[241,68],[231,68],[230,71],[228,68],[223,68],[236,68],[234,68],[238,68],[222,68],[235,68],[239,68],[224,68],[225,68],[237,68],[219,68],[226,68],[227,68],[229,68],[233,68],[244,72],[232,68],[220,68],[257,73],[256,2],[251,72],[253,74],[252,72],[245,72],[246,72],[248,72],[250,72],[254,74],[255,74],[247,74],[249,74],[186,75],[258,76],[199,77],[197,78],[198,79],[259,9],[261,80],[262,2],[263,81],[264,2],[265,82],[208,2],[74,83],[73,2],[70,84],[69,2],[98,2],[214,85],[114,2],[212,86],[213,87],[211,88],[260,2],[62,89],[61,2],[59,2],[60,2],[12,2],[14,2],[13,2],[2,2],[15,2],[16,2],[17,2],[18,2],[19,2],[20,2],[21,2],[22,2],[3,2],[4,2],[26,2],[23,2],[24,2],[25,2],[27,2],[28,2],[29,2],[5,2],[30,2],[31,2],[32,2],[33,2],[6,2],[37,2],[34,2],[35,2],[36,2],[38,2],[7,2],[39,2],[44,2],[45,2],[40,2],[41,2],[42,2],[43,2],[8,2],[49,2],[46,2],[47,2],[48,2],[50,2],[9,2],[51,2],[52,2],[53,2],[56,2],[54,2],[55,2],[57,2],[10,2],[1,2],[11,2],[58,2],[84,90],[100,91],[101,92],[95,93],[102,91],[103,91],[85,94],[86,95],[87,96],[104,97],[77,98],[105,99],[106,100],[78,101],[76,102],[75,103],[107,104],[89,90],[108,90],[113,105],[109,90],[110,106],[111,90],[112,107],[115,108],[116,109],[68,110],[63,90],[64,111],[67,112],[117,113],[118,114],[96,115],[97,116],[99,117],[119,90],[72,118],[71,119],[79,90],[83,120],[80,121],[82,122],[121,123],[120,124],[90,125],[93,126],[94,127],[92,128],[91,124],[88,129],[81,90]],"exportedModulesMap":[[124,1],[122,2],[207,2],[210,3],[209,2],[127,4],[123,1],[125,5],[126,1],[183,6],[184,7],[190,8],[182,9],[66,10],[191,2],[196,11],[192,2],[195,12],[193,2],[189,13],[200,14],[201,15],[202,2],[203,16],[204,2],[205,17],[206,18],[215,19],[194,2],[185,2],[65,2],[128,20],[129,20],[131,21],[132,22],[133,23],[134,24],[135,25],[136,26],[137,27],[138,28],[139,29],[140,30],[141,30],[143,31],[142,32],[144,31],[145,33],[146,34],[130,35],[180,2],[147,36],[148,37],[149,38],[181,39],[150,40],[151,41],[152,42],[153,43],[154,44],[155,45],[156,46],[157,47],[158,48],[159,49],[160,49],[161,50],[162,51],[164,52],[163,53],[165,54],[166,55],[167,2],[168,56],[169,57],[170,58],[171,59],[172,60],[173,61],[174,62],[175,63],[176,64],[177,65],[178,66],[179,67],[216,2],[188,2],[187,2],[217,2],[242,68],[243,69],[218,70],[221,70],[240,68],[241,68],[231,68],[230,71],[228,68],[223,68],[236,68],[234,68],[238,68],[222,68],[235,68],[239,68],[224,68],[225,68],[237,68],[219,68],[226,68],[227,68],[229,68],[233,68],[244,72],[232,68],[220,68],[257,73],[256,2],[251,72],[253,74],[252,72],[245,72],[246,72],[248,72],[250,72],[254,74],[255,74],[247,74],[249,74],[186,75],[258,76],[199,77],[197,78],[198,79],[259,9],[261,80],[262,2],[263,81],[264,2],[265,82],[208,2],[74,83],[73,2],[70,84],[69,2],[98,2],[214,85],[114,2],[212,86],[213,87],[211,88],[260,2],[62,89],[61,2],[59,2],[60,2],[12,2],[14,2],[13,2],[2,2],[15,2],[16,2],[17,2],[18,2],[19,2],[20,2],[21,2],[22,2],[3,2],[4,2],[26,2],[23,2],[24,2],[25,2],[27,2],[28,2],[29,2],[5,2],[30,2],[31,2],[32,2],[33,2],[6,2],[37,2],[34,2],[35,2],[36,2],[38,2],[7,2],[39,2],[44,2],[45,2],[40,2],[41,2],[42,2],[43,2],[8,2],[49,2],[46,2],[47,2],[48,2],[50,2],[9,2],[51,2],[52,2],[53,2],[56,2],[54,2],[55,2],[57,2],[10,2],[1,2],[11,2],[58,2],[95,130],[85,131],[86,131],[87,131],[77,132],[105,133],[78,101],[76,134],[75,135],[116,109],[68,110],[96,136],[97,116],[72,118],[83,120],[80,137],[121,123],[120,138],[90,139],[93,139],[94,127],[92,128],[91,138],[88,139]],"semanticDiagnosticsPerFile":[124,122,207,210,209,127,123,125,126,183,184,190,182,66,191,196,192,195,193,189,200,201,202,203,204,205,206,215,194,185,65,128,129,131,132,133,134,135,136,137,138,139,140,141,143,142,144,145,146,130,180,147,148,149,181,150,151,152,153,154,155,156,157,158,159,160,161,162,164,163,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,216,188,187,217,242,243,218,221,240,241,231,230,228,223,236,234,238,222,235,239,224,225,237,219,226,227,229,233,244,232,220,257,256,251,253,252,245,246,248,250,254,255,247,249,186,258,199,197,198,259,261,262,263,264,265,208,74,73,70,69,98,214,114,212,213,211,260,62,61,59,60,12,14,13,2,15,16,17,18,19,20,21,22,3,4,26,23,24,25,27,28,29,5,30,31,32,33,6,37,34,35,36,38,7,39,44,45,40,41,42,43,8,49,46,47,48,50,9,51,52,53,56,54,55,57,10,1,11,58,84,100,101,95,102,103,85,86,87,104,77,105,106,78,76,75,107,89,108,113,109,110,111,112,115,116,68,63,64,67,117,118,96,97,99,119,72,71,79,83,80,82,121,120,90,93,94,92,91,88,81],"latestChangedDtsFile":"./dest/node/types/browser/index.d.ts"},"version":"5.1.3"} \ No newline at end of file From 18afd8a65979c9001afadac2c1f9a1bda3ddadbf Mon Sep 17 00:00:00 2001 From: jonybur Date: Wed, 12 Jul 2023 15:21:04 +0000 Subject: [PATCH 45/88] Remove unused deps --- ts/package.json | 9 +- ts/yarn.lock | 424 +----------------------------------------------- 2 files changed, 7 insertions(+), 426 deletions(-) diff --git a/ts/package.json b/ts/package.json index 35a95b5597..da29e2a20a 100644 --- a/ts/package.json +++ b/ts/package.json @@ -53,16 +53,9 @@ "dependencies": { "comlink": "^4.4.1", "commander": "^10.0.1", - "crypto-browserify": "^3.12.0", "debug": "^4.3.4", - "eventemitter3": "^5.0.1", - "fs": "^0.0.1-security", "idb-keyval": "^6.2.1", - "os-browserify": "^0.3.0", - "path-browserify": "^1.0.1", - "ts-node": "^10.9.1", - "tslib": "^2.4.0", - "url": "^0.11.1" + "ts-node": "^10.9.1" }, "devDependencies": { "@jest/globals": "^29.4.3", diff --git a/ts/yarn.lock b/ts/yarn.lock index cc628236a6..a83c2b3f42 100644 --- a/ts/yarn.lock +++ b/ts/yarn.lock @@ -31,17 +31,12 @@ __metadata: comlink: ^4.4.1 commander: ^10.0.1 copy-webpack-plugin: ^11.0.0 - crypto-browserify: ^3.12.0 debug: ^4.3.4 eslint: ^8.35.0 eslint-config-prettier: ^8.8.0 - eventemitter3: ^5.0.1 - fs: ^0.0.1-security html-webpack-plugin: ^5.5.1 idb-keyval: ^6.2.1 jest: ^29.5.0 - os-browserify: ^0.3.0 - path-browserify: ^1.0.1 prettier: ^2.8.4 replace-in-file: ^7.0.1 resolve-typescript-plugin: ^2.0.1 @@ -49,9 +44,7 @@ __metadata: ts-loader: ^9.4.2 ts-node: ^10.9.1 tsconfig-paths-webpack-plugin: ^4.0.1 - tslib: ^2.4.0 typescript: ^5.0.4 - url: ^0.11.1 webpack: ^5.82.1 webpack-cli: ^5.1.1 webpack-dev-server: ^4.15.0 @@ -1943,18 +1936,6 @@ __metadata: languageName: node linkType: hard -"asn1.js@npm:^5.2.0": - version: 5.4.1 - resolution: "asn1.js@npm:5.4.1" - dependencies: - bn.js: ^4.0.0 - inherits: ^2.0.1 - minimalistic-assert: ^1.0.0 - safer-buffer: ^2.1.0 - checksum: 3786a101ac6f304bd4e9a7df79549a7561950a13d4bcaec0c7790d44c80d147c1a94ba3d4e663673406064642a40b23fcd6c82a9952468e386c1a1376d747f9a - languageName: node - linkType: hard - "babel-jest@npm:^29.5.0": version: 29.5.0 resolution: "babel-jest@npm:29.5.0" @@ -2059,20 +2040,6 @@ __metadata: languageName: node linkType: hard -"bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.11.9": - version: 4.12.0 - resolution: "bn.js@npm:4.12.0" - checksum: 39afb4f15f4ea537b55eaf1446c896af28ac948fdcf47171961475724d1bb65118cca49fa6e3d67706e4790955ec0e74de584e45c8f1ef89f46c812bee5b5a12 - languageName: node - linkType: hard - -"bn.js@npm:^5.0.0, bn.js@npm:^5.1.1": - version: 5.2.1 - resolution: "bn.js@npm:5.2.1" - checksum: 3dd8c8d38055fedfa95c1d5fc3c99f8dd547b36287b37768db0abab3c239711f88ff58d18d155dd8ad902b0b0cee973747b7ae20ea12a09473272b0201c9edd3 - languageName: node - linkType: hard - "body-parser@npm:1.20.1": version: 1.20.1 resolution: "body-parser@npm:1.20.1" @@ -2140,77 +2107,6 @@ __metadata: languageName: node linkType: hard -"brorand@npm:^1.0.1, brorand@npm:^1.1.0": - version: 1.1.0 - resolution: "brorand@npm:1.1.0" - checksum: 8a05c9f3c4b46572dec6ef71012b1946db6cae8c7bb60ccd4b7dd5a84655db49fe043ecc6272e7ef1f69dc53d6730b9e2a3a03a8310509a3d797a618cbee52be - languageName: node - linkType: hard - -"browserify-aes@npm:^1.0.0, browserify-aes@npm:^1.0.4": - version: 1.2.0 - resolution: "browserify-aes@npm:1.2.0" - dependencies: - buffer-xor: ^1.0.3 - cipher-base: ^1.0.0 - create-hash: ^1.1.0 - evp_bytestokey: ^1.0.3 - inherits: ^2.0.1 - safe-buffer: ^5.0.1 - checksum: 4a17c3eb55a2aa61c934c286f34921933086bf6d67f02d4adb09fcc6f2fc93977b47d9d884c25619144fccd47b3b3a399e1ad8b3ff5a346be47270114bcf7104 - languageName: node - linkType: hard - -"browserify-cipher@npm:^1.0.0": - version: 1.0.1 - resolution: "browserify-cipher@npm:1.0.1" - dependencies: - browserify-aes: ^1.0.4 - browserify-des: ^1.0.0 - evp_bytestokey: ^1.0.0 - checksum: 2d8500acf1ee535e6bebe808f7a20e4c3a9e2ed1a6885fff1facbfd201ac013ef030422bec65ca9ece8ffe82b03ca580421463f9c45af6c8415fd629f4118c13 - languageName: node - linkType: hard - -"browserify-des@npm:^1.0.0": - version: 1.0.2 - resolution: "browserify-des@npm:1.0.2" - dependencies: - cipher-base: ^1.0.1 - des.js: ^1.0.0 - inherits: ^2.0.1 - safe-buffer: ^5.1.2 - checksum: b15a3e358a1d78a3b62ddc06c845d02afde6fc826dab23f1b9c016e643e7b1fda41de628d2110b712f6a44fb10cbc1800bc6872a03ddd363fb50768e010395b7 - languageName: node - linkType: hard - -"browserify-rsa@npm:^4.0.0, browserify-rsa@npm:^4.0.1": - version: 4.1.0 - resolution: "browserify-rsa@npm:4.1.0" - dependencies: - bn.js: ^5.0.0 - randombytes: ^2.0.1 - checksum: 155f0c135873efc85620571a33d884aa8810e40176125ad424ec9d85016ff105a07f6231650914a760cca66f29af0494087947b7be34880dd4599a0cd3c38e54 - languageName: node - linkType: hard - -"browserify-sign@npm:^4.0.0": - version: 4.2.1 - resolution: "browserify-sign@npm:4.2.1" - dependencies: - bn.js: ^5.1.1 - browserify-rsa: ^4.0.1 - create-hash: ^1.2.0 - create-hmac: ^1.1.7 - elliptic: ^6.5.3 - inherits: ^2.0.4 - parse-asn1: ^5.1.5 - readable-stream: ^3.6.0 - safe-buffer: ^5.2.0 - checksum: 0221f190e3f5b2d40183fa51621be7e838d9caa329fe1ba773406b7637855f37b30f5d83e52ff8f244ed12ffe6278dd9983638609ed88c841ce547e603855707 - languageName: node - linkType: hard - "browserslist@npm:^4.14.5, browserslist@npm:^4.21.3": version: 4.21.8 resolution: "browserslist@npm:4.21.8" @@ -2250,13 +2146,6 @@ __metadata: languageName: node linkType: hard -"buffer-xor@npm:^1.0.3": - version: 1.0.3 - resolution: "buffer-xor@npm:1.0.3" - checksum: 10c520df29d62fa6e785e2800e586a20fc4f6dfad84bcdbd12e1e8a83856de1cb75c7ebd7abe6d036bbfab738a6cf18a3ae9c8e5a2e2eb3167ca7399ce65373a - languageName: node - linkType: hard - "buffer@npm:^6.0.3": version: 6.0.3 resolution: "buffer@npm:6.0.3" @@ -2417,16 +2306,6 @@ __metadata: languageName: node linkType: hard -"cipher-base@npm:^1.0.0, cipher-base@npm:^1.0.1, cipher-base@npm:^1.0.3": - version: 1.0.4 - resolution: "cipher-base@npm:1.0.4" - dependencies: - inherits: ^2.0.1 - safe-buffer: ^5.0.1 - checksum: 47d3568dbc17431a339bad1fe7dff83ac0891be8206911ace3d3b818fc695f376df809bea406e759cdea07fff4b454fa25f1013e648851bec790c1d75763032e - languageName: node - linkType: hard - "cjs-module-lexer@npm:^1.0.0": version: 1.2.3 resolution: "cjs-module-lexer@npm:1.2.3" @@ -2674,43 +2553,6 @@ __metadata: languageName: node linkType: hard -"create-ecdh@npm:^4.0.0": - version: 4.0.4 - resolution: "create-ecdh@npm:4.0.4" - dependencies: - bn.js: ^4.1.0 - elliptic: ^6.5.3 - checksum: 0dd7fca9711d09e152375b79acf1e3f306d1a25ba87b8ff14c2fd8e68b83aafe0a7dd6c4e540c9ffbdd227a5fa1ad9b81eca1f233c38bb47770597ba247e614b - languageName: node - linkType: hard - -"create-hash@npm:^1.1.0, create-hash@npm:^1.1.2, create-hash@npm:^1.2.0": - version: 1.2.0 - resolution: "create-hash@npm:1.2.0" - dependencies: - cipher-base: ^1.0.1 - inherits: ^2.0.1 - md5.js: ^1.3.4 - ripemd160: ^2.0.1 - sha.js: ^2.4.0 - checksum: 02a6ae3bb9cd4afee3fabd846c1d8426a0e6b495560a977ba46120c473cb283be6aa1cace76b5f927cf4e499c6146fb798253e48e83d522feba807d6b722eaa9 - languageName: node - linkType: hard - -"create-hmac@npm:^1.1.0, create-hmac@npm:^1.1.4, create-hmac@npm:^1.1.7": - version: 1.1.7 - resolution: "create-hmac@npm:1.1.7" - dependencies: - cipher-base: ^1.0.3 - create-hash: ^1.1.0 - inherits: ^2.0.1 - ripemd160: ^2.0.0 - safe-buffer: ^5.0.1 - sha.js: ^2.4.8 - checksum: ba12bb2257b585a0396108c72830e85f882ab659c3320c83584b1037f8ab72415095167ced80dc4ce8e446a8ecc4b2acf36d87befe0707d73b26cf9dc77440ed - languageName: node - linkType: hard - "create-require@npm:^1.1.0": version: 1.1.1 resolution: "create-require@npm:1.1.1" @@ -2729,25 +2571,6 @@ __metadata: languageName: node linkType: hard -"crypto-browserify@npm:^3.12.0": - version: 3.12.0 - resolution: "crypto-browserify@npm:3.12.0" - dependencies: - browserify-cipher: ^1.0.0 - browserify-sign: ^4.0.0 - create-ecdh: ^4.0.0 - create-hash: ^1.1.0 - create-hmac: ^1.1.0 - diffie-hellman: ^5.0.0 - inherits: ^2.0.1 - pbkdf2: ^3.0.3 - public-encrypt: ^4.0.0 - randombytes: ^2.0.0 - randomfill: ^1.0.3 - checksum: c1609af82605474262f3eaa07daa0b2140026bd264ab316d4bf1170272570dbe02f0c49e29407fe0d3634f96c507c27a19a6765fb856fed854a625f9d15618e2 - languageName: node - linkType: hard - "css-select@npm:^4.1.3": version: 4.3.0 resolution: "css-select@npm:4.3.0" @@ -2847,16 +2670,6 @@ __metadata: languageName: node linkType: hard -"des.js@npm:^1.0.0": - version: 1.1.0 - resolution: "des.js@npm:1.1.0" - dependencies: - inherits: ^2.0.1 - minimalistic-assert: ^1.0.0 - checksum: 0e9c1584b70d31e20f20a613fc9ef60fbc6a147dfec9e448a168794a4b97ac04d8dc47ea008f1fa93b0f8aaf7c1ead632a5e59ce1913a6079d2d244c9f5ebe33 - languageName: node - linkType: hard - "destroy@npm:1.2.0": version: 1.2.0 resolution: "destroy@npm:1.2.0" @@ -2892,17 +2705,6 @@ __metadata: languageName: node linkType: hard -"diffie-hellman@npm:^5.0.0": - version: 5.0.3 - resolution: "diffie-hellman@npm:5.0.3" - dependencies: - bn.js: ^4.1.0 - miller-rabin: ^4.0.0 - randombytes: ^2.0.0 - checksum: 0e620f322170c41076e70181dd1c24e23b08b47dbb92a22a644f3b89b6d3834b0f8ee19e37916164e5eb1ee26d2aa836d6129f92723995267250a0b541811065 - languageName: node - linkType: hard - "dir-glob@npm:^3.0.1": version: 3.0.1 resolution: "dir-glob@npm:3.0.1" @@ -3015,21 +2817,6 @@ __metadata: languageName: node linkType: hard -"elliptic@npm:^6.5.3": - version: 6.5.4 - resolution: "elliptic@npm:6.5.4" - dependencies: - bn.js: ^4.11.9 - brorand: ^1.1.0 - hash.js: ^1.0.0 - hmac-drbg: ^1.0.1 - inherits: ^2.0.4 - minimalistic-assert: ^1.0.1 - minimalistic-crypto-utils: ^1.0.1 - checksum: d56d21fd04e97869f7ffcc92e18903b9f67f2d4637a23c860492fbbff5a3155fd9ca0184ce0c865dd6eb2487d234ce9551335c021c376cd2d3b7cb749c7d10f4 - languageName: node - linkType: hard - "emittery@npm:^0.13.1": version: 0.13.1 resolution: "emittery@npm:0.13.1" @@ -3319,13 +3106,6 @@ __metadata: languageName: node linkType: hard -"eventemitter3@npm:^5.0.1": - version: 5.0.1 - resolution: "eventemitter3@npm:5.0.1" - checksum: 543d6c858ab699303c3c32e0f0f47fc64d360bf73c3daf0ac0b5079710e340d6fe9f15487f94e66c629f5f82cd1a8678d692f3dbb6f6fcd1190e1b97fcad36f8 - languageName: node - linkType: hard - "events@npm:^3.2.0": version: 3.3.0 resolution: "events@npm:3.3.0" @@ -3333,17 +3113,6 @@ __metadata: languageName: node linkType: hard -"evp_bytestokey@npm:^1.0.0, evp_bytestokey@npm:^1.0.3": - version: 1.0.3 - resolution: "evp_bytestokey@npm:1.0.3" - dependencies: - md5.js: ^1.3.4 - node-gyp: latest - safe-buffer: ^5.1.1 - checksum: ad4e1577f1a6b721c7800dcc7c733fe01f6c310732bb5bf2240245c2a5b45a38518b91d8be2c610611623160b9d1c0e91f1ce96d639f8b53e8894625cf20fa45 - languageName: node - linkType: hard - "execa@npm:^5.0.0": version: 5.1.1 resolution: "execa@npm:5.1.1" @@ -3631,13 +3400,6 @@ __metadata: languageName: node linkType: hard -"fs@npm:^0.0.1-security": - version: 0.0.1-security - resolution: "fs@npm:0.0.1-security" - checksum: 53c6230e1faae9fa32c1df82c16a84b51b1243d20f3da2b64bd110bb472b73b9185169b703e008356e3cdc92d155088b617d9d39a63b5227a30b3621baad7f5d - languageName: node - linkType: hard - "fsevents@npm:^2.3.2, fsevents@npm:~2.3.2": version: 2.3.2 resolution: "fsevents@npm:2.3.2" @@ -3902,27 +3664,6 @@ __metadata: languageName: node linkType: hard -"hash-base@npm:^3.0.0": - version: 3.1.0 - resolution: "hash-base@npm:3.1.0" - dependencies: - inherits: ^2.0.4 - readable-stream: ^3.6.0 - safe-buffer: ^5.2.0 - checksum: 26b7e97ac3de13cb23fc3145e7e3450b0530274a9562144fc2bf5c1e2983afd0e09ed7cc3b20974ba66039fad316db463da80eb452e7373e780cbee9a0d2f2dc - languageName: node - linkType: hard - -"hash.js@npm:^1.0.0, hash.js@npm:^1.0.3": - version: 1.1.7 - resolution: "hash.js@npm:1.1.7" - dependencies: - inherits: ^2.0.3 - minimalistic-assert: ^1.0.1 - checksum: e350096e659c62422b85fa508e4b3669017311aa4c49b74f19f8e1bc7f3a54a584fdfd45326d4964d6011f2b2d882e38bea775a96046f2a61b7779a979629d8f - languageName: node - linkType: hard - "he@npm:^1.2.0": version: 1.2.0 resolution: "he@npm:1.2.0" @@ -3932,17 +3673,6 @@ __metadata: languageName: node linkType: hard -"hmac-drbg@npm:^1.0.1": - version: 1.0.1 - resolution: "hmac-drbg@npm:1.0.1" - dependencies: - hash.js: ^1.0.3 - minimalistic-assert: ^1.0.0 - minimalistic-crypto-utils: ^1.0.1 - checksum: bd30b6a68d7f22d63f10e1888aee497d7c2c5c0bb469e66bbdac99f143904d1dfe95f8131f95b3e86c86dd239963c9d972fcbe147e7cffa00e55d18585c43fe0 - languageName: node - linkType: hard - "hpack.js@npm:^2.1.6": version: 2.1.6 resolution: "hpack.js@npm:2.1.6" @@ -4210,7 +3940,7 @@ __metadata: languageName: node linkType: hard -"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.3": +"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:~2.0.3": version: 2.0.4 resolution: "inherits@npm:2.0.4" checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1 @@ -5167,17 +4897,6 @@ __metadata: languageName: node linkType: hard -"md5.js@npm:^1.3.4": - version: 1.3.5 - resolution: "md5.js@npm:1.3.5" - dependencies: - hash-base: ^3.0.0 - inherits: ^2.0.1 - safe-buffer: ^5.1.2 - checksum: 098494d885684bcc4f92294b18ba61b7bd353c23147fbc4688c75b45cb8590f5a95fd4584d742415dcc52487f7a1ef6ea611cfa1543b0dc4492fe026357f3f0c - languageName: node - linkType: hard - "media-typer@npm:0.3.0": version: 0.3.0 resolution: "media-typer@npm:0.3.0" @@ -5232,18 +4951,6 @@ __metadata: languageName: node linkType: hard -"miller-rabin@npm:^4.0.0": - version: 4.0.1 - resolution: "miller-rabin@npm:4.0.1" - dependencies: - bn.js: ^4.0.0 - brorand: ^1.0.1 - bin: - miller-rabin: bin/miller-rabin - checksum: 00cd1ab838ac49b03f236cc32a14d29d7d28637a53096bf5c6246a032a37749c9bd9ce7360cbf55b41b89b7d649824949ff12bc8eee29ac77c6b38eada619ece - languageName: node - linkType: hard - "mime-db@npm:1.52.0, mime-db@npm:>= 1.43.0 < 2": version: 1.52.0 resolution: "mime-db@npm:1.52.0" @@ -5276,20 +4983,13 @@ __metadata: languageName: node linkType: hard -"minimalistic-assert@npm:^1.0.0, minimalistic-assert@npm:^1.0.1": +"minimalistic-assert@npm:^1.0.0": version: 1.0.1 resolution: "minimalistic-assert@npm:1.0.1" checksum: cc7974a9268fbf130fb055aff76700d7e2d8be5f761fb5c60318d0ed010d839ab3661a533ad29a5d37653133385204c503bfac995aaa4236f4e847461ea32ba7 languageName: node linkType: hard -"minimalistic-crypto-utils@npm:^1.0.1": - version: 1.0.1 - resolution: "minimalistic-crypto-utils@npm:1.0.1" - checksum: 6e8a0422b30039406efd4c440829ea8f988845db02a3299f372fceba56ffa94994a9c0f2fd70c17f9969eedfbd72f34b5070ead9656a34d3f71c0bd72583a0ed - languageName: node - linkType: hard - "minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": version: 3.1.2 resolution: "minimatch@npm:3.1.2" @@ -5651,13 +5351,6 @@ __metadata: languageName: node linkType: hard -"os-browserify@npm:^0.3.0": - version: 0.3.0 - resolution: "os-browserify@npm:0.3.0" - checksum: 16e37ba3c0e6a4c63443c7b55799ce4066d59104143cb637ecb9fce586d5da319cdca786ba1c867abbe3890d2cbf37953f2d51eea85e20dd6c4570d6c54bfebf - languageName: node - linkType: hard - "p-limit@npm:^2.2.0": version: 2.3.0 resolution: "p-limit@npm:2.3.0" @@ -5739,19 +5432,6 @@ __metadata: languageName: node linkType: hard -"parse-asn1@npm:^5.0.0, parse-asn1@npm:^5.1.5": - version: 5.1.6 - resolution: "parse-asn1@npm:5.1.6" - dependencies: - asn1.js: ^5.2.0 - browserify-aes: ^1.0.0 - evp_bytestokey: ^1.0.0 - pbkdf2: ^3.0.3 - safe-buffer: ^5.1.1 - checksum: 9243311d1f88089bc9f2158972aa38d1abd5452f7b7cabf84954ed766048fe574d434d82c6f5a39b988683e96fb84cd933071dda38927e03469dc8c8d14463c7 - languageName: node - linkType: hard - "parse-json@npm:^5.2.0": version: 5.2.0 resolution: "parse-json@npm:5.2.0" @@ -5781,13 +5461,6 @@ __metadata: languageName: node linkType: hard -"path-browserify@npm:^1.0.1": - version: 1.0.1 - resolution: "path-browserify@npm:1.0.1" - checksum: c6d7fa376423fe35b95b2d67990060c3ee304fc815ff0a2dc1c6c3cfaff2bd0d572ee67e18f19d0ea3bbe32e8add2a05021132ac40509416459fffee35200699 - languageName: node - linkType: hard - "path-exists@npm:^4.0.0": version: 4.0.0 resolution: "path-exists@npm:4.0.0" @@ -5840,19 +5513,6 @@ __metadata: languageName: node linkType: hard -"pbkdf2@npm:^3.0.3": - version: 3.1.2 - resolution: "pbkdf2@npm:3.1.2" - dependencies: - create-hash: ^1.1.2 - create-hmac: ^1.1.4 - ripemd160: ^2.0.1 - safe-buffer: ^5.0.1 - sha.js: ^2.4.8 - checksum: 2c950a100b1da72123449208e231afc188d980177d021d7121e96a2de7f2abbc96ead2b87d03d8fe5c318face097f203270d7e27908af9f471c165a4e8e69c92 - languageName: node - linkType: hard - "picocolors@npm:^1.0.0": version: 1.0.0 resolution: "picocolors@npm:1.0.0" @@ -5957,27 +5617,6 @@ __metadata: languageName: node linkType: hard -"public-encrypt@npm:^4.0.0": - version: 4.0.3 - resolution: "public-encrypt@npm:4.0.3" - dependencies: - bn.js: ^4.1.0 - browserify-rsa: ^4.0.0 - create-hash: ^1.1.0 - parse-asn1: ^5.0.0 - randombytes: ^2.0.1 - safe-buffer: ^5.1.2 - checksum: 215d446e43cef021a20b67c1df455e5eea134af0b1f9b8a35f9e850abf32991b0c307327bc5b9bc07162c288d5cdb3d4a783ea6c6640979ed7b5017e3e0c9935 - languageName: node - linkType: hard - -"punycode@npm:^1.4.1": - version: 1.4.1 - resolution: "punycode@npm:1.4.1" - checksum: fa6e698cb53db45e4628559e557ddaf554103d2a96a1d62892c8f4032cd3bc8871796cae9eabc1bc700e2b6677611521ce5bb1d9a27700086039965d0cf34518 - languageName: node - linkType: hard - "punycode@npm:^2.1.0": version: 2.3.0 resolution: "punycode@npm:2.3.0" @@ -6001,15 +5640,6 @@ __metadata: languageName: node linkType: hard -"qs@npm:^6.11.0": - version: 6.11.2 - resolution: "qs@npm:6.11.2" - dependencies: - side-channel: ^1.0.4 - checksum: e812f3c590b2262548647d62f1637b6989cc56656dc960b893fe2098d96e1bd633f36576f4cd7564dfbff9db42e17775884db96d846bebe4f37420d073ecdc0b - languageName: node - linkType: hard - "queue-microtask@npm:^1.2.2": version: 1.2.3 resolution: "queue-microtask@npm:1.2.3" @@ -6017,7 +5647,7 @@ __metadata: languageName: node linkType: hard -"randombytes@npm:^2.0.0, randombytes@npm:^2.0.1, randombytes@npm:^2.0.5, randombytes@npm:^2.1.0": +"randombytes@npm:^2.1.0": version: 2.1.0 resolution: "randombytes@npm:2.1.0" dependencies: @@ -6026,16 +5656,6 @@ __metadata: languageName: node linkType: hard -"randomfill@npm:^1.0.3": - version: 1.0.4 - resolution: "randomfill@npm:1.0.4" - dependencies: - randombytes: ^2.0.5 - safe-buffer: ^5.1.0 - checksum: 33734bb578a868d29ee1b8555e21a36711db084065d94e019a6d03caa67debef8d6a1bfd06a2b597e32901ddc761ab483a85393f0d9a75838f1912461d4dbfc7 - languageName: node - linkType: hard - "range-parser@npm:^1.2.1, range-parser@npm:~1.2.1": version: 1.2.1 resolution: "range-parser@npm:1.2.1" @@ -6259,16 +5879,6 @@ __metadata: languageName: node linkType: hard -"ripemd160@npm:^2.0.0, ripemd160@npm:^2.0.1": - version: 2.0.2 - resolution: "ripemd160@npm:2.0.2" - dependencies: - hash-base: ^3.0.0 - inherits: ^2.0.1 - checksum: 006accc40578ee2beae382757c4ce2908a826b27e2b079efdcd2959ee544ddf210b7b5d7d5e80467807604244e7388427330f5c6d4cd61e6edaddc5773ccc393 - languageName: node - linkType: hard - "run-parallel@npm:^1.1.9": version: 1.2.0 resolution: "run-parallel@npm:1.2.0" @@ -6285,14 +5895,14 @@ __metadata: languageName: node linkType: hard -"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:~5.2.0": +"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.1.0, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491 languageName: node linkType: hard -"safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.1.0": +"safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0": version: 2.1.2 resolution: "safer-buffer@npm:2.1.2" checksum: cab8f25ae6f1434abee8d80023d7e72b598cf1327164ddab31003c51215526801e40b66c5e65d658a0af1e9d6478cadcb4c745f4bd6751f97d8644786c0978b0 @@ -6436,18 +6046,6 @@ __metadata: languageName: node linkType: hard -"sha.js@npm:^2.4.0, sha.js@npm:^2.4.8": - version: 2.4.11 - resolution: "sha.js@npm:2.4.11" - dependencies: - inherits: ^2.0.1 - safe-buffer: ^5.0.1 - bin: - sha.js: ./bin.js - checksum: ebd3f59d4b799000699097dadb831c8e3da3eb579144fd7eb7a19484cbcbb7aca3c68ba2bb362242eb09e33217de3b4ea56e4678184c334323eca24a58e3ad07 - languageName: node - linkType: hard - "shallow-clone@npm:^3.0.0": version: 3.0.1 resolution: "shallow-clone@npm:3.0.1" @@ -7022,7 +6620,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^2.0.3, tslib@npm:^2.4.0": +"tslib@npm:^2.0.3": version: 2.5.3 resolution: "tslib@npm:2.5.3" checksum: 88902b309afaf83259131c1e13da1dceb0ad1682a213143a1346a649143924d78cf3760c448b84d796938fd76127183894f8d85cbb3bf9c4fddbfcc140c0003c @@ -7148,16 +6746,6 @@ __metadata: languageName: node linkType: hard -"url@npm:^0.11.1": - version: 0.11.1 - resolution: "url@npm:0.11.1" - dependencies: - punycode: ^1.4.1 - qs: ^6.11.0 - checksum: a7de4b37bbcbe60ef199acda4ce437ef843c0ef3a4b34ec3e3d97e0446a5f50dc7bfeafbe33ad118cf4e5aa04805e1328f0d0126e254f2b77bb8498fa395c596 - languageName: node - linkType: hard - "util-deprecate@npm:^1.0.1, util-deprecate@npm:~1.0.1": version: 1.0.2 resolution: "util-deprecate@npm:1.0.2" From 89ab4f36668cd237919365fd282bf5929697331b Mon Sep 17 00:00:00 2001 From: jonybur Date: Mon, 17 Jul 2023 13:22:24 +0000 Subject: [PATCH 46/88] Set up nodemon in bb.js-dev --- ts/bb.js-dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/bb.js-dev b/ts/bb.js-dev index daddc96424..1f93688795 100755 --- a/ts/bb.js-dev +++ b/ts/bb.js-dev @@ -3,4 +3,4 @@ # Now you can run bb.js-dev anywhere to execute latest code, no 'yarn build' required. SCRIPT_PATH=$(dirname $(realpath $0)) export TS_NODE_PROJECT="$SCRIPT_PATH/tsconfig.node.json" -NODE_OPTIONS="--loader $SCRIPT_PATH/node_modules/ts-node/esm/transpile-only.mjs --no-warnings" node $SCRIPT_PATH/src/main.ts $@ +npx nodemon --ext '.ts' --watch 'src/**/*.ts' --exec "ts-node -r tsconfig-paths/register" $SCRIPT_PATH/src/main.ts $@ From 23cc31e5d784b3094246548bff08437c85e745e0 Mon Sep 17 00:00:00 2001 From: jonybur Date: Mon, 17 Jul 2023 23:03:09 +0000 Subject: [PATCH 47/88] Fix prettier issues --- ts/src/barretenberg_wasm/browser/index.ts | 8 ++++---- ts/src/barretenberg_wasm/node/index.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ts/src/barretenberg_wasm/browser/index.ts b/ts/src/barretenberg_wasm/browser/index.ts index d29e6fd29a..30d9c957f3 100644 --- a/ts/src/barretenberg_wasm/browser/index.ts +++ b/ts/src/barretenberg_wasm/browser/index.ts @@ -1,11 +1,11 @@ import { wrap } from 'comlink'; import { BarretenbergWasmWorker, type BarretenbergWasm } from '../barretenberg_wasm.js'; -import debug from "debug"; +import debug from 'debug'; export async function fetchCode(multithreading: boolean) { - const wasmModuleUrl = multithreading ? - new URL(`../../barretenberg-threads.wasm`, import.meta.url) : - new URL(`../../barretenberg.wasm`, import.meta.url); + const wasmModuleUrl = multithreading + ? new URL(`../../barretenberg-threads.wasm`, import.meta.url) + : new URL(`../../barretenberg.wasm`, import.meta.url); const res = await fetch(wasmModuleUrl.href); return await res.arrayBuffer(); } diff --git a/ts/src/barretenberg_wasm/node/index.ts b/ts/src/barretenberg_wasm/node/index.ts index d03ef376cf..63ae79c399 100644 --- a/ts/src/barretenberg_wasm/node/index.ts +++ b/ts/src/barretenberg_wasm/node/index.ts @@ -10,7 +10,7 @@ import { writeSync } from 'fs'; export async function fetchCode(multithreading: boolean) { const __dirname = dirname(fileURLToPath(import.meta.url)); - return await readFile(__dirname + `/../../${multithreading ? "barretenberg-threads.wasm" : "barretenberg.wasm"}`); + return await readFile(__dirname + `/../../${multithreading ? 'barretenberg-threads.wasm' : 'barretenberg.wasm'}`); } export function createWorker() { From e8aff77a7a83f32cf7f74ee4799de8cad99f2fad Mon Sep 17 00:00:00 2001 From: jonybur Date: Mon, 17 Jul 2023 23:17:33 +0000 Subject: [PATCH 48/88] Fix eslint --- ts/.eslintrc.cjs | 2 +- ts/tsconfig.browser.json | 4 +--- ts/tsconfig.node.json | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ts/.eslintrc.cjs b/ts/.eslintrc.cjs index 7a835b7900..bae5b5c4f2 100644 --- a/ts/.eslintrc.cjs +++ b/ts/.eslintrc.cjs @@ -36,7 +36,7 @@ module.exports = { { files: ['*.ts', '*.tsx'], parserOptions: { - project: true, + project: ['./ts/tsconfig.node.json', './ts/tsconfig.browser.json'], }, }, { diff --git a/ts/tsconfig.browser.json b/ts/tsconfig.browser.json index 0278c3ec4c..c6ea28ecfe 100644 --- a/ts/tsconfig.browser.json +++ b/ts/tsconfig.browser.json @@ -36,7 +36,5 @@ ] } }, - "include": [ - "src" - ] + "include": ["src/**/*"] } \ No newline at end of file diff --git a/ts/tsconfig.node.json b/ts/tsconfig.node.json index 729d9e85e8..b211c7c12d 100644 --- a/ts/tsconfig.node.json +++ b/ts/tsconfig.node.json @@ -36,7 +36,5 @@ ] } }, - "include": [ - "src" - ] + "include": ["src/**/*"] } \ No newline at end of file From 365e575a7e349b6199da35d3b622c7655660bd80 Mon Sep 17 00:00:00 2001 From: jonybur Date: Tue, 18 Jul 2023 14:13:15 +0000 Subject: [PATCH 49/88] Fix docker file --- ts/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/Dockerfile b/ts/Dockerfile index 9a4877deea..9a0829d4d3 100644 --- a/ts/Dockerfile +++ b/ts/Dockerfile @@ -10,5 +10,5 @@ COPY yarn.lock yarn.lock COPY .yarnrc.yml .yarnrc.yml RUN yarn --immutable COPY . . -RUN yarn formatting && yarn build:ts +RUN yarn formatting && yarn build:ts:browser && yarn build:ts:node CMD ["yarn", "test"] \ No newline at end of file From 752cfcb0d6512fe9597ed5750724f7f88e4c4e5e Mon Sep 17 00:00:00 2001 From: jonybur Date: Tue, 18 Jul 2023 14:23:54 +0000 Subject: [PATCH 50/88] Test fix --- ts/.eslintrc.cjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/.eslintrc.cjs b/ts/.eslintrc.cjs index bae5b5c4f2..2e5eebd599 100644 --- a/ts/.eslintrc.cjs +++ b/ts/.eslintrc.cjs @@ -36,7 +36,7 @@ module.exports = { { files: ['*.ts', '*.tsx'], parserOptions: { - project: ['./ts/tsconfig.node.json', './ts/tsconfig.browser.json'], + project: ['./tsconfig.node.json', './tsconfig.browser.json'], }, }, { From 8f28b8a5e9d10990ddb17fb89cd9c121d4bd0409 Mon Sep 17 00:00:00 2001 From: jonybur Date: Tue, 18 Jul 2023 14:28:11 +0000 Subject: [PATCH 51/88] Fix script path --- ts/.eslintrc.cjs | 2 +- ts/bb.js-dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ts/.eslintrc.cjs b/ts/.eslintrc.cjs index 2e5eebd599..bae5b5c4f2 100644 --- a/ts/.eslintrc.cjs +++ b/ts/.eslintrc.cjs @@ -36,7 +36,7 @@ module.exports = { { files: ['*.ts', '*.tsx'], parserOptions: { - project: ['./tsconfig.node.json', './tsconfig.browser.json'], + project: ['./ts/tsconfig.node.json', './ts/tsconfig.browser.json'], }, }, { diff --git a/ts/bb.js-dev b/ts/bb.js-dev index 1f93688795..09750a3d0d 100755 --- a/ts/bb.js-dev +++ b/ts/bb.js-dev @@ -2,5 +2,5 @@ # Add a symlink to this somewhere in your path. # Now you can run bb.js-dev anywhere to execute latest code, no 'yarn build' required. SCRIPT_PATH=$(dirname $(realpath $0)) -export TS_NODE_PROJECT="$SCRIPT_PATH/tsconfig.node.json" +export TS_NODE_PROJECT="tsconfig.node.json" npx nodemon --ext '.ts' --watch 'src/**/*.ts' --exec "ts-node -r tsconfig-paths/register" $SCRIPT_PATH/src/main.ts $@ From b0b964816b7bf4f391553594bc88185da7f6fda9 Mon Sep 17 00:00:00 2001 From: jonybur Date: Tue, 18 Jul 2023 14:30:57 +0000 Subject: [PATCH 52/88] Reinstantiate script path --- ts/bb.js-dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/bb.js-dev b/ts/bb.js-dev index 09750a3d0d..1f93688795 100755 --- a/ts/bb.js-dev +++ b/ts/bb.js-dev @@ -2,5 +2,5 @@ # Add a symlink to this somewhere in your path. # Now you can run bb.js-dev anywhere to execute latest code, no 'yarn build' required. SCRIPT_PATH=$(dirname $(realpath $0)) -export TS_NODE_PROJECT="tsconfig.node.json" +export TS_NODE_PROJECT="$SCRIPT_PATH/tsconfig.node.json" npx nodemon --ext '.ts' --watch 'src/**/*.ts' --exec "ts-node -r tsconfig-paths/register" $SCRIPT_PATH/src/main.ts $@ From 8856636bda0f6235ac4ea4bd11e637ff58a13c21 Mon Sep 17 00:00:00 2001 From: jonybur Date: Tue, 18 Jul 2023 14:50:07 +0000 Subject: [PATCH 53/88] Add docker env variable --- ts/.eslintrc.cjs | 4 +++- ts/Dockerfile | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ts/.eslintrc.cjs b/ts/.eslintrc.cjs index bae5b5c4f2..bcefc54c07 100644 --- a/ts/.eslintrc.cjs +++ b/ts/.eslintrc.cjs @@ -26,6 +26,8 @@ const contexts = [ 'EnumExpression', ]; +const isDocker = process.env.DOCKER_ENV === 'true'; + module.exports = { extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'prettier'], root: true, @@ -36,7 +38,7 @@ module.exports = { { files: ['*.ts', '*.tsx'], parserOptions: { - project: ['./ts/tsconfig.node.json', './ts/tsconfig.browser.json'], + project: [`.${isDocker ? '' : '/ts'}/tsconfig.node.json`, `.${isDocker ? '' : '/ts'}/tsconfig.browser.json`], }, }, { diff --git a/ts/Dockerfile b/ts/Dockerfile index 9a0829d4d3..e367ef6eae 100644 --- a/ts/Dockerfile +++ b/ts/Dockerfile @@ -1,5 +1,6 @@ #FROM aztecprotocol/barretenberg-wasm-linux-clang:latest FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/barretenberg-wasm-linux-clang +ENV DOCKER_ENV=true FROM node:18-alpine COPY --from=0 /usr/src/barretenberg /usr/src/barretenberg From 01ae15d13855e16d8fb61dad7b292e921e094743 Mon Sep 17 00:00:00 2001 From: jonybur Date: Tue, 18 Jul 2023 14:53:05 +0000 Subject: [PATCH 54/88] Fix isDocker var --- ts/.eslintrc.cjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/.eslintrc.cjs b/ts/.eslintrc.cjs index bcefc54c07..b3a165ab18 100644 --- a/ts/.eslintrc.cjs +++ b/ts/.eslintrc.cjs @@ -26,7 +26,7 @@ const contexts = [ 'EnumExpression', ]; -const isDocker = process.env.DOCKER_ENV === 'true'; +const isDocker = process.env.DOCKER_ENV; module.exports = { extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'prettier'], From 184d2f521a09501b8f6755f3f9001ed6c8fe1b85 Mon Sep 17 00:00:00 2001 From: jonybur Date: Tue, 18 Jul 2023 14:59:44 +0000 Subject: [PATCH 55/88] Try to fix tsconfig paths --- ts/.eslintrc.cjs | 9 +++++++-- ts/Dockerfile | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ts/.eslintrc.cjs b/ts/.eslintrc.cjs index b3a165ab18..46c5abeee4 100644 --- a/ts/.eslintrc.cjs +++ b/ts/.eslintrc.cjs @@ -26,7 +26,12 @@ const contexts = [ 'EnumExpression', ]; -const isDocker = process.env.DOCKER_ENV; +let tsconfigPaths; +if (process.env.DOCKER_ENV) { + tsconfigPaths = ['./tsconfig.node.json', './tsconfig.browser.json']; +} else { + tsconfigPaths = ['./ts/tsconfig.node.json', './ts/tsconfig.browser.json']; +} module.exports = { extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'prettier'], @@ -38,7 +43,7 @@ module.exports = { { files: ['*.ts', '*.tsx'], parserOptions: { - project: [`.${isDocker ? '' : '/ts'}/tsconfig.node.json`, `.${isDocker ? '' : '/ts'}/tsconfig.browser.json`], + project: tsconfigPaths, }, }, { diff --git a/ts/Dockerfile b/ts/Dockerfile index e367ef6eae..d67609f321 100644 --- a/ts/Dockerfile +++ b/ts/Dockerfile @@ -1,6 +1,5 @@ #FROM aztecprotocol/barretenberg-wasm-linux-clang:latest FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/barretenberg-wasm-linux-clang -ENV DOCKER_ENV=true FROM node:18-alpine COPY --from=0 /usr/src/barretenberg /usr/src/barretenberg @@ -11,5 +10,6 @@ COPY yarn.lock yarn.lock COPY .yarnrc.yml .yarnrc.yml RUN yarn --immutable COPY . . +ENV DOCKER_ENV=true RUN yarn formatting && yarn build:ts:browser && yarn build:ts:node CMD ["yarn", "test"] \ No newline at end of file From bf0e9e7c3bbbcdca4c339595ef8fdf6b7fc0e7e5 Mon Sep 17 00:00:00 2001 From: jonybur Date: Tue, 18 Jul 2023 15:35:32 +0000 Subject: [PATCH 56/88] Fix signature --- ts/src/crs/browser/cached_net_crs.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ts/src/crs/browser/cached_net_crs.ts b/ts/src/crs/browser/cached_net_crs.ts index 3152933d3b..7ef266641e 100644 --- a/ts/src/crs/browser/cached_net_crs.ts +++ b/ts/src/crs/browser/cached_net_crs.ts @@ -10,7 +10,9 @@ export class CachedNetCrs { constructor(public readonly numPoints: number) {} - static async new(numPoints: number) { + // This is to keep signrature equal with the node version of CRS + // eslint-disable-next-line @typescript-eslint/no-unused-vars + static async new(numPoints: number, _?: string) { const crs = new CachedNetCrs(numPoints); await crs.init(); return crs; From 170d1272dd53bbaf3d757130448d9f0ae727789e Mon Sep 17 00:00:00 2001 From: jonybur Date: Tue, 18 Jul 2023 17:16:15 +0000 Subject: [PATCH 57/88] Add jest config --- ts/jest.config.js | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 ts/jest.config.js diff --git a/ts/jest.config.js b/ts/jest.config.js new file mode 100644 index 0000000000..4d072fbd3d --- /dev/null +++ b/ts/jest.config.js @@ -0,0 +1,9 @@ +module.exports = { + preset: 'ts-jest', + testEnvironment: 'node', + globals: { + 'ts-jest': { + tsconfig: './tsconfig.node.json', + }, + }, +}; From eeb30242472c734db08bfb25563817f9cf650d0c Mon Sep 17 00:00:00 2001 From: jonybur Date: Tue, 18 Jul 2023 17:17:38 +0000 Subject: [PATCH 58/88] Fix jest --- ts/package.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ts/package.json b/ts/package.json index 607a484c3e..9dc7c2d732 100644 --- a/ts/package.json +++ b/ts/package.json @@ -36,6 +36,11 @@ }, "jest": { "preset": "ts-jest/presets/default-esm", + "globals": { + "ts-jest": { + "tsconfig": "./tsconfig.node.json" + } + }, "transform": { "./src/.*\\.ts": [ "ts-jest", From 15e86eae1a543be9dfd2fe7b35adafd51fe32d79 Mon Sep 17 00:00:00 2001 From: jonybur Date: Tue, 18 Jul 2023 17:18:14 +0000 Subject: [PATCH 59/88] Remove jest config --- ts/jest.config.js | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 ts/jest.config.js diff --git a/ts/jest.config.js b/ts/jest.config.js deleted file mode 100644 index 4d072fbd3d..0000000000 --- a/ts/jest.config.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - globals: { - 'ts-jest': { - tsconfig: './tsconfig.node.json', - }, - }, -}; From 272cb352cae2aabd5ffab1d1b0b62c406c955cf9 Mon Sep 17 00:00:00 2001 From: jonybur Date: Tue, 18 Jul 2023 22:12:55 +0000 Subject: [PATCH 60/88] Fix jest tests --- ts/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ts/package.json b/ts/package.json index 9dc7c2d732..276b987749 100644 --- a/ts/package.json +++ b/ts/package.json @@ -50,7 +50,8 @@ ] }, "moduleNameMapper": { - "^(\\.{1,2}/.*)\\.js$": "$1" + "^(\\.{1,2}/.*)\\.js$": "$1", + "^dynamic/(.*)$": "/src/$1/node/index.ts" }, "testRegex": "./src/.*\\.test\\.ts$", "rootDir": "./src" From 15f6e69af637ba9483975bc1400011956ad9e403 Mon Sep 17 00:00:00 2001 From: jonybur Date: Tue, 18 Jul 2023 22:19:46 +0000 Subject: [PATCH 61/88] Fix moduleNameMapper --- ts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/package.json b/ts/package.json index 276b987749..6a82b85441 100644 --- a/ts/package.json +++ b/ts/package.json @@ -51,7 +51,7 @@ }, "moduleNameMapper": { "^(\\.{1,2}/.*)\\.js$": "$1", - "^dynamic/(.*)$": "/src/$1/node/index.ts" + "^dynamic/(.*)$": "/$1/node/index.ts" }, "testRegex": "./src/.*\\.test\\.ts$", "rootDir": "./src" From 4b3f7da84dd12af62f54c4bbffd3c40f8df9da04 Mon Sep 17 00:00:00 2001 From: jonybur Date: Tue, 18 Jul 2023 22:32:54 +0000 Subject: [PATCH 62/88] Change moduleNameMapper --- ts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/package.json b/ts/package.json index 6a82b85441..0b72342789 100644 --- a/ts/package.json +++ b/ts/package.json @@ -51,7 +51,7 @@ }, "moduleNameMapper": { "^(\\.{1,2}/.*)\\.js$": "$1", - "^dynamic/(.*)$": "/$1/node/index.ts" + "^dynamic/(.*)$": "../$1/node/index.ts" }, "testRegex": "./src/.*\\.test\\.ts$", "rootDir": "./src" From bf11890ae6817a4d08bff50ba871ed9dcbad89c3 Mon Sep 17 00:00:00 2001 From: jonybur Date: Tue, 18 Jul 2023 22:40:44 +0000 Subject: [PATCH 63/88] moduleNameMapper issue debugging --- ts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/package.json b/ts/package.json index 0b72342789..1e9be37fd3 100644 --- a/ts/package.json +++ b/ts/package.json @@ -51,7 +51,7 @@ }, "moduleNameMapper": { "^(\\.{1,2}/.*)\\.js$": "$1", - "^dynamic/(.*)$": "../$1/node/index.ts" + "^dynamic/(.*)$": "/usr/src/barretenberg/ts/src/$1/node/index.ts" }, "testRegex": "./src/.*\\.test\\.ts$", "rootDir": "./src" From 018f821a015e41d51f58ec30fb442c489e72df38 Mon Sep 17 00:00:00 2001 From: jonybur Date: Tue, 18 Jul 2023 22:46:48 +0000 Subject: [PATCH 64/88] Fix rootDir --- ts/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ts/package.json b/ts/package.json index 1e9be37fd3..36ca46a5ea 100644 --- a/ts/package.json +++ b/ts/package.json @@ -51,10 +51,10 @@ }, "moduleNameMapper": { "^(\\.{1,2}/.*)\\.js$": "$1", - "^dynamic/(.*)$": "/usr/src/barretenberg/ts/src/$1/node/index.ts" + "^dynamic/(.*)$": "/src/$1/node/index.ts" }, "testRegex": "./src/.*\\.test\\.ts$", - "rootDir": "./src" + "rootDir": "." }, "dependencies": { "comlink": "^4.4.1", From f2b4e84377cfbf62f21169b272ba3d8b00935b27 Mon Sep 17 00:00:00 2001 From: jonybur Date: Wed, 19 Jul 2023 11:29:02 +0000 Subject: [PATCH 65/88] Remove globals in ts-jest --- ts/package.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ts/package.json b/ts/package.json index 36ca46a5ea..0196df2cc7 100644 --- a/ts/package.json +++ b/ts/package.json @@ -36,15 +36,11 @@ }, "jest": { "preset": "ts-jest/presets/default-esm", - "globals": { - "ts-jest": { - "tsconfig": "./tsconfig.node.json" - } - }, "transform": { "./src/.*\\.ts": [ "ts-jest", { + "tsconfig": "./tsconfig.node.json", "useESM": true } ] From d618b4a42c179fb90d924e9123642f777a083f06 Mon Sep 17 00:00:00 2001 From: jonybur Date: Wed, 19 Jul 2023 17:02:05 +0000 Subject: [PATCH 66/88] Root dir set to src --- ts/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ts/package.json b/ts/package.json index 0196df2cc7..33585a8923 100644 --- a/ts/package.json +++ b/ts/package.json @@ -47,10 +47,10 @@ }, "moduleNameMapper": { "^(\\.{1,2}/.*)\\.js$": "$1", - "^dynamic/(.*)$": "/src/$1/node/index.ts" + "^dynamic/(.*)$": "/$1/node/index.ts" }, "testRegex": "./src/.*\\.test\\.ts$", - "rootDir": "." + "rootDir": "./src" }, "dependencies": { "comlink": "^4.4.1", From 465622fc2e396525f2998f27d48333ebdac38db8 Mon Sep 17 00:00:00 2001 From: jonybur Date: Thu, 20 Jul 2023 15:58:40 +0000 Subject: [PATCH 67/88] Add bbjs release workflow --- .github/workflows/bbjs.yml | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/bbjs.yml diff --git a/.github/workflows/bbjs.yml b/.github/workflows/bbjs.yml new file mode 100644 index 0000000000..b477e83b61 --- /dev/null +++ b/.github/workflows/bbjs.yml @@ -0,0 +1,45 @@ +name: CI + +on: + push: + branches: + - jb/bbjs-cra + +jobs: + build-and-deploy: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Setup Node.js + uses: actions/setup-node@v2 + with: + node-version: "18" + registry-url: "https://registry.npmjs.org" + + - name: Compile Barretenberg + run: | + cd cpp + ./bootstrap.sh + + - name: Compile Typescript + run: | + cd ts + yarn install && yarn && yarn build + + - name: Checkout destination repository + uses: actions/checkout@v3 + with: + repository: AztecProtocol/bb.js + path: ./bb.js + token: ${{ secrets.GITHUB_TOKEN }} + + - name: Push to destination repository + run: | + cd ./bb.js + cp -R ../ts/dest/* . + git add . + git commit -m "Tracking changes" + git push From 38edbdeb4b47c9cced8fdd096c92b4cd318bd2ca Mon Sep 17 00:00:00 2001 From: jonybur Date: Thu, 20 Jul 2023 16:02:41 +0000 Subject: [PATCH 68/88] Fix barretenberg --- .github/workflows/bbjs.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bbjs.yml b/.github/workflows/bbjs.yml index b477e83b61..ee044664ac 100644 --- a/.github/workflows/bbjs.yml +++ b/.github/workflows/bbjs.yml @@ -22,7 +22,9 @@ jobs: - name: Compile Barretenberg run: | cd cpp - ./bootstrap.sh + + cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert + cmake --build --preset default --target bb - name: Compile Typescript run: | From d98116146f1463387cdbba7c895450d092e2a430 Mon Sep 17 00:00:00 2001 From: jonybur Date: Thu, 20 Jul 2023 16:07:17 +0000 Subject: [PATCH 69/88] Fix workflow --- .github/workflows/bbjs.yml | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/.github/workflows/bbjs.yml b/.github/workflows/bbjs.yml index ee044664ac..d94aa08148 100644 --- a/.github/workflows/bbjs.yml +++ b/.github/workflows/bbjs.yml @@ -7,22 +7,34 @@ on: jobs: build-and-deploy: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v3 + name: Build on Linux + runs-on: ubuntu-20.04 + needs: [release-please] + if: ${{ needs.release-please.outputs.tag-name }} + steps: + - name: Checkout Code + uses: actions/checkout@v2 + + - name: Install bleeding edge cmake + run: | + sudo apt -y remove --purge cmake + sudo snap install cmake --classic + + - name: Create Build Environment + run: | + sudo apt-get update + sudo apt-get -y install clang ninja-build yarn - - name: Setup Node.js - uses: actions/setup-node@v2 - with: - node-version: "18" - registry-url: "https://registry.npmjs.org" + - name: Install yarn + run: | + curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - + echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list + sudo apt -y update && sudo apt -y install yarn - name: Compile Barretenberg run: | cd cpp - + cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert cmake --build --preset default --target bb From ff4b441f193038c8251d9c372ffbeba063d31b46 Mon Sep 17 00:00:00 2001 From: jonybur Date: Thu, 20 Jul 2023 16:08:37 +0000 Subject: [PATCH 70/88] Remove release please condition --- .github/workflows/bbjs.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bbjs.yml b/.github/workflows/bbjs.yml index d94aa08148..d76f305bf1 100644 --- a/.github/workflows/bbjs.yml +++ b/.github/workflows/bbjs.yml @@ -9,9 +9,7 @@ jobs: build-and-deploy: name: Build on Linux runs-on: ubuntu-20.04 - needs: [release-please] - if: ${{ needs.release-please.outputs.tag-name }} - steps: + steps: - name: Checkout Code uses: actions/checkout@v2 @@ -19,7 +17,7 @@ jobs: run: | sudo apt -y remove --purge cmake sudo snap install cmake --classic - + - name: Create Build Environment run: | sudo apt-get update @@ -34,7 +32,7 @@ jobs: - name: Compile Barretenberg run: | cd cpp - + cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert cmake --build --preset default --target bb From 46091845f175e09ba7d89afaecb8c8cdcf015959 Mon Sep 17 00:00:00 2001 From: jonybur Date: Thu, 20 Jul 2023 16:16:14 +0000 Subject: [PATCH 71/88] Fix build step --- .github/workflows/bbjs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bbjs.yml b/.github/workflows/bbjs.yml index d76f305bf1..67c08118ae 100644 --- a/.github/workflows/bbjs.yml +++ b/.github/workflows/bbjs.yml @@ -1,4 +1,4 @@ -name: CI +name: Release bb.js on: push: @@ -39,7 +39,7 @@ jobs: - name: Compile Typescript run: | cd ts - yarn install && yarn && yarn build + yarn && yarn build - name: Checkout destination repository uses: actions/checkout@v3 From 7d1fed768e9828302bcbdb3d775fcb3195951bd6 Mon Sep 17 00:00:00 2001 From: jonybur Date: Thu, 20 Jul 2023 16:17:53 +0000 Subject: [PATCH 72/88] Add WASI-SDK step --- .github/workflows/bbjs.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bbjs.yml b/.github/workflows/bbjs.yml index 67c08118ae..ee56150315 100644 --- a/.github/workflows/bbjs.yml +++ b/.github/workflows/bbjs.yml @@ -22,13 +22,11 @@ jobs: run: | sudo apt-get update sudo apt-get -y install clang ninja-build yarn - - name: Install yarn run: | curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list sudo apt -y update && sudo apt -y install yarn - - name: Compile Barretenberg run: | cd cpp @@ -36,10 +34,16 @@ jobs: cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert cmake --build --preset default --target bb + - name: Install WASI-SDK + run: | + cd cpp + + ./scripts/install-wasi-sdk.sh + - name: Compile Typescript run: | cd ts - yarn && yarn build + yarn install && yarn && yarn build - name: Checkout destination repository uses: actions/checkout@v3 From b4f20cadc30ba3e60fe91fad9bfe45e7f86c8c30 Mon Sep 17 00:00:00 2001 From: jonybur Date: Thu, 20 Jul 2023 21:51:50 +0000 Subject: [PATCH 73/88] Fix tests --- ts/package.json | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/ts/package.json b/ts/package.json index 2a808b6c50..262bbc5c87 100644 --- a/ts/package.json +++ b/ts/package.json @@ -26,8 +26,8 @@ "serve": "webpack serve", "formatting": "prettier --check ./src && eslint --max-warnings 0 ./src", "formatting:fix": "prettier -w ./src", - "test": "yarn test:jest && yarn test:bin", - "test:jest": "NODE_OPTIONS='--loader ts-node/esm' NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests", + "test": "yarn build && yarn test:jest && yarn test:bin", + "test:jest": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests", "test:bin": "cd ./bin-test && ./bin-test.sh", "test-debug": "NODE_OPTIONS='--loader ts-node/esm' NODE_NO_WARNINGS=1 node --inspect-brk=0.0.0.0 --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests --runInBand", "simple_test": "NODE_OPTIONS='--loader ts-node/esm' NODE_NO_WARNINGS=1 node ./src/examples/simple.rawtest.ts", @@ -35,22 +35,8 @@ "deploy": "npm publish --access public" }, "jest": { - "preset": "ts-jest/presets/default-esm", - "transform": { - "./src/.*\\.ts": [ - "ts-jest", - { - "tsconfig": "./tsconfig.node.json", - "useESM": true - } - ] - }, - "moduleNameMapper": { - "^(\\.{1,2}/.*)\\.js$": "$1", - "^dynamic/(.*)$": "/$1/node/index.ts" - }, - "testRegex": "./src/.*\\.test\\.ts$", - "rootDir": "./src" + "testRegex": "./dest/node/.*\\.test\\.js$", + "rootDir": "./dest" }, "dependencies": { "comlink": "^4.4.1", From 4f5f5f94d22408968ab97e66ab8fc6107b866bd1 Mon Sep 17 00:00:00 2001 From: jonybur Date: Thu, 20 Jul 2023 22:05:04 +0000 Subject: [PATCH 74/88] Remove simple.rawtest, ts-node dep, ignore browser/wasm file --- ts/package.json | 7 +++--- ts/src/examples/simple.rawtest.ts | 37 ------------------------------- 2 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 ts/src/examples/simple.rawtest.ts diff --git a/ts/package.json b/ts/package.json index 262bbc5c87..c50048c722 100644 --- a/ts/package.json +++ b/ts/package.json @@ -13,6 +13,7 @@ "files": [ "src/", "dest/", + "!dest/browser/*.wasm", "README.md" ], "scripts": { @@ -29,8 +30,7 @@ "test": "yarn build && yarn test:jest && yarn test:bin", "test:jest": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests", "test:bin": "cd ./bin-test && ./bin-test.sh", - "test-debug": "NODE_OPTIONS='--loader ts-node/esm' NODE_NO_WARNINGS=1 node --inspect-brk=0.0.0.0 --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests --runInBand", - "simple_test": "NODE_OPTIONS='--loader ts-node/esm' NODE_NO_WARNINGS=1 node ./src/examples/simple.rawtest.ts", + "test-debug": "NODE_NO_WARNINGS=1 node --inspect-brk=0.0.0.0 --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests --runInBand", "prepack": "yarn build", "deploy": "npm publish --access public" }, @@ -42,8 +42,7 @@ "comlink": "^4.4.1", "commander": "^10.0.1", "debug": "^4.3.4", - "idb-keyval": "^6.2.1", - "ts-node": "^10.9.1" + "idb-keyval": "^6.2.1" }, "devDependencies": { "@jest/globals": "^29.4.3", diff --git a/ts/src/examples/simple.rawtest.ts b/ts/src/examples/simple.rawtest.ts deleted file mode 100644 index 179489ac95..0000000000 --- a/ts/src/examples/simple.rawtest.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { Crs } from '../crs/index.js'; -import createDebug from 'debug'; -import { newBarretenbergApiAsync } from '../factory/index.js'; -import { RawBuffer } from '../types/index.js'; - -createDebug.enable('*'); -const debug = createDebug('simple_test'); - -async function main() { - const CIRCUIT_SIZE = 2 ** 19; - - debug('starting test...'); - const api = await newBarretenbergApiAsync(); - - // Important to init slab allocator as first thing, to ensure maximum memory efficiency. - await api.commonInitSlabAllocator(CIRCUIT_SIZE); - - // Plus 1 needed! - const crs = await Crs.new(CIRCUIT_SIZE + 1); - await api.srsInitSrs(new RawBuffer(crs.getG1Data()), crs.numPoints, new RawBuffer(crs.getG2Data())); - - const iterations = 10; - let totalTime = 0; - for (let i = 0; i < iterations; ++i) { - const start = new Date().getTime(); - debug(`iteration ${i} starting...`); - await api.examplesSimpleCreateAndVerifyProof(); - totalTime += new Date().getTime() - start; - } - - await api.destroy(); - - debug(`avg iteration time: ${totalTime / iterations}ms`); - debug('test complete.'); -} - -void main(); From ff68b792348bef5942d43d399d81b75833c7d6ca Mon Sep 17 00:00:00 2001 From: jonybur Date: Thu, 20 Jul 2023 23:49:41 +0000 Subject: [PATCH 75/88] Remove workflow --- .github/workflows/bbjs.yml | 61 -------------------------------------- 1 file changed, 61 deletions(-) delete mode 100644 .github/workflows/bbjs.yml diff --git a/.github/workflows/bbjs.yml b/.github/workflows/bbjs.yml deleted file mode 100644 index ee56150315..0000000000 --- a/.github/workflows/bbjs.yml +++ /dev/null @@ -1,61 +0,0 @@ -name: Release bb.js - -on: - push: - branches: - - jb/bbjs-cra - -jobs: - build-and-deploy: - name: Build on Linux - runs-on: ubuntu-20.04 - steps: - - name: Checkout Code - uses: actions/checkout@v2 - - - name: Install bleeding edge cmake - run: | - sudo apt -y remove --purge cmake - sudo snap install cmake --classic - - - name: Create Build Environment - run: | - sudo apt-get update - sudo apt-get -y install clang ninja-build yarn - - name: Install yarn - run: | - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - - echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list - sudo apt -y update && sudo apt -y install yarn - - name: Compile Barretenberg - run: | - cd cpp - - cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert - cmake --build --preset default --target bb - - - name: Install WASI-SDK - run: | - cd cpp - - ./scripts/install-wasi-sdk.sh - - - name: Compile Typescript - run: | - cd ts - yarn install && yarn && yarn build - - - name: Checkout destination repository - uses: actions/checkout@v3 - with: - repository: AztecProtocol/bb.js - path: ./bb.js - token: ${{ secrets.GITHUB_TOKEN }} - - - name: Push to destination repository - run: | - cd ./bb.js - cp -R ../ts/dest/* . - git add . - git commit -m "Tracking changes" - git push From 68d5cb59c855bc95a09b6054752d34a50624d46d Mon Sep 17 00:00:00 2001 From: jonybur Date: Thu, 20 Jul 2023 23:56:30 +0000 Subject: [PATCH 76/88] Update yarn.lock --- ts/yarn.lock | 139 +-------------------------------------------------- 1 file changed, 2 insertions(+), 137 deletions(-) diff --git a/ts/yarn.lock b/ts/yarn.lock index a83c2b3f42..f9a4a3eb53 100644 --- a/ts/yarn.lock +++ b/ts/yarn.lock @@ -42,7 +42,6 @@ __metadata: resolve-typescript-plugin: ^2.0.1 ts-jest: ^29.1.0 ts-loader: ^9.4.2 - ts-node: ^10.9.1 tsconfig-paths-webpack-plugin: ^4.0.1 typescript: ^5.0.4 webpack: ^5.82.1 @@ -448,15 +447,6 @@ __metadata: languageName: node linkType: hard -"@cspotcode/source-map-support@npm:^0.8.0": - version: 0.8.1 - resolution: "@cspotcode/source-map-support@npm:0.8.1" - dependencies: - "@jridgewell/trace-mapping": 0.3.9 - checksum: 5718f267085ed8edb3e7ef210137241775e607ee18b77d95aa5bd7514f47f5019aa2d82d96b3bf342ef7aa890a346fa1044532ff7cc3009e7d24fce3ce6200fa - languageName: node - linkType: hard - "@discoveryjs/json-ext@npm:^0.5.0": version: 0.5.7 resolution: "@discoveryjs/json-ext@npm:0.5.7" @@ -813,13 +803,6 @@ __metadata: languageName: node linkType: hard -"@jridgewell/resolve-uri@npm:^3.0.3": - version: 3.1.1 - resolution: "@jridgewell/resolve-uri@npm:3.1.1" - checksum: f5b441fe7900eab4f9155b3b93f9800a916257f4e8563afbcd3b5a5337b55e52bd8ae6735453b1b745457d9f6cdb16d74cd6220bbdd98cf153239e13f6cbb653 - languageName: node - linkType: hard - "@jridgewell/set-array@npm:^1.0.1": version: 1.1.2 resolution: "@jridgewell/set-array@npm:1.1.2" @@ -851,16 +834,6 @@ __metadata: languageName: node linkType: hard -"@jridgewell/trace-mapping@npm:0.3.9": - version: 0.3.9 - resolution: "@jridgewell/trace-mapping@npm:0.3.9" - dependencies: - "@jridgewell/resolve-uri": ^3.0.3 - "@jridgewell/sourcemap-codec": ^1.4.10 - checksum: d89597752fd88d3f3480845691a05a44bd21faac18e2185b6f436c3b0fd0c5a859fbbd9aaa92050c4052caf325ad3e10e2e1d1b64327517471b7d51babc0ddef - languageName: node - linkType: hard - "@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.15, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9": version: 0.3.18 resolution: "@jridgewell/trace-mapping@npm:0.3.18" @@ -953,34 +926,6 @@ __metadata: languageName: node linkType: hard -"@tsconfig/node10@npm:^1.0.7": - version: 1.0.9 - resolution: "@tsconfig/node10@npm:1.0.9" - checksum: a33ae4dc2a621c0678ac8ac4bceb8e512ae75dac65417a2ad9b022d9b5411e863c4c198b6ba9ef659e14b9fb609bbec680841a2e84c1172df7a5ffcf076539df - languageName: node - linkType: hard - -"@tsconfig/node12@npm:^1.0.7": - version: 1.0.11 - resolution: "@tsconfig/node12@npm:1.0.11" - checksum: 5ce29a41b13e7897a58b8e2df11269c5395999e588b9a467386f99d1d26f6c77d1af2719e407621412520ea30517d718d5192a32403b8dfcc163bf33e40a338a - languageName: node - linkType: hard - -"@tsconfig/node14@npm:^1.0.0": - version: 1.0.3 - resolution: "@tsconfig/node14@npm:1.0.3" - checksum: 19275fe80c4c8d0ad0abed6a96dbf00642e88b220b090418609c4376e1cef81bf16237bf170ad1b341452feddb8115d8dd2e5acdfdea1b27422071163dc9ba9d - languageName: node - linkType: hard - -"@tsconfig/node16@npm:^1.0.2": - version: 1.0.4 - resolution: "@tsconfig/node16@npm:1.0.4" - checksum: 202319785901f942a6e1e476b872d421baec20cf09f4b266a1854060efbf78cde16a4d256e8bc949d31e6cd9a90f1e8ef8fb06af96a65e98338a2b6b0de0a0ff - languageName: node - linkType: hard - "@types/babel__core@npm:^7.1.14": version: 7.20.1 resolution: "@types/babel__core@npm:7.20.1" @@ -1697,14 +1642,7 @@ __metadata: languageName: node linkType: hard -"acorn-walk@npm:^8.1.1": - version: 8.2.0 - resolution: "acorn-walk@npm:8.2.0" - checksum: 1715e76c01dd7b2d4ca472f9c58968516a4899378a63ad5b6c2d668bba8da21a71976c14ec5f5b75f887b6317c4ae0b897ab141c831d741dc76024d8745f1ad1 - languageName: node - linkType: hard - -"acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.0, acorn@npm:^8.8.2": +"acorn@npm:^8.7.1, acorn@npm:^8.8.0, acorn@npm:^8.8.2": version: 8.8.2 resolution: "acorn@npm:8.8.2" bin: @@ -1892,13 +1830,6 @@ __metadata: languageName: node linkType: hard -"arg@npm:^4.1.0": - version: 4.1.3 - resolution: "arg@npm:4.1.3" - checksum: 544af8dd3f60546d3e4aff084d451b96961d2267d668670199692f8d054f0415d86fc5497d0e641e91546f0aa920e7c29e5250e99fc89f5552a34b5d93b77f43 - languageName: node - linkType: hard - "argparse@npm:^1.0.7": version: 1.0.10 resolution: "argparse@npm:1.0.10" @@ -2553,13 +2484,6 @@ __metadata: languageName: node linkType: hard -"create-require@npm:^1.1.0": - version: 1.1.1 - resolution: "create-require@npm:1.1.1" - checksum: a9a1503d4390d8b59ad86f4607de7870b39cad43d929813599a23714831e81c520bddf61bcdd1f8e30f05fd3a2b71ae8538e946eb2786dc65c2bbc520f692eff - languageName: node - linkType: hard - "cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3": version: 7.0.3 resolution: "cross-spawn@npm:7.0.3" @@ -2698,13 +2622,6 @@ __metadata: languageName: node linkType: hard -"diff@npm:^4.0.1": - version: 4.0.2 - resolution: "diff@npm:4.0.2" - checksum: f2c09b0ce4e6b301c221addd83bf3f454c0bc00caa3dd837cf6c127d6edf7223aa2bbe3b688feea110b7f262adbfc845b757c44c8a9f8c0c5b15d8fa9ce9d20d - languageName: node - linkType: hard - "dir-glob@npm:^3.0.1": version: 3.0.1 resolution: "dir-glob@npm:3.0.1" @@ -4858,7 +4775,7 @@ __metadata: languageName: node linkType: hard -"make-error@npm:1.x, make-error@npm:^1.1.1": +"make-error@npm:1.x": version: 1.3.6 resolution: "make-error@npm:1.3.6" checksum: b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402 @@ -6546,44 +6463,6 @@ __metadata: languageName: node linkType: hard -"ts-node@npm:^10.9.1": - version: 10.9.1 - resolution: "ts-node@npm:10.9.1" - dependencies: - "@cspotcode/source-map-support": ^0.8.0 - "@tsconfig/node10": ^1.0.7 - "@tsconfig/node12": ^1.0.7 - "@tsconfig/node14": ^1.0.0 - "@tsconfig/node16": ^1.0.2 - acorn: ^8.4.1 - acorn-walk: ^8.1.1 - arg: ^4.1.0 - create-require: ^1.1.0 - diff: ^4.0.1 - make-error: ^1.1.1 - v8-compile-cache-lib: ^3.0.1 - yn: 3.1.1 - peerDependencies: - "@swc/core": ">=1.2.50" - "@swc/wasm": ">=1.2.50" - "@types/node": "*" - typescript: ">=2.7" - peerDependenciesMeta: - "@swc/core": - optional: true - "@swc/wasm": - optional: true - bin: - ts-node: dist/bin.js - ts-node-cwd: dist/bin-cwd.js - ts-node-esm: dist/bin-esm.js - ts-node-script: dist/bin-script.js - ts-node-transpile-only: dist/bin-transpile.js - ts-script: dist/bin-script-deprecated.js - checksum: 090adff1302ab20bd3486e6b4799e90f97726ed39e02b39e566f8ab674fd5bd5f727f43615debbfc580d33c6d9d1c6b1b3ce7d8e3cca3e20530a145ffa232c35 - languageName: node - linkType: hard - "tsconfig-paths-webpack-plugin@npm:^4.0.1": version: 4.0.1 resolution: "tsconfig-paths-webpack-plugin@npm:4.0.1" @@ -6776,13 +6655,6 @@ __metadata: languageName: node linkType: hard -"v8-compile-cache-lib@npm:^3.0.1": - version: 3.0.1 - resolution: "v8-compile-cache-lib@npm:3.0.1" - checksum: 78089ad549e21bcdbfca10c08850022b22024cdcc2da9b168bcf5a73a6ed7bf01a9cebb9eac28e03cd23a684d81e0502797e88f3ccd27a32aeab1cfc44c39da0 - languageName: node - linkType: hard - "v8-to-istanbul@npm:^9.0.1": version: 9.1.0 resolution: "v8-to-istanbul@npm:9.1.0" @@ -7126,13 +6998,6 @@ __metadata: languageName: node linkType: hard -"yn@npm:3.1.1": - version: 3.1.1 - resolution: "yn@npm:3.1.1" - checksum: 2c487b0e149e746ef48cda9f8bad10fc83693cd69d7f9dcd8be4214e985de33a29c9e24f3c0d6bcf2288427040a8947406ab27f7af67ee9456e6b84854f02dd6 - languageName: node - linkType: hard - "yocto-queue@npm:^0.1.0": version: 0.1.0 resolution: "yocto-queue@npm:0.1.0" From 6251826cb33e24d6a1a06bb67117b3ae6f0de913 Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 21 Jul 2023 00:08:36 +0000 Subject: [PATCH 77/88] Fix cmake issue --- ts/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ts/Dockerfile b/ts/Dockerfile index d67609f321..139605496c 100644 --- a/ts/Dockerfile +++ b/ts/Dockerfile @@ -2,6 +2,8 @@ FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/barretenberg-wasm-linux-clang FROM node:18-alpine + +RUN apk add --update cmake COPY --from=0 /usr/src/barretenberg /usr/src/barretenberg WORKDIR /usr/src/barretenberg/ts COPY .yarn .yarn @@ -12,4 +14,4 @@ RUN yarn --immutable COPY . . ENV DOCKER_ENV=true RUN yarn formatting && yarn build:ts:browser && yarn build:ts:node -CMD ["yarn", "test"] \ No newline at end of file +CMD ["yarn", "test"] From 30a1e15e1cbb1b350503dfaf54165c21c6bb3f39 Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 21 Jul 2023 11:24:23 +0000 Subject: [PATCH 78/88] Add docker history output --- .circleci/config.yml | 6 ++++++ ts/Dockerfile | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2707d12eb5..6209976330 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -309,6 +309,12 @@ jobs: steps: - *checkout - *setup_env + - run: + name: "Pull Docker Image" + command: docker pull 278380418400.dkr.ecr.us-east-2.amazonaws.com/bb.js:cache-6251826cb33e24d6a1a06bb67117b3ae6f0de913 + - run: + name: "Show Docker image history" + command: docker history 278380418400.dkr.ecr.us-east-2.amazonaws.com/bb.js:cache-6251826cb33e24d6a1a06bb67117b3ae6f0de913 - run: name: "Test" command: cond_spot_run_tests bb.js diff --git a/ts/Dockerfile b/ts/Dockerfile index 139605496c..1a94506a44 100644 --- a/ts/Dockerfile +++ b/ts/Dockerfile @@ -3,7 +3,6 @@ FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/barretenberg-wasm-linux-clang FROM node:18-alpine -RUN apk add --update cmake COPY --from=0 /usr/src/barretenberg /usr/src/barretenberg WORKDIR /usr/src/barretenberg/ts COPY .yarn .yarn From 1a93b95e22ee58cffce5daa2d9cefb00c6ae1bd8 Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 21 Jul 2023 11:36:32 +0000 Subject: [PATCH 79/88] Revert docker config --- .circleci/config.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6209976330..2707d12eb5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -309,12 +309,6 @@ jobs: steps: - *checkout - *setup_env - - run: - name: "Pull Docker Image" - command: docker pull 278380418400.dkr.ecr.us-east-2.amazonaws.com/bb.js:cache-6251826cb33e24d6a1a06bb67117b3ae6f0de913 - - run: - name: "Show Docker image history" - command: docker history 278380418400.dkr.ecr.us-east-2.amazonaws.com/bb.js:cache-6251826cb33e24d6a1a06bb67117b3ae6f0de913 - run: name: "Test" command: cond_spot_run_tests bb.js From 2834f866a1230847c5b3a591622b8ff26ff216eb Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 21 Jul 2023 12:23:04 +0000 Subject: [PATCH 80/88] Readd cmake --- acir_tests/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/acir_tests/Dockerfile b/acir_tests/Dockerfile index b3da26dede..4a1c3e59c4 100644 --- a/acir_tests/Dockerfile +++ b/acir_tests/Dockerfile @@ -2,6 +2,8 @@ FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/barretenberg-x86_64-linux-clan FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/bb.js FROM node:18-alpine + +RUN apk add --update cmake RUN apk update && apk add git bash curl COPY --from=0 /usr/src/barretenberg/cpp/build /usr/src/barretenberg/cpp/build COPY --from=1 /usr/src/barretenberg/ts /usr/src/barretenberg/ts From 7002874b4a7efb2b830243deaed6cc0859b5ad9f Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 21 Jul 2023 12:27:01 +0000 Subject: [PATCH 81/88] Debug information for folders --- acir_tests/Dockerfile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/acir_tests/Dockerfile b/acir_tests/Dockerfile index 4a1c3e59c4..c428da9aa6 100644 --- a/acir_tests/Dockerfile +++ b/acir_tests/Dockerfile @@ -1,15 +1,18 @@ -FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/barretenberg-x86_64-linux-clang-assert -FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/bb.js +FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/barretenberg-x86_64-linux-clang-assert as builder1 +RUN test -d /usr/src/barretenberg/cpp/build || (echo "/usr/src/barretenberg/cpp/build directory not found" && exit 1) + +FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/bb.js as builder2 +RUN test -d /usr/src/barretenberg/ts || (echo "/usr/src/barretenberg/ts directory not found" && exit 1) FROM node:18-alpine RUN apk add --update cmake RUN apk update && apk add git bash curl -COPY --from=0 /usr/src/barretenberg/cpp/build /usr/src/barretenberg/cpp/build -COPY --from=1 /usr/src/barretenberg/ts /usr/src/barretenberg/ts +COPY --from=builder1 /usr/src/barretenberg/cpp/build /usr/src/barretenberg/cpp/build +COPY --from=builder2 /usr/src/barretenberg/ts /usr/src/barretenberg/ts WORKDIR /usr/src/barretenberg/acir_tests COPY . . # Run all native tests. RUN ./run_acir_tests.sh # Just run double_verify_proof as a sanity check as bb.js is quite slow. -RUN BB=../ts/dest/main.js ./run_acir_tests.sh double_verify_proof \ No newline at end of file +RUN BB=../ts/dest/main.js ./run_acir_tests.sh double_verify_proof From 4645fe4c848deb5fd35a8d3cca36ba805740073e Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 21 Jul 2023 12:31:24 +0000 Subject: [PATCH 82/88] Add apk update --- acir_tests/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/acir_tests/Dockerfile b/acir_tests/Dockerfile index c428da9aa6..8a02c00290 100644 --- a/acir_tests/Dockerfile +++ b/acir_tests/Dockerfile @@ -6,8 +6,7 @@ RUN test -d /usr/src/barretenberg/ts || (echo "/usr/src/barretenberg/ts director FROM node:18-alpine -RUN apk add --update cmake -RUN apk update && apk add git bash curl +RUN apk update && apk add cmake git bash curl COPY --from=builder1 /usr/src/barretenberg/cpp/build /usr/src/barretenberg/cpp/build COPY --from=builder2 /usr/src/barretenberg/ts /usr/src/barretenberg/ts WORKDIR /usr/src/barretenberg/acir_tests From fc632ae155e7be60f4514bfd0393964cb883d3cc Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 21 Jul 2023 12:37:41 +0000 Subject: [PATCH 83/88] Revert acir_tests Dockerfile --- acir_tests/Dockerfile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/acir_tests/Dockerfile b/acir_tests/Dockerfile index 8a02c00290..35b7e3dd12 100644 --- a/acir_tests/Dockerfile +++ b/acir_tests/Dockerfile @@ -1,17 +1,14 @@ -FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/barretenberg-x86_64-linux-clang-assert as builder1 -RUN test -d /usr/src/barretenberg/cpp/build || (echo "/usr/src/barretenberg/cpp/build directory not found" && exit 1) - -FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/bb.js as builder2 -RUN test -d /usr/src/barretenberg/ts || (echo "/usr/src/barretenberg/ts directory not found" && exit 1) +FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/barretenberg-x86_64-linux-clang-assert +FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/bb.js FROM node:18-alpine +RUN apk update && apk add git bash curl +COPY --from=0 /usr/src/barretenberg/cpp/build /usr/src/barretenberg/cpp/build +COPY --from=1 /usr/src/barretenberg/ts /usr/src/barretenberg/ts -RUN apk update && apk add cmake git bash curl -COPY --from=builder1 /usr/src/barretenberg/cpp/build /usr/src/barretenberg/cpp/build -COPY --from=builder2 /usr/src/barretenberg/ts /usr/src/barretenberg/ts WORKDIR /usr/src/barretenberg/acir_tests COPY . . # Run all native tests. RUN ./run_acir_tests.sh # Just run double_verify_proof as a sanity check as bb.js is quite slow. -RUN BB=../ts/dest/main.js ./run_acir_tests.sh double_verify_proof +RUN BB=../ts/dest/main.js ./run_acir_tests.sh double_verify_proof \ No newline at end of file From a6c4484e1de41ecbefbb4b6a3c3aa02800dd1fa6 Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 21 Jul 2023 12:40:04 +0000 Subject: [PATCH 84/88] Add cmake to ts/Dockerfile --- ts/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ts/Dockerfile b/ts/Dockerfile index 1a94506a44..5ca6df2962 100644 --- a/ts/Dockerfile +++ b/ts/Dockerfile @@ -3,6 +3,8 @@ FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/barretenberg-wasm-linux-clang FROM node:18-alpine +RUN apk add --no-cache make g++ python3 && apk add cmake --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main + COPY --from=0 /usr/src/barretenberg /usr/src/barretenberg WORKDIR /usr/src/barretenberg/ts COPY .yarn .yarn From d3ed0e09a3525cfcbbe8f6805294c1f92f2fcc2e Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 21 Jul 2023 14:48:49 +0000 Subject: [PATCH 85/88] Roll back changes --- acir_tests/Dockerfile | 1 - ts/Dockerfile | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/acir_tests/Dockerfile b/acir_tests/Dockerfile index 35b7e3dd12..b3da26dede 100644 --- a/acir_tests/Dockerfile +++ b/acir_tests/Dockerfile @@ -5,7 +5,6 @@ FROM node:18-alpine RUN apk update && apk add git bash curl COPY --from=0 /usr/src/barretenberg/cpp/build /usr/src/barretenberg/cpp/build COPY --from=1 /usr/src/barretenberg/ts /usr/src/barretenberg/ts - WORKDIR /usr/src/barretenberg/acir_tests COPY . . # Run all native tests. diff --git a/ts/Dockerfile b/ts/Dockerfile index 5ca6df2962..684c490c30 100644 --- a/ts/Dockerfile +++ b/ts/Dockerfile @@ -3,8 +3,6 @@ FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/barretenberg-wasm-linux-clang FROM node:18-alpine -RUN apk add --no-cache make g++ python3 && apk add cmake --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main - COPY --from=0 /usr/src/barretenberg /usr/src/barretenberg WORKDIR /usr/src/barretenberg/ts COPY .yarn .yarn @@ -14,5 +12,5 @@ COPY .yarnrc.yml .yarnrc.yml RUN yarn --immutable COPY . . ENV DOCKER_ENV=true -RUN yarn formatting && yarn build:ts:browser && yarn build:ts:node +RUN yarn formatting && yarn build CMD ["yarn", "test"] From 465cfa1e14a60dfcf95bdf15860b02691237620f Mon Sep 17 00:00:00 2001 From: jonybur Date: Fri, 21 Jul 2023 14:50:49 +0000 Subject: [PATCH 86/88] Readd cmake --- ts/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ts/Dockerfile b/ts/Dockerfile index 684c490c30..ec0dc5d266 100644 --- a/ts/Dockerfile +++ b/ts/Dockerfile @@ -3,6 +3,8 @@ FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/barretenberg-wasm-linux-clang FROM node:18-alpine +RUN apk add --no-cache make g++ python3 && apk add cmake --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main + COPY --from=0 /usr/src/barretenberg /usr/src/barretenberg WORKDIR /usr/src/barretenberg/ts COPY .yarn .yarn From 5ca0d261bbd1d341dab210e06962f0b37a661c3b Mon Sep 17 00:00:00 2001 From: ludamad Date: Fri, 21 Jul 2023 13:12:55 -0400 Subject: [PATCH 87/88] fix: fix attempts for bbjs-cra branch (#620) --- acir_tests/Dockerfile | 2 +- acir_tests/run_bb.sh | 4 ++++ ts/package.json | 4 ++-- ts/replace_imports.cjs | 19 ++++++++++++------- ts/webpack.config.cjs | 13 ++++++------- 5 files changed, 25 insertions(+), 17 deletions(-) create mode 100755 acir_tests/run_bb.sh diff --git a/acir_tests/Dockerfile b/acir_tests/Dockerfile index b3da26dede..a36aa0f6e1 100644 --- a/acir_tests/Dockerfile +++ b/acir_tests/Dockerfile @@ -10,4 +10,4 @@ COPY . . # Run all native tests. RUN ./run_acir_tests.sh # Just run double_verify_proof as a sanity check as bb.js is quite slow. -RUN BB=../ts/dest/main.js ./run_acir_tests.sh double_verify_proof \ No newline at end of file +RUN BB=./run_bb.sh ./run_acir_tests.sh double_verify_proof \ No newline at end of file diff --git a/acir_tests/run_bb.sh b/acir_tests/run_bb.sh new file mode 100755 index 0000000000..756c110068 --- /dev/null +++ b/acir_tests/run_bb.sh @@ -0,0 +1,4 @@ +#!/bin/bash +# Used to call this script from a stable path +DIR=$(dirname "$0") +exec node "$DIR/../ts/dest/node/main.js" $@ \ No newline at end of file diff --git a/ts/package.json b/ts/package.json index c50048c722..e821a68a10 100644 --- a/ts/package.json +++ b/ts/package.json @@ -22,12 +22,12 @@ "build:dev": "tsc -b --watch", "build:wasm": "cd ../cpp && cmake --preset wasm-threads && cmake --build --preset wasm-threads && cmake --preset wasm && cmake --build --preset wasm", "build:ts:browser": "tsc -b tsconfig.browser.json && BUILD_TARGET=browser webpack && chmod +x ./dest/browser/main.js && BUILD_TARGET=browser node replace_imports.cjs", - "build:ts:node": "tsc -b tsconfig.node.json && BUILD_TARGET=node webpack && chmod +x ./dest/node/main.js && BUILD_TARGET=node node replace_imports.cjs", + "build:ts:node": "tsc -b tsconfig.node.json && chmod +x ./dest/node/main.js && BUILD_TARGET=node node replace_imports.cjs", "build:bindings": "cd .. && ./scripts/bindgen.sh", "serve": "webpack serve", "formatting": "prettier --check ./src && eslint --max-warnings 0 ./src", "formatting:fix": "prettier -w ./src", - "test": "yarn build && yarn test:jest && yarn test:bin", + "test": "yarn build:ts:browser && yarn build:ts:node && yarn test:jest && yarn test:bin", "test:jest": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests", "test:bin": "cd ./bin-test && ./bin-test.sh", "test-debug": "NODE_NO_WARNINGS=1 node --inspect-brk=0.0.0.0 --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests --runInBand", diff --git a/ts/replace_imports.cjs b/ts/replace_imports.cjs index 87620ec4c2..eb8aa41d56 100644 --- a/ts/replace_imports.cjs +++ b/ts/replace_imports.cjs @@ -1,4 +1,5 @@ const replaceInFile = require('replace-in-file'); +const fs = require('fs'); const path = require('path'); const buildTarget = process.env.BUILD_TARGET; @@ -12,14 +13,18 @@ async function replaceImports() { from: new RegExp(`'dynamic\\/${item}';`, 'g'), to: `'./${buildTarget}/index.js';`, }); - }); - - // hack to allow for shared .wasm files between build targets - await replaceInFile({ - files: path.resolve(__dirname, `dest/${buildTarget}/barretenberg_wasm/${buildTarget}/index.js`), - from: /\.\.\/\.\.\//g, - to: `../../../`, }); + const filePath = path.resolve(__dirname, `dest/${buildTarget}/barretenberg_wasm/${buildTarget}/index.js`); + // Grab the contents for a hacky check if this has ran twice + const contents = fs.readFileSync(filePath, 'utf8'); + // hack to allow for shared .wasm files between build targets + if (contents.includes('../../') && !contents.includes('../../../')) { + await replaceInFile({ + files: filePath, + from: /\.\.\/\.\.\//g, + to: `../../../`, + }); + } } catch (error) { console.error('Error occurred:', error); } diff --git a/ts/webpack.config.cjs b/ts/webpack.config.cjs index 7a7a7a458f..53b65b917b 100644 --- a/ts/webpack.config.cjs +++ b/ts/webpack.config.cjs @@ -1,5 +1,7 @@ /** * Builds both the web and node version of the worker, and outputs it to the dest directory. + * NOTE: Currently only runs on web, has issues with translating node imports to require. + * Currently node passes only through typescript compiler. */ const path = require('path'); const ResolveTypeScriptPlugin = require('resolve-typescript-plugin'); @@ -10,12 +12,12 @@ const { resolve } = path; const buildTarget = process.env.BUILD_TARGET; const isNode = buildTarget === 'node'; -const configFile = path.resolve(__dirname, `./tsconfig.${buildTarget}.json`) ; +const configFile = path.resolve(__dirname, `./tsconfig.${buildTarget}.json`); module.exports = { mode: 'production', entry: './src/index.ts', - target: isNode ? "node" : "web", + target: isNode ? 'node' : 'web', output: { path: resolve(__dirname, `./dest/${buildTarget}`), filename: '[name].js', @@ -29,10 +31,7 @@ module.exports = { ], }, resolve: { - plugins: [ - new ResolveTypeScriptPlugin(), - new TsconfigPathsPlugin({ configFile }) - ], + plugins: [new ResolveTypeScriptPlugin(), new TsconfigPathsPlugin({ configFile })], }, optimization: { minimize: isNode, @@ -53,4 +52,4 @@ module.exports = { ], }), ], -} +}; From d4dfaef3de4db625061304ecb91245a2487b5719 Mon Sep 17 00:00:00 2001 From: ludamad Date: Mon, 24 Jul 2023 09:52:14 -0400 Subject: [PATCH 88/88] fix: bbjs with cra --- ts/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ts/Dockerfile b/ts/Dockerfile index ec0dc5d266..1a94506a44 100644 --- a/ts/Dockerfile +++ b/ts/Dockerfile @@ -3,8 +3,6 @@ FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/barretenberg-wasm-linux-clang FROM node:18-alpine -RUN apk add --no-cache make g++ python3 && apk add cmake --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main - COPY --from=0 /usr/src/barretenberg /usr/src/barretenberg WORKDIR /usr/src/barretenberg/ts COPY .yarn .yarn @@ -14,5 +12,5 @@ COPY .yarnrc.yml .yarnrc.yml RUN yarn --immutable COPY . . ENV DOCKER_ENV=true -RUN yarn formatting && yarn build +RUN yarn formatting && yarn build:ts:browser && yarn build:ts:node CMD ["yarn", "test"]