@cosmwasm/ts-codegen 1.12.1 → 1.13.1

package/helpers/contractContextBase.js

@@ -3,14 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.contractContextBase = void 0;
 exports.contractContextBase = `
 import {
-  CosmWasmClient,
-  SigningCosmWasmClient,
-} from '@cosmjs/cosmwasm-stargate';
+  ICosmWasmClient,
+  ISigningCosmWasmClient,
+  getCosmWasmClient,
+  getSigningCosmWasmClient,
+} from './baseClient';
 
 export interface IContractConstructor {
   address: string | undefined;
-  cosmWasmClient: CosmWasmClient | undefined;
-  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  cosmWasmClient: ICosmWasmClient | undefined;
+  signingCosmWasmClient: ISigningCosmWasmClient | undefined;
 }
 
 export const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';
@@ -52,15 +54,15 @@ export class ContractBase<
 > {
 
   address: string | undefined;
-  cosmWasmClient: CosmWasmClient | undefined;
-  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  cosmWasmClient: ICosmWasmClient | undefined;
+  signingCosmWasmClient: ISigningCosmWasmClient | undefined;
   TSign?: new (
-    client: SigningCosmWasmClient,
+    client: ISigningCosmWasmClient,
     sender: string,
     contractAddress: string
   ) => TSign;
   TQuery?: new (
-    client: CosmWasmClient,
+    client: ICosmWasmClient,
     contractAddress: string
   ) => TQuery;
   TMsgComposer?: new (
@@ -70,15 +72,15 @@ export class ContractBase<
 
   constructor(
     address: string | undefined,
-    cosmWasmClient: CosmWasmClient | undefined,
-    signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    cosmWasmClient: ICosmWasmClient | undefined,
+    signingCosmWasmClient: ISigningCosmWasmClient | undefined,
     TSign?: new (
-      client: SigningCosmWasmClient,
+      client: ISigningCosmWasmClient,
       sender: string,
       contractAddress: string
     ) => TSign,
     TQuery?: new (
-      client: CosmWasmClient,
+      client: ICosmWasmClient,
       contractAddress: string
     ) => TQuery,
     TMsgComposer?: new (

package/helpers/contractContextBaseShortHandCtor.d.ts

@@ -1 +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";
+export declare const contractContextBaseShortHandCtor = "\nimport {\n  ICosmWasmClient,\n  ISigningCosmWasmClient,\n  getCosmWasmClient,\n  getSigningCosmWasmClient,\n} from './baseClient';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: ICosmWasmClient | undefined;\n  signingCosmWasmClient: ISigningCosmWasmClient | 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: ICosmWasmClient | undefined,\n    protected signingCosmWasmClient: ISigningCosmWasmClient | undefined,\n    private TSign?: new (\n      client: ISigningCosmWasmClient,\n      sender: string,\n      contractAddress: string\n    ) => TSign,\n    private TQuery?: new (\n      client: ICosmWasmClient,\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/helpers/contractContextBaseShortHandCtor.js

@@ -3,14 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.contractContextBaseShortHandCtor = void 0;
 exports.contractContextBaseShortHandCtor = `
 import {
-  CosmWasmClient,
-  SigningCosmWasmClient,
-} from '@cosmjs/cosmwasm-stargate';
+  ICosmWasmClient,
+  ISigningCosmWasmClient,
+  getCosmWasmClient,
+  getSigningCosmWasmClient,
+} from './baseClient';
 
 export interface IContractConstructor {
   address: string | undefined;
-  cosmWasmClient: CosmWasmClient | undefined;
-  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  cosmWasmClient: ICosmWasmClient | undefined;
+  signingCosmWasmClient: ISigningCosmWasmClient | undefined;
 }
 
 export const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';
@@ -52,15 +54,15 @@ export class ContractBase<
 > {
   constructor(
     protected address: string | undefined,
-    protected cosmWasmClient: CosmWasmClient | undefined,
-    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    protected cosmWasmClient: ICosmWasmClient | undefined,
+    protected signingCosmWasmClient: ISigningCosmWasmClient | undefined,
     private TSign?: new (
-      client: SigningCosmWasmClient,
+      client: ISigningCosmWasmClient,
       sender: string,
       contractAddress: string
     ) => TSign,
     private TQuery?: new (
-      client: CosmWasmClient,
+      client: ICosmWasmClient,
       contractAddress: string
     ) => TQuery,
     private TMsgComposer?: new (

package/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\nexport interface 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";
+export declare const contractsContextTSX = "\nimport React, { useEffect, useMemo, useRef, useState, useContext } from 'react';\nimport {\n  ICosmWasmClient,\n  ISigningCosmWasmClient,\n} from './baseClient';\n\nimport { IContractsContext, getProviders } from './contractContextProviders';\n\nexport interface ContractsConfig {\n  address: string | undefined;\n  getCosmWasmClient: () => Promise<ICosmWasmClient>;\n  getSigningCosmWasmClient: () => Promise<ISigningCosmWasmClient>;\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<ICosmWasmClient>();\n  const [signingCosmWasmClient, setSigningCosmWasmClient] =\n    useState<ISigningCosmWasmClient>();\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/helpers/contractsContextTSX.js

@@ -4,16 +4,16 @@ exports.contractsContextTSX = void 0;
 exports.contractsContextTSX = `
 import React, { useEffect, useMemo, useRef, useState, useContext } from 'react';
 import {
-  CosmWasmClient,
-  SigningCosmWasmClient,
-} from '@cosmjs/cosmwasm-stargate';
+  ICosmWasmClient,
+  ISigningCosmWasmClient,
+} from './baseClient';
 
 import { IContractsContext, getProviders } from './contractContextProviders';
 
 export interface ContractsConfig {
   address: string | undefined;
-  getCosmWasmClient: () => Promise<CosmWasmClient>;
-  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;
+  getCosmWasmClient: () => Promise<ICosmWasmClient>;
+  getSigningCosmWasmClient: () => Promise<ISigningCosmWasmClient>;
 }
 
 const ContractsContext = React.createContext<IContractsContext | null>(null);
@@ -25,9 +25,9 @@ export const ContractsProvider = ({
   children: React.ReactNode;
   contractsConfig: ContractsConfig;
 }) => {
-  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();
+  const [cosmWasmClient, setCosmWasmClient] = useState<ICosmWasmClient>();
   const [signingCosmWasmClient, setSigningCosmWasmClient] =
-    useState<SigningCosmWasmClient>();
+    useState<ISigningCosmWasmClient>();
 
   const { address, getCosmWasmClient, getSigningCosmWasmClient } =
     contractsConfig;

package/helpers/create-helpers.js

@@ -20,6 +20,8 @@ const write = (outPath, file, content, varname) => {
 };
 const createHelpers = (input, builderContext) => {
     const files = [];
+    // Always generate baseClient.ts since InterchainJS interfaces are needed by all clients
+    files.push(write(input.outPath, 'baseClient.ts', helpers_1.baseClient));
     if (input.options?.useContractsHook?.enabled &&
         Object.keys(builderContext.providers)?.length) {
         const useShorthandCtor = input.options?.useShorthandCtor;

package/helpers/index.d.ts

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

package/helpers/index.js

@@ -16,4 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./contractContextBase"), exports);
 __exportStar(require("./contractContextBaseShortHandCtor"), exports);
+__exportStar(require("./baseClient"), exports);
 __exportStar(require("./contractsContextTSX"), exports);

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.12.1",
+  "version": "1.13.1",
   "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",
+  "homepage": "https://github.com/hyperweb-io/ts-codegen",
   "license": "SEE LICENSE IN LICENSE",
   "main": "index.js",
   "module": "esm/index.js",
@@ -20,31 +20,34 @@
     "copy": "copyfiles -f LICENSE-Apache LICENSE-MIT README.md package.json dist",
     "clean": "rimraf dist/**",
     "prepare": "npm run build",
-    "cmds": "ts-node ./scripts/cmds.ts",
+    "cmds": "tsx ./scripts/cmds.ts",
     "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
     "lint": "eslint . --fix",
+    "format": "prettier --write --log-level warn \"./**/*.ts\"",
     "test": "jest",
     "test:watch": "jest --watch",
-    "dev": "ts-node src/ts-codegen",
-    "file": "ts-node src/file"
+    "dev": "tsx src/ts-codegen",
+    "file": "tsx src/file"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/cosmwasm/ts-codegen"
+    "url": "https://github.com/hyperweb-io/ts-codegen"
   },
   "bugs": {
-    "url": "https://github.com/cosmwasm/ts-codegen/issues"
-  },
-  "devDependencies": {
-    "@cosmjs/cosmwasm-stargate": "0.32.3",
-    "ast-stringify": "0.1.0"
+    "url": "https://github.com/hyperweb-io/ts-codegen/issues"
   },
   "dependencies": {
     "@babel/generator": "7.24.4",
     "@babel/traverse": "7.24.1",
     "@babel/types": "7.24.0",
-    "@cosmwasm/ts-codegen-ast": "^1.8.1",
-    "@cosmwasm/ts-codegen-types": "^1.3.1",
+    "@chain-registry/types": "^0.17.1",
+    "@chain-registry/utils": "^1.51.71",
+    "@chain-registry/v2": "^1.71.229",
+    "@cosmwasm/ts-codegen-ast": "^1.9.1",
+    "@cosmwasm/ts-codegen-types": "^1.4.1",
+    "@interchainjs/amino": "1.17.1",
+    "@interchainjs/cosmos": "1.17.1",
+    "@interchainjs/types": "1.17.1",
     "@pyramation/json-schema-to-typescript": " 11.0.4",
     "@types/rimraf": "3.0.2",
     "@types/shelljs": "0.8.15",
@@ -52,8 +55,10 @@
     "dargs": "7.0.0",
     "deepmerge": "4.2.2",
     "fuzzy": "0.1.3",
-    "glob": "8.0.3",
+    "glob": "^10",
     "inquirerer": "0.1.3",
+    "interchainjs": "1.17.1",
+    "minimatch": "^10.0.3",
     "minimist": "1.2.6",
     "mkdirp": "1.0.4",
     "nested-obj": "0.0.1",
@@ -67,5 +72,5 @@
     "smart contracts",
     "codegen"
   ],
-  "gitHead": "be8802a215dbc75df9af75dba2f6ac17c04d6938"
+  "gitHead": "472007b2c11c211f16e18d4653350bf7a8e16901"
 }

package/plugins/client.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientPlugin = void 0;
 const w = __importStar(require("@cosmwasm/ts-codegen-ast"));
@@ -69,7 +79,7 @@ class ClientPlugin extends plugin_base_1.BuilderPluginBase {
                 context.addProviderInfo(name, w.PROVIDER_TYPES.SIGNING_CLIENT_TYPE, Client, localname);
             }
         }
-        if (typeHash.hasOwnProperty('Coin')) {
+        if (Object.prototype.hasOwnProperty.call(typeHash, 'Coin')) {
             // @ts-ignore
             delete context.utils.Coin;
         }

package/plugins/message-builder.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageBuilderPlugin = void 0;
 const w = __importStar(require("@cosmwasm/ts-codegen-ast"));
@@ -63,7 +73,7 @@ class MessageBuilderPlugin extends plugin_base_1.BuilderPluginBase {
                 body.push(w.createMessageBuilderClass(context, className, QueryMsg));
             }
         }
-        if (typeHash.hasOwnProperty('Coin')) {
+        if (Object.prototype.hasOwnProperty.call(typeHash, 'Coin')) {
             // @ts-ignore
             delete context.utils.Coin;
         }
@@ -71,8 +81,8 @@ class MessageBuilderPlugin extends plugin_base_1.BuilderPluginBase {
             {
                 type: 'message-builder',
                 localname,
-                body
-            }
+                body,
+            },
         ];
     }
 }

package/plugins/message-composer.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageComposerPlugin = void 0;
 const w = __importStar(require("@cosmwasm/ts-codegen-ast"));
@@ -56,7 +66,7 @@ class MessageComposerPlugin extends plugin_base_1.BuilderPluginBase {
                 context.addProviderInfo(name, w.PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE, TheClass, localname);
             }
         }
-        if (typeHash.hasOwnProperty('Coin')) {
+        if (Object.prototype.hasOwnProperty.call(typeHash, 'Coin')) {
             // @ts-ignore
             delete context.utils.Coin;
         }

package/plugins/plugin-base.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -70,8 +80,9 @@ class BuilderPluginBase {
         }
         return results.map((result) => {
             const imports = context.getImports(this.utils, result.localname);
+            const nodes = [...imports, ...result.body];
             // @ts-ignore
-            const code = header_1.header + (0, generator_1.default)(t.program([...imports, ...result.body])).code;
+            const code = header_1.header + (0, generator_1.default)(t.program(nodes)).code;
             (0, mkdirp_1.sync)(outPath);
             const filename = (0, path_1.join)(outPath, result.localname);
             (0, fs_1.writeFileSync)(filename, code);

package/plugins/provider-bundle.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContractsProviderBundlePlugin = void 0;
 const w = __importStar(require("@cosmwasm/ts-codegen-ast"));
@@ -35,8 +45,10 @@ class ContractsProviderBundlePlugin extends plugin_base_1.BuilderPluginBase {
         this.lifecycle = 'after';
         this.defaultContractName = 'contractContextProviders';
         this.utils = {
-            CosmWasmClient: '@cosmjs/cosmwasm-stargate',
-            SigningCosmWasmClient: '@cosmjs/cosmwasm-stargate',
+            ICosmWasmClient: '__baseClient__',
+            ISigningCosmWasmClient: '__baseClient__',
+            getCosmWasmClient: '__baseClient__',
+            getSigningCosmWasmClient: '__baseClient__',
             IQueryClientProvider: '__contractContextBase__',
             ISigningClientProvider: '__contractContextBase__',
             IMessageComposerProvider: '__contractContextBase__',
@@ -55,8 +67,10 @@ class ContractsProviderBundlePlugin extends plugin_base_1.BuilderPluginBase {
         }
         const localname = 'contractContextProviders.ts';
         const body = [];
-        context.addUtil('CosmWasmClient');
-        context.addUtil('SigningCosmWasmClient');
+        context.addUtil('ICosmWasmClient');
+        context.addUtil('ISigningCosmWasmClient');
+        context.addUtil('getCosmWasmClient');
+        context.addUtil('getSigningCosmWasmClient');
         context.addUtil('IQueryClientProvider');
         context.addUtil('ISigningClientProvider');
         context.addUtil('IMessageComposerProvider');

package/plugins/provider.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContractsContextProviderPlugin = exports.GetLocalBaseNameByContractName = exports.GetLocalNameByContractName = void 0;
 const w = __importStar(require("@cosmwasm/ts-codegen-ast"));

package/plugins/react-query.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReactQueryPlugin = void 0;
 const w = __importStar(require("@cosmwasm/ts-codegen-ast"));
@@ -50,7 +60,8 @@ class ReactQueryPlugin extends plugin_base_1.BuilderPluginBase {
         const QueryClient = (0, case_1.pascal)(`${name}QueryClient`);
         const body = [];
         const clientImports = [];
-        QueryMsg && clientImports.push(QueryClient);
+        if (QueryMsg)
+            clientImports.push(QueryClient);
         // check that there are commands within the exec msg
         const shouldGenerateMutationHooks = ExecuteMsg &&
             options?.version === 'v4' &&
@@ -69,7 +80,7 @@ class ReactQueryPlugin extends plugin_base_1.BuilderPluginBase {
                 context,
                 queryMsg: QueryMsg,
                 contractName: name,
-                QueryClient
+                QueryClient,
             }));
         }
         if (shouldGenerateMutationHooks) {
@@ -77,10 +88,10 @@ class ReactQueryPlugin extends plugin_base_1.BuilderPluginBase {
                 context,
                 execMsg: ExecuteMsg,
                 contractName: name,
-                ExecuteClient
+                ExecuteClient,
             }));
         }
-        if (typeHash.hasOwnProperty('Coin')) {
+        if (Object.prototype.hasOwnProperty.call(typeHash, 'Coin')) {
             // @ts-ignore
             delete context.utils.Coin;
         }
@@ -88,8 +99,8 @@ class ReactQueryPlugin extends plugin_base_1.BuilderPluginBase {
             {
                 type: 'react-query',
                 localname,
-                body
-            }
+                body,
+            },
         ];
     }
 }