diff --git a/yarn-project/acir-simulator/src/acvm/deserialize.ts b/yarn-project/acir-simulator/src/acvm/deserialize.ts index f38418a1707..3884408c9c5 100644 --- a/yarn-project/acir-simulator/src/acvm/deserialize.ts +++ b/yarn-project/acir-simulator/src/acvm/deserialize.ts @@ -6,9 +6,9 @@ import { MAX_NEW_NULLIFIERS_PER_CALL, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, + MAX_READ_REQUESTS_PER_CALL, NUM_FIELDS_PER_SHA256, PrivateCircuitPublicInputs, - MAX_READ_REQUESTS_PER_CALL, RETURN_VALUES_LENGTH, } from '@aztec/circuits.js'; import { AztecAddress } from '@aztec/foundation/aztec-address'; diff --git a/yarn-project/aztec-rpc/src/aztec_rpc_http/aztec_rpc_http_server.ts b/yarn-project/aztec-rpc/src/aztec_rpc_http/aztec_rpc_http_server.ts index 94a01829324..c32f915fa9f 100644 --- a/yarn-project/aztec-rpc/src/aztec_rpc_http/aztec_rpc_http_server.ts +++ b/yarn-project/aztec-rpc/src/aztec_rpc_http/aztec_rpc_http_server.ts @@ -4,6 +4,7 @@ import { JsonRpcServer } from '@aztec/foundation/json-rpc'; import { ContractData, ContractDeploymentTx, ContractPublicData, Tx, TxExecutionRequest, TxHash } from '@aztec/types'; import { foundry } from 'viem/chains'; + import { AztecRPCServer, EthAddress } from '../index.js'; export const localAnvil = foundry; diff --git a/yarn-project/aztec-rpc/src/aztec_rpc_server/aztec_rpc_server.test.ts b/yarn-project/aztec-rpc/src/aztec_rpc_server/aztec_rpc_server.test.ts index 635d3bb73a0..0cdee8cb904 100644 --- a/yarn-project/aztec-rpc/src/aztec_rpc_server/aztec_rpc_server.test.ts +++ b/yarn-project/aztec-rpc/src/aztec_rpc_server/aztec_rpc_server.test.ts @@ -2,14 +2,14 @@ import { AztecAddress, CircuitsWasm, Fr } from '@aztec/circuits.js'; import { computeContractAddressFromPartial } from '@aztec/circuits.js/abis'; import { Grumpkin } from '@aztec/circuits.js/barretenberg'; import { ConstantKeyPair, TestKeyStore } from '@aztec/key-store'; +import { AztecNode } from '@aztec/types'; import { randomBytes } from 'crypto'; import { MockProxy, mock } from 'jest-mock-extended'; import { MemoryDB } from '../database/memory_db.js'; -import { AztecRPCServer } from './aztec_rpc_server.js'; -import { AztecNode } from '@aztec/types'; import { RpcServerConfig } from '../index.js'; +import { AztecRPCServer } from './aztec_rpc_server.js'; describe('AztecRpcServer', function () { let wasm: CircuitsWasm; diff --git a/yarn-project/aztec-rpc/src/aztec_rpc_server/aztec_rpc_server.ts b/yarn-project/aztec-rpc/src/aztec_rpc_server/aztec_rpc_server.ts index 827a6989857..96c8ace0a65 100644 --- a/yarn-project/aztec-rpc/src/aztec_rpc_server/aztec_rpc_server.ts +++ b/yarn-project/aztec-rpc/src/aztec_rpc_server/aztec_rpc_server.ts @@ -29,13 +29,14 @@ import { getNewContractPublicFunctions, toContractDao, } from '@aztec/types'; + +import { RpcServerConfig } from '../config/index.js'; import { ContractDataOracle } from '../contract_data_oracle/index.js'; import { Database, TxDao } from '../database/index.js'; import { KernelOracle } from '../kernel_oracle/index.js'; import { KernelProver } from '../kernel_prover/kernel_prover.js'; import { getAcirSimulator } from '../simulator/index.js'; import { Synchroniser } from '../synchroniser/index.js'; -import { RpcServerConfig } from '../config/index.js'; /** * A remote Aztec RPC Client implementation. diff --git a/yarn-project/aztec-rpc/src/contract_data_oracle/index.ts b/yarn-project/aztec-rpc/src/contract_data_oracle/index.ts index c0cc62ff071..3c568914a0e 100644 --- a/yarn-project/aztec-rpc/src/contract_data_oracle/index.ts +++ b/yarn-project/aztec-rpc/src/contract_data_oracle/index.ts @@ -1,8 +1,8 @@ import { AztecAddress, CircuitsWasm, MembershipWitness, VK_TREE_HEIGHT } from '@aztec/circuits.js'; import { ContractDatabase } from '@aztec/types'; +import { ContractCommitmentProvider } from '@aztec/types'; import { ContractTree } from '../contract_tree/index.js'; -import { ContractCommitmentProvider } from '@aztec/types'; /** * ContractDataOracle serves as a data manager and retriever for noir contracts. diff --git a/yarn-project/aztec-rpc/src/kernel_prover/kernel_prover.test.ts b/yarn-project/aztec-rpc/src/kernel_prover/kernel_prover.test.ts index fe49288c10a..507f6c9a9d2 100644 --- a/yarn-project/aztec-rpc/src/kernel_prover/kernel_prover.test.ts +++ b/yarn-project/aztec-rpc/src/kernel_prover/kernel_prover.test.ts @@ -3,10 +3,10 @@ import { KernelCircuitPublicInputs, MAX_NEW_COMMITMENTS_PER_TX, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, + MAX_READ_REQUESTS_PER_CALL, MembershipWitness, PrivateCallStackItem, PrivateCircuitPublicInputs, - MAX_READ_REQUESTS_PER_CALL, ReadRequestMembershipWitness, TxRequest, VK_TREE_HEIGHT, diff --git a/yarn-project/aztec-rpc/src/kernel_prover/kernel_prover.ts b/yarn-project/aztec-rpc/src/kernel_prover/kernel_prover.ts index 6a28afe056d..3fde266537c 100644 --- a/yarn-project/aztec-rpc/src/kernel_prover/kernel_prover.ts +++ b/yarn-project/aztec-rpc/src/kernel_prover/kernel_prover.ts @@ -5,11 +5,11 @@ import { Fr, KernelCircuitPublicInputs, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, + MAX_READ_REQUESTS_PER_CALL, MembershipWitness, PreviousKernelData, PrivateCallData, PrivateCallStackItem, - MAX_READ_REQUESTS_PER_CALL, ReadRequestMembershipWitness, TxRequest, VK_TREE_HEIGHT, diff --git a/yarn-project/aztec-rpc/src/note_processor/note_processor.ts b/yarn-project/aztec-rpc/src/note_processor/note_processor.ts index 5fe0818d263..a8a434d5c5d 100644 --- a/yarn-project/aztec-rpc/src/note_processor/note_processor.ts +++ b/yarn-project/aztec-rpc/src/note_processor/note_processor.ts @@ -1,11 +1,12 @@ import { AztecAddress, CircuitsWasm } from '@aztec/circuits.js'; +import { siloNullifier } from '@aztec/circuits.js/abis'; import { Grumpkin } from '@aztec/circuits.js/barretenberg'; import { Fr } from '@aztec/foundation/fields'; import { createDebugLogger } from '@aztec/foundation/log'; import { AztecNode, KeyStore, L2BlockContext, L2BlockL2Logs, NoteSpendingInfo, PublicKey } from '@aztec/types'; + import { Database, NoteSpendingInfoDao, TxDao } from '../database/index.js'; import { getAcirSimulator } from '../simulator/index.js'; -import { siloNullifier } from '@aztec/circuits.js/abis'; /** * Contains all the decrypted data in this array so that we can later batch insert it all into the database. diff --git a/yarn-project/aztec-rpc/src/simulator/index.ts b/yarn-project/aztec-rpc/src/simulator/index.ts index 017eac20ba8..82d99879cad 100644 --- a/yarn-project/aztec-rpc/src/simulator/index.ts +++ b/yarn-project/aztec-rpc/src/simulator/index.ts @@ -1,8 +1,9 @@ -import { ContractCommitmentProvider, DataCommitmentProvider, L1ToL2MessageProvider, KeyStore } from '@aztec/types'; +import { AcirSimulator } from '@aztec/acir-simulator'; +import { ContractCommitmentProvider, DataCommitmentProvider, KeyStore, L1ToL2MessageProvider } from '@aztec/types'; + import { ContractDataOracle } from '../contract_data_oracle/index.js'; import { Database } from '../database/database.js'; import { SimulatorOracle } from '../simulator_oracle/index.js'; -import { AcirSimulator } from '@aztec/acir-simulator'; /** * Helper method to create an instance of the acir simulator. diff --git a/yarn-project/aztec.js/src/account_impl/single_key_account_contract.ts b/yarn-project/aztec.js/src/account_impl/single_key_account_contract.ts index 0a6657b48b5..2a9c2346b5a 100644 --- a/yarn-project/aztec.js/src/account_impl/single_key_account_contract.ts +++ b/yarn-project/aztec.js/src/account_impl/single_key_account_contract.ts @@ -2,13 +2,14 @@ import { AztecAddress, CircuitsWasm, FunctionData, PartialContractAddress, TxCon import { Signer } from '@aztec/circuits.js/barretenberg'; import { ContractAbi, encodeArguments, generateFunctionSelector } from '@aztec/foundation/abi'; import { ExecutionRequest, PackedArguments, TxExecutionRequest } from '@aztec/types'; + import partition from 'lodash.partition'; + +import SchnorrAccountContractAbi from '../abis/schnorr_account_contract.json' assert { type: 'json' }; import { generatePublicKey } from '../index.js'; import { buildPayload, hashPayload } from './entrypoint_payload.js'; import { AccountImplementation } from './index.js'; -import SchnorrAccountContractAbi from '../abis/schnorr_account_contract.json' assert { type: 'json' }; - /** * Account contract implementation that uses a single key for signing and encryption. This public key is not * stored in the contract, but rather verified against the contract address. Note that this approach is not diff --git a/yarn-project/aztec.js/src/account_impl/stored_key_account_contract.ts b/yarn-project/aztec.js/src/account_impl/stored_key_account_contract.ts index b37d97a94c4..12b99117a0d 100644 --- a/yarn-project/aztec.js/src/account_impl/stored_key_account_contract.ts +++ b/yarn-project/aztec.js/src/account_impl/stored_key_account_contract.ts @@ -2,11 +2,12 @@ import { AztecAddress, CircuitsWasm, FunctionData, TxContext } from '@aztec/circ import { Signer } from '@aztec/circuits.js/barretenberg'; import { ContractAbi, encodeArguments, generateFunctionSelector } from '@aztec/foundation/abi'; import { ExecutionRequest, PackedArguments, TxExecutionRequest } from '@aztec/types'; + import partition from 'lodash.partition'; -import { buildPayload, hashPayload } from './entrypoint_payload.js'; -import { AccountImplementation } from './index.js'; import EcdsaAccountContractAbi from '../abis/ecdsa_account_contract.json' assert { type: 'json' }; +import { buildPayload, hashPayload } from './entrypoint_payload.js'; +import { AccountImplementation } from './index.js'; /** * Account contract implementation that keeps a signing public key in storage, and is retrieved on diff --git a/yarn-project/circuits.js/src/cbind/circuits.gen.ts b/yarn-project/circuits.js/src/cbind/circuits.gen.ts index 5618e9a2ba9..64e165b22b3 100644 --- a/yarn-project/circuits.js/src/cbind/circuits.gen.ts +++ b/yarn-project/circuits.js/src/cbind/circuits.gen.ts @@ -8,7 +8,6 @@ import mapValues from 'lodash.mapvalues'; import { callCbind } from './cbind.js'; import { - toBuffer, Address, CallContext, CircuitError, @@ -24,7 +23,6 @@ import { G1AffineElement, KernelCircuitPublicInputs, NativeAggregationState, - ReadRequestMembershipWitness, NewContractData, OptionallyRevealedData, Point, @@ -37,9 +35,11 @@ import { PublicDataRead, PublicDataUpdateRequest, PublicKernelInputs, + ReadRequestMembershipWitness, TxContext, VerificationKeyData, isCircuitError, + toBuffer, } from './types.js'; interface MsgpackG1AffineElement { diff --git a/yarn-project/circuits.js/src/tests/factories.ts b/yarn-project/circuits.js/src/tests/factories.ts index bdb22937cc9..4496fa4cfce 100644 --- a/yarn-project/circuits.js/src/tests/factories.ts +++ b/yarn-project/circuits.js/src/tests/factories.ts @@ -46,6 +46,7 @@ import { MAX_PUBLIC_DATA_READS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, + MAX_READ_REQUESTS_PER_CALL, MAX_READ_REQUESTS_PER_TX, MembershipWitness, MergeRollupInputs, @@ -75,7 +76,6 @@ import { PublicDataRead, PublicDataUpdateRequest, PublicKernelInputs, - MAX_READ_REQUESTS_PER_CALL, RETURN_VALUES_LENGTH, ROLLUP_VK_TREE_HEIGHT, ReadRequestMembershipWitness, diff --git a/yarn-project/end-to-end/src/e2e_account_contracts.test.ts b/yarn-project/end-to-end/src/e2e_account_contracts.test.ts index 69196240555..bf0f371c418 100644 --- a/yarn-project/end-to-end/src/e2e_account_contracts.test.ts +++ b/yarn-project/end-to-end/src/e2e_account_contracts.test.ts @@ -15,6 +15,7 @@ import { ContractAbi } from '@aztec/foundation/abi'; import { toBigInt } from '@aztec/foundation/serialize'; import { ChildAbi, EcdsaAccountContractAbi, SchnorrAccountContractAbi } from '@aztec/noir-contracts/examples'; import { PublicKey } from '@aztec/types'; + import { randomBytes } from 'crypto'; import { setup } from './utils.js'; diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract.test.ts b/yarn-project/end-to-end/src/e2e_deploy_contract.test.ts index 70c178dfdf0..65363f9ce68 100644 --- a/yarn-project/end-to-end/src/e2e_deploy_contract.test.ts +++ b/yarn-project/end-to-end/src/e2e_deploy_contract.test.ts @@ -1,12 +1,12 @@ import { AztecNodeService } from '@aztec/aztec-node'; import { AztecRPCServer } from '@aztec/aztec-rpc'; import { AztecAddress, ContractDeployer, Fr } from '@aztec/aztec.js'; +import { getContractDeploymentInfo } from '@aztec/circuits.js'; import { DebugLogger } from '@aztec/foundation/log'; import { TestContractAbi } from '@aztec/noir-contracts/examples'; import { TxStatus } from '@aztec/types'; import { setup } from './utils.js'; -import { getContractDeploymentInfo } from '@aztec/circuits.js'; describe('e2e_deploy_contract', () => { let aztecNode: AztecNodeService; diff --git a/yarn-project/foundation/.prettierrc.json b/yarn-project/foundation/.prettierrc.json index 0579ad16775..0f8d94093a8 100644 --- a/yarn-project/foundation/.prettierrc.json +++ b/yarn-project/foundation/.prettierrc.json @@ -3,11 +3,8 @@ "trailingComma": "all", "printWidth": 120, "arrowParens": "avoid", - "importOrder": [ - "^@aztec/(.*)$", - "", - "^\\.\/|\\.\\.\/" - ], + "importOrder": ["^@aztec/(.*)$", "", "^\\./|\\.\\./"], "importOrderSeparation": true, - "importOrderSortSpecifiers": true -} \ No newline at end of file + "importOrderSortSpecifiers": true, + "importOrderParserPlugins": ["importAssertions", "typescript"] +} diff --git a/yarn-project/merkle-tree/src/interfaces/indexed_tree.ts b/yarn-project/merkle-tree/src/interfaces/indexed_tree.ts index ec2c2c6c981..a684541fa48 100644 --- a/yarn-project/merkle-tree/src/interfaces/indexed_tree.ts +++ b/yarn-project/merkle-tree/src/interfaces/indexed_tree.ts @@ -1,4 +1,5 @@ import { SiblingPath } from '@aztec/types'; + import { LowLeafWitnessData } from '../index.js'; import { AppendOnlyTree } from './append_only_tree.js'; diff --git a/yarn-project/noir-contracts/src/examples/index.ts b/yarn-project/noir-contracts/src/examples/index.ts index 06a10329824..fa2260ecc15 100644 --- a/yarn-project/noir-contracts/src/examples/index.ts +++ b/yarn-project/noir-contracts/src/examples/index.ts @@ -1,16 +1,16 @@ // TODO the verification keys in this contracts are mocked ATM -import { ContractAbi } from '@aztec/foundation/abi' assert { type: 'json' }; +import { ContractAbi } from '@aztec/foundation/abi'; -import TestContractJson from './test_contract.json' assert { type: 'json' }; -import ZkTokenContractJson from './zk_token_contract.json' assert { type: 'json' }; -import ParentJson from './parent_contract.json' assert { type: 'json' }; import ChildJson from './child_contract.json' assert { type: 'json' }; -import PublicTokenContractJson from './public_token_contract.json' assert { type: 'json' }; -import NonNativeTokenContractJson from './non_native_token_contract.json' assert { type: 'json' }; import EcdsaAccountContractJson from './ecdsa_account_contract.json' assert { type: 'json' }; +import NonNativeTokenContractJson from './non_native_token_contract.json' assert { type: 'json' }; +import ParentJson from './parent_contract.json' assert { type: 'json' }; +import PendingCommitmentsContractJson from './pending_commitments_contract.json' assert { type: 'json' }; +import PublicTokenContractJson from './public_token_contract.json' assert { type: 'json' }; import SchnorrAccountContractJson from './schnorr_account_contract.json' assert { type: 'json' }; +import TestContractJson from './test_contract.json' assert { type: 'json' }; import UniswapContractJson from './uniswap_contract.json' assert { type: 'json' }; -import PendingCommitmentsContractJson from './pending_commitments_contract.json' assert { type: 'json' }; +import ZkTokenContractJson from './zk_token_contract.json' assert { type: 'json' }; export const TestContractAbi = TestContractJson as ContractAbi; export const ZkTokenContractAbi = ZkTokenContractJson as ContractAbi; diff --git a/yarn-project/package.json b/yarn-project/package.json index e50eeb70e5f..d4277d17569 100644 --- a/yarn-project/package.json +++ b/yarn-project/package.json @@ -45,6 +45,7 @@ "prettier": "@aztec/foundation/prettier", "devDependencies": { "@monorepo-utils/workspaces-to-typescript-project-references": "^2.9.0", + "@trivago/prettier-plugin-sort-imports": "^4.1.1", "eslint": "^8.21.0", "prettier": "^2.8.8", "typedoc": "^0.23.26", diff --git a/yarn-project/types/src/contract_dao.ts b/yarn-project/types/src/contract_dao.ts index 5a6005b08ef..415b95b5332 100644 --- a/yarn-project/types/src/contract_dao.ts +++ b/yarn-project/types/src/contract_dao.ts @@ -2,6 +2,7 @@ import { ContractFunctionDao } from '@aztec/circuits.js'; import { ContractAbi, FunctionType, generateFunctionSelector } from '@aztec/foundation/abi'; import { AztecAddress } from '@aztec/foundation/aztec-address'; import { EthAddress } from '@aztec/foundation/eth-address'; + import { EncodedContractFunction } from './contract_data.js'; /** diff --git a/yarn-project/types/src/interfaces/contract_commitment_provider.ts b/yarn-project/types/src/interfaces/contract_commitment_provider.ts index 235eba5f79b..b7539d2b41a 100644 --- a/yarn-project/types/src/interfaces/contract_commitment_provider.ts +++ b/yarn-project/types/src/interfaces/contract_commitment_provider.ts @@ -1,4 +1,5 @@ import { CONTRACT_TREE_HEIGHT } from '@aztec/circuits.js'; + import { SiblingPath } from '../sibling_path.js'; /** diff --git a/yarn-project/types/src/interfaces/data_commitment_provider.ts b/yarn-project/types/src/interfaces/data_commitment_provider.ts index 20314accb59..bedfa72c1b4 100644 --- a/yarn-project/types/src/interfaces/data_commitment_provider.ts +++ b/yarn-project/types/src/interfaces/data_commitment_provider.ts @@ -1,4 +1,5 @@ import { PRIVATE_DATA_TREE_HEIGHT } from '@aztec/circuits.js'; + import { SiblingPath } from '../sibling_path.js'; /** diff --git a/yarn-project/types/src/interfaces/l1_l2_message_provider.ts b/yarn-project/types/src/interfaces/l1_l2_message_provider.ts index e07b1d03d88..5e350737deb 100644 --- a/yarn-project/types/src/interfaces/l1_l2_message_provider.ts +++ b/yarn-project/types/src/interfaces/l1_l2_message_provider.ts @@ -1,4 +1,5 @@ import { Fr, L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js'; + import { L1ToL2MessageAndIndex } from '../l1_to_l2_message.js'; import { SiblingPath } from '../sibling_path.js'; diff --git a/yarn-project/yarn-project-base/scripts/update_build_manifest.mjs b/yarn-project/yarn-project-base/scripts/update_build_manifest.mjs index 6fbade9f2d1..36adc602a58 100644 --- a/yarn-project/yarn-project-base/scripts/update_build_manifest.mjs +++ b/yarn-project/yarn-project-base/scripts/update_build_manifest.mjs @@ -1,9 +1,7 @@ #!/usr/bin/env node - // Updates build manifest for a package based on a package.json - import { existsSync, readFileSync, writeFileSync } from 'fs'; -import { basename, dirname, resolve, join } from 'path'; +import { basename, dirname, join, resolve } from 'path'; import { cwd } from 'process'; // Update build_manifest.json with new dependencies diff --git a/yarn-project/yarn-project-base/scripts/update_package_jsons.mjs b/yarn-project/yarn-project-base/scripts/update_package_jsons.mjs index 636735acc92..49fe7337565 100644 --- a/yarn-project/yarn-project-base/scripts/update_package_jsons.mjs +++ b/yarn-project/yarn-project-base/scripts/update_package_jsons.mjs @@ -1,10 +1,8 @@ #!/usr/bin/env node - // Updates a package.json in the yarn-project folder based on inherits directives // Run with --check to check for changes (exits with non-zero if any, useful for CI) - -import { readFileSync, writeFileSync, readdirSync, statSync, existsSync } from 'fs'; -import { resolve, dirname, join } from 'path'; +import { existsSync, readFileSync, readdirSync, statSync, writeFileSync } from 'fs'; +import { dirname, join, resolve } from 'path'; const sources = {}; async function getSource(fullpath) { diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock index 21047f3fcc0..32522f2a982 100644 --- a/yarn-project/yarn.lock +++ b/yarn-project/yarn.lock @@ -220,6 +220,7 @@ __metadata: resolution: "@aztec/aztec3-packages@workspace:." dependencies: "@monorepo-utils/workspaces-to-typescript-project-references": ^2.9.0 + "@trivago/prettier-plugin-sort-imports": ^4.1.1 eslint: ^8.21.0 prettier: ^2.8.8 typedoc: ^0.23.26 @@ -686,7 +687,7 @@ __metadata: languageName: unknown linkType: soft -"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.22.5": +"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.22.5": version: 7.22.5 resolution: "@babel/code-frame@npm:7.22.5" dependencies: @@ -725,6 +726,29 @@ __metadata: languageName: node linkType: hard +"@babel/generator@npm:7.17.7": + version: 7.17.7 + resolution: "@babel/generator@npm:7.17.7" + dependencies: + "@babel/types": ^7.17.0 + jsesc: ^2.5.1 + source-map: ^0.5.0 + checksum: e7344b9b4559115f2754ecc2ae9508412ea6a8f617544cd3d3f17cabc727bd30630765f96c8a4ebc8901ded1492a3a6c23d695a4f1e8f3042f860b30c891985c + languageName: node + linkType: hard + +"@babel/generator@npm:^7.17.3": + version: 7.22.9 + resolution: "@babel/generator@npm:7.22.9" + dependencies: + "@babel/types": ^7.22.5 + "@jridgewell/gen-mapping": ^0.3.2 + "@jridgewell/trace-mapping": ^0.3.17 + jsesc: ^2.5.1 + checksum: 7c9d2c58b8d5ac5e047421a6ab03ec2ff5d9a5ff2c2212130a0055e063ac349e0b19d435537d6886c999771aef394832e4f54cd9fc810100a7f23d982f6af06b + languageName: node + linkType: hard + "@babel/generator@npm:^7.22.7, @babel/generator@npm:^7.7.2": version: 7.22.7 resolution: "@babel/generator@npm:7.22.7" @@ -752,14 +776,14 @@ __metadata: languageName: node linkType: hard -"@babel/helper-environment-visitor@npm:^7.22.5": +"@babel/helper-environment-visitor@npm:^7.16.7, @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.22.5": +"@babel/helper-function-name@npm:^7.16.7, @babel/helper-function-name@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-function-name@npm:7.22.5" dependencies: @@ -769,7 +793,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-hoist-variables@npm:^7.22.5": +"@babel/helper-hoist-variables@npm:^7.16.7, @babel/helper-hoist-variables@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-hoist-variables@npm:7.22.5" dependencies: @@ -819,7 +843,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-split-export-declaration@npm:^7.22.5, @babel/helper-split-export-declaration@npm:^7.22.6": +"@babel/helper-split-export-declaration@npm:^7.16.7, @babel/helper-split-export-declaration@npm:^7.22.5, @babel/helper-split-export-declaration@npm:^7.22.6": version: 7.22.6 resolution: "@babel/helper-split-export-declaration@npm:7.22.6" dependencies: @@ -835,7 +859,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-validator-identifier@npm:^7.22.5": +"@babel/helper-validator-identifier@npm:^7.16.7, @babel/helper-validator-identifier@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-validator-identifier@npm:7.22.5" checksum: 7f0f30113474a28298c12161763b49de5018732290ca4de13cdaefd4fd0d635a6fe3f6686c37a02905fb1e64f21a5ee2b55140cf7b070e729f1bd66866506aea @@ -871,7 +895,7 @@ __metadata: 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.22.5, @babel/parser@npm:^7.22.7": +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.17.3, @babel/parser@npm:^7.20.5, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.5, @babel/parser@npm:^7.22.7": version: 7.22.7 resolution: "@babel/parser@npm:7.22.7" bin: @@ -1054,6 +1078,24 @@ __metadata: languageName: node linkType: hard +"@babel/traverse@npm:7.17.3": + version: 7.17.3 + resolution: "@babel/traverse@npm:7.17.3" + dependencies: + "@babel/code-frame": ^7.16.7 + "@babel/generator": ^7.17.3 + "@babel/helper-environment-visitor": ^7.16.7 + "@babel/helper-function-name": ^7.16.7 + "@babel/helper-hoist-variables": ^7.16.7 + "@babel/helper-split-export-declaration": ^7.16.7 + "@babel/parser": ^7.17.3 + "@babel/types": ^7.17.0 + debug: ^4.1.0 + globals: ^11.1.0 + checksum: 780d7ecf711758174989794891af08d378f81febdb8932056c0d9979524bf0298e28f8e7708a872d7781151506c28f56c85c63ea3f1f654662c2fcb8a3eb9fdc + languageName: node + linkType: hard + "@babel/traverse@npm:^7.22.5, @babel/traverse@npm:^7.22.6, @babel/traverse@npm:^7.22.8": version: 7.22.8 resolution: "@babel/traverse@npm:7.22.8" @@ -1072,7 +1114,17 @@ __metadata: languageName: node linkType: hard -"@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": +"@babel/types@npm:7.17.0": + version: 7.17.0 + resolution: "@babel/types@npm:7.17.0" + dependencies: + "@babel/helper-validator-identifier": ^7.16.7 + to-fast-properties: ^2.0.0 + checksum: 12e5a287986fe557188e87b2c5202223f1dc83d9239a196ab936fdb9f8c1eb0be717ff19f934b5fad4e29a75586d5798f74bed209bccea1c20376b9952056f0e + languageName: node + linkType: hard + +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.17.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: @@ -2718,6 +2770,26 @@ __metadata: languageName: node linkType: hard +"@trivago/prettier-plugin-sort-imports@npm:^4.1.1": + version: 4.1.1 + resolution: "@trivago/prettier-plugin-sort-imports@npm:4.1.1" + dependencies: + "@babel/generator": 7.17.7 + "@babel/parser": ^7.20.5 + "@babel/traverse": 7.17.3 + "@babel/types": 7.17.0 + javascript-natural-sort: 0.7.1 + lodash: ^4.17.21 + peerDependencies: + "@vue/compiler-sfc": 3.x + prettier: 2.x + peerDependenciesMeta: + "@vue/compiler-sfc": + optional: true + checksum: 09b4c3c3f4a9e7883737acf92ae7f2a59eb3f7a6f104621a883bdb2a962dcf98398891489267a6fdbba1227a3484676f8d7470e1b3bc6422b4f457382fd030ce + languageName: node + linkType: hard + "@tsconfig/node10@npm:^1.0.7": version: 1.0.9 resolution: "@tsconfig/node10@npm:1.0.9" @@ -6354,6 +6426,13 @@ __metadata: languageName: node linkType: hard +"javascript-natural-sort@npm:0.7.1": + version: 0.7.1 + resolution: "javascript-natural-sort@npm:0.7.1" + checksum: 161e2c512cc7884bc055a582c6645d9032cab88497a76123d73cb23bfb03d97a04cf7772ecdb8bd3366fc07192c2f996366f479f725c23ef073fffe03d6a586a + languageName: node + linkType: hard + "jest-changed-files@npm:^29.5.0": version: 29.5.0 resolution: "jest-changed-files@npm:29.5.0" @@ -8943,6 +9022,13 @@ __metadata: languageName: node linkType: hard +"source-map@npm:^0.5.0": + version: 0.5.7 + resolution: "source-map@npm:0.5.7" + checksum: 5dc2043b93d2f194142c7f38f74a24670cd7a0063acdaf4bf01d2964b402257ae843c2a8fa822ad5b71013b5fcafa55af7421383da919752f22ff488bc553f4d + languageName: node + linkType: hard + "source-map@npm:^0.6.0, source-map@npm:^0.6.1": version: 0.6.1 resolution: "source-map@npm:0.6.1"