@cosmwasm/ts-codegen 0.33.0 → 0.34.0

package/main/builder/builder.js

@@ -303,38 +303,43 @@ var TSBuilder = /*#__PURE__*/function () {
     key: "after",
     value: function () {
       var _after = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-        var contractsProviderBundlePlugin, files;
+        var contractsProviderBundlePlugin, files, helpers;
         return _regenerator["default"].wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
-                if (this.options.bundle.enabled) {
-                  this.bundle();
-                } //create useContracts bundle file
-
-
+                //create useContracts bundle file
                 contractsProviderBundlePlugin = new _providerBundle.ContractsProviderBundlePlugin(this.options);
-                contractsProviderBundlePlugin.setBuilder(this);
-                _context4.next = 5;
-                return contractsProviderBundlePlugin.render("", {
+                contractsProviderBundlePlugin.setBuilder(this); //contractContextProviders.ts
+
+                _context4.next = 4;
+                return contractsProviderBundlePlugin.render("contractContextProviders", {
                   schemas: []
                 }, this.outPath);
 
-              case 5:
+              case 4:
                 files = _context4.sent;
 
                 if (files && files.length) {
                   [].push.apply(this.files, files);
                 }
 
-                (0, _createHelpers.createHelpers)({
+                helpers = (0, _createHelpers.createHelpers)({
                   outPath: this.outPath,
                   contracts: this.contracts,
                   options: this.options,
                   plugins: this.plugins
                 }, this.builderContext);
 
-              case 8:
+                if (helpers && helpers.length) {
+                  [].push.apply(this.files, helpers);
+                }
+
+                if (this.options.bundle.enabled) {
+                  this.bundle();
+                }
+
+              case 9:
               case "end":
                 return _context4.stop();
             }

package/main/generators/create-helpers.js

@@ -20,19 +20,33 @@ var _helpers = require("../helpers");
 var version = process.env.NODE_ENV === "test" ? "latest" : _package["default"].version;
 var header = "/**\n* This file and any referenced files were automatically generated by ".concat(_package["default"].name, "@").concat(version, "\n* DO NOT MODIFY BY HAND. Instead, download the latest proto files for your chain\n* and run the transpile command or yarn proto command to regenerate this bundle.\n*/\n\n");
 
-var write = function write(outPath, file, content) {
+var write = function write(outPath, file, content, varname) {
   var outFile = (0, _path.join)(outPath, file);
   (0, _mkdirp.sync)((0, _path.dirname)(outFile));
   (0, _files.writeContentToFile)(outPath, header + content, outFile);
+  return {
+    type: "plugin",
+    pluginType: "helper",
+    contract: varname !== null && varname !== void 0 ? varname : (0, _path.basename)(file, (0, _path.extname)(file)),
+    localname: file,
+    filename: outFile
+  };
 };
 
 var createHelpers = function createHelpers(input, builderContext) {
   var _input$options, _input$options$useCon, _Object$keys;
 
+  var files = [];
+
   if ((_input$options = input.options) !== null && _input$options !== void 0 && (_input$options$useCon = _input$options.useContractsHooks) !== null && _input$options$useCon !== void 0 && _input$options$useCon.enabled && (_Object$keys = Object.keys(builderContext.providers)) !== null && _Object$keys !== void 0 && _Object$keys.length) {
-    write(input.outPath, "contractContextBase.ts", _helpers.contractContextBase);
-    write(input.outPath, "contracts-context.tsx", _helpers.contractsContextTSX);
+    var _input$options2;
+
+    var useShorthandCtor = (_input$options2 = input.options) === null || _input$options2 === void 0 ? void 0 : _input$options2.useShorthandCtor;
+    files.push(write(input.outPath, "contractContextBase.ts", useShorthandCtor ? _helpers.contractContextBaseShortHandCtor : _helpers.contractContextBase));
+    files.push(write(input.outPath, "contracts-context.tsx", _helpers.contractsContextTSX, "contractsContext"));
   }
+
+  return files;
 };
 
 exports.createHelpers = createHelpers;

package/main/helpers/contractContextBase.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.contractContextBase = void 0;
-var contractContextBase = "\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n}\n\nexport const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';\n\nexport const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';\n\nexport const NO_ADDRESS_ERROR_MESSAGE = \"address doesn't exist\";\n\nexport const NO_SIGNING_CLIENT_ERROR_MESSAGE =\n  'Signing client is not generated. Please check ts-codegen config';\n\nexport const NO_QUERY_CLIENT_ERROR_MESSAGE =\n  'Query client is not generated. Please check ts-codegen config';\n\nexport const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =\n  'Message composer client is not generated. Please check ts-codegen config';\n\n/**\n * a placeholder for non-generated classes\n */\nexport interface IEmptyClient {}\n\nexport interface ISigningClientProvider<T> {\n  getSigningClient(contractAddr: string): T;\n}\n\nexport interface IQueryClientProvider<T> {\n  getQueryClient(contractAddr: string): T;\n}\n\nexport interface IMessageComposerProvider<T> {\n  getMessageComposer(contractAddr: string): T;\n}\n\nexport class ContractBase<\n  TSign = IEmptyClient,\n  TQuery = IEmptyClient,\n  TMsgComposer = IEmptyClient\n> {\n  constructor(\n    protected address: string | undefined,\n    protected cosmWasmClient: CosmWasmClient | undefined,\n    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,\n    private TSign?: new (\n      client: SigningCosmWasmClient,\n      sender: string,\n      contractAddress: string\n    ) => TSign,\n    private TQuery?: new (\n      client: CosmWasmClient,\n      contractAddress: string\n    ) => TQuery,\n    private TMsgComposer?: new (\n      sender: string,\n      contractAddress: string\n    ) => TMsgComposer\n  ) {}\n\n  public getSigningClient(contractAddr: string): TSign {\n    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);\n    return new this.TSign(\n      this.signingCosmWasmClient,\n      this.address,\n      contractAddr\n    );\n  }\n\n  public getQueryClient(contractAddr: string): TQuery {\n    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);\n    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);\n    return new this.TQuery(this.cosmWasmClient, contractAddr);\n  }\n\n  public getMessageComposer(contractAddr: string): TMsgComposer {\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);\n    return new this.TMsgComposer(this.address, contractAddr);\n  }\n}\n";
+var contractContextBase = "\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n}\n\nexport const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';\n\nexport const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';\n\nexport const NO_ADDRESS_ERROR_MESSAGE = \"address doesn't exist\";\n\nexport const NO_SIGNING_CLIENT_ERROR_MESSAGE =\n  'Signing client is not generated. Please check ts-codegen config';\n\nexport const NO_QUERY_CLIENT_ERROR_MESSAGE =\n  'Query client is not generated. Please check ts-codegen config';\n\nexport const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =\n  'Message composer client is not generated. Please check ts-codegen config';\n\n/**\n * a placeholder for non-generated classes\n */\nexport interface IEmptyClient {}\n\nexport interface ISigningClientProvider<T> {\n  getSigningClient(contractAddr: string): T;\n}\n\nexport interface IQueryClientProvider<T> {\n  getQueryClient(contractAddr: string): T;\n}\n\nexport interface IMessageComposerProvider<T> {\n  getMessageComposer(contractAddr: string): T;\n}\n\nexport class ContractBase<\n  TSign = IEmptyClient,\n  TQuery = IEmptyClient,\n  TMsgComposer = IEmptyClient\n> {\n\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n  TSign?: new (\n    client: SigningCosmWasmClient,\n    sender: string,\n    contractAddress: string\n  ) => TSign;\n  TQuery?: new (\n    client: CosmWasmClient,\n    contractAddress: string\n  ) => TQuery;\n  TMsgComposer?: new (\n    sender: string,\n    contractAddress: string\n  ) => TMsgComposer;\n\n  constructor(\n    address: string | undefined,\n    cosmWasmClient: CosmWasmClient | undefined,\n    signingCosmWasmClient: SigningCosmWasmClient | undefined,\n    TSign?: new (\n      client: SigningCosmWasmClient,\n      sender: string,\n      contractAddress: string\n    ) => TSign,\n    TQuery?: new (\n      client: CosmWasmClient,\n      contractAddress: string\n    ) => TQuery,\n    TMsgComposer?: new (\n      sender: string,\n      contractAddress: string\n    ) => TMsgComposer\n  ) {\n    this.address = address;\n    this.cosmWasmClient = cosmWasmClient;\n    this.signingCosmWasmClient = signingCosmWasmClient;\n    this.TSign = TSign;\n    this.TQuery = TQuery;\n    this.TMsgComposer = TMsgComposer;\n  }\n\n  public getSigningClient(contractAddr: string): TSign {\n    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);\n    return new this.TSign(\n      this.signingCosmWasmClient,\n      this.address,\n      contractAddr\n    );\n  }\n\n  public getQueryClient(contractAddr: string): TQuery {\n    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);\n    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);\n    return new this.TQuery(this.cosmWasmClient, contractAddr);\n  }\n\n  public getMessageComposer(contractAddr: string): TMsgComposer {\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);\n    return new this.TMsgComposer(this.address, contractAddr);\n  }\n}\n";
 exports.contractContextBase = contractContextBase;

package/main/helpers/contractContextBaseShortHandCtor.js

@@ -0,0 +1,8 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.contractContextBaseShortHandCtor = void 0;
+var contractContextBaseShortHandCtor = "\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n}\n\nexport const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';\n\nexport const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';\n\nexport const NO_ADDRESS_ERROR_MESSAGE = \"address doesn't exist\";\n\nexport const NO_SIGNING_CLIENT_ERROR_MESSAGE =\n  'Signing client is not generated. Please check ts-codegen config';\n\nexport const NO_QUERY_CLIENT_ERROR_MESSAGE =\n  'Query client is not generated. Please check ts-codegen config';\n\nexport const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =\n  'Message composer client is not generated. Please check ts-codegen config';\n\n/**\n * a placeholder for non-generated classes\n */\nexport interface IEmptyClient {}\n\nexport interface ISigningClientProvider<T> {\n  getSigningClient(contractAddr: string): T;\n}\n\nexport interface IQueryClientProvider<T> {\n  getQueryClient(contractAddr: string): T;\n}\n\nexport interface IMessageComposerProvider<T> {\n  getMessageComposer(contractAddr: string): T;\n}\n\nexport class ContractBase<\n  TSign = IEmptyClient,\n  TQuery = IEmptyClient,\n  TMsgComposer = IEmptyClient\n> {\n  constructor(\n    protected address: string | undefined,\n    protected cosmWasmClient: CosmWasmClient | undefined,\n    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,\n    private TSign?: new (\n      client: SigningCosmWasmClient,\n      sender: string,\n      contractAddress: string\n    ) => TSign,\n    private TQuery?: new (\n      client: CosmWasmClient,\n      contractAddress: string\n    ) => TQuery,\n    private TMsgComposer?: new (\n      sender: string,\n      contractAddress: string\n    ) => TMsgComposer\n  ) {}\n\n  public getSigningClient(contractAddr: string): TSign {\n    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);\n    return new this.TSign(\n      this.signingCosmWasmClient,\n      this.address,\n      contractAddr\n    );\n  }\n\n  public getQueryClient(contractAddr: string): TQuery {\n    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);\n    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);\n    return new this.TQuery(this.cosmWasmClient, contractAddr);\n  }\n\n  public getMessageComposer(contractAddr: string): TMsgComposer {\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);\n    return new this.TMsgComposer(this.address, contractAddr);\n  }\n}\n";
+exports.contractContextBaseShortHandCtor = contractContextBaseShortHandCtor;

package/main/helpers/contractsContextTSX.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.contractsContextTSX = void 0;
-var contractsContextTSX = "\nimport React, { useEffect, useMemo, useRef, useState, useContext } from 'react';\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nimport { IContractsContext, getProviders } from './contractContextProviders';\n\ninterface ContractsConfig {\n  address: string | undefined;\n  getCosmWasmClient: () => Promise<CosmWasmClient>;\n  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;\n}\n\nconst ContractsContext = React.createContext<IContractsContext | null>(null);\n\nexport const ContractsProvider = ({\n  children,\n  contractsConfig,\n}: {\n  children: React.ReactNode;\n  contractsConfig: ContractsConfig;\n}) => {\n  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();\n  const [signingCosmWasmClient, setSigningCosmWasmClient] =\n    useState<SigningCosmWasmClient>();\n\n  const { address, getCosmWasmClient, getSigningCosmWasmClient } =\n    contractsConfig;\n\n  const prevAddressRef = useRef<string | undefined>(address);\n\n  const contracts: IContractsContext = useMemo(() => {\n    return getProviders(address, cosmWasmClient, signingCosmWasmClient);\n  }, [address, cosmWasmClient, signingCosmWasmClient]);\n\n  useEffect(() => {\n    const connectSigningCwClient = async () => {\n      if (address && prevAddressRef.current !== address) {\n        const signingCosmWasmClient = await getSigningCosmWasmClient();\n        setSigningCosmWasmClient(signingCosmWasmClient);\n      } else if (!address) {\n        setSigningCosmWasmClient(undefined);\n      }\n      prevAddressRef.current = address;\n    };\n    connectSigningCwClient();\n  }, [address, getSigningCosmWasmClient]);\n\n  useEffect(() => {\n    const connectCosmWasmClient = async () => {\n      const cosmWasmClient = await getCosmWasmClient();\n      setCosmWasmClient(cosmWasmClient);\n    };\n    connectCosmWasmClient();\n  }, [getCosmWasmClient]);\n\n  return (\n    <ContractsContext.Provider value={contracts}>\n      {children}\n    </ContractsContext.Provider>\n  );\n};\n\nexport const useContracts = () => {\n  const contracts = useContext(ContractsContext);\n  if (contracts === null) {\n    throw new Error('useContracts must be used within a ContractsProvider');\n  }\n  return contracts;\n};\n";
+var contractsContextTSX = "\nimport React, { useEffect, useMemo, useRef, useState, useContext } from 'react';\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nimport { IContractsContext, getProviders } from './contractContextProviders';\n\ninterface ContractsConfig {\n  address: string | undefined;\n  getCosmWasmClient: () => Promise<CosmWasmClient>;\n  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;\n}\n\nconst ContractsContext = React.createContext<IContractsContext | null>(null);\n\nexport const ContractsProvider = ({\n  children,\n  contractsConfig,\n}: {\n  children: React.ReactNode;\n  contractsConfig: ContractsConfig;\n}) => {\n  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();\n  const [signingCosmWasmClient, setSigningCosmWasmClient] =\n    useState<SigningCosmWasmClient>();\n\n  const { address, getCosmWasmClient, getSigningCosmWasmClient } =\n    contractsConfig;\n\n  const prevAddressRef = useRef<string | undefined>(address);\n\n  const contracts: IContractsContext = useMemo(() => {\n    return getProviders(address, cosmWasmClient, signingCosmWasmClient);\n  }, [address, cosmWasmClient, signingCosmWasmClient]);\n\n  useEffect(() => {\n    const connectSigningCwClient = async () => {\n      if (address && prevAddressRef.current !== address) {\n        const signingCosmWasmClient = await getSigningCosmWasmClient();\n        setSigningCosmWasmClient(signingCosmWasmClient);\n      } else if (!address) {\n        setSigningCosmWasmClient(undefined);\n      }\n      prevAddressRef.current = address;\n    };\n    connectSigningCwClient();\n  }, [address, getSigningCosmWasmClient]);\n\n  useEffect(() => {\n    const connectCosmWasmClient = async () => {\n      const cosmWasmClient = await getCosmWasmClient();\n      setCosmWasmClient(cosmWasmClient);\n    };\n    connectCosmWasmClient();\n  }, [getCosmWasmClient]);\n\n  return (\n    <ContractsContext.Provider value={contracts}>\n      {children}\n    </ContractsContext.Provider>\n  );\n};\n\nexport const useContracts = () => {\n  const contracts: IContractsContext = useContext(ContractsContext);\n  if (contracts === null) {\n    throw new Error('useContracts must be used within a ContractsProvider');\n  }\n  return contracts;\n};\n";
 exports.contractsContextTSX = contractsContextTSX;

package/main/helpers/index.js

@@ -17,6 +17,19 @@ Object.keys(_contractContextBase).forEach(function (key) {
   });
 });
 
+var _contractContextBaseShortHandCtor = require("./contractContextBaseShortHandCtor");
+
+Object.keys(_contractContextBaseShortHandCtor).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _contractContextBaseShortHandCtor[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _contractContextBaseShortHandCtor[key];
+    }
+  });
+});
+
 var _contractsContextTSX = require("./contractsContextTSX");
 
 Object.keys(_contractsContextTSX).forEach(function (key) {

package/main/plugins/provider-bundle.js

@@ -121,6 +121,7 @@ var ContractsProviderBundlePlugin = /*#__PURE__*/function (_BuilderPluginBase) {
                 body.push(w.createGettingProviders(providerInfos));
                 return _context.abrupt("return", [{
                   type: "plugin",
+                  pluginType: "contractContextProviders",
                   localname: localname,
                   body: body
                 }]);

package/main/plugins/provider.js

@@ -145,6 +145,7 @@ var ContractsContextProviderPlugin = /*#__PURE__*/function (_BuilderPluginBase)
                 body.push(w.createProvider(name, providerInfo));
                 return _context.abrupt("return", [{
                   type: "plugin",
+                  pluginType: "provider",
                   localname: localname,
                   body: body
                 }]);

package/module/builder/builder.js

@@ -112,14 +112,11 @@ export class TSBuilder {
   }
 
   async after() {
-    if (this.options.bundle.enabled) {
-      this.bundle();
-    } //create useContracts bundle file
-
-
+    //create useContracts bundle file
     const contractsProviderBundlePlugin = new ContractsProviderBundlePlugin(this.options);
-    contractsProviderBundlePlugin.setBuilder(this);
-    let files = await contractsProviderBundlePlugin.render("", {
+    contractsProviderBundlePlugin.setBuilder(this); //contractContextProviders.ts
+
+    const files = await contractsProviderBundlePlugin.render("contractContextProviders", {
       schemas: []
     }, this.outPath);
 
@@ -127,12 +124,20 @@ export class TSBuilder {
       [].push.apply(this.files, files);
     }
 
-    createHelpers({
+    const helpers = createHelpers({
       outPath: this.outPath,
       contracts: this.contracts,
       options: this.options,
       plugins: this.plugins
     }, this.builderContext);
+
+    if (helpers && helpers.length) {
+      [].push.apply(this.files, helpers);
+    }
+
+    if (this.options.bundle.enabled) {
+      this.bundle();
+    }
   }
 
   async bundle() {

package/module/generators/create-helpers.js

@@ -1,8 +1,8 @@
-import { join, dirname } from "path";
+import { join, dirname, basename, extname } from "path";
 import { sync as mkdirp } from "mkdirp";
 import pkg from "../../package.json";
 import { writeContentToFile } from "../utils/files";
-import { contractContextBase, contractsContextTSX } from "../helpers";
+import { contractContextBase, contractContextBaseShortHandCtor, contractsContextTSX } from "../helpers";
 const version = process.env.NODE_ENV === "test" ? "latest" : pkg.version;
 const header = `/**
 * This file and any referenced files were automatically generated by ${pkg.name}@${version}
@@ -11,15 +11,27 @@ const header = `/**
 */
 \n`;
 
-const write = (outPath, file, content) => {
+const write = (outPath, file, content, varname) => {
   const outFile = join(outPath, file);
   mkdirp(dirname(outFile));
   writeContentToFile(outPath, header + content, outFile);
+  return {
+    type: "plugin",
+    pluginType: "helper",
+    contract: varname ?? basename(file, extname(file)),
+    localname: file,
+    filename: outFile
+  };
 };
 
 export const createHelpers = (input, builderContext) => {
+  const files = [];
+
   if (input.options?.useContractsHooks?.enabled && Object.keys(builderContext.providers)?.length) {
-    write(input.outPath, "contractContextBase.ts", contractContextBase);
-    write(input.outPath, "contracts-context.tsx", contractsContextTSX);
+    const useShorthandCtor = input.options?.useShorthandCtor;
+    files.push(write(input.outPath, "contractContextBase.ts", useShorthandCtor ? contractContextBaseShortHandCtor : contractContextBase));
+    files.push(write(input.outPath, "contracts-context.tsx", contractsContextTSX, "contractsContext"));
   }
+
+  return files;
 };

package/module/helpers/contractContextBase.js

@@ -47,24 +47,49 @@ export class ContractBase<
   TQuery = IEmptyClient,
   TMsgComposer = IEmptyClient
 > {
+
+  address: string | undefined;
+  cosmWasmClient: CosmWasmClient | undefined;
+  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  TSign?: new (
+    client: SigningCosmWasmClient,
+    sender: string,
+    contractAddress: string
+  ) => TSign;
+  TQuery?: new (
+    client: CosmWasmClient,
+    contractAddress: string
+  ) => TQuery;
+  TMsgComposer?: new (
+    sender: string,
+    contractAddress: string
+  ) => TMsgComposer;
+
   constructor(
-    protected address: string | undefined,
-    protected cosmWasmClient: CosmWasmClient | undefined,
-    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
-    private TSign?: new (
+    address: string | undefined,
+    cosmWasmClient: CosmWasmClient | undefined,
+    signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    TSign?: new (
       client: SigningCosmWasmClient,
       sender: string,
       contractAddress: string
     ) => TSign,
-    private TQuery?: new (
+    TQuery?: new (
       client: CosmWasmClient,
       contractAddress: string
     ) => TQuery,
-    private TMsgComposer?: new (
+    TMsgComposer?: new (
       sender: string,
       contractAddress: string
     ) => TMsgComposer
-  ) {}
+  ) {
+    this.address = address;
+    this.cosmWasmClient = cosmWasmClient;
+    this.signingCosmWasmClient = signingCosmWasmClient;
+    this.TSign = TSign;
+    this.TQuery = TQuery;
+    this.TMsgComposer = TMsgComposer;
+  }
 
   public getSigningClient(contractAddr: string): TSign {
     if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);

package/module/helpers/contractContextBaseShortHandCtor.js

@@ -0,0 +1,92 @@
+export const contractContextBaseShortHandCtor = `
+import {
+  CosmWasmClient,
+  SigningCosmWasmClient,
+} from '@cosmjs/cosmwasm-stargate';
+
+export interface IContractConstructor {
+  address: string | undefined;
+  cosmWasmClient: CosmWasmClient | undefined;
+  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+}
+
+export const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';
+
+export const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';
+
+export const NO_ADDRESS_ERROR_MESSAGE = "address doesn't exist";
+
+export const NO_SIGNING_CLIENT_ERROR_MESSAGE =
+  'Signing client is not generated. Please check ts-codegen config';
+
+export const NO_QUERY_CLIENT_ERROR_MESSAGE =
+  'Query client is not generated. Please check ts-codegen config';
+
+export const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =
+  'Message composer client is not generated. Please check ts-codegen config';
+
+/**
+ * a placeholder for non-generated classes
+ */
+export interface IEmptyClient {}
+
+export interface ISigningClientProvider<T> {
+  getSigningClient(contractAddr: string): T;
+}
+
+export interface IQueryClientProvider<T> {
+  getQueryClient(contractAddr: string): T;
+}
+
+export interface IMessageComposerProvider<T> {
+  getMessageComposer(contractAddr: string): T;
+}
+
+export class ContractBase<
+  TSign = IEmptyClient,
+  TQuery = IEmptyClient,
+  TMsgComposer = IEmptyClient
+> {
+  constructor(
+    protected address: string | undefined,
+    protected cosmWasmClient: CosmWasmClient | undefined,
+    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    private TSign?: new (
+      client: SigningCosmWasmClient,
+      sender: string,
+      contractAddress: string
+    ) => TSign,
+    private TQuery?: new (
+      client: CosmWasmClient,
+      contractAddress: string
+    ) => TQuery,
+    private TMsgComposer?: new (
+      sender: string,
+      contractAddress: string
+    ) => TMsgComposer
+  ) {}
+
+  public getSigningClient(contractAddr: string): TSign {
+    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);
+    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);
+    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);
+    return new this.TSign(
+      this.signingCosmWasmClient,
+      this.address,
+      contractAddr
+    );
+  }
+
+  public getQueryClient(contractAddr: string): TQuery {
+    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);
+    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);
+    return new this.TQuery(this.cosmWasmClient, contractAddr);
+  }
+
+  public getMessageComposer(contractAddr: string): TMsgComposer {
+    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);
+    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);
+    return new this.TMsgComposer(this.address, contractAddr);
+  }
+}
+`;

package/module/helpers/contractsContextTSX.js

@@ -64,7 +64,7 @@ export const ContractsProvider = ({
 };
 
 export const useContracts = () => {
-  const contracts = useContext(ContractsContext);
+  const contracts: IContractsContext = useContext(ContractsContext);
   if (contracts === null) {
     throw new Error('useContracts must be used within a ContractsProvider');
   }

package/module/helpers/index.js

@@ -1,2 +1,3 @@
 export * from './contractContextBase';
+export * from './contractContextBaseShortHandCtor';
 export * from './contractsContextTSX';

package/module/plugins/provider-bundle.js

@@ -57,6 +57,7 @@ export class ContractsProviderBundlePlugin extends BuilderPluginBase {
     body.push(w.createGettingProviders(providerInfos));
     return [{
       type: "plugin",
+      pluginType: "contractContextProviders",
       localname,
       body
     }];

package/module/plugins/provider.js

@@ -73,6 +73,7 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase {
     body.push(w.createProvider(name, providerInfo));
     return [{
       type: "plugin",
+      pluginType: "provider",
       localname,
       body
     }];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,7 +96,7 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.24.0"
+    "wasm-ast-types": "^0.25.0"
   },
-  "gitHead": "9d4f9eca0ee378e0f53c5b95343842d76d446534"
+  "gitHead": "676f2d7bf1f7317e75660f8c19a71619064857d2"
 }

package/src/builder/builder.ts

@@ -49,11 +49,15 @@ export interface BundleOptions {
 
 export interface UseContractsOptions {
     enabled?: boolean;
-    filename?: string;
 };
 
 export type TSBuilderOptions = {
     bundle?: BundleOptions;
+    /**
+     * Enable using shorthand constructor.
+     * Default: false
+     */
+    useShorthandCtor?: boolean;
     useContractsHooks?: UseContractsOptions;
 } & RenderOptions;
 
@@ -63,7 +67,9 @@ export interface BuilderFile {
     type: BuilderFileType;
     pluginType?: string;
     contract: string;
+    //filename only: Factory.client.ts
     localname: string;
+    //full path: contracts/Factory.client.ts
     filename: string;
 };
 
@@ -157,35 +163,41 @@ export class TSBuilder {
     }
 
     private async after() {
-        if (this.options.bundle.enabled) {
-            this.bundle();
-        }
 
         //create useContracts bundle file
         const contractsProviderBundlePlugin = new ContractsProviderBundlePlugin(this.options);
         contractsProviderBundlePlugin.setBuilder(this);
 
-        let files = await contractsProviderBundlePlugin.render(
-            "",
+        //contractContextProviders.ts
+        const files = await contractsProviderBundlePlugin.render(
+            "contractContextProviders",
             {
                 schemas: [],
             },
             this.outPath
         );
+
         if (files && files.length) {
             [].push.apply(this.files, files);
         }
 
-        createHelpers({
+        const helpers = createHelpers({
             outPath: this.outPath,
             contracts: this.contracts,
             options: this.options,
             plugins: this.plugins,
         }, this.builderContext);
+
+        if (helpers && helpers.length) {
+          [].push.apply(this.files, helpers);
+        }
+
+        if (this.options.bundle.enabled) {
+            this.bundle();
+        }
     }
 
     async bundle() {
-
         const allFiles = this.files;
 
         const bundleFile = this.options.bundle.bundleFile;

package/src/generators/create-helpers.ts

@@ -1,9 +1,13 @@
-import { join, dirname } from "path";
+import { join, dirname, basename, extname } from "path";
 import { sync as mkdirp } from "mkdirp";
 import pkg from "../../package.json";
 import { writeContentToFile } from "../utils/files";
-import { TSBuilderInput } from "../builder";
-import { contractContextBase, contractsContextTSX } from "../helpers";
+import { BuilderFile, TSBuilderInput } from "../builder";
+import {
+  contractContextBase,
+  contractContextBaseShortHandCtor,
+  contractsContextTSX,
+} from "../helpers";
 import { BuilderContext } from "wasm-ast-types";
 
 const version = process.env.NODE_ENV === "test" ? "latest" : pkg.version;
@@ -14,15 +18,54 @@ const header = `/**
 */
 \n`;
 
-const write = (outPath: string, file: string, content: string) => {
+const write = (
+  outPath: string,
+  file: string,
+  content: string,
+  varname?: string
+): BuilderFile => {
   const outFile = join(outPath, file);
   mkdirp(dirname(outFile));
   writeContentToFile(outPath, header + content, outFile);
+
+  return {
+    type: "plugin",
+    pluginType: "helper",
+    contract: varname ?? basename(file, extname(file)),
+    localname: file,
+    filename: outFile,
+  };
 };
 
-export const createHelpers = (input: TSBuilderInput, builderContext: BuilderContext) => {
-  if (input.options?.useContractsHooks?.enabled && Object.keys(builderContext.providers)?.length) {
-    write(input.outPath, "contractContextBase.ts", contractContextBase);
-    write(input.outPath, "contracts-context.tsx", contractsContextTSX);
+export const createHelpers = (
+  input: TSBuilderInput,
+  builderContext: BuilderContext
+): BuilderFile[] => {
+  const files: BuilderFile[] = [];
+
+  if (
+    input.options?.useContractsHooks?.enabled &&
+    Object.keys(builderContext.providers)?.length
+  ) {
+    const useShorthandCtor = input.options?.useShorthandCtor;
+    files.push(
+      write(
+        input.outPath,
+        "contractContextBase.ts",
+        useShorthandCtor
+          ? contractContextBaseShortHandCtor
+          : contractContextBase
+      )
+    );
+    files.push(
+      write(
+        input.outPath,
+        "contracts-context.tsx",
+        contractsContextTSX,
+        "contractsContext"
+      )
+    );
   }
+
+  return files;
 };

package/src/helpers/contractContextBase.ts

@@ -47,24 +47,49 @@ export class ContractBase<
   TQuery = IEmptyClient,
   TMsgComposer = IEmptyClient
 > {
+
+  address: string | undefined;
+  cosmWasmClient: CosmWasmClient | undefined;
+  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  TSign?: new (
+    client: SigningCosmWasmClient,
+    sender: string,
+    contractAddress: string
+  ) => TSign;
+  TQuery?: new (
+    client: CosmWasmClient,
+    contractAddress: string
+  ) => TQuery;
+  TMsgComposer?: new (
+    sender: string,
+    contractAddress: string
+  ) => TMsgComposer;
+
   constructor(
-    protected address: string | undefined,
-    protected cosmWasmClient: CosmWasmClient | undefined,
-    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
-    private TSign?: new (
+    address: string | undefined,
+    cosmWasmClient: CosmWasmClient | undefined,
+    signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    TSign?: new (
       client: SigningCosmWasmClient,
       sender: string,
       contractAddress: string
     ) => TSign,
-    private TQuery?: new (
+    TQuery?: new (
       client: CosmWasmClient,
       contractAddress: string
     ) => TQuery,
-    private TMsgComposer?: new (
+    TMsgComposer?: new (
       sender: string,
       contractAddress: string
     ) => TMsgComposer
-  ) {}
+  ) {
+    this.address = address;
+    this.cosmWasmClient = cosmWasmClient;
+    this.signingCosmWasmClient = signingCosmWasmClient;
+    this.TSign = TSign;
+    this.TQuery = TQuery;
+    this.TMsgComposer = TMsgComposer;
+  }
 
   public getSigningClient(contractAddr: string): TSign {
     if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);

package/src/helpers/contractContextBaseShortHandCtor.ts

@@ -0,0 +1,92 @@
+export const contractContextBaseShortHandCtor = `
+import {
+  CosmWasmClient,
+  SigningCosmWasmClient,
+} from '@cosmjs/cosmwasm-stargate';
+
+export interface IContractConstructor {
+  address: string | undefined;
+  cosmWasmClient: CosmWasmClient | undefined;
+  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+}
+
+export const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';
+
+export const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';
+
+export const NO_ADDRESS_ERROR_MESSAGE = "address doesn't exist";
+
+export const NO_SIGNING_CLIENT_ERROR_MESSAGE =
+  'Signing client is not generated. Please check ts-codegen config';
+
+export const NO_QUERY_CLIENT_ERROR_MESSAGE =
+  'Query client is not generated. Please check ts-codegen config';
+
+export const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =
+  'Message composer client is not generated. Please check ts-codegen config';
+
+/**
+ * a placeholder for non-generated classes
+ */
+export interface IEmptyClient {}
+
+export interface ISigningClientProvider<T> {
+  getSigningClient(contractAddr: string): T;
+}
+
+export interface IQueryClientProvider<T> {
+  getQueryClient(contractAddr: string): T;
+}
+
+export interface IMessageComposerProvider<T> {
+  getMessageComposer(contractAddr: string): T;
+}
+
+export class ContractBase<
+  TSign = IEmptyClient,
+  TQuery = IEmptyClient,
+  TMsgComposer = IEmptyClient
+> {
+  constructor(
+    protected address: string | undefined,
+    protected cosmWasmClient: CosmWasmClient | undefined,
+    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    private TSign?: new (
+      client: SigningCosmWasmClient,
+      sender: string,
+      contractAddress: string
+    ) => TSign,
+    private TQuery?: new (
+      client: CosmWasmClient,
+      contractAddress: string
+    ) => TQuery,
+    private TMsgComposer?: new (
+      sender: string,
+      contractAddress: string
+    ) => TMsgComposer
+  ) {}
+
+  public getSigningClient(contractAddr: string): TSign {
+    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);
+    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);
+    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);
+    return new this.TSign(
+      this.signingCosmWasmClient,
+      this.address,
+      contractAddr
+    );
+  }
+
+  public getQueryClient(contractAddr: string): TQuery {
+    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);
+    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);
+    return new this.TQuery(this.cosmWasmClient, contractAddr);
+  }
+
+  public getMessageComposer(contractAddr: string): TMsgComposer {
+    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);
+    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);
+    return new this.TMsgComposer(this.address, contractAddr);
+  }
+}
+`;

package/src/helpers/contractsContextTSX.ts

@@ -64,7 +64,7 @@ export const ContractsProvider = ({
 };
 
 export const useContracts = () => {
-  const contracts = useContext(ContractsContext);
+  const contracts: IContractsContext = useContext(ContractsContext);
   if (contracts === null) {
     throw new Error('useContracts must be used within a ContractsProvider');
   }

package/src/helpers/index.ts

@@ -1,2 +1,3 @@
 export * from './contractContextBase';
+export * from './contractContextBaseShortHandCtor';
 export * from './contractsContextTSX';

package/src/plugins/provider-bundle.ts

@@ -89,6 +89,7 @@ export class ContractsProviderBundlePlugin extends BuilderPluginBase<TSBuilderOp
     return [
       {
         type: "plugin",
+        pluginType: "contractContextProviders",
         localname,
         body,
       },

package/src/plugins/provider.ts

@@ -106,6 +106,7 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
     return [
       {
         type: "plugin",
+        pluginType: "provider",
         localname,
         body,
       },

package/types/src/builder/builder.d.ts

@@ -14,13 +14,16 @@ export interface BundleOptions {
 }
 export interface UseContractsOptions {
     enabled?: boolean;
-    filename?: string;
 }
-export type TSBuilderOptions = {
+export declare type TSBuilderOptions = {
     bundle?: BundleOptions;
+    /**
+     * Enable using shorthand constructor.
+     */
+    useShorthandCtor?: boolean;
     useContractsHooks?: UseContractsOptions;
 } & RenderOptions;
-export type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'msg-builder' | 'plugin';
+export declare type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'msg-builder' | 'plugin';
 export interface BuilderFile {
     type: BuilderFileType;
     pluginType?: string;

package/types/src/generators/create-helpers.d.ts

@@ -1,3 +1,3 @@
-import { TSBuilderInput } from "../builder";
+import { BuilderFile, TSBuilderInput } from "../builder";
 import { BuilderContext } from "wasm-ast-types";
-export declare const createHelpers: (input: TSBuilderInput, builderContext: BuilderContext) => void;
+export declare const createHelpers: (input: TSBuilderInput, builderContext: BuilderContext) => BuilderFile[];

package/types/src/helpers/contractContextBase.d.ts

@@ -1 +1 @@
-export declare const contractContextBase = "\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n}\n\nexport const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';\n\nexport const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';\n\nexport const NO_ADDRESS_ERROR_MESSAGE = \"address doesn't exist\";\n\nexport const NO_SIGNING_CLIENT_ERROR_MESSAGE =\n  'Signing client is not generated. Please check ts-codegen config';\n\nexport const NO_QUERY_CLIENT_ERROR_MESSAGE =\n  'Query client is not generated. Please check ts-codegen config';\n\nexport const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =\n  'Message composer client is not generated. Please check ts-codegen config';\n\n/**\n * a placeholder for non-generated classes\n */\nexport interface IEmptyClient {}\n\nexport interface ISigningClientProvider<T> {\n  getSigningClient(contractAddr: string): T;\n}\n\nexport interface IQueryClientProvider<T> {\n  getQueryClient(contractAddr: string): T;\n}\n\nexport interface IMessageComposerProvider<T> {\n  getMessageComposer(contractAddr: string): T;\n}\n\nexport class ContractBase<\n  TSign = IEmptyClient,\n  TQuery = IEmptyClient,\n  TMsgComposer = IEmptyClient\n> {\n  constructor(\n    protected address: string | undefined,\n    protected cosmWasmClient: CosmWasmClient | undefined,\n    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,\n    private TSign?: new (\n      client: SigningCosmWasmClient,\n      sender: string,\n      contractAddress: string\n    ) => TSign,\n    private TQuery?: new (\n      client: CosmWasmClient,\n      contractAddress: string\n    ) => TQuery,\n    private TMsgComposer?: new (\n      sender: string,\n      contractAddress: string\n    ) => TMsgComposer\n  ) {}\n\n  public getSigningClient(contractAddr: string): TSign {\n    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);\n    return new this.TSign(\n      this.signingCosmWasmClient,\n      this.address,\n      contractAddr\n    );\n  }\n\n  public getQueryClient(contractAddr: string): TQuery {\n    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);\n    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);\n    return new this.TQuery(this.cosmWasmClient, contractAddr);\n  }\n\n  public getMessageComposer(contractAddr: string): TMsgComposer {\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);\n    return new this.TMsgComposer(this.address, contractAddr);\n  }\n}\n";
+export declare const contractContextBase = "\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n}\n\nexport const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';\n\nexport const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';\n\nexport const NO_ADDRESS_ERROR_MESSAGE = \"address doesn't exist\";\n\nexport const NO_SIGNING_CLIENT_ERROR_MESSAGE =\n  'Signing client is not generated. Please check ts-codegen config';\n\nexport const NO_QUERY_CLIENT_ERROR_MESSAGE =\n  'Query client is not generated. Please check ts-codegen config';\n\nexport const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =\n  'Message composer client is not generated. Please check ts-codegen config';\n\n/**\n * a placeholder for non-generated classes\n */\nexport interface IEmptyClient {}\n\nexport interface ISigningClientProvider<T> {\n  getSigningClient(contractAddr: string): T;\n}\n\nexport interface IQueryClientProvider<T> {\n  getQueryClient(contractAddr: string): T;\n}\n\nexport interface IMessageComposerProvider<T> {\n  getMessageComposer(contractAddr: string): T;\n}\n\nexport class ContractBase<\n  TSign = IEmptyClient,\n  TQuery = IEmptyClient,\n  TMsgComposer = IEmptyClient\n> {\n\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n  TSign?: new (\n    client: SigningCosmWasmClient,\n    sender: string,\n    contractAddress: string\n  ) => TSign;\n  TQuery?: new (\n    client: CosmWasmClient,\n    contractAddress: string\n  ) => TQuery;\n  TMsgComposer?: new (\n    sender: string,\n    contractAddress: string\n  ) => TMsgComposer;\n\n  constructor(\n    address: string | undefined,\n    cosmWasmClient: CosmWasmClient | undefined,\n    signingCosmWasmClient: SigningCosmWasmClient | undefined,\n    TSign?: new (\n      client: SigningCosmWasmClient,\n      sender: string,\n      contractAddress: string\n    ) => TSign,\n    TQuery?: new (\n      client: CosmWasmClient,\n      contractAddress: string\n    ) => TQuery,\n    TMsgComposer?: new (\n      sender: string,\n      contractAddress: string\n    ) => TMsgComposer\n  ) {\n    this.address = address;\n    this.cosmWasmClient = cosmWasmClient;\n    this.signingCosmWasmClient = signingCosmWasmClient;\n    this.TSign = TSign;\n    this.TQuery = TQuery;\n    this.TMsgComposer = TMsgComposer;\n  }\n\n  public getSigningClient(contractAddr: string): TSign {\n    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);\n    return new this.TSign(\n      this.signingCosmWasmClient,\n      this.address,\n      contractAddr\n    );\n  }\n\n  public getQueryClient(contractAddr: string): TQuery {\n    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);\n    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);\n    return new this.TQuery(this.cosmWasmClient, contractAddr);\n  }\n\n  public getMessageComposer(contractAddr: string): TMsgComposer {\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);\n    return new this.TMsgComposer(this.address, contractAddr);\n  }\n}\n";

package/types/src/helpers/contractContextBaseShortHandCtor.d.ts

@@ -0,0 +1 @@
+export declare const contractContextBaseShortHandCtor = "\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n}\n\nexport const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';\n\nexport const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';\n\nexport const NO_ADDRESS_ERROR_MESSAGE = \"address doesn't exist\";\n\nexport const NO_SIGNING_CLIENT_ERROR_MESSAGE =\n  'Signing client is not generated. Please check ts-codegen config';\n\nexport const NO_QUERY_CLIENT_ERROR_MESSAGE =\n  'Query client is not generated. Please check ts-codegen config';\n\nexport const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =\n  'Message composer client is not generated. Please check ts-codegen config';\n\n/**\n * a placeholder for non-generated classes\n */\nexport interface IEmptyClient {}\n\nexport interface ISigningClientProvider<T> {\n  getSigningClient(contractAddr: string): T;\n}\n\nexport interface IQueryClientProvider<T> {\n  getQueryClient(contractAddr: string): T;\n}\n\nexport interface IMessageComposerProvider<T> {\n  getMessageComposer(contractAddr: string): T;\n}\n\nexport class ContractBase<\n  TSign = IEmptyClient,\n  TQuery = IEmptyClient,\n  TMsgComposer = IEmptyClient\n> {\n  constructor(\n    protected address: string | undefined,\n    protected cosmWasmClient: CosmWasmClient | undefined,\n    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,\n    private TSign?: new (\n      client: SigningCosmWasmClient,\n      sender: string,\n      contractAddress: string\n    ) => TSign,\n    private TQuery?: new (\n      client: CosmWasmClient,\n      contractAddress: string\n    ) => TQuery,\n    private TMsgComposer?: new (\n      sender: string,\n      contractAddress: string\n    ) => TMsgComposer\n  ) {}\n\n  public getSigningClient(contractAddr: string): TSign {\n    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);\n    return new this.TSign(\n      this.signingCosmWasmClient,\n      this.address,\n      contractAddr\n    );\n  }\n\n  public getQueryClient(contractAddr: string): TQuery {\n    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);\n    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);\n    return new this.TQuery(this.cosmWasmClient, contractAddr);\n  }\n\n  public getMessageComposer(contractAddr: string): TMsgComposer {\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);\n    return new this.TMsgComposer(this.address, contractAddr);\n  }\n}\n";

package/types/src/helpers/contractsContextTSX.d.ts

@@ -1 +1 @@
-export declare const contractsContextTSX = "\nimport React, { useEffect, useMemo, useRef, useState, useContext } from 'react';\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nimport { IContractsContext, getProviders } from './contractContextProviders';\n\ninterface ContractsConfig {\n  address: string | undefined;\n  getCosmWasmClient: () => Promise<CosmWasmClient>;\n  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;\n}\n\nconst ContractsContext = React.createContext<IContractsContext | null>(null);\n\nexport const ContractsProvider = ({\n  children,\n  contractsConfig,\n}: {\n  children: React.ReactNode;\n  contractsConfig: ContractsConfig;\n}) => {\n  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();\n  const [signingCosmWasmClient, setSigningCosmWasmClient] =\n    useState<SigningCosmWasmClient>();\n\n  const { address, getCosmWasmClient, getSigningCosmWasmClient } =\n    contractsConfig;\n\n  const prevAddressRef = useRef<string | undefined>(address);\n\n  const contracts: IContractsContext = useMemo(() => {\n    return getProviders(address, cosmWasmClient, signingCosmWasmClient);\n  }, [address, cosmWasmClient, signingCosmWasmClient]);\n\n  useEffect(() => {\n    const connectSigningCwClient = async () => {\n      if (address && prevAddressRef.current !== address) {\n        const signingCosmWasmClient = await getSigningCosmWasmClient();\n        setSigningCosmWasmClient(signingCosmWasmClient);\n      } else if (!address) {\n        setSigningCosmWasmClient(undefined);\n      }\n      prevAddressRef.current = address;\n    };\n    connectSigningCwClient();\n  }, [address, getSigningCosmWasmClient]);\n\n  useEffect(() => {\n    const connectCosmWasmClient = async () => {\n      const cosmWasmClient = await getCosmWasmClient();\n      setCosmWasmClient(cosmWasmClient);\n    };\n    connectCosmWasmClient();\n  }, [getCosmWasmClient]);\n\n  return (\n    <ContractsContext.Provider value={contracts}>\n      {children}\n    </ContractsContext.Provider>\n  );\n};\n\nexport const useContracts = () => {\n  const contracts = useContext(ContractsContext);\n  if (contracts === null) {\n    throw new Error('useContracts must be used within a ContractsProvider');\n  }\n  return contracts;\n};\n";
+export declare const contractsContextTSX = "\nimport React, { useEffect, useMemo, useRef, useState, useContext } from 'react';\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nimport { IContractsContext, getProviders } from './contractContextProviders';\n\ninterface ContractsConfig {\n  address: string | undefined;\n  getCosmWasmClient: () => Promise<CosmWasmClient>;\n  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;\n}\n\nconst ContractsContext = React.createContext<IContractsContext | null>(null);\n\nexport const ContractsProvider = ({\n  children,\n  contractsConfig,\n}: {\n  children: React.ReactNode;\n  contractsConfig: ContractsConfig;\n}) => {\n  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();\n  const [signingCosmWasmClient, setSigningCosmWasmClient] =\n    useState<SigningCosmWasmClient>();\n\n  const { address, getCosmWasmClient, getSigningCosmWasmClient } =\n    contractsConfig;\n\n  const prevAddressRef = useRef<string | undefined>(address);\n\n  const contracts: IContractsContext = useMemo(() => {\n    return getProviders(address, cosmWasmClient, signingCosmWasmClient);\n  }, [address, cosmWasmClient, signingCosmWasmClient]);\n\n  useEffect(() => {\n    const connectSigningCwClient = async () => {\n      if (address && prevAddressRef.current !== address) {\n        const signingCosmWasmClient = await getSigningCosmWasmClient();\n        setSigningCosmWasmClient(signingCosmWasmClient);\n      } else if (!address) {\n        setSigningCosmWasmClient(undefined);\n      }\n      prevAddressRef.current = address;\n    };\n    connectSigningCwClient();\n  }, [address, getSigningCosmWasmClient]);\n\n  useEffect(() => {\n    const connectCosmWasmClient = async () => {\n      const cosmWasmClient = await getCosmWasmClient();\n      setCosmWasmClient(cosmWasmClient);\n    };\n    connectCosmWasmClient();\n  }, [getCosmWasmClient]);\n\n  return (\n    <ContractsContext.Provider value={contracts}>\n      {children}\n    </ContractsContext.Provider>\n  );\n};\n\nexport const useContracts = () => {\n  const contracts: IContractsContext = useContext(ContractsContext);\n  if (contracts === null) {\n    throw new Error('useContracts must be used within a ContractsProvider');\n  }\n  return contracts;\n};\n";

package/types/src/helpers/index.d.ts

@@ -1,2 +1,3 @@
 export * from './contractContextBase';
+export * from './contractContextBaseShortHandCtor';
 export * from './contractsContextTSX';