Chore/revert client

README.md

@@ -10,11 +10,13 @@ Generate TypeScript SDKs for your CosmWasm smart contracts
   <a href="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml">
     <img height="20" src="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml/badge.svg" />
   </a>
+   <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/npm/dt/@cosmwasm/ts-codegen"></a>
    <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-MIT"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
    <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-Apache"><img height="20" src="https://img.shields.io/badge/license-Apache-blue.svg"></a>
    <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/github/package-json/v/CosmWasm/ts-codegen?filename=packages%2Fts-codegen%2Fpackage.json"></a>
 </p>
 
+
 ```
 npm install -g @cosmwasm/ts-codegen
 ```
@@ -110,6 +112,7 @@ codegen({
       version: 'v4',
       mutations: true,
       queryKeys: true,
+      queryFactory: true,
     },
     recoil: {
       enabled: false
@@ -143,10 +146,11 @@ The `client` plugin will generate TS client classes for your contracts. This opt
 
 #### Client Options
 
-  | option                        | description                                          |
-  | ----------------------------- | ---------------------------------------------------  |
-  | `client.enabled`              | generate TS client classes for your contracts        |
-  | `client.execExtendsQuery`     | execute should extend query message clients          |
+  | option                                  | description                                          |
+  | --------------------------------------- | ---------------------------------------------------  |
+  | `client.enabled`                        | generate TS client classes for your contracts        |
+  | `client.execExtendsQuery`               | execute should extend query message clients          |
+  | `client.noImplicitOverride`             | should match your tsconfig noImplicitOverride option |
 
 #### Client via CLI
 
@@ -166,10 +170,11 @@ Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query
 #### React Query Options
 
   | option                      | description                                                                  |
-  | ----------------------------| ---------------------------------------------------------------------------- |
+  | ---------------------------- | ---------------------------------------------------------------------------- |
   | `reactQuery.enabled`        | enable the react-query plugin                                                |
   | `reactQuery.optionalClient` | allows contract client to be undefined as the component renders              |
   | `reactQuery.queryKeys`      | generates a const queryKeys object for use with invalidations and set values |
+  | `reactQuery.queryFactory`   | generates a const queryFactory object for useQueries and prefetchQueries use |
   | `reactQuery.version`        | `v4` uses `@tanstack/react-query` and `v3` uses `react-query`                |
   | `reactQuery.mutations`      | also generate mutations                                                      |
   | `reactQuery.camelize`       | use camelCase style for property names                                       |
@@ -477,7 +482,8 @@ See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/wasm-as
 Checkout these related projects:
 
 * [@osmonauts/telescope](https://github.com/osmosis-labs/telescope) a "babel for the Cosmos", Telescope is a TypeScript Transpiler for Cosmos Protobufs.
-
+* [chain-registry](https://github.com/cosmology-tech/chain-registry) Cosmos chain registry and chain info.
+* [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) A wallet connector for the Cosmos.
 ## Credits
 
 🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.tech/validator)

__output__/vectis/factory-query-factory/Factory.react-query.ts

@@ -0,0 +1,114 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions, useQuery } from "react-query";
+import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
+import { FactoryQueryClient } from "./Factory.client";
+export const factoryQueryKeys = {
+  contract: ([{
+    contract: "factory"
+  }] as const),
+  address: (contractAddress: string) => ([{ ...factoryQueryKeys.contract[0],
+    address: contractAddress
+  }] as const),
+  wallets: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "wallets",
+    args
+  }] as const),
+  walletsOf: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "wallets_of",
+    args
+  }] as const),
+  codeId: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "code_id",
+    args
+  }] as const),
+  fee: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "fee",
+    args
+  }] as const),
+  govecAddr: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "govec_addr",
+    args
+  }] as const),
+  adminAddr: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "admin_addr",
+    args
+  }] as const)
+};
+export interface FactoryReactQuery<TResponse, TData = TResponse> {
+  client: FactoryQueryClient;
+  options?: UseQueryOptions<TResponse, Error, TData>;
+}
+export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
+export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
+  client,
+  options
+}: FactoryAdminAddrQuery<TData>) {
+  return useQuery<AdminAddrResponse, Error, TData>(factoryQueryKeys.adminAddr(client.contractAddress), () => client.adminAddr(), options);
+}
+export interface FactoryGovecAddrQuery<TData> extends FactoryReactQuery<GovecAddrResponse, TData> {}
+export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
+  client,
+  options
+}: FactoryGovecAddrQuery<TData>) {
+  return useQuery<GovecAddrResponse, Error, TData>(factoryQueryKeys.govecAddr(client.contractAddress), () => client.govecAddr(), options);
+}
+export interface FactoryFeeQuery<TData> extends FactoryReactQuery<FeeResponse, TData> {}
+export function useFactoryFeeQuery<TData = FeeResponse>({
+  client,
+  options
+}: FactoryFeeQuery<TData>) {
+  return useQuery<FeeResponse, Error, TData>(factoryQueryKeys.fee(client.contractAddress), () => client.fee(), options);
+}
+export interface FactoryCodeIdQuery<TData> extends FactoryReactQuery<CodeIdResponse, TData> {
+  args: {
+    ty: CodeIdType;
+  };
+}
+export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
+  client,
+  args,
+  options
+}: FactoryCodeIdQuery<TData>) {
+  return useQuery<CodeIdResponse, Error, TData>(factoryQueryKeys.codeId(client.contractAddress, args), () => client.codeId({
+    ty: args.ty
+  }), options);
+}
+export interface FactoryWalletsOfQuery<TData> extends FactoryReactQuery<WalletsOfResponse, TData> {
+  args: {
+    limit?: number;
+    startAfter?: string;
+    user: string;
+  };
+}
+export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
+  client,
+  args,
+  options
+}: FactoryWalletsOfQuery<TData>) {
+  return useQuery<WalletsOfResponse, Error, TData>(factoryQueryKeys.walletsOf(client.contractAddress, args), () => client.walletsOf({
+    limit: args.limit,
+    startAfter: args.startAfter,
+    user: args.user
+  }), options);
+}
+export interface FactoryWalletsQuery<TData> extends FactoryReactQuery<WalletsResponse, TData> {
+  args: {
+    limit?: number;
+    startAfter?: WalletQueryPrefix;
+  };
+}
+export function useFactoryWalletsQuery<TData = WalletsResponse>({
+  client,
+  args,
+  options
+}: FactoryWalletsQuery<TData>) {
+  return useQuery<WalletsResponse, Error, TData>(factoryQueryKeys.wallets(client.contractAddress, args), () => client.wallets({
+    limit: args.limit,
+    startAfter: args.startAfter
+  }), options);
+}

__output__/vectis/factory-query-keys/Factory.react-query.ts

@@ -39,6 +39,74 @@ export const factoryQueryKeys = {
     args
   }] as const)
 };
+export const factoryQueries = {
+  wallets: <TData = WalletsResponse,>({
+    client,
+    args,
+    options
+  }: FactoryWalletsQuery<TData>): UseQueryOptions<WalletsResponse, Error, TData> => ({
+    queryKey: factoryQueryKeys.wallets(client?.contractAddress, args),
+    queryFn: () => client.wallets({
+      limit: args.limit,
+      startAfter: args.startAfter
+    }),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  walletsOf: <TData = WalletsOfResponse,>({
+    client,
+    args,
+    options
+  }: FactoryWalletsOfQuery<TData>): UseQueryOptions<WalletsOfResponse, Error, TData> => ({
+    queryKey: factoryQueryKeys.walletsOf(client?.contractAddress, args),
+    queryFn: () => client.walletsOf({
+      limit: args.limit,
+      startAfter: args.startAfter,
+      user: args.user
+    }),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  codeId: <TData = CodeIdResponse,>({
+    client,
+    args,
+    options
+  }: FactoryCodeIdQuery<TData>): UseQueryOptions<CodeIdResponse, Error, TData> => ({
+    queryKey: factoryQueryKeys.codeId(client?.contractAddress, args),
+    queryFn: () => client.codeId({
+      ty: args.ty
+    }),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  fee: <TData = FeeResponse,>({
+    client,
+    options
+  }: FactoryFeeQuery<TData>): UseQueryOptions<FeeResponse, Error, TData> => ({
+    queryKey: factoryQueryKeys.fee(client?.contractAddress),
+    queryFn: () => client.fee(),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  govecAddr: <TData = GovecAddrResponse,>({
+    client,
+    options
+  }: FactoryGovecAddrQuery<TData>): UseQueryOptions<GovecAddrResponse, Error, TData> => ({
+    queryKey: factoryQueryKeys.govecAddr(client?.contractAddress),
+    queryFn: () => client.govecAddr(),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  adminAddr: <TData = AdminAddrResponse,>({
+    client,
+    options
+  }: FactoryAdminAddrQuery<TData>): UseQueryOptions<AdminAddrResponse, Error, TData> => ({
+    queryKey: factoryQueryKeys.adminAddr(client?.contractAddress),
+    queryFn: () => client.adminAddr(),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  })
+};
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;

packages/ts-codegen/CHANGELOG.md

@@ -3,6 +3,62 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.24.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/[email protected]...@cosmwasm/[email protected]) (2022-12-02)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
+# [0.23.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/[email protected]...@cosmwasm/[email protected]) (2022-11-25)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
+# [0.22.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/[email protected]...@cosmwasm/[email protected]) (2022-11-18)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
+## [0.21.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/[email protected]...@cosmwasm/[email protected]) (2022-11-17)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
+## [0.21.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/[email protected]...@cosmwasm/[email protected]) (2022-11-09)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
+# [0.21.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/[email protected]...@cosmwasm/[email protected]) (2022-11-09)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
+# [0.20.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/[email protected]...@cosmwasm/[email protected]) (2022-10-26)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.19.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/[email protected]...@cosmwasm/[email protected]) (2022-10-11)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen

packages/ts-codegen/README.md

@@ -10,11 +10,13 @@ Generate TypeScript SDKs for your CosmWasm smart contracts
   <a href="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml">
     <img height="20" src="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml/badge.svg" />
   </a>
+   <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/npm/dt/@cosmwasm/ts-codegen"></a>
    <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-MIT"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
    <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-Apache"><img height="20" src="https://img.shields.io/badge/license-Apache-blue.svg"></a>
    <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/github/package-json/v/CosmWasm/ts-codegen?filename=packages%2Fts-codegen%2Fpackage.json"></a>
 </p>
 
+
 ```
 npm install -g @cosmwasm/ts-codegen
 ```
@@ -109,6 +111,7 @@ codegen({
       version: 'v4',
       mutations: true,
       queryKeys: true,
+      queryFactory: true,
     },
     recoil: {
       enabled: false
@@ -142,9 +145,11 @@ The `client` plugin will generate TS client classes for your contracts. This opt
 
 #### Client Options
 
-  | option                        | description                                          |
-  | ----------------------------- | ---------------------------------------------------  |
-  | `client.enabled`              | generate TS client classes for your contracts        |
+  | option                                  | description                                          |
+  | --------------------------------------- | ---------------------------------------------------  |
+  | `client.enabled`                        | generate TS client classes for your contracts        |
+  | `client.execExtendsQuery`               | execute should extend query message clients          |
+  | `client.noImplicitOverride`             | should match your tsconfig noImplicitOverride option |
 
 #### Client via CLI
 
@@ -164,10 +169,11 @@ Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query
 #### React Query Options
 
   | option                      | description                                                                  |
-  | ----------------------------| ---------------------------------------------------------------------------- |
+  | ---------------------------- | ---------------------------------------------------------------------------- |
   | `reactQuery.enabled`        | enable the react-query plugin                                                |
   | `reactQuery.optionalClient` | allows contract client to be undefined as the component renders              |
   | `reactQuery.queryKeys`      | generates a const queryKeys object for use with invalidations and set values |
+  | `reactQuery.queryFactory`   | generates a const queryFactory object for useQueries and prefetchQueries use |
   | `reactQuery.version`        | `v4` uses `@tanstack/react-query` and `v3` uses `react-query`                |
   | `reactQuery.mutations`      | also generate mutations                                                      |
   | `reactQuery.camelize`       | use camelCase style for property names                                       |
@@ -474,7 +480,8 @@ See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/wasm-as
 Checkout these related projects:
 
 * [@osmonauts/telescope](https://github.com/osmosis-labs/telescope) a "babel for the Cosmos", Telescope is a TypeScript Transpiler for Cosmos Protobufs.
-
+* [chain-registry](https://github.com/cosmology-tech/chain-registry) Cosmos chain registry and chain info.
+* [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) A wallet connector for the Cosmos.
 ## Credits
 
 Built by Cosmology — if you like our tools, please consider delegating to [our validator](https://www.mintscan.io/juno/validators/junovaloper1pr5qgj4jg47lvsnejtfvk78090shvuctgdwdm5)

packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap

@@ -12,6 +12,7 @@ TSBuilder {
     "client": Object {
       "enabled": true,
       "execExtendsQuery": true,
+      "noImplicitOverride": false,
     },
     "messageComposer": Object {
       "enabled": false,
@@ -47,6 +48,7 @@ TSBuilder {
     "client": Object {
       "enabled": true,
       "execExtendsQuery": true,
+      "noImplicitOverride": false,
     },
     "messageComposer": Object {
       "enabled": false,