diff --git a/README.md b/README.md index f54c03c991..9ef1ed729f 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,6 @@

-

@@ -73,6 +72,9 @@ The following blockchain libraries (generated by Telescope) are available via np - [LCD Clients](#lcd-clients) - [LCD Clients Classes](#lcd-clients-classes) - [RPC Clients](#rpc-clients) + - [Tendermint Client](#tendermint-client) + - [gRPC-web Client](#grpc-web-client) + - [gRPC-gateway Client](#grpc-gateway-client) - [RPC Client Classes](#rpc-client-classes) - [Manually registering types](#manually-registering-types) - [CosmWasm](#cosmwasm) @@ -105,6 +107,7 @@ telescope generate cd ./your-new-project yarn ``` + ### Add Protobufs If you have `.proto` files, simply add them to a `./proto` folder. @@ -143,6 +146,7 @@ yarn buidl Now you should have code inside of your `./src` folder, ready for publshing via `npm publish`. Or, if you used the defaults, you can start developing and your code can be imported from `./src/codegen`; # Usage + ## Programatic Usage First add telescope to your `devDependencies`: @@ -214,7 +218,7 @@ telescope({ ### Amino Encoding | option | description | defaults | -| ------------------------------ | -------------------------------------------------------------- | ---------- | +| -----------------------------* | -------------------------------------------------------------* | ---------* | | `aminoEncoding.enabled` | generate amino types and amino converters | `true` | | `aminoEncoding.casingFn` | set the amino-casing function for a project | `snake()` | | `aminoEncoding.exceptions` | set specific aminoType name exceptions | see code | @@ -223,7 +227,7 @@ telescope({ ### Prototypes Options | option | description | defaults | -| ----------------------------------------- | -------------------------------------------------------------- | ---------- | +| ----------------------------------------* | -------------------------------------------------------------* | ---------* | | `prototypes.enabled` | enables the generation of proto encoding methods | `true` | | `prototypes.includePackageVar` | export a `protoPackage` variable to indicate package name | `false` | | `prototypes.excluded.packages` | exclude a set of packages from transpilation | `undefined`| @@ -237,7 +241,7 @@ telescope({ ### Prototypes Methods | option | description | defaults| -| ---------------------------------- | ----------------------------------------------------------------- | ------- | +| ---------------------------------* | ----------------------------------------------------------------* | ------* | | `prototypes.methods.encode` | boolean to enable `encode` method on proto objects | `true` | | `prototypes.methods.decode` | boolean to enable `decode` method on proto objects | `true` | | `prototypes.methods.fromJSON` | boolean to enable `fromJSON` method on proto objects | `true` | @@ -249,7 +253,7 @@ telescope({ ### LCD Client Options | option | description | defaults | -| ------------------------------ | -------------------------------------------------------------- | ---------- | +| -----------------------------* | -------------------------------------------------------------* | ---------* | | `lcdClients.enabled` | generate LCD clients that can query proto `Query` messages | `true` | | `lcdClients.bundle` | will generate factory bundle aggregate of all LCD Clients | `true` | | `lcdClients.scoped` | will generate factory of scoped LCD Clients | `undefined`| @@ -260,8 +264,8 @@ See [LCD Clients](#lcd-clients) for more info. ### RPC Client Options | option | description | defaults | -| ------------------------------ | ---------------------------------------------------------------------- | ----------------------------- | -| `rpcClients.type` | will generate this type of RPC client (tendermint, gRPC-web, gRPC) | `tendermint` | +| -----------------------------* | ---------------------------------------------------------------------* | ----------------------------* | +| `rpcClients.type` | will generate this type of RPC client (`tendermint`, `gRPC-web`, `gRPC`)| `tendermint` | | `rpcClients.enabled` | generate RPC clients that can interact with proto messages | `true` | | `rpcClients.bundle` | will generate factory bundle aggregate of all RPC Clients | `true` | | `rpcClients.camelCase` | use camel-case for RPC methods when generating RPC clients | `true` | @@ -274,14 +278,15 @@ See [RPC Clients](#rpc-clients) for more info. ### Stargate Client Options | option | description | defaults | -| -------------------------------------------- | -------------------------------------------------------------- | ---------| +| -------------------------------------------* | -------------------------------------------------------------* | ---------| | `stargateClients.includeCosmosDefaultTypes` | if true, will include the cosmjs defaults with stargate clients | `true` (except cosmos package) | ### State Management + #### React Query | option | description | defaults | -| -------------------------------- | ---------------------------------------------------------------------- | ---------| +| -------------------------------* | ---------------------------------------------------------------------* | ---------| | `reactQuery.enabled` | if true, will create react hooks that use `@tanstack/react-query` hooks | `false` | | `reactQuery.include.protos` | if set, will create the hooks on matched proto filenames or patterns using minimatch | `[]` | | `reactQuery.include.packages` | if set, will create the hooks on matched packages files using minimatch | `[]` | @@ -290,27 +295,25 @@ See [RPC Clients](#rpc-clients) for more info. #### Mobx | option | description | defaults | -| -------------------------------- | ---------------------------------------------------------------------- | ---------| +| -------------------------------* | ---------------------------------------------------------------------* | ---------| | `mobx.enabled` | if true, will create mobx stores that use `mobx` | `false` | | `mobx.include.protos` | if set, will create the mobx stores on matched proto filenames or patterns using minimatch | `[]` | | `mobx.include.packages` | if set, will create the mobx stores on matched packages files using minimatch | `[]` | | `mobx.include.patterns` | if set, will create the mobx stores on matched patterns of proto files using minimatch(deprecated in favor of packages and protos have been supported minimatch) | `[]` | - #### Pinia | option | description | defaults | -| -------------------------------- | ---------------------------------------------------------------------- | ---------| +| -------------------------------* | ---------------------------------------------------------------------* | ---------| | `pinia.enabled` | if true, will create pinia stores that use `pinia` | `false` | | `mobx.include.protos` | if set, will create the pinia stores on matched proto filenames or patterns using minimatch | `[]` | | `mobx.include.packages` | if set, will create the pinia stores on matched packages files using minimatch | `[]` | | `mobx.include.patterns` | if set, will create the pinia stores on matched patterns of proto files using minimatch(deprecated in favor of packages and protos have been supported minimatch) | `[]` | - ### Typings and Formating | option | description | defaults | -| ----------------------------------------- | -------------------------------------------------------------- | --------- | +| ----------------------------------------* | -------------------------------------------------------------* | --------* | | `prototypes.typingsFormat.customTypes.useCosmosSDKDec` | enable handling "prototypes.typingsFormat.customTypes.useCosmosSDKDec" proto custom type. Used to show decimal fields with the custom type correctly. Highly recommend set to true. | `false` | | `prototypes.typingsFormat.num64` | 'long' or 'bigint', the way of generating int64 proto types, set to 'bigint' to enable using more stable built-in type | `long` | | `prototypes.typingsFormat.useDeepPartial` | defaults to true, but if disabled uses the `Partial` TS type | `true` | @@ -321,7 +324,7 @@ See [RPC Clients](#rpc-clients) for more info. ### Protobuf parser | option | description | defaults | -| ----------------------------------------- | -------------------------------------------------------------- | --------- | +| ----------------------------------------* | -------------------------------------------------------------* | --------* | | `prototypes.parser.keepCase` | passes `keepCase` to protobuf `parse()` to keep original casing | `true` | | `prototypes.parser.alternateCommentMode` | passes `alternateCommentMode` to protobuf `parse()` method | `true` | | `prototypes.parser.preferTrailingComment` | passes `preferTrailingComment` to protobuf `parse()` method | `false` | @@ -329,7 +332,7 @@ See [RPC Clients](#rpc-clients) for more info. ### Typescript Disabling | option | description | defaults | -| -------------------------------------------- | -------------------------------------------------------------- | ---------| +| -------------------------------------------* | -------------------------------------------------------------* | ---------| | `tsDisable.disableAll` | if true, will include `//@ts-nocheck` on every output file | `false` | | `tsDisable.patterns` | if set, will include `//@ts-nocheck` on matched patterns | `[]` | | `tsDisable.files` | if set, will include `//@ts-nocheck` on matched files | `[]` | @@ -337,7 +340,7 @@ See [RPC Clients](#rpc-clients) for more info. ### ESLint Disabling | option | description | defaults | -| -------------------------------------------- | ---------------------------------------------------------------- | ---------| +| -------------------------------------------* | ---------------------------------------------------------------* | ---------| | `eslintDisable.disableAll` | if true, will include `/* eslint-disable */` on every output file | `false` | | `eslintDisable.patterns` | if set, will include `/* eslint-disable */` on matched patterns | `[]` | | `eslintDisable.files` | if set, will include `/* eslint-disable */` on matched files | `[]` | @@ -345,13 +348,13 @@ See [RPC Clients](#rpc-clients) for more info. ### Bundle | option | description | defaults | -| ------------------------------ | -------------------------------------------------------------- | ---------- | +| -----------------------------* | -------------------------------------------------------------* | ---------* | | `bundle.enabled` | bundle all files into a scoped index file | `true` | ### Output | option | description | defaults | -| ------------------------------ | ----------------------------------------------------------------- | ---------- | +| -----------------------------* | ----------------------------------------------------------------* | ---------* | | `env` | 'default' or 'v-next', set to 'v-next' to enable yet to release features | `default` | | `removeUnusedImports` | removes unused imports | `true` | | `classesUseArrowFunctions` | classes use arrow functions instead of `bind()`ing in constructors | `false` | @@ -364,18 +367,19 @@ See [RPC Clients](#rpc-clients) for more info. The representation of `google.protobuf.Timestamp` is configurable by the `prototypes.typingsFormat.timestamp` option. | Protobuf type | Default/`date='date'` | `date='timestamp'` | -| --------------------------- | ---------------------- | ----------------------------------| +| --------------------------* | ---------------------* | ----------------------------------| | `google.protobuf.Timestamp` | `Date` | `{ seconds: Long, nanos: number }`| TODO -- [ ] add `date='string'` option + +* [ ] add `date='string'` option ### Duration The representation of `google.protobuf.Duration` is configurable by the `prototypes.typingsFormat.duration` option. | Protobuf type | Default/`duration='duration'` | `duration='string'` | | -| --------------------------- | ---------------------- | ------------------------------------ | ---------------- | +| --------------------------* | ---------------------* | -----------------------------------* | ---------------* | | `google.protobuf.Duration` | `{ seconds: Long, nanos: number }` | `string` | | ## Composing Messages @@ -411,6 +415,7 @@ const msg = swapExactAmountIn({ tokenOutMinAmount }); ``` + ## Calculating Fees Make sure to create a `fee` object in addition to your message. @@ -438,6 +443,7 @@ const fee = { .toString() }; ``` + ## Stargate Clients Every module gets their own signing client. This example demonstrates for the `osmosis` module. @@ -456,6 +462,7 @@ const client = await getSigningOsmosisClient({ ## Creating Signers To broadcast messages, you'll want to use either [keplr](https://docs.keplr.app/api/cosmjs.html) or an `OfflineSigner` from `cosmjs` using mnemonics. + ### Amino Signer Likely you'll want to use the Amino, so unless you need proto, you should use this one: @@ -463,6 +470,7 @@ Likely you'll want to use the Amino, so unless you need proto, you should use th ```js import { getOfflineSigner as getOfflineSignerAmino } from 'cosmjs-utils'; ``` + ### Proto Signer ```js @@ -578,19 +586,24 @@ main().then(() => { console.log('all done') }) ``` + ## RPC Clients +### Tendermint Client + For querying data via RPC endpoints, you can use RPC Clients. For a better developer experience, you can generate a factory of scoped bundles of all RPC Clients with the `rpcClients` option. ```ts const options: TelescopeOptions = { rpcClients: { - enabled: true + type: 'tendermint', + enabled: true, + camelCase: true } }; ``` -If you use the `rpcClients.scoped` array, you can scope to only the modules of your interest. +If you use the `rpcClients.scoped` array, you can scope to only the modules of your interest. `gRPC-web` and `gRPC-gateway` work the same way with this option. ```ts const options: TelescopeOptions = { @@ -629,6 +642,95 @@ const main = async () => { }; ``` +### gRPC-web Client + +For querying data via gRPC-web endpoints, you can use gRPC-web Clients. For a better developer experience, you can generate a factory of scoped bundles of all gRPC-web Clients with the `rpcClients` option. + +```ts +const options: TelescopeOptions = { + rpcClients: { + type: 'grpc-web', + enabled: true, + camelCase: true + } +}; +``` + +This will generate helpers `createGrpcWebClient` and `createGrpcMsgClient` in the `ClientFactory`, which you can then use to query multiple modules from a single object, if you need an example with scaffold and broadcast msg you can refer to the example below in `grpc-gateway`: + +```js +import { osmosis } from './codegen'; + +const main = async () => { + const client = await osmosis.ClientFactory.createGrpcWebClient({ endpoint }); + + // now you can query the modules + const pool = await client.osmosis.gamm.v1beta1.pool({ poolId: "1" }); + const balance = await client.cosmos.bank.v1beta1.allBalances({ address: 'osmo1addresshere' }); +}; +``` + +### gRPC-gateway Client + +For querying data via gRPC-web endpoints, you can use gRPC-web Clients. For a better developer experience, you can generate a factory of scoped bundles of all gRPC-web Clients with the `rpcClients` option. + +```ts +const options: TelescopeOptions = { + rpcClients: { + type: 'grpc-gateway', + enabled: true, + camelCase: true + } +}; +``` + +This will generate helpers `createGrpcGateWayClient` in the `ClientFactory`, which you can then use to query multiple modules from a single object: + +```js +import { osmosis } from './codegen'; + +const main = async () => { + // endpoint here is lcd endpoint + const client = await osmosis.ClientFactory.createGrpcGateWayClient({ endpoint }); + + // now you can query the modules + const pool = await client.osmosis.gamm.v1beta1.pool({ poolId: "1" }); + const balance = await client.cosmos.bank.v1beta1.allBalances({ address: 'osmo1addresshere' }); +}; +``` + +Below will be an example of scaffold a `grant` Proto Msg for grpc-web and grpc-gateway and then broadcast it. + +```js + const { grant } = cosmos.authz.v1beta1.MessageComposer.withTypeUrl; + const msg = grant({ + granter: 'granter_address', + grantee: 'grantee_address', + grant: { + authorization: StakeAuthorization.toProtoMsg({ + maxTokens: { + denom: 'uosmo', + amount: '100000000' + }, + authorizationType: AuthorizationType.AUTHORIZATION_TYPE_DELEGATE + }), + expiration: new Date(Date.now() + 60 * 60 * 24 * 7) + }}) + + const signed_tx = await signClient.sign('granter_address', [msg], fee, 'telescope: grant', signerData); + const txRawBytes = Uint8Array.from(TxRaw.encode(signed_tx).finish()); + + const res = await client.cosmos.tx.v1beta1.broadcastTx( + { + txBytes: txRawBytes, + mode: BroadcastMode.BROADCAST_MODE_BLOCK + } + ) + + console.log(res); + +``` + ## RPC Client Classes If you want to instantiate a single client, you can generate RPC classes with the `rpcClients` option; @@ -664,6 +766,7 @@ main().then(() => { console.log('all done') }) ``` + ## Manually registering types This example is with `osmosis` module in `osmojs`, but it is the same pattern for any module. @@ -733,10 +836,10 @@ const options: TelescopeOptions = { If you don't use the boilerplate, you will need to manually install -- `@cosmjs/amino` -- `@cosmjs/proto-signing` -- `@cosmjs/stargate` -- `@cosmjs/tendermint-rpc` +* `@cosmjs/amino` +* `@cosmjs/proto-signing` +* `@cosmjs/stargate` +* `@cosmjs/tendermint-rpc` ```sh yarn add @cosmjs/amino @cosmjs/proto-signing @cosmjs/stargate @cosmjs/tendermint-rpc @@ -744,7 +847,7 @@ yarn add @cosmjs/amino @cosmjs/proto-signing @cosmjs/stargate @cosmjs/tendermint If you use the LCD Client generation, you'll need to add -- `@osmonauts/lcd` +* `@osmonauts/lcd` ```sh yarn add @osmonauts/lcd @@ -756,11 +859,11 @@ yarn add @osmonauts/lcd CRA requires that you update Webpack configurations: -https://github.com/cosmos/cosmjs/blob/656e02374898afe755e980e93390591b4b65fd86/README.md#webpack-configs + Here is an example of a `config-overrides.js`: -https://github.com/pyramation/osmosis-ui/blob/main/config-overrides.js + ### Babel @@ -773,6 +876,7 @@ This should not be an issue, but if you experience problems with syntax or are n ## Developing See our [documentation](https://github.com/osmosis-labs/telescope/blob/main/docs/README.md) for how to contribute and develop Telescope. + ## Sponsors Kudos to our sponsors: diff --git a/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/query.ts index 6dbd445835..dffe1120bc 100644 --- a/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/query.ts @@ -45,7 +45,7 @@ export interface QueryAccountsRequestSDKType { */ export interface QueryAccountsResponse { /** accounts are the existing accounts */ - accounts: (BaseAccount & Any)[] | Any[]; + accounts: (BaseAccount | Any)[] | Any[]; /** pagination defines the pagination in the response. */ pagination: PageResponse; } @@ -141,7 +141,7 @@ export interface QueryParamsResponseSDKType { /** QueryAccountResponse is the response type for the Query/Account RPC method. */ export interface QueryAccountResponse { /** account defines the account of the corresponding address. */ - account: (BaseAccount & Any) | undefined; + account: BaseAccount | Any | undefined; } export interface QueryAccountResponseProtoMsg { typeUrl: "/cosmos.auth.v1beta1.QueryAccountResponse"; @@ -179,7 +179,7 @@ export interface QueryParamsRequestAminoMsg { export interface QueryParamsRequestSDKType {} /** QueryModuleAccountsResponse is the response type for the Query/ModuleAccounts RPC method. */ export interface QueryModuleAccountsResponse { - accounts: (ModuleAccount & Any)[] | Any[]; + accounts: (ModuleAccount | Any)[] | Any[]; } export interface QueryModuleAccountsResponseProtoMsg { typeUrl: "/cosmos.auth.v1beta1.QueryModuleAccountsResponse"; diff --git a/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/authz.ts b/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/authz.ts index cf9129724b..e5a1223ff2 100644 --- a/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/authz.ts @@ -47,7 +47,7 @@ export interface GenericAuthorizationSDKType { * the provide method with expiration time. */ export interface Grant { - authorization: (GenericAuthorization & DepositDeploymentAuthorization1 & DepositDeploymentAuthorization2 & SendAuthorization & StakeAuthorization & Any) | undefined; + authorization: GenericAuthorization | DepositDeploymentAuthorization1 | DepositDeploymentAuthorization2 | SendAuthorization | StakeAuthorization | Any | undefined; /** * time when the grant will expire and will be pruned. If null, then the grant * doesn't have a time expiration (other conditions in `authorization` @@ -94,7 +94,7 @@ export interface GrantSDKType { export interface GrantAuthorization { granter: string; grantee: string; - authorization: (GenericAuthorization & DepositDeploymentAuthorization1 & DepositDeploymentAuthorization2 & SendAuthorization & StakeAuthorization & Any) | undefined; + authorization: GenericAuthorization | DepositDeploymentAuthorization1 | DepositDeploymentAuthorization2 | SendAuthorization | StakeAuthorization | Any | undefined; expiration: Date; } export interface GrantAuthorizationProtoMsg { diff --git a/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/tx.ts index c3f670080b..9d6e7d4327 100644 --- a/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/tx.ts @@ -8,7 +8,7 @@ export const protobufPackage = "cosmos.evidence.v1beta1"; */ export interface MsgSubmitEvidence { submitter: string; - evidence: (Any) | undefined; + evidence: Any | undefined; } export interface MsgSubmitEvidenceProtoMsg { typeUrl: "/cosmos.evidence.v1beta1.MsgSubmitEvidence"; diff --git a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/feegrant.ts b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/feegrant.ts index c006b60533..a7dc544adb 100644 --- a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/feegrant.ts +++ b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/feegrant.ts @@ -123,7 +123,7 @@ export interface PeriodicAllowanceSDKType { /** AllowedMsgAllowance creates allowance only for specified message types. */ export interface AllowedMsgAllowance { /** allowance can be any of basic and periodic fee allowance. */ - allowance: (BasicAllowance & PeriodicAllowance & AllowedMsgAllowance & Any) | undefined; + allowance: BasicAllowance | PeriodicAllowance | AllowedMsgAllowance | Any | undefined; /** allowed_messages are the messages for which the grantee has the access. */ allowedMessages: string[]; } @@ -157,7 +157,7 @@ export interface Grant { /** grantee is the address of the user being granted an allowance of another user's funds. */ grantee: string; /** allowance can be any of basic, periodic, allowed fee allowance. */ - allowance: (BasicAllowance & PeriodicAllowance & AllowedMsgAllowance & Any) | undefined; + allowance: BasicAllowance | PeriodicAllowance | AllowedMsgAllowance | Any | undefined; } export interface GrantProtoMsg { typeUrl: "/cosmos.feegrant.v1beta1.Grant"; diff --git a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/tx.ts index ae261c7c4a..2f627fcf00 100644 --- a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/tx.ts @@ -13,7 +13,7 @@ export interface MsgGrantAllowance { /** grantee is the address of the user being granted an allowance of another user's funds. */ grantee: string; /** allowance can be any of basic, periodic, allowed fee allowance. */ - allowance: (BasicAllowance & PeriodicAllowance & AllowedMsgAllowance & Any) | undefined; + allowance: BasicAllowance | PeriodicAllowance | AllowedMsgAllowance | Any | undefined; } export interface MsgGrantAllowanceProtoMsg { typeUrl: "/cosmos.feegrant.v1beta1.MsgGrantAllowance"; diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1/tx.ts index 498f541e48..05caa1e76e 100644 --- a/__fixtures__/v-next/outputv2/cosmos/gov/v1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/gov/v1/tx.ts @@ -15,7 +15,7 @@ export const protobufPackage = "cosmos.gov.v1"; * proposal Content. */ export interface MsgSubmitProposal { - messages: (TextProposal & RegisterIncentiveProposal & ClientUpdateProposal & UpgradeProposal & ReplacePoolIncentivesProposal & UpdatePoolIncentivesProposal & SetSuperfluidAssetsProposal & RemoveSuperfluidAssetsProposal & UpdateUnpoolWhiteListProposal & UpdateFeeTokenProposal & Any)[] | Any[]; + messages: (TextProposal | RegisterIncentiveProposal | ClientUpdateProposal | UpgradeProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any)[] | Any[]; initialDeposit: Coin[]; proposer: string; /** metadata is any arbitrary metadata attached to the proposal. */ @@ -79,7 +79,7 @@ export interface MsgSubmitProposalResponseSDKType { */ export interface MsgExecLegacyContent { /** content is the proposal's content. */ - content: (TextProposal & RegisterIncentiveProposal & ClientUpdateProposal & UpgradeProposal & ReplacePoolIncentivesProposal & UpdatePoolIncentivesProposal & SetSuperfluidAssetsProposal & RemoveSuperfluidAssetsProposal & UpdateUnpoolWhiteListProposal & UpdateFeeTokenProposal & Any) | undefined; + content: TextProposal | RegisterIncentiveProposal | ClientUpdateProposal | UpgradeProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any | undefined; /** authority must be the gov module address. */ authority: string; } diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/gov.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/gov.ts index ed08d42f5a..50415fee75 100644 --- a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/gov.ts @@ -249,7 +249,7 @@ export interface DepositSDKType { /** Proposal defines the core field members of a governance proposal. */ export interface Proposal { proposalId: Long; - content: (TextProposal & RegisterIncentiveProposal & ClientUpdateProposal & UpgradeProposal & ReplacePoolIncentivesProposal & UpdatePoolIncentivesProposal & SetSuperfluidAssetsProposal & RemoveSuperfluidAssetsProposal & UpdateUnpoolWhiteListProposal & UpdateFeeTokenProposal & Any) | undefined; + content: TextProposal | RegisterIncentiveProposal | ClientUpdateProposal | UpgradeProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any | undefined; status: ProposalStatus; /** * final_tally_result is the final tally result of the proposal. When diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/tx.ts index fafca55a6d..6a1ba4ca4b 100644 --- a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/tx.ts @@ -14,7 +14,7 @@ export const protobufPackage = "cosmos.gov.v1beta1"; * proposal Content. */ export interface MsgSubmitProposal { - content: (TextProposal & RegisterIncentiveProposal & ClientUpdateProposal & UpgradeProposal & ReplacePoolIncentivesProposal & UpdatePoolIncentivesProposal & SetSuperfluidAssetsProposal & RemoveSuperfluidAssetsProposal & UpdateUnpoolWhiteListProposal & UpdateFeeTokenProposal & Any) | undefined; + content: TextProposal | RegisterIncentiveProposal | ClientUpdateProposal | UpgradeProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any | undefined; initialDeposit: Coin[]; proposer: string; } diff --git a/__fixtures__/v-next/outputv2/cosmos/group/v1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/group/v1/tx.ts index ee514a24ad..04e1a8b1de 100644 --- a/__fixtures__/v-next/outputv2/cosmos/group/v1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/group/v1/tx.ts @@ -253,7 +253,7 @@ export interface MsgCreateGroupPolicy { /** metadata is any arbitrary metadata attached to the group policy. */ metadata: string; /** decision_policy specifies the group policy's decision policy. */ - decisionPolicy: (ThresholdDecisionPolicy & PercentageDecisionPolicy & Any) | undefined; + decisionPolicy: ThresholdDecisionPolicy | PercentageDecisionPolicy | Any | undefined; } export interface MsgCreateGroupPolicyProtoMsg { typeUrl: "/cosmos.group.v1.MsgCreateGroupPolicy"; @@ -351,7 +351,7 @@ export interface MsgCreateGroupWithPolicy { /** group_policy_as_admin is a boolean field, if set to true, the group policy account address will be used as group and group policy admin. */ groupPolicyAsAdmin: boolean; /** decision_policy specifies the group policy's decision policy. */ - decisionPolicy: (ThresholdDecisionPolicy & PercentageDecisionPolicy & Any) | undefined; + decisionPolicy: ThresholdDecisionPolicy | PercentageDecisionPolicy | Any | undefined; } export interface MsgCreateGroupWithPolicyProtoMsg { typeUrl: "/cosmos.group.v1.MsgCreateGroupWithPolicy"; @@ -436,7 +436,7 @@ export interface MsgUpdateGroupPolicyDecisionPolicy { /** address is the account address of group policy. */ address: string; /** decision_policy is the updated group policy's decision policy. */ - decisionPolicy: (ThresholdDecisionPolicy & PercentageDecisionPolicy & Any) | undefined; + decisionPolicy: ThresholdDecisionPolicy | PercentageDecisionPolicy | Any | undefined; } export interface MsgUpdateGroupPolicyDecisionPolicyProtoMsg { typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyDecisionPolicy"; diff --git a/__fixtures__/v-next/outputv2/cosmos/group/v1/types.ts b/__fixtures__/v-next/outputv2/cosmos/group/v1/types.ts index 073fa531f8..7849e2ece5 100644 --- a/__fixtures__/v-next/outputv2/cosmos/group/v1/types.ts +++ b/__fixtures__/v-next/outputv2/cosmos/group/v1/types.ts @@ -496,7 +496,7 @@ export interface GroupPolicyInfo { */ version: Long; /** decision_policy specifies the group policy's decision policy. */ - decisionPolicy: (ThresholdDecisionPolicy & PercentageDecisionPolicy & Any) | undefined; + decisionPolicy: ThresholdDecisionPolicy | PercentageDecisionPolicy | Any | undefined; /** created_at is a timestamp specifying when a group policy was created. */ createdAt: Date; } diff --git a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/staking.ts b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/staking.ts index 23f985c1e3..2d0d81da6d 100644 --- a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/staking.ts +++ b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/staking.ts @@ -219,7 +219,7 @@ export interface Validator { /** operator_address defines the address of the validator's operator; bech encoded in JSON. */ operatorAddress: string; /** consensus_pubkey is the consensus public key of the validator, as a Protobuf Any. */ - consensusPubkey: (Any) | undefined; + consensusPubkey: Any | undefined; /** jailed defined whether the validator has been jailed from bonded status or not. */ jailed: boolean; /** status is the validator status (bonded/unbonding/unbonded). */ diff --git a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/tx.ts index b6565fbfa3..5a7dcbc5e8 100644 --- a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/tx.ts @@ -14,7 +14,7 @@ export interface MsgCreateValidator { minSelfDelegation: string; delegatorAddress: string; validatorAddress: string; - pubkey: (Any) | undefined; + pubkey: Any | undefined; value: Coin; } export interface MsgCreateValidatorProtoMsg { diff --git a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/types.ts b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/types.ts index 1fd4a33550..b805933adf 100644 --- a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/types.ts +++ b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/types.ts @@ -223,7 +223,7 @@ export interface ContractInfo { * Extension is an extension point to store custom metadata within the * persistence model. */ - extension: (Any) | undefined; + extension: Any | undefined; } export interface ContractInfoProtoMsg { typeUrl: "/cosmwasm.wasm.v1.ContractInfo"; diff --git a/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/genesis.ts index 1b878f4e6d..5e28824313 100644 --- a/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/genesis.ts @@ -31,7 +31,7 @@ export interface ParamsSDKType { } /** GenesisState defines the gamm module's genesis state. */ export interface GenesisState { - pools: (Pool1 & Pool2 & Any)[] | Any[]; + pools: (Pool1 | Pool2 | Any)[] | Any[]; /** will be renamed to next_pool_id in an upcoming version */ nextPoolNumber: Long; params: Params; diff --git a/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/query.ts b/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/query.ts index 6d1fa67f13..7a00eaee81 100644 --- a/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/query.ts @@ -32,7 +32,7 @@ export interface QueryPoolRequestSDKType { pool_id: Long; } export interface QueryPoolResponse { - pool: (Pool1 & Pool2 & Any) | undefined; + pool: Pool1 | Pool2 | Any | undefined; } export interface QueryPoolResponseProtoMsg { typeUrl: "/osmosis.gamm.v1beta1.QueryPoolResponse"; @@ -74,7 +74,7 @@ export interface QueryPoolsRequestSDKType { pagination: PageRequestSDKType; } export interface QueryPoolsResponse { - pools: (Pool1 & Pool2 & Any)[] | Any[]; + pools: (Pool1 | Pool2 | Any)[] | Any[]; /** pagination defines the pagination in the response. */ pagination: PageResponse; } @@ -465,7 +465,7 @@ export interface QueryPoolsWithFilterRequestSDKType { pagination: PageRequestSDKType; } export interface QueryPoolsWithFilterResponse { - pools: (Pool1 & Pool2 & Any)[] | Any[]; + pools: (Pool1 | Pool2 | Any)[] | Any[]; /** pagination defines the pagination in the response. */ pagination: PageResponse; } diff --git a/__fixtures__/v-next/outputv3/akash/audit/v1beta2/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/akash/audit/v1beta2/query.rpc.Query.ts index f8898579e8..29402a576e 100644 --- a/__fixtures__/v-next/outputv3/akash/audit/v1beta2/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/akash/audit/v1beta2/query.rpc.Query.ts @@ -56,7 +56,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/akash/cert/v1beta2/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/akash/cert/v1beta2/query.rpc.Query.ts index 9cfe79ac3b..b23132869c 100644 --- a/__fixtures__/v-next/outputv3/akash/cert/v1beta2/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/akash/cert/v1beta2/query.rpc.Query.ts @@ -13,7 +13,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/query.rpc.Query.ts index 31124d13f4..320b201b9a 100644 --- a/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/query.rpc.Query.ts @@ -33,7 +33,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/query.rpc.Query.ts index 488a1aa8f2..04128e4e81 100644 --- a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/query.rpc.Query.ts @@ -34,7 +34,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/akash/escrow/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/akash/escrow/v1beta1/query.rpc.Query.ts index e16b6c292b..3877d55f04 100644 --- a/__fixtures__/v-next/outputv3/akash/escrow/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/akash/escrow/v1beta1/query.rpc.Query.ts @@ -30,7 +30,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/akash/escrow/v1beta2/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/akash/escrow/v1beta2/query.rpc.Query.ts index a5432ad7e0..8735c3d907 100644 --- a/__fixtures__/v-next/outputv3/akash/escrow/v1beta2/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/akash/escrow/v1beta2/query.rpc.Query.ts @@ -30,7 +30,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/akash/market/v1beta2/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/akash/market/v1beta2/query.rpc.Query.ts index 23c9548e11..a12335c780 100644 --- a/__fixtures__/v-next/outputv3/akash/market/v1beta2/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/akash/market/v1beta2/query.rpc.Query.ts @@ -61,7 +61,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/akash/provider/v1beta2/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/akash/provider/v1beta2/query.rpc.Query.ts index 3d4c6443b6..92f789fc7e 100644 --- a/__fixtures__/v-next/outputv3/akash/provider/v1beta2/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/akash/provider/v1beta2/query.rpc.Query.ts @@ -22,7 +22,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/akash/rpc.query.ts b/__fixtures__/v-next/outputv3/akash/rpc.query.ts index fc600d3237..90172cb202 100644 --- a/__fixtures__/v-next/outputv3/akash/rpc.query.ts +++ b/__fixtures__/v-next/outputv3/akash/rpc.query.ts @@ -7,80 +7,80 @@ export const createGrpcGateWayClient = async ({ return { akash: { audit: { - v1beta2: new (await import("./audit/v1beta2/query.rpc.Query")).Querier(endpoint) + v1beta2: new (await import("./audit/v1beta2/query.rpc.Query")).QueryClientImpl(endpoint) }, cert: { - v1beta2: new (await import("./cert/v1beta2/query.rpc.Query")).Querier(endpoint) + v1beta2: new (await import("./cert/v1beta2/query.rpc.Query")).QueryClientImpl(endpoint) }, deployment: { - v1beta1: new (await import("./deployment/v1beta1/query.rpc.Query")).Querier(endpoint), - v1beta2: new (await import("./deployment/v1beta2/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./deployment/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint), + v1beta2: new (await import("./deployment/v1beta2/query.rpc.Query")).QueryClientImpl(endpoint) }, escrow: { - v1beta1: new (await import("./escrow/v1beta1/query.rpc.Query")).Querier(endpoint), - v1beta2: new (await import("./escrow/v1beta2/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./escrow/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint), + v1beta2: new (await import("./escrow/v1beta2/query.rpc.Query")).QueryClientImpl(endpoint) }, market: { - v1beta2: new (await import("./market/v1beta2/query.rpc.Query")).Querier(endpoint) + v1beta2: new (await import("./market/v1beta2/query.rpc.Query")).QueryClientImpl(endpoint) }, provider: { - v1beta2: new (await import("./provider/v1beta2/query.rpc.Query")).Querier(endpoint) + v1beta2: new (await import("./provider/v1beta2/query.rpc.Query")).QueryClientImpl(endpoint) } }, cosmos: { app: { - v1alpha1: new (await import("../cosmos/app/v1alpha1/query.rpc.Query")).Querier(endpoint) + v1alpha1: new (await import("../cosmos/app/v1alpha1/query.rpc.Query")).QueryClientImpl(endpoint) }, auth: { - v1beta1: new (await import("../cosmos/auth/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/auth/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, authz: { - v1beta1: new (await import("../cosmos/authz/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/authz/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, bank: { - v1beta1: new (await import("../cosmos/bank/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/bank/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, base: { tendermint: { - v1beta1: new (await import("../cosmos/base/tendermint/v1beta1/query.rpc.Service")).Querier(endpoint) + v1beta1: new (await import("../cosmos/base/tendermint/v1beta1/query.rpc.Service")).ServiceClientImpl(endpoint) } }, distribution: { - v1beta1: new (await import("../cosmos/distribution/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/distribution/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, evidence: { - v1beta1: new (await import("../cosmos/evidence/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/evidence/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, feegrant: { - v1beta1: new (await import("../cosmos/feegrant/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/feegrant/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, gov: { - v1: new (await import("../cosmos/gov/v1/query.rpc.Query")).Querier(endpoint), - v1beta1: new (await import("../cosmos/gov/v1beta1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("../cosmos/gov/v1/query.rpc.Query")).QueryClientImpl(endpoint), + v1beta1: new (await import("../cosmos/gov/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, group: { - v1: new (await import("../cosmos/group/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("../cosmos/group/v1/query.rpc.Query")).QueryClientImpl(endpoint) }, mint: { - v1beta1: new (await import("../cosmos/mint/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/mint/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, nft: { - v1beta1: new (await import("../cosmos/nft/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/nft/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, params: { - v1beta1: new (await import("../cosmos/params/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/params/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, slashing: { - v1beta1: new (await import("../cosmos/slashing/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/slashing/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, staking: { - v1beta1: new (await import("../cosmos/staking/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/staking/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, tx: { - v1beta1: new (await import("../cosmos/tx/v1beta1/service.rpc.Service")).Querier(endpoint) + v1beta1: new (await import("../cosmos/tx/v1beta1/service.rpc.Service")).ServiceClientImpl(endpoint) }, upgrade: { - v1beta1: new (await import("../cosmos/upgrade/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/upgrade/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) } } }; diff --git a/__fixtures__/v-next/outputv3/cosmos/app/v1alpha1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/cosmos/app/v1alpha1/query.rpc.Query.ts index b59119bb8f..c3bb74bade 100644 --- a/__fixtures__/v-next/outputv3/cosmos/app/v1alpha1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/app/v1alpha1/query.rpc.Query.ts @@ -12,7 +12,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/cosmos/auth/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/cosmos/auth/v1beta1/query.rpc.Query.ts index 250d1c7009..e7dc7082b3 100644 --- a/__fixtures__/v-next/outputv3/cosmos/auth/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/auth/v1beta1/query.rpc.Query.ts @@ -72,7 +72,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/cosmos/auth/v1beta1/query.ts b/__fixtures__/v-next/outputv3/cosmos/auth/v1beta1/query.ts index 6dbd445835..dffe1120bc 100644 --- a/__fixtures__/v-next/outputv3/cosmos/auth/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/auth/v1beta1/query.ts @@ -45,7 +45,7 @@ export interface QueryAccountsRequestSDKType { */ export interface QueryAccountsResponse { /** accounts are the existing accounts */ - accounts: (BaseAccount & Any)[] | Any[]; + accounts: (BaseAccount | Any)[] | Any[]; /** pagination defines the pagination in the response. */ pagination: PageResponse; } @@ -141,7 +141,7 @@ export interface QueryParamsResponseSDKType { /** QueryAccountResponse is the response type for the Query/Account RPC method. */ export interface QueryAccountResponse { /** account defines the account of the corresponding address. */ - account: (BaseAccount & Any) | undefined; + account: BaseAccount | Any | undefined; } export interface QueryAccountResponseProtoMsg { typeUrl: "/cosmos.auth.v1beta1.QueryAccountResponse"; @@ -179,7 +179,7 @@ export interface QueryParamsRequestAminoMsg { export interface QueryParamsRequestSDKType {} /** QueryModuleAccountsResponse is the response type for the Query/ModuleAccounts RPC method. */ export interface QueryModuleAccountsResponse { - accounts: (ModuleAccount & Any)[] | Any[]; + accounts: (ModuleAccount | Any)[] | Any[]; } export interface QueryModuleAccountsResponseProtoMsg { typeUrl: "/cosmos.auth.v1beta1.QueryModuleAccountsResponse"; diff --git a/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/authz.ts b/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/authz.ts index 3f7ddd025d..0abaa053b4 100644 --- a/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/authz.ts @@ -47,7 +47,7 @@ export interface GenericAuthorizationSDKType { * the provide method with expiration time. */ export interface Grant { - authorization: (GenericAuthorization & DepositDeploymentAuthorization1 & DepositDeploymentAuthorization2 & SendAuthorization & StakeAuthorization & Any) | undefined; + authorization: GenericAuthorization | DepositDeploymentAuthorization1 | DepositDeploymentAuthorization2 | SendAuthorization | StakeAuthorization | Any | undefined; /** * time when the grant will expire and will be pruned. If null, then the grant * doesn't have a time expiration (other conditions in `authorization` @@ -94,7 +94,7 @@ export interface GrantSDKType { export interface GrantAuthorization { granter: string; grantee: string; - authorization: (GenericAuthorization & DepositDeploymentAuthorization1 & DepositDeploymentAuthorization2 & SendAuthorization & StakeAuthorization & Any) | undefined; + authorization: GenericAuthorization | DepositDeploymentAuthorization1 | DepositDeploymentAuthorization2 | SendAuthorization | StakeAuthorization | Any | undefined; expiration: Date; } export interface GrantAuthorizationProtoMsg { diff --git a/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/query.rpc.Query.ts index 1ca2de197b..95b01d095f 100644 --- a/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/authz/v1beta1/query.rpc.Query.ts @@ -39,7 +39,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/query.rpc.Query.ts index d55f87910f..2492c2d316 100644 --- a/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/bank/v1beta1/query.rpc.Query.ts @@ -95,7 +95,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/cosmos/base/tendermint/v1beta1/query.rpc.Service.ts b/__fixtures__/v-next/outputv3/cosmos/base/tendermint/v1beta1/query.rpc.Service.ts index e403fd1dc6..1efb1efd51 100644 --- a/__fixtures__/v-next/outputv3/cosmos/base/tendermint/v1beta1/query.rpc.Service.ts +++ b/__fixtures__/v-next/outputv3/cosmos/base/tendermint/v1beta1/query.rpc.Service.ts @@ -61,7 +61,7 @@ export class Service { }); } } -export class Querier { +export class ServiceClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/cosmos/distribution/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/cosmos/distribution/v1beta1/query.rpc.Query.ts index a1fc97a389..fb122e2a7e 100644 --- a/__fixtures__/v-next/outputv3/cosmos/distribution/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/distribution/v1beta1/query.rpc.Query.ts @@ -89,7 +89,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/query.rpc.Query.ts index 7dae052b38..b306e0da31 100644 --- a/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/query.rpc.Query.ts @@ -22,7 +22,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/tx.ts index c3f670080b..9d6e7d4327 100644 --- a/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/evidence/v1beta1/tx.ts @@ -8,7 +8,7 @@ export const protobufPackage = "cosmos.evidence.v1beta1"; */ export interface MsgSubmitEvidence { submitter: string; - evidence: (Any) | undefined; + evidence: Any | undefined; } export interface MsgSubmitEvidenceProtoMsg { typeUrl: "/cosmos.evidence.v1beta1.MsgSubmitEvidence"; diff --git a/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/feegrant.ts b/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/feegrant.ts index 02eca0a412..1dbcbe5b93 100644 --- a/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/feegrant.ts +++ b/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/feegrant.ts @@ -123,7 +123,7 @@ export interface PeriodicAllowanceSDKType { /** AllowedMsgAllowance creates allowance only for specified message types. */ export interface AllowedMsgAllowance { /** allowance can be any of basic and periodic fee allowance. */ - allowance: (BasicAllowance & PeriodicAllowance & AllowedMsgAllowance & Any) | undefined; + allowance: BasicAllowance | PeriodicAllowance | AllowedMsgAllowance | Any | undefined; /** allowed_messages are the messages for which the grantee has the access. */ allowedMessages: string[]; } @@ -157,7 +157,7 @@ export interface Grant { /** grantee is the address of the user being granted an allowance of another user's funds. */ grantee: string; /** allowance can be any of basic, periodic, allowed fee allowance. */ - allowance: (BasicAllowance & PeriodicAllowance & AllowedMsgAllowance & Any) | undefined; + allowance: BasicAllowance | PeriodicAllowance | AllowedMsgAllowance | Any | undefined; } export interface GrantProtoMsg { typeUrl: "/cosmos.feegrant.v1beta1.Grant"; diff --git a/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/query.rpc.Query.ts index a49f46672a..287c1f5907 100644 --- a/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/query.rpc.Query.ts @@ -34,7 +34,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/tx.ts index ae261c7c4a..2f627fcf00 100644 --- a/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/feegrant/v1beta1/tx.ts @@ -13,7 +13,7 @@ export interface MsgGrantAllowance { /** grantee is the address of the user being granted an allowance of another user's funds. */ grantee: string; /** allowance can be any of basic, periodic, allowed fee allowance. */ - allowance: (BasicAllowance & PeriodicAllowance & AllowedMsgAllowance & Any) | undefined; + allowance: BasicAllowance | PeriodicAllowance | AllowedMsgAllowance | Any | undefined; } export interface MsgGrantAllowanceProtoMsg { typeUrl: "/cosmos.feegrant.v1beta1.MsgGrantAllowance"; diff --git a/__fixtures__/v-next/outputv3/cosmos/gov/v1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/cosmos/gov/v1/query.rpc.Query.ts index 7491ad7a4a..21e92759d1 100644 --- a/__fixtures__/v-next/outputv3/cosmos/gov/v1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/gov/v1/query.rpc.Query.ts @@ -76,7 +76,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/cosmos/gov/v1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/gov/v1/tx.ts index a5bc15039b..88d0c3e521 100644 --- a/__fixtures__/v-next/outputv3/cosmos/gov/v1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/gov/v1/tx.ts @@ -15,7 +15,7 @@ export const protobufPackage = "cosmos.gov.v1"; * proposal Content. */ export interface MsgSubmitProposal { - messages: (TextProposal & RegisterIncentiveProposal & ClientUpdateProposal & UpgradeProposal & ReplacePoolIncentivesProposal & UpdatePoolIncentivesProposal & SetSuperfluidAssetsProposal & RemoveSuperfluidAssetsProposal & UpdateUnpoolWhiteListProposal & UpdateFeeTokenProposal & Any)[] | Any[]; + messages: (TextProposal | RegisterIncentiveProposal | ClientUpdateProposal | UpgradeProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any)[] | Any[]; initialDeposit: Coin[]; proposer: string; /** metadata is any arbitrary metadata attached to the proposal. */ @@ -79,7 +79,7 @@ export interface MsgSubmitProposalResponseSDKType { */ export interface MsgExecLegacyContent { /** content is the proposal's content. */ - content: (TextProposal & RegisterIncentiveProposal & ClientUpdateProposal & UpgradeProposal & ReplacePoolIncentivesProposal & UpdatePoolIncentivesProposal & SetSuperfluidAssetsProposal & RemoveSuperfluidAssetsProposal & UpdateUnpoolWhiteListProposal & UpdateFeeTokenProposal & Any) | undefined; + content: TextProposal | RegisterIncentiveProposal | ClientUpdateProposal | UpgradeProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any | undefined; /** authority must be the gov module address. */ authority: string; } diff --git a/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/gov.ts b/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/gov.ts index e2ceca6de3..99a61fdb0f 100644 --- a/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/gov.ts @@ -249,7 +249,7 @@ export interface DepositSDKType { /** Proposal defines the core field members of a governance proposal. */ export interface Proposal { proposalId: Long; - content: (TextProposal & RegisterIncentiveProposal & ClientUpdateProposal & UpgradeProposal & ReplacePoolIncentivesProposal & UpdatePoolIncentivesProposal & SetSuperfluidAssetsProposal & RemoveSuperfluidAssetsProposal & UpdateUnpoolWhiteListProposal & UpdateFeeTokenProposal & Any) | undefined; + content: TextProposal | RegisterIncentiveProposal | ClientUpdateProposal | UpgradeProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any | undefined; status: ProposalStatus; /** * final_tally_result is the final tally result of the proposal. When diff --git a/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/query.rpc.Query.ts index a64c2d46a5..efcbca95ef 100644 --- a/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/query.rpc.Query.ts @@ -76,7 +76,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/tx.ts index 9e07302344..a03a26a824 100644 --- a/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/gov/v1beta1/tx.ts @@ -14,7 +14,7 @@ export const protobufPackage = "cosmos.gov.v1beta1"; * proposal Content. */ export interface MsgSubmitProposal { - content: (TextProposal & RegisterIncentiveProposal & ClientUpdateProposal & UpgradeProposal & ReplacePoolIncentivesProposal & UpdatePoolIncentivesProposal & SetSuperfluidAssetsProposal & RemoveSuperfluidAssetsProposal & UpdateUnpoolWhiteListProposal & UpdateFeeTokenProposal & Any) | undefined; + content: TextProposal | RegisterIncentiveProposal | ClientUpdateProposal | UpgradeProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any | undefined; initialDeposit: Coin[]; proposer: string; } diff --git a/__fixtures__/v-next/outputv3/cosmos/group/v1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/cosmos/group/v1/query.rpc.Query.ts index 9d0ffb4258..49ee47c7c0 100644 --- a/__fixtures__/v-next/outputv3/cosmos/group/v1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/group/v1/query.rpc.Query.ts @@ -121,7 +121,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/cosmos/group/v1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/group/v1/tx.ts index 2f64fa7283..a83d998a58 100644 --- a/__fixtures__/v-next/outputv3/cosmos/group/v1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/group/v1/tx.ts @@ -253,7 +253,7 @@ export interface MsgCreateGroupPolicy { /** metadata is any arbitrary metadata attached to the group policy. */ metadata: string; /** decision_policy specifies the group policy's decision policy. */ - decisionPolicy: (ThresholdDecisionPolicy & PercentageDecisionPolicy & Any) | undefined; + decisionPolicy: ThresholdDecisionPolicy | PercentageDecisionPolicy | Any | undefined; } export interface MsgCreateGroupPolicyProtoMsg { typeUrl: "/cosmos.group.v1.MsgCreateGroupPolicy"; @@ -351,7 +351,7 @@ export interface MsgCreateGroupWithPolicy { /** group_policy_as_admin is a boolean field, if set to true, the group policy account address will be used as group and group policy admin. */ groupPolicyAsAdmin: boolean; /** decision_policy specifies the group policy's decision policy. */ - decisionPolicy: (ThresholdDecisionPolicy & PercentageDecisionPolicy & Any) | undefined; + decisionPolicy: ThresholdDecisionPolicy | PercentageDecisionPolicy | Any | undefined; } export interface MsgCreateGroupWithPolicyProtoMsg { typeUrl: "/cosmos.group.v1.MsgCreateGroupWithPolicy"; @@ -436,7 +436,7 @@ export interface MsgUpdateGroupPolicyDecisionPolicy { /** address is the account address of group policy. */ address: string; /** decision_policy is the updated group policy's decision policy. */ - decisionPolicy: (ThresholdDecisionPolicy & PercentageDecisionPolicy & Any) | undefined; + decisionPolicy: ThresholdDecisionPolicy | PercentageDecisionPolicy | Any | undefined; } export interface MsgUpdateGroupPolicyDecisionPolicyProtoMsg { typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyDecisionPolicy"; diff --git a/__fixtures__/v-next/outputv3/cosmos/group/v1/types.ts b/__fixtures__/v-next/outputv3/cosmos/group/v1/types.ts index 9f64b10d95..fe9db4a4f0 100644 --- a/__fixtures__/v-next/outputv3/cosmos/group/v1/types.ts +++ b/__fixtures__/v-next/outputv3/cosmos/group/v1/types.ts @@ -496,7 +496,7 @@ export interface GroupPolicyInfo { */ version: Long; /** decision_policy specifies the group policy's decision policy. */ - decisionPolicy: (ThresholdDecisionPolicy & PercentageDecisionPolicy & Any) | undefined; + decisionPolicy: ThresholdDecisionPolicy | PercentageDecisionPolicy | Any | undefined; /** created_at is a timestamp specifying when a group policy was created. */ createdAt: Date; } diff --git a/__fixtures__/v-next/outputv3/cosmos/mint/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/cosmos/mint/v1beta1/query.rpc.Query.ts index 2d46190fc7..bde378a151 100644 --- a/__fixtures__/v-next/outputv3/cosmos/mint/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/mint/v1beta1/query.rpc.Query.ts @@ -30,7 +30,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/query.rpc.Query.ts index 78d3a1d492..ee0c0c0453 100644 --- a/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/nft/v1beta1/query.rpc.Query.ts @@ -70,7 +70,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/cosmos/params/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/cosmos/params/v1beta1/query.rpc.Query.ts index 8ce415413a..bde2403974 100644 --- a/__fixtures__/v-next/outputv3/cosmos/params/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/params/v1beta1/query.rpc.Query.ts @@ -24,7 +24,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/cosmos/rpc.query.ts b/__fixtures__/v-next/outputv3/cosmos/rpc.query.ts index a510f8c80f..5990c32393 100644 --- a/__fixtures__/v-next/outputv3/cosmos/rpc.query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/rpc.query.ts @@ -7,58 +7,58 @@ export const createGrpcGateWayClient = async ({ return { cosmos: { app: { - v1alpha1: new (await import("./app/v1alpha1/query.rpc.Query")).Querier(endpoint) + v1alpha1: new (await import("./app/v1alpha1/query.rpc.Query")).QueryClientImpl(endpoint) }, auth: { - v1beta1: new (await import("./auth/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./auth/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, authz: { - v1beta1: new (await import("./authz/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./authz/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, bank: { - v1beta1: new (await import("./bank/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./bank/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, base: { tendermint: { - v1beta1: new (await import("./base/tendermint/v1beta1/query.rpc.Service")).Querier(endpoint) + v1beta1: new (await import("./base/tendermint/v1beta1/query.rpc.Service")).ServiceClientImpl(endpoint) } }, distribution: { - v1beta1: new (await import("./distribution/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./distribution/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, evidence: { - v1beta1: new (await import("./evidence/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./evidence/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, feegrant: { - v1beta1: new (await import("./feegrant/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./feegrant/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, gov: { - v1: new (await import("./gov/v1/query.rpc.Query")).Querier(endpoint), - v1beta1: new (await import("./gov/v1beta1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("./gov/v1/query.rpc.Query")).QueryClientImpl(endpoint), + v1beta1: new (await import("./gov/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, group: { - v1: new (await import("./group/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("./group/v1/query.rpc.Query")).QueryClientImpl(endpoint) }, mint: { - v1beta1: new (await import("./mint/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./mint/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, nft: { - v1beta1: new (await import("./nft/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./nft/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, params: { - v1beta1: new (await import("./params/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./params/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, slashing: { - v1beta1: new (await import("./slashing/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./slashing/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, staking: { - v1beta1: new (await import("./staking/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./staking/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, tx: { - v1beta1: new (await import("./tx/v1beta1/service.rpc.Service")).Querier(endpoint) + v1beta1: new (await import("./tx/v1beta1/service.rpc.Service")).ServiceClientImpl(endpoint) }, upgrade: { - v1beta1: new (await import("./upgrade/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./upgrade/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) } } }; diff --git a/__fixtures__/v-next/outputv3/cosmos/slashing/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/cosmos/slashing/v1beta1/query.rpc.Query.ts index 6335ad9d6b..0897043ae0 100644 --- a/__fixtures__/v-next/outputv3/cosmos/slashing/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/slashing/v1beta1/query.rpc.Query.ts @@ -31,7 +31,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/query.rpc.Query.ts index c6867a8993..75fcb838ec 100644 --- a/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/query.rpc.Query.ts @@ -142,7 +142,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/staking.ts b/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/staking.ts index 1761edc759..afe1e85efa 100644 --- a/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/staking.ts +++ b/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/staking.ts @@ -219,7 +219,7 @@ export interface Validator { /** operator_address defines the address of the validator's operator; bech encoded in JSON. */ operatorAddress: string; /** consensus_pubkey is the consensus public key of the validator, as a Protobuf Any. */ - consensusPubkey: (Any) | undefined; + consensusPubkey: Any | undefined; /** jailed defined whether the validator has been jailed from bonded status or not. */ jailed: boolean; /** status is the validator status (bonded/unbonding/unbonded). */ diff --git a/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/tx.ts index 977ab47e20..d37b05ece8 100644 --- a/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/tx.ts @@ -14,7 +14,7 @@ export interface MsgCreateValidator { minSelfDelegation: string; delegatorAddress: string; validatorAddress: string; - pubkey: (Any) | undefined; + pubkey: Any | undefined; value: Coin; } export interface MsgCreateValidatorProtoMsg { diff --git a/__fixtures__/v-next/outputv3/cosmos/tx/v1beta1/service.rpc.Service.ts b/__fixtures__/v-next/outputv3/cosmos/tx/v1beta1/service.rpc.Service.ts index 4091de61fe..0a5536abda 100644 --- a/__fixtures__/v-next/outputv3/cosmos/tx/v1beta1/service.rpc.Service.ts +++ b/__fixtures__/v-next/outputv3/cosmos/tx/v1beta1/service.rpc.Service.ts @@ -54,7 +54,7 @@ export class Service { }); } } -export class Querier { +export class ServiceClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/cosmos/upgrade/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/cosmos/upgrade/v1beta1/query.rpc.Query.ts index 52622eb13a..9038abb75a 100644 --- a/__fixtures__/v-next/outputv3/cosmos/upgrade/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/cosmos/upgrade/v1beta1/query.rpc.Query.ts @@ -59,7 +59,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/cosmwasm/rpc.query.ts b/__fixtures__/v-next/outputv3/cosmwasm/rpc.query.ts index 42fcd320ab..d0eb317db3 100644 --- a/__fixtures__/v-next/outputv3/cosmwasm/rpc.query.ts +++ b/__fixtures__/v-next/outputv3/cosmwasm/rpc.query.ts @@ -7,63 +7,63 @@ export const createGrpcGateWayClient = async ({ return { cosmos: { app: { - v1alpha1: new (await import("../cosmos/app/v1alpha1/query.rpc.Query")).Querier(endpoint) + v1alpha1: new (await import("../cosmos/app/v1alpha1/query.rpc.Query")).QueryClientImpl(endpoint) }, auth: { - v1beta1: new (await import("../cosmos/auth/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/auth/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, authz: { - v1beta1: new (await import("../cosmos/authz/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/authz/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, bank: { - v1beta1: new (await import("../cosmos/bank/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/bank/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, base: { tendermint: { - v1beta1: new (await import("../cosmos/base/tendermint/v1beta1/query.rpc.Service")).Querier(endpoint) + v1beta1: new (await import("../cosmos/base/tendermint/v1beta1/query.rpc.Service")).ServiceClientImpl(endpoint) } }, distribution: { - v1beta1: new (await import("../cosmos/distribution/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/distribution/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, evidence: { - v1beta1: new (await import("../cosmos/evidence/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/evidence/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, feegrant: { - v1beta1: new (await import("../cosmos/feegrant/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/feegrant/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, gov: { - v1: new (await import("../cosmos/gov/v1/query.rpc.Query")).Querier(endpoint), - v1beta1: new (await import("../cosmos/gov/v1beta1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("../cosmos/gov/v1/query.rpc.Query")).QueryClientImpl(endpoint), + v1beta1: new (await import("../cosmos/gov/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, group: { - v1: new (await import("../cosmos/group/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("../cosmos/group/v1/query.rpc.Query")).QueryClientImpl(endpoint) }, mint: { - v1beta1: new (await import("../cosmos/mint/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/mint/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, nft: { - v1beta1: new (await import("../cosmos/nft/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/nft/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, params: { - v1beta1: new (await import("../cosmos/params/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/params/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, slashing: { - v1beta1: new (await import("../cosmos/slashing/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/slashing/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, staking: { - v1beta1: new (await import("../cosmos/staking/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/staking/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, tx: { - v1beta1: new (await import("../cosmos/tx/v1beta1/service.rpc.Service")).Querier(endpoint) + v1beta1: new (await import("../cosmos/tx/v1beta1/service.rpc.Service")).ServiceClientImpl(endpoint) }, upgrade: { - v1beta1: new (await import("../cosmos/upgrade/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/upgrade/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) } }, cosmwasm: { wasm: { - v1: new (await import("./wasm/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("./wasm/v1/query.rpc.Query")).QueryClientImpl(endpoint) } } }; diff --git a/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/query.rpc.Query.ts index 68ed08d3b1..6818e200b9 100644 --- a/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/query.rpc.Query.ts @@ -85,7 +85,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/types.ts b/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/types.ts index 1fd4a33550..b805933adf 100644 --- a/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/types.ts +++ b/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/types.ts @@ -223,7 +223,7 @@ export interface ContractInfo { * Extension is an extension point to store custom metadata within the * persistence model. */ - extension: (Any) | undefined; + extension: Any | undefined; } export interface ContractInfoProtoMsg { typeUrl: "/cosmwasm.wasm.v1.ContractInfo"; diff --git a/__fixtures__/v-next/outputv3/evmos/claims/v1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/evmos/claims/v1/query.rpc.Query.ts index dbd568167f..aca89f4f64 100644 --- a/__fixtures__/v-next/outputv3/evmos/claims/v1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/evmos/claims/v1/query.rpc.Query.ts @@ -42,7 +42,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/evmos/epochs/v1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/evmos/epochs/v1/query.rpc.Query.ts index bb7cbf7753..e50842b61d 100644 --- a/__fixtures__/v-next/outputv3/evmos/epochs/v1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/evmos/epochs/v1/query.rpc.Query.ts @@ -22,7 +22,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/evmos/erc20/v1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/evmos/erc20/v1/query.rpc.Query.ts index cb48e4983e..015ef05ca7 100644 --- a/__fixtures__/v-next/outputv3/evmos/erc20/v1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/evmos/erc20/v1/query.rpc.Query.ts @@ -32,7 +32,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/evmos/fees/v1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/evmos/fees/v1/query.rpc.Query.ts index 489f005636..7ff5299dad 100644 --- a/__fixtures__/v-next/outputv3/evmos/fees/v1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/evmos/fees/v1/query.rpc.Query.ts @@ -44,7 +44,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/evmos/incentives/v1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/evmos/incentives/v1/query.rpc.Query.ts index d7aa5c0b80..113f283894 100644 --- a/__fixtures__/v-next/outputv3/evmos/incentives/v1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/evmos/incentives/v1/query.rpc.Query.ts @@ -72,7 +72,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/evmos/inflation/v1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/evmos/inflation/v1/query.rpc.Query.ts index 9b22309fe8..18de6a030c 100644 --- a/__fixtures__/v-next/outputv3/evmos/inflation/v1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/evmos/inflation/v1/query.rpc.Query.ts @@ -61,7 +61,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/evmos/recovery/v1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/evmos/recovery/v1/query.rpc.Query.ts index 60ef834f11..4ca88770c5 100644 --- a/__fixtures__/v-next/outputv3/evmos/recovery/v1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/evmos/recovery/v1/query.rpc.Query.ts @@ -12,7 +12,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/evmos/rpc.query.ts b/__fixtures__/v-next/outputv3/evmos/rpc.query.ts index f1e37fa08b..8fb0012678 100644 --- a/__fixtures__/v-next/outputv3/evmos/rpc.query.ts +++ b/__fixtures__/v-next/outputv3/evmos/rpc.query.ts @@ -7,84 +7,84 @@ export const createGrpcGateWayClient = async ({ return { cosmos: { app: { - v1alpha1: new (await import("../cosmos/app/v1alpha1/query.rpc.Query")).Querier(endpoint) + v1alpha1: new (await import("../cosmos/app/v1alpha1/query.rpc.Query")).QueryClientImpl(endpoint) }, auth: { - v1beta1: new (await import("../cosmos/auth/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/auth/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, authz: { - v1beta1: new (await import("../cosmos/authz/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/authz/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, bank: { - v1beta1: new (await import("../cosmos/bank/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/bank/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, base: { tendermint: { - v1beta1: new (await import("../cosmos/base/tendermint/v1beta1/query.rpc.Service")).Querier(endpoint) + v1beta1: new (await import("../cosmos/base/tendermint/v1beta1/query.rpc.Service")).ServiceClientImpl(endpoint) } }, distribution: { - v1beta1: new (await import("../cosmos/distribution/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/distribution/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, evidence: { - v1beta1: new (await import("../cosmos/evidence/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/evidence/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, feegrant: { - v1beta1: new (await import("../cosmos/feegrant/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/feegrant/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, gov: { - v1: new (await import("../cosmos/gov/v1/query.rpc.Query")).Querier(endpoint), - v1beta1: new (await import("../cosmos/gov/v1beta1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("../cosmos/gov/v1/query.rpc.Query")).QueryClientImpl(endpoint), + v1beta1: new (await import("../cosmos/gov/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, group: { - v1: new (await import("../cosmos/group/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("../cosmos/group/v1/query.rpc.Query")).QueryClientImpl(endpoint) }, mint: { - v1beta1: new (await import("../cosmos/mint/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/mint/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, nft: { - v1beta1: new (await import("../cosmos/nft/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/nft/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, params: { - v1beta1: new (await import("../cosmos/params/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/params/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, slashing: { - v1beta1: new (await import("../cosmos/slashing/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/slashing/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, staking: { - v1beta1: new (await import("../cosmos/staking/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/staking/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, tx: { - v1beta1: new (await import("../cosmos/tx/v1beta1/service.rpc.Service")).Querier(endpoint) + v1beta1: new (await import("../cosmos/tx/v1beta1/service.rpc.Service")).ServiceClientImpl(endpoint) }, upgrade: { - v1beta1: new (await import("../cosmos/upgrade/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/upgrade/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) } }, evmos: { claims: { - v1: new (await import("./claims/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("./claims/v1/query.rpc.Query")).QueryClientImpl(endpoint) }, epochs: { - v1: new (await import("./epochs/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("./epochs/v1/query.rpc.Query")).QueryClientImpl(endpoint) }, erc20: { - v1: new (await import("./erc20/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("./erc20/v1/query.rpc.Query")).QueryClientImpl(endpoint) }, fees: { - v1: new (await import("./fees/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("./fees/v1/query.rpc.Query")).QueryClientImpl(endpoint) }, incentives: { - v1: new (await import("./incentives/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("./incentives/v1/query.rpc.Query")).QueryClientImpl(endpoint) }, inflation: { - v1: new (await import("./inflation/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("./inflation/v1/query.rpc.Query")).QueryClientImpl(endpoint) }, recovery: { - v1: new (await import("./recovery/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("./recovery/v1/query.rpc.Query")).QueryClientImpl(endpoint) }, vesting: { - v1: new (await import("./vesting/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("./vesting/v1/query.rpc.Query")).QueryClientImpl(endpoint) } } }; diff --git a/__fixtures__/v-next/outputv3/evmos/vesting/v1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/evmos/vesting/v1/query.rpc.Query.ts index 6ffc1a3561..4d6515e855 100644 --- a/__fixtures__/v-next/outputv3/evmos/vesting/v1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/evmos/vesting/v1/query.rpc.Query.ts @@ -12,7 +12,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/ibc/applications/transfer/v1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/ibc/applications/transfer/v1/query.rpc.Query.ts index 2a10a11759..4ddaf403f5 100644 --- a/__fixtures__/v-next/outputv3/ibc/applications/transfer/v1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/ibc/applications/transfer/v1/query.rpc.Query.ts @@ -31,7 +31,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/ibc/core/channel/v1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/ibc/core/channel/v1/query.rpc.Query.ts index 58c483f8f1..76c727e994 100644 --- a/__fixtures__/v-next/outputv3/ibc/core/channel/v1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/ibc/core/channel/v1/query.rpc.Query.ts @@ -147,7 +147,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/ibc/core/client/v1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/ibc/core/client/v1/query.rpc.Query.ts index ab7c13458f..7425fcafa5 100644 --- a/__fixtures__/v-next/outputv3/ibc/core/client/v1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/ibc/core/client/v1/query.rpc.Query.ts @@ -83,7 +83,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/ibc/core/connection/v1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/ibc/core/connection/v1/query.rpc.Query.ts index 0397eeb79f..2f2742d2c6 100644 --- a/__fixtures__/v-next/outputv3/ibc/core/connection/v1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/ibc/core/connection/v1/query.rpc.Query.ts @@ -60,7 +60,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/ibc/core/port/v1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/ibc/core/port/v1/query.rpc.Query.ts index 7b932f0ce6..242d33da09 100644 --- a/__fixtures__/v-next/outputv3/ibc/core/port/v1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/ibc/core/port/v1/query.rpc.Query.ts @@ -12,7 +12,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/ibc/rpc.query.ts b/__fixtures__/v-next/outputv3/ibc/rpc.query.ts index 836aa9a4e1..a3fe0aa144 100644 --- a/__fixtures__/v-next/outputv3/ibc/rpc.query.ts +++ b/__fixtures__/v-next/outputv3/ibc/rpc.query.ts @@ -7,78 +7,78 @@ export const createGrpcGateWayClient = async ({ return { cosmos: { app: { - v1alpha1: new (await import("../cosmos/app/v1alpha1/query.rpc.Query")).Querier(endpoint) + v1alpha1: new (await import("../cosmos/app/v1alpha1/query.rpc.Query")).QueryClientImpl(endpoint) }, auth: { - v1beta1: new (await import("../cosmos/auth/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/auth/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, authz: { - v1beta1: new (await import("../cosmos/authz/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/authz/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, bank: { - v1beta1: new (await import("../cosmos/bank/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/bank/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, base: { tendermint: { - v1beta1: new (await import("../cosmos/base/tendermint/v1beta1/query.rpc.Service")).Querier(endpoint) + v1beta1: new (await import("../cosmos/base/tendermint/v1beta1/query.rpc.Service")).ServiceClientImpl(endpoint) } }, distribution: { - v1beta1: new (await import("../cosmos/distribution/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/distribution/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, evidence: { - v1beta1: new (await import("../cosmos/evidence/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/evidence/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, feegrant: { - v1beta1: new (await import("../cosmos/feegrant/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/feegrant/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, gov: { - v1: new (await import("../cosmos/gov/v1/query.rpc.Query")).Querier(endpoint), - v1beta1: new (await import("../cosmos/gov/v1beta1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("../cosmos/gov/v1/query.rpc.Query")).QueryClientImpl(endpoint), + v1beta1: new (await import("../cosmos/gov/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, group: { - v1: new (await import("../cosmos/group/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("../cosmos/group/v1/query.rpc.Query")).QueryClientImpl(endpoint) }, mint: { - v1beta1: new (await import("../cosmos/mint/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/mint/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, nft: { - v1beta1: new (await import("../cosmos/nft/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/nft/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, params: { - v1beta1: new (await import("../cosmos/params/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/params/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, slashing: { - v1beta1: new (await import("../cosmos/slashing/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/slashing/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, staking: { - v1beta1: new (await import("../cosmos/staking/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/staking/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, tx: { - v1beta1: new (await import("../cosmos/tx/v1beta1/service.rpc.Service")).Querier(endpoint) + v1beta1: new (await import("../cosmos/tx/v1beta1/service.rpc.Service")).ServiceClientImpl(endpoint) }, upgrade: { - v1beta1: new (await import("../cosmos/upgrade/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/upgrade/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) } }, ibc: { applications: { transfer: { - v1: new (await import("./applications/transfer/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("./applications/transfer/v1/query.rpc.Query")).QueryClientImpl(endpoint) } }, core: { channel: { - v1: new (await import("./core/channel/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("./core/channel/v1/query.rpc.Query")).QueryClientImpl(endpoint) }, client: { - v1: new (await import("./core/client/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("./core/client/v1/query.rpc.Query")).QueryClientImpl(endpoint) }, connection: { - v1: new (await import("./core/connection/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("./core/connection/v1/query.rpc.Query")).QueryClientImpl(endpoint) }, port: { - v1: new (await import("./core/port/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("./core/port/v1/query.rpc.Query")).QueryClientImpl(endpoint) } } } diff --git a/__fixtures__/v-next/outputv3/osmosis/claim/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/osmosis/claim/v1beta1/query.rpc.Query.ts index 667eb26078..e85fe7c26d 100644 --- a/__fixtures__/v-next/outputv3/osmosis/claim/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/claim/v1beta1/query.rpc.Query.ts @@ -45,7 +45,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/osmosis/epochs/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/osmosis/epochs/query.rpc.Query.ts index 87e6507ac3..c5b97b0197 100644 --- a/__fixtures__/v-next/outputv3/osmosis/epochs/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/epochs/query.rpc.Query.ts @@ -21,7 +21,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/genesis.ts b/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/genesis.ts index 1b878f4e6d..5e28824313 100644 --- a/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/genesis.ts @@ -31,7 +31,7 @@ export interface ParamsSDKType { } /** GenesisState defines the gamm module's genesis state. */ export interface GenesisState { - pools: (Pool1 & Pool2 & Any)[] | Any[]; + pools: (Pool1 | Pool2 | Any)[] | Any[]; /** will be renamed to next_pool_id in an upcoming version */ nextPoolNumber: Long; params: Params; diff --git a/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/query.rpc.Query.ts index 2e39194ca8..26c12bb563 100644 --- a/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/query.rpc.Query.ts @@ -149,7 +149,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/query.ts b/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/query.ts index 6d1fa67f13..7a00eaee81 100644 --- a/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/gamm/v1beta1/query.ts @@ -32,7 +32,7 @@ export interface QueryPoolRequestSDKType { pool_id: Long; } export interface QueryPoolResponse { - pool: (Pool1 & Pool2 & Any) | undefined; + pool: Pool1 | Pool2 | Any | undefined; } export interface QueryPoolResponseProtoMsg { typeUrl: "/osmosis.gamm.v1beta1.QueryPoolResponse"; @@ -74,7 +74,7 @@ export interface QueryPoolsRequestSDKType { pagination: PageRequestSDKType; } export interface QueryPoolsResponse { - pools: (Pool1 & Pool2 & Any)[] | Any[]; + pools: (Pool1 | Pool2 | Any)[] | Any[]; /** pagination defines the pagination in the response. */ pagination: PageResponse; } @@ -465,7 +465,7 @@ export interface QueryPoolsWithFilterRequestSDKType { pagination: PageRequestSDKType; } export interface QueryPoolsWithFilterResponse { - pools: (Pool1 & Pool2 & Any)[] | Any[]; + pools: (Pool1 | Pool2 | Any)[] | Any[]; /** pagination defines the pagination in the response. */ pagination: PageResponse; } diff --git a/__fixtures__/v-next/outputv3/osmosis/gamm/v2/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/osmosis/gamm/v2/query.rpc.Query.ts index 3c8f8e3c21..6b73ad16a6 100644 --- a/__fixtures__/v-next/outputv3/osmosis/gamm/v2/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/gamm/v2/query.rpc.Query.ts @@ -14,7 +14,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/osmosis/ibc-rate-limit/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/osmosis/ibc-rate-limit/v1beta1/query.rpc.Query.ts index 62b7765b9a..38ea087faf 100644 --- a/__fixtures__/v-next/outputv3/osmosis/ibc-rate-limit/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/ibc-rate-limit/v1beta1/query.rpc.Query.ts @@ -15,7 +15,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/osmosis/incentives/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/osmosis/incentives/query.rpc.Query.ts index 7b8b288f7f..d5ae6b3928 100644 --- a/__fixtures__/v-next/outputv3/osmosis/incentives/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/incentives/query.rpc.Query.ts @@ -97,7 +97,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/osmosis/lockup/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/osmosis/lockup/query.rpc.Query.ts index 33c4660c18..7d586b31a0 100644 --- a/__fixtures__/v-next/outputv3/osmosis/lockup/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/lockup/query.rpc.Query.ts @@ -166,7 +166,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/osmosis/mint/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/osmosis/mint/v1beta1/query.rpc.Query.ts index 01c373d8f1..d1da08e6e1 100644 --- a/__fixtures__/v-next/outputv3/osmosis/mint/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/mint/v1beta1/query.rpc.Query.ts @@ -21,7 +21,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/osmosis/pool-incentives/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/osmosis/pool-incentives/v1beta1/query.rpc.Query.ts index 6a864d2f7c..6d1b841015 100644 --- a/__fixtures__/v-next/outputv3/osmosis/pool-incentives/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/pool-incentives/v1beta1/query.rpc.Query.ts @@ -59,7 +59,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/osmosis/rpc.query.ts b/__fixtures__/v-next/outputv3/osmosis/rpc.query.ts index 28e0bc7924..56fcc73b2a 100644 --- a/__fixtures__/v-next/outputv3/osmosis/rpc.query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/rpc.query.ts @@ -7,91 +7,91 @@ export const createGrpcGateWayClient = async ({ return { cosmos: { app: { - v1alpha1: new (await import("../cosmos/app/v1alpha1/query.rpc.Query")).Querier(endpoint) + v1alpha1: new (await import("../cosmos/app/v1alpha1/query.rpc.Query")).QueryClientImpl(endpoint) }, auth: { - v1beta1: new (await import("../cosmos/auth/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/auth/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, authz: { - v1beta1: new (await import("../cosmos/authz/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/authz/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, bank: { - v1beta1: new (await import("../cosmos/bank/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/bank/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, base: { tendermint: { - v1beta1: new (await import("../cosmos/base/tendermint/v1beta1/query.rpc.Service")).Querier(endpoint) + v1beta1: new (await import("../cosmos/base/tendermint/v1beta1/query.rpc.Service")).ServiceClientImpl(endpoint) } }, distribution: { - v1beta1: new (await import("../cosmos/distribution/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/distribution/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, evidence: { - v1beta1: new (await import("../cosmos/evidence/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/evidence/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, feegrant: { - v1beta1: new (await import("../cosmos/feegrant/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/feegrant/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, gov: { - v1: new (await import("../cosmos/gov/v1/query.rpc.Query")).Querier(endpoint), - v1beta1: new (await import("../cosmos/gov/v1beta1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("../cosmos/gov/v1/query.rpc.Query")).QueryClientImpl(endpoint), + v1beta1: new (await import("../cosmos/gov/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, group: { - v1: new (await import("../cosmos/group/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("../cosmos/group/v1/query.rpc.Query")).QueryClientImpl(endpoint) }, mint: { - v1beta1: new (await import("../cosmos/mint/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/mint/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, nft: { - v1beta1: new (await import("../cosmos/nft/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/nft/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, params: { - v1beta1: new (await import("../cosmos/params/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/params/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, slashing: { - v1beta1: new (await import("../cosmos/slashing/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/slashing/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, staking: { - v1beta1: new (await import("../cosmos/staking/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/staking/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, tx: { - v1beta1: new (await import("../cosmos/tx/v1beta1/service.rpc.Service")).Querier(endpoint) + v1beta1: new (await import("../cosmos/tx/v1beta1/service.rpc.Service")).ServiceClientImpl(endpoint) }, upgrade: { - v1beta1: new (await import("../cosmos/upgrade/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/upgrade/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) } }, osmosis: { claim: { - v1beta1: new (await import("./claim/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./claim/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, epochs: { - v1beta1: new (await import("./epochs/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./epochs/query.rpc.Query")).QueryClientImpl(endpoint) }, gamm: { - v1beta1: new (await import("./gamm/v1beta1/query.rpc.Query")).Querier(endpoint), - v2: new (await import("./gamm/v2/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./gamm/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint), + v2: new (await import("./gamm/v2/query.rpc.Query")).QueryClientImpl(endpoint) }, ibcratelimit: { - v1beta1: new (await import("./ibc-rate-limit/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./ibc-rate-limit/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, - incentives: new (await import("./incentives/query.rpc.Query")).Querier(endpoint), - lockup: new (await import("./lockup/query.rpc.Query")).Querier(endpoint), + incentives: new (await import("./incentives/query.rpc.Query")).QueryClientImpl(endpoint), + lockup: new (await import("./lockup/query.rpc.Query")).QueryClientImpl(endpoint), mint: { - v1beta1: new (await import("./mint/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./mint/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, poolincentives: { - v1beta1: new (await import("./pool-incentives/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./pool-incentives/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, - superfluid: new (await import("./superfluid/query.rpc.Query")).Querier(endpoint), + superfluid: new (await import("./superfluid/query.rpc.Query")).QueryClientImpl(endpoint), tokenfactory: { - v1beta1: new (await import("./tokenfactory/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./tokenfactory/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, twap: { - v1beta1: new (await import("./twap/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./twap/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, txfees: { - v1beta1: new (await import("./txfees/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("./txfees/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) } } }; diff --git a/__fixtures__/v-next/outputv3/osmosis/superfluid/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/osmosis/superfluid/query.rpc.Query.ts index 00e79a51fd..e7b839759b 100644 --- a/__fixtures__/v-next/outputv3/osmosis/superfluid/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/superfluid/query.rpc.Query.ts @@ -159,7 +159,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/query.rpc.Query.ts index c498aa4b4e..47ef7326b8 100644 --- a/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/tokenfactory/v1beta1/query.rpc.Query.ts @@ -40,7 +40,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/osmosis/twap/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/osmosis/twap/v1beta1/query.rpc.Query.ts index c574e5f278..17a9233f26 100644 --- a/__fixtures__/v-next/outputv3/osmosis/twap/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/twap/v1beta1/query.rpc.Query.ts @@ -28,7 +28,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/__fixtures__/v-next/outputv3/osmosis/txfees/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/osmosis/txfees/v1beta1/query.rpc.Query.ts index 663b390cf8..064ec73e1c 100644 --- a/__fixtures__/v-next/outputv3/osmosis/txfees/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/v-next/outputv3/osmosis/txfees/v1beta1/query.rpc.Query.ts @@ -43,7 +43,7 @@ export class Query { }); } } -export class Querier { +export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/packages/ast/package.json b/packages/ast/package.json index 04022bcb3a..08c8c703ba 100644 --- a/packages/ast/package.json +++ b/packages/ast/package.json @@ -84,7 +84,7 @@ "regenerator-runtime": "^0.13.11", "rimraf": "5.0.0", "ts-jest": "^29.1.0", - "typescript": "^5.0.4" + "typescript": "5.0.4" }, "dependencies": { "@babel/parser": "^7.21.4", @@ -96,4 +96,4 @@ "case": "1.6.3", "dotty": "0.1.2" } -} +} \ No newline at end of file diff --git a/packages/ast/src/clients/rpc/class/grpc-gateway/__snapshots__/grpc-gateway.query.test.ts.snap b/packages/ast/src/clients/rpc/class/grpc-gateway/__snapshots__/grpc-gateway.query.test.ts.snap index ccc2f14844..816ab6ca35 100644 --- a/packages/ast/src/clients/rpc/class/grpc-gateway/__snapshots__/grpc-gateway.query.test.ts.snap +++ b/packages/ast/src/clients/rpc/class/grpc-gateway/__snapshots__/grpc-gateway.query.test.ts.snap @@ -96,7 +96,7 @@ exports[`GRPC-Gateway Query Client 1`] = ` `; exports[`GRPC-Gateway Query Client 2`] = ` -"export class Querier { +"export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; @@ -320,7 +320,7 @@ exports[`GRPC-Gateway Query Client with 2 params 1`] = ` `; exports[`GRPC-Gateway Query Client with 2 params 2`] = ` -"export class Querier { +"export class QueryClientImpl { private readonly url: string; constructor(url: string) { this.url = url; @@ -491,7 +491,7 @@ exports[`GRPC-Gateway Service Client 1`] = ` `; exports[`GRPC-Gateway Service Client 2`] = ` -"export class Querier { +"export class ServiceClientImpl { private readonly url: string; constructor(url: string) { this.url = url; diff --git a/packages/ast/src/clients/rpc/class/grpc-gateway/grpc-gateway.query.ts b/packages/ast/src/clients/rpc/class/grpc-gateway/grpc-gateway.query.ts index f9b7099512..0300fac7df 100644 --- a/packages/ast/src/clients/rpc/class/grpc-gateway/grpc-gateway.query.ts +++ b/packages/ast/src/clients/rpc/class/grpc-gateway/grpc-gateway.query.ts @@ -583,6 +583,14 @@ export const createGRPCGatewayWrapperClass = ( service: ProtoService ) => { const serviceName = service.name; + let className: string; + if (serviceName === 'Query') { + // QueryClientImp for wrapper class + className = 'QueryClientImpl' + } else { + className = 'ServiceClientImpl' + } + const camelRpcMethods = context.pluginValue('rpcClients.camelCase'); const keys = Object.keys(service.methods ?? {}); const methods = keys @@ -601,7 +609,7 @@ export const createGRPCGatewayWrapperClass = ( return t.exportNamedDeclaration( t.classDeclaration( - t.identifier('Querier'), + t.identifier(className), null, t.classBody( [ diff --git a/packages/ast/src/clients/rpc/scoped/__snapshots__/grpc-gateway.test.ts.snap b/packages/ast/src/clients/rpc/scoped/__snapshots__/grpc-gateway.test.ts.snap index 85b9c10574..7687eb5b68 100644 --- a/packages/ast/src/clients/rpc/scoped/__snapshots__/grpc-gateway.test.ts.snap +++ b/packages/ast/src/clients/rpc/scoped/__snapshots__/grpc-gateway.test.ts.snap @@ -10,29 +10,29 @@ exports[`createScopedGrpcWebFactory 1`] = ` return { cosmos: { app: { - v1alpha1: new (await import("../cosmos/app/v1alpha1/query.rpc.Query")).Querier(endpoint) + v1alpha1: new (await import("../cosmos/app/v1alpha1/query.rpc.Query")).QueryClientImpl(endpoint) }, auth: { - v1beta1: new (await import("../cosmos/auth/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/auth/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, authz: { - v1beta1: new (await import("../cosmos/authz/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/authz/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, bank: { - v1beta1: new (await import("../cosmos/bank/v1beta1/query.rpc.Query")).Querier(endpoint) + v1beta1: new (await import("../cosmos/bank/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint) }, base: { tendermint: { - v1beta1: new (await import("../cosmos/base/tendermint/v1beta1/query.rpc.Service")).Querier(endpoint) + v1beta1: new (await import("../cosmos/base/tendermint/v1beta1/query.rpc.Service")).ServiceClientImpl(endpoint) } }, tx: { - v1beta1: new (await import("../cosmos/tx/v1beta1/service.rpc.Service")).Querier(endpoint) + v1beta1: new (await import("../cosmos/tx/v1beta1/service.rpc.Service")).ServiceClientImpl(endpoint) } }, cosmwasm: { wasm: { - v1: new (await import("./wasm/v1/query.rpc.Query")).Querier(endpoint) + v1: new (await import("./wasm/v1/query.rpc.Query")).QueryClientImpl(endpoint) } } }; diff --git a/packages/ast/src/clients/rpc/scoped/grpc-gateway.ts b/packages/ast/src/clients/rpc/scoped/grpc-gateway.ts index e9509da8f5..ed44d22c20 100644 --- a/packages/ast/src/clients/rpc/scoped/grpc-gateway.ts +++ b/packages/ast/src/clients/rpc/scoped/grpc-gateway.ts @@ -32,6 +32,7 @@ export const grpcGatewayClientScaffold = (): t.Statement[] => { const grpcGatewayNewAwaitImport = ( path: string, + className: string ) => { return t.newExpression( t.memberExpression( @@ -45,7 +46,7 @@ const grpcGatewayNewAwaitImport = ( ] ) ), - t.identifier('Querier'), + t.identifier(className), false ), [ @@ -64,21 +65,21 @@ const grpcGatewayNestedImportObject = ( const serviceType = (obj as string).split(".").pop(); switch (serviceType) { case "Query": - className = 'Query' + className = 'QueryClientImpl' // console.log("This is a Query RPC."); break; case "Service": - className = 'Service'; + className = 'ServiceClientImpl'; // console.log("This is a Service RPC."); break; case "msg": - className = 'Msg'; + className = 'MsgClientImpl'; // console.log("This is a Message RPC."); break; default: console.log("grpc service error!! This should not happend. Undefined service type"); } - return grpcGatewayNewAwaitImport(obj); + return grpcGatewayNewAwaitImport(obj, className); } const keys = Object.keys(obj); diff --git a/packages/telescope/__tests__/telescope-v2.test.ts b/packages/telescope/__tests__/telescope-v2.test.ts index 1e79794506..8b5229c91b 100644 --- a/packages/telescope/__tests__/telescope-v2.test.ts +++ b/packages/telescope/__tests__/telescope-v2.test.ts @@ -38,7 +38,7 @@ const options: TelescopeOptions = { interfaces: { enabled: true, - useUnionTypes: false + useUnionTypes: true }, aminoEncoding: { enabled: true, diff --git a/packages/telescope/__tests__/telescope-v3.test.ts b/packages/telescope/__tests__/telescope-v3.test.ts index c9f0bb6a09..5d9d304e22 100644 --- a/packages/telescope/__tests__/telescope-v3.test.ts +++ b/packages/telescope/__tests__/telescope-v3.test.ts @@ -38,7 +38,7 @@ const options: TelescopeOptions = { interfaces: { enabled: true, - useUnionTypes: false + useUnionTypes: true }, aminoEncoding: { enabled: true, diff --git a/yarn.lock b/yarn.lock index 67257ed0bf..6795a840e2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2368,81 +2368,81 @@ read-package-json-fast "^3.0.0" which "^3.0.0" -"@nrwl/devkit@16.3.2": - version "16.3.2" - resolved "https://registry.npmjs.org/@nrwl/devkit/-/devkit-16.3.2.tgz#b45393dfd62dcb75554ff0c2dff6715a907e3877" - integrity sha512-EiDwVIvh6AcClXv22Q7auQh7Iy/ONISEFWzTswy/J6ZmVGCQesbiwg4cGV0MKiScr+awdVzqyNey+wD6IR5Lkw== +"@nrwl/devkit@16.4.0": + version "16.4.0" + resolved "https://registry.npmjs.org/@nrwl/devkit/-/devkit-16.4.0.tgz#0bd16834e09d1b01fadf5c68fd19410893e61ac8" + integrity sha512-KUu9oNrMB8DP78BAO8XWJC5HOSS6dO6ocMWj2DtuNVgMgABviy+ih/TmrGKxQQBH0Ib4cxTeMIQVRdAak5c1UA== dependencies: - "@nx/devkit" "16.3.2" + "@nx/devkit" "16.4.0" -"@nrwl/tao@16.3.2": - version "16.3.2" - resolved "https://registry.npmjs.org/@nrwl/tao/-/tao-16.3.2.tgz#eefc1974342afbbe48e4e5351d6707ad2f9fb179" - integrity sha512-2Kg7dtv6JcQagCZPSq+okceI81NqmXGGgbKWqS7sOfdmp1otxS9uiUFNXw+Pdtnw38mdRviMtSOXScntu4sUKg== +"@nrwl/tao@16.4.0": + version "16.4.0" + resolved "https://registry.npmjs.org/@nrwl/tao/-/tao-16.4.0.tgz#81a844c8c707ff747b26ea7d23f6bed005b72967" + integrity sha512-6n4chOOv6jqact07NvIDRQfsnaiYYhi+mrqSuJKs6fL+c5kx/VCryndTP0MDTBbazfL6H7vwiQUkTja2sQDuwA== dependencies: - nx "16.3.2" + nx "16.4.0" -"@nx/devkit@16.3.2", "@nx/devkit@>=16.1.3 < 17": - version "16.3.2" - resolved "https://registry.npmjs.org/@nx/devkit/-/devkit-16.3.2.tgz#95d58d104449c54bdc276fa1c9166fcad867cfa8" - integrity sha512-1ev3EDm2Sx/ibziZroL1SheqxDR7UgC49tkBgJz1GrQLQnfdhBYroCPSyBSWGPMLHjIuHb3+hyGSV1Bz+BIYOA== +"@nx/devkit@16.4.0", "@nx/devkit@>=16.1.3 < 17": + version "16.4.0" + resolved "https://registry.npmjs.org/@nx/devkit/-/devkit-16.4.0.tgz#e8e5d6c6e4f6964387d418a4b48588528a021517" + integrity sha512-/Y+tC2IBxVEf3EKB80G9mF27ZBAFEBBmDMn1MPzfGX9AB2GGNCqgvSkSHT5DlkyxJOMqbE7DpMyHxubALyenEA== dependencies: - "@nrwl/devkit" "16.3.2" + "@nrwl/devkit" "16.4.0" ejs "^3.1.7" ignore "^5.0.4" - semver "7.3.4" + semver "7.5.3" tmp "~0.2.1" tslib "^2.3.0" -"@nx/nx-darwin-arm64@16.3.2": - version "16.3.2" - resolved "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.3.2.tgz#83b6e78b27d2d7da8f7626560f52070c8735d28a" - integrity sha512-YfYVNfsJBzBcBnJUU4AcA6A4QMkgnVlETfp4KGL36Otq542mRY1ISGHdox63ocI5AKh5gay5AaGcR4wR9PU9Vg== - -"@nx/nx-darwin-x64@16.3.2": - version "16.3.2" - resolved "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-16.3.2.tgz#0ae2a64356542c5fb73ca8038ce10ec4512e7fcb" - integrity sha512-bJtpozz0zSRVRrcQ76GrlT3TWEGTymLYWrVG51bH5KZ46t6/a4EQBI3uL3vubMmOZ0jR4ywybOcPBBhxmBJ68w== - -"@nx/nx-freebsd-x64@16.3.2": - version "16.3.2" - resolved "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.3.2.tgz#202adf4d6070f47ed46450f006ecd50851147c74" - integrity sha512-ZvufI0bWqT67nLbBo6ejrIGxypdoedRQTP/tudWbs/4isvxLe1uVku1BfKCTQUsJG367SqNOU1H5kzI/MRr3ow== - -"@nx/nx-linux-arm-gnueabihf@16.3.2": - version "16.3.2" - resolved "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.3.2.tgz#62314a82566e3647866b9dd4167a2d0e1397f001" - integrity sha512-IQL4kxdiZLvifar7+SIum3glRuVsxtE0dL8RvteSDXrxDQnaTUrjILC+VGhalRmk7ngBbGKNrhWOeeL7390CzQ== - -"@nx/nx-linux-arm64-gnu@16.3.2": - version "16.3.2" - resolved "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.3.2.tgz#02826400aa55b8f44bac83332dd29647d0e95001" - integrity sha512-f6AWgPVu3mfUEoOBa0rY2/7QY0Or9eR0KtLFpcPh7RUpxPw2EXzIbjD/0RGipdpspSrgiMKbZpsUjo6mXBFsQA== - -"@nx/nx-linux-arm64-musl@16.3.2": - version "16.3.2" - resolved "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.3.2.tgz#a0a81520e0904aa026a7ab0a8a3bf3facec9f14c" - integrity sha512-AvrWcYz7021E3b5P9/0i26p60XMZfw86Epks51L6AhlflarlOH4AcEChc7APMtb1ELAIbDWx2S6oIDRbQ7rtVA== - -"@nx/nx-linux-x64-gnu@16.3.2": - version "16.3.2" - resolved "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.3.2.tgz#e79b5c142ec8d9bfb458ea5803bc4b62abbcf296" - integrity sha512-K2pWGAcbCNm6b7UZI9cc8z4Rb540QcuepBXD7akjPjWerzXriT6VCn4i9mVKsCg2mwSfknTJJVJ1PZwJSmTl/Q== - -"@nx/nx-linux-x64-musl@16.3.2": - version "16.3.2" - resolved "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.3.2.tgz#900aee8f171638b9fb44378e2ac0548cb4aa99a7" - integrity sha512-sY1QDuQlqyYiRPJZanrtV07tU0DOXiCrWb0pDsGiO0qHuUSmW5Vw17GWEY4z3rt0/5U8fJ+/9WQrneviOmsOKg== - -"@nx/nx-win32-arm64-msvc@16.3.2": - version "16.3.2" - resolved "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.3.2.tgz#88db772b3535648e147b1a0206b1a1fe875fa9a5" - integrity sha512-wBfohT2hjrLKn9WFHvG0MFVk7uYhgYNiptnTLdTouziHgFyZ08vyl7XYBq55BwHPMQ5iswVoEfjn/5ZBfCPscg== - -"@nx/nx-win32-x64-msvc@16.3.2": - version "16.3.2" - resolved "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.3.2.tgz#2195faaf1fc465c7a89bfdd62323fdd2a5d91f15" - integrity sha512-QC0sWrfQm0/WdvvM//7UAgm+otbak6bznZ0zawTeqmLBh1hLjNeweyzSVKQEtZtlzDMKpzCVuuwkJq+VKBLvmw== +"@nx/nx-darwin-arm64@16.4.0": + version "16.4.0" + resolved "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.4.0.tgz#72d5cbeb585aa05b4035f1de8f92ba562b180137" + integrity sha512-/ZXuF8M3u8DSNmjYstQKorzo7uIETNhnFinwWlO8mzz+SyR+Xs5G6penJ4+cB1ju3Hf3lZkXd5U6pEiW4OAAkA== + +"@nx/nx-darwin-x64@16.4.0": + version "16.4.0" + resolved "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-16.4.0.tgz#24f8b9946c77ec1d66e42ffe2f84623e4072167c" + integrity sha512-0Fo58qZzHgRs4SRVaAOBipdJQNew57YQbpFaLHKhCTyKc0Pe6THEYaaT/x9QVkcFO0x4AzNr9T7iJTrneNwcKg== + +"@nx/nx-freebsd-x64@16.4.0": + version "16.4.0" + resolved "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.4.0.tgz#a82954fe4bc6a74cd6b7e0cb89e1486ac4c06e27" + integrity sha512-Qoes/NifE4zb5Gb6ZdC32HvxZBzO0xo74j7EozUV5rZEm3bCtKbKqThPV9Uuu+8S4j718r5vlob/IMXqRcWK4g== + +"@nx/nx-linux-arm-gnueabihf@16.4.0": + version "16.4.0" + resolved "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.4.0.tgz#77911992e38c1aee51d4a075545ea2828d074c45" + integrity sha512-m8uklbettj8RnLtasjQPiYxqJotDSfO3LO1II8Bds53C7OT8TDnTkW68MEx+CxuSCQFy2Aa0Oih3jSvDzfnZzA== + +"@nx/nx-linux-arm64-gnu@16.4.0": + version "16.4.0" + resolved "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.4.0.tgz#ee2b7208083cf3fc63121ee079ab3e0c2bbe5fa4" + integrity sha512-bAs2T/zZQDTCzzhciE8kCrkwgXbeX3K83cGRacB7PDZZl/O4jr5TRO4zYHi6doytyLONjqhvWNLbIo4cEEcfZA== + +"@nx/nx-linux-arm64-musl@16.4.0": + version "16.4.0" + resolved "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.4.0.tgz#afaf514d3df0bc31c4a6545d254502c661e3d347" + integrity sha512-K1D8j4lRZDBVuW8iomeJjCznFz7rfP3qaB3RHjKZU5qrZBq1uYohhdfT7dzwWFNWEvt6WytfhGCl2S9PsQ37Wg== + +"@nx/nx-linux-x64-gnu@16.4.0": + version "16.4.0" + resolved "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.4.0.tgz#fba4991ac27f0c342157445259485c06fca686f2" + integrity sha512-v1NJ3ESaw5bdSeuh5Xslq1dXGWztf0mSLwZP510Rt9+ulr5LQ/X1Rri8zefU0gZNLcmJL0G2Qq7UTnppYGRTEg== + +"@nx/nx-linux-x64-musl@16.4.0": + version "16.4.0" + resolved "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.4.0.tgz#9bbdb590a49de9667e2e26dc173fe6d303e165be" + integrity sha512-+8YLVWZFq+k6YJ2ZDwR5sGaRnZhUVYtR8aPbGyonMnJ8VEQJNEqsm1KT6nt0gd3JJdxyphm3VsMQWBMo42jM+w== + +"@nx/nx-win32-arm64-msvc@16.4.0": + version "16.4.0" + resolved "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.4.0.tgz#a2e06890c70afdd339d0d95516ae8bbc222d9ce6" + integrity sha512-HwE6AxlrfWvODT49vVX6NGMYc3zdMVXETCdZb0jZ/oz28XXTAPvVb/8DJgKSyCs0DPirEeCHiPwbdcJA1Bqw8A== + +"@nx/nx-win32-x64-msvc@16.4.0": + version "16.4.0" + resolved "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.4.0.tgz#d98b4087b696b524461fc142f656a337ed00a520" + integrity sha512-ISL3c6i/v+JOsUHEbngDHaobmbgu6oSY0htKas1RjLWGkWXDLgEXMRjQ/xDbNVYH00Mto7mmq+nrjkNNbqOrfQ== "@octokit/auth-token@^3.0.0": version "3.0.4" @@ -3574,9 +3574,9 @@ camelcase@^6.2.0: integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-lite@^1.0.30001503: - version "1.0.30001506" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001506.tgz#35bd814b310a487970c585430e9e80ee23faf14b" - integrity sha512-6XNEcpygZMCKaufIcgpQNZNf00GEqc7VQON+9Rd0K1bMYo8xhMZRAo5zpbnbMNizi4YNgIDAFrdykWsvY3H4Hw== + version "1.0.30001507" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001507.tgz#fae53f6286e7564783eadea9b447819410a59534" + integrity sha512-SFpUDoSLCaE5XYL2jfqe9ova/pbQHEmbheDf5r4diNwbAgR3qxM9NQtfsiSscjqoya5K7kFcHPUQ+VsUkIJR4A== case@1.6.3: version "1.6.3" @@ -4233,9 +4233,9 @@ ejs@^3.1.7: jake "^10.8.5" electron-to-chromium@^1.4.431: - version "1.4.439" - resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.439.tgz#d0748e8128c18f92354d3412dfb2104c3fb90e8f" - integrity sha512-BHpErPSNhb9FB25+OwQP6mCAf3ZXfGbmuvc4LzBNVJwpCcXQJm++LerimocYRG9FRxUVRKZqaB7d0+pImSTPSg== + version "1.4.440" + resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.440.tgz#d3b1eeb36b717eb479a240c0406ac1fa67901762" + integrity sha512-r6dCgNpRhPwiWlxbHzZQ/d9swfPaEJGi8ekqRBwQYaR3WmA5VkqQfBWSDDjuJU1ntO+W9tHx8OHV/96Q8e0dVw== elliptic@^6.4.0, elliptic@^6.5.3, elliptic@^6.5.4: version "6.5.4" @@ -6896,9 +6896,9 @@ minimatch@^8.0.2: brace-expansion "^2.0.1" minimatch@^9.0.0, minimatch@^9.0.1: - version "9.0.1" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz#8a555f541cf976c622daf078bb28f29fb927c253" - integrity sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w== + version "9.0.2" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.2.tgz#397e387fff22f6795844d00badc903a3d5de7057" + integrity sha512-PZOT9g5v2ojiTL7r1xF6plNHLtOeTpSlDI007As2NlA2aYBMfVom17yqa6QzhmDP8QOhn7LjHTg7DFCVSSa6yg== dependencies: brace-expansion "^2.0.1" @@ -7296,12 +7296,12 @@ npmlog@^6.0.0, npmlog@^6.0.2: gauge "^4.0.3" set-blocking "^2.0.0" -nx@16.3.2, "nx@>=16.1.3 < 17": - version "16.3.2" - resolved "https://registry.npmjs.org/nx/-/nx-16.3.2.tgz#92a2d7ef06d15b3b111b7cf9d35de08de0a22d90" - integrity sha512-fOzCVL7qoCJAcYTJwvJ9j+PSaL791ro4AICWuLxaphZsp2jcLoav4Ev7ONPks2Wlkt8FS9bee3nqQ3w1ya36Og== +nx@16.4.0, "nx@>=16.1.3 < 17": + version "16.4.0" + resolved "https://registry.npmjs.org/nx/-/nx-16.4.0.tgz#cd136a3ebadf77138dce421b0c0e0944527fe9b3" + integrity sha512-HhJnOAm2wlaIVMmxK1HcdcKfX5DlnQc1RAHFf+QostvQQ/SmUg9f7LoStxpNm01JhQTehb01tH9zAsXKcKzO4A== dependencies: - "@nrwl/tao" "16.3.2" + "@nrwl/tao" "16.4.0" "@parcel/watcher" "2.0.4" "@yarnpkg/lockfile" "^1.1.0" "@yarnpkg/parsers" "^3.0.0-rc.18" @@ -7325,7 +7325,7 @@ nx@16.3.2, "nx@>=16.1.3 < 17": minimatch "3.0.5" npm-run-path "^4.0.1" open "^8.4.0" - semver "7.3.4" + semver "7.5.3" string-width "^4.2.3" strong-log-transformer "^2.1.0" tar-stream "~2.2.0" @@ -7336,16 +7336,16 @@ nx@16.3.2, "nx@>=16.1.3 < 17": yargs "^17.6.2" yargs-parser "21.1.1" optionalDependencies: - "@nx/nx-darwin-arm64" "16.3.2" - "@nx/nx-darwin-x64" "16.3.2" - "@nx/nx-freebsd-x64" "16.3.2" - "@nx/nx-linux-arm-gnueabihf" "16.3.2" - "@nx/nx-linux-arm64-gnu" "16.3.2" - "@nx/nx-linux-arm64-musl" "16.3.2" - "@nx/nx-linux-x64-gnu" "16.3.2" - "@nx/nx-linux-x64-musl" "16.3.2" - "@nx/nx-win32-arm64-msvc" "16.3.2" - "@nx/nx-win32-x64-msvc" "16.3.2" + "@nx/nx-darwin-arm64" "16.4.0" + "@nx/nx-darwin-x64" "16.4.0" + "@nx/nx-freebsd-x64" "16.4.0" + "@nx/nx-linux-arm-gnueabihf" "16.4.0" + "@nx/nx-linux-arm64-gnu" "16.4.0" + "@nx/nx-linux-arm64-musl" "16.4.0" + "@nx/nx-linux-x64-gnu" "16.4.0" + "@nx/nx-linux-x64-musl" "16.4.0" + "@nx/nx-win32-arm64-msvc" "16.4.0" + "@nx/nx-win32-x64-msvc" "16.4.0" object-assign@^4.0.1: version "4.1.1" @@ -8262,14 +8262,7 @@ secure-random@1.1.2: resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@7.3.4: - version "7.3.4" - resolved "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" - integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== - dependencies: - lru-cache "^6.0.0" - -semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8: +semver@7.5.3, semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8: version "7.5.3" resolved "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e" integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ== @@ -8924,6 +8917,11 @@ typedarray@^0.0.6: resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== +typescript@5.0.4: + version "5.0.4" + resolved "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b" + integrity sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw== + "typescript@>=3 < 6", typescript@^5.0.4: version "5.1.3" resolved "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz#8d84219244a6b40b6fb2b33cc1c062f715b9e826"