@cosmwasm/ts-codegen 0.34.2 → 0.35.1

package/module/commands/generate.js

@@ -29,11 +29,9 @@ export default (async argv => {
     message: 'enable bundle?',
     default: true
   }];
-
   if (argv.typesOnly) {
     argv.plugin = 'types';
   }
-
   let {
     schema,
     out,
@@ -41,10 +39,10 @@ export default (async argv => {
     plugin,
     bundle
   } = await prompt(questions, argv);
-  if (!Array.isArray(plugin)) plugin = [plugin]; ///////// REACT QUERY
+  if (!Array.isArray(plugin)) plugin = [plugin];
 
+  ///////// REACT QUERY
   const questions2 = [];
-
   if (plugin.includes('react-query')) {
     [].push.apply(questions2, [{
       type: 'confirm',
@@ -55,7 +53,7 @@ export default (async argv => {
       type: 'list',
       name: 'version',
       message: 'which react-query version?',
-      default: 'v3',
+      default: 'v4',
       choices: ['v3', 'v4']
     }, {
       type: 'confirm',
@@ -64,7 +62,6 @@ export default (async argv => {
       default: false
     }]);
   }
-
   ;
   const {
     optionalClient,
@@ -72,9 +69,9 @@ export default (async argv => {
     queryKeys
   } = await prompt(questions2, argv);
   const questions3 = [];
-
   if (version === 'v4') {
-    [].push.apply(questions3, [// currently we only support v4 for useMutation
+    [].push.apply(questions3, [
+    // currently we only support v4 for useMutation
     {
       type: 'confirm',
       name: 'mutations',
@@ -82,15 +79,14 @@ export default (async argv => {
       default: false
     }]);
   }
-
   ;
   const {
     mutations
   } = await prompt(questions3, argv);
   const queryFactoryQuestions = [];
-
   if (queryKeys) {
-    [].push.apply(queryFactoryQuestions, [// Only can use queryFactory if queryKeys is enabled
+    [].push.apply(queryFactoryQuestions, [
+    // Only can use queryFactory if queryKeys is enabled
     {
       type: 'confirm',
       name: 'queryFactory',
@@ -98,15 +94,14 @@ export default (async argv => {
       default: false
     }]);
   }
-
   ;
   const {
     queryFactory
-  } = await prompt(queryFactoryQuestions, argv); ///////// END REACT QUERY
-  ///////// BUNDLE
+  } = await prompt(queryFactoryQuestions, argv);
+  ///////// END REACT QUERY
 
+  ///////// BUNDLE
   const questions4 = [];
-
   if (bundle) {
     [].push.apply(questions4, [{
       type: 'string',
@@ -120,12 +115,12 @@ export default (async argv => {
       default: 'contracts'
     }]);
   }
-
   ;
   const {
     bundleFile,
     bundleScope
-  } = await prompt(questions4, argv); ///////// END BUNDLE
+  } = await prompt(questions4, argv);
+  ///////// END BUNDLE
 
   const options = {
     types: {
@@ -148,8 +143,8 @@ export default (async argv => {
     messageComposer: {
       enabled: plugin.includes('message-composer')
     },
-    msgBuilder: {
-      enabled: plugin.includes('msg-builder')
+    messageBuilder: {
+      enabled: plugin.includes('message-builder')
     },
     bundle: {
       enabled: bundle,

package/module/commands/install.js

@@ -1,9 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 import { resolve, join, dirname, basename, extname } from 'path';
 import { sync as mkdirp } from 'mkdirp';
 import { sync as glob } from 'glob';
@@ -14,9 +11,7 @@ import { parse } from 'parse-package-name';
 import { tmpdir } from 'os';
 import { readFileSync, writeFileSync } from 'fs';
 const TMPDIR = tmpdir();
-
 const rnd = () => Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
-
 const getPackages = names => {
   return names.map(pkg => {
     const {
@@ -26,24 +21,22 @@ const getPackages = names => {
     return `${name}@${version}`;
   }).join(' ');
 };
-
 export default (async argv => {
   // don't prompt if we got this...
   if (argv._.length) {
     argv.pkg = argv._;
-  } // current dir/package
-
+  }
 
+  // current dir/package
   const cur = process.cwd();
   let thisPackage;
-
   try {
     thisPackage = JSON.parse(readFileSync(join(cur, 'package.json'), 'utf-8'));
   } catch (e) {
     throw new Error('make sure you are inside of a telescope package!');
-  } // what are we installing?
-
+  }
 
+  // what are we installing?
   let {
     pkg
   } = await prompt([{
@@ -56,14 +49,16 @@ export default (async argv => {
         value: `@cosmjson/${name}`
       };
     })
-  }], argv); // install
+  }], argv);
 
+  // install
   if (!Array.isArray(pkg)) pkg = [pkg];
   const tmp = join(TMPDIR, rnd());
   mkdirp(tmp);
   process.chdir(tmp);
-  exec(`npm install ${getPackages(pkg)} --production --prefix ./smart-contracts`); // protos
+  exec(`npm install ${getPackages(pkg)} --production --prefix ./smart-contracts`);
 
+  // protos
   const pkgs = glob('./smart-contracts/**/package.json');
   const cmds = pkgs.filter(f => {
     return f !== './smart-contracts/package.json';
@@ -79,23 +74,25 @@ export default (async argv => {
       rimraf(f);
     });
     return [extDir, resolve(join(cur, 'contracts', dst)), dir];
-  }); // move protos 
+  });
 
+  // move protos 
   for (const [src, dst, pkg] of cmds) {
     rimraf(dst);
     console.log(`installing ${pkg}...`);
     mkdirp(dirname(dst));
     exec(`mv ${src} ${dst}`);
-  } // package
-
+  }
 
+  // package
   const packageInfo = JSON.parse(readFileSync('./smart-contracts/package.json', 'utf-8'));
   const deps = packageInfo.dependencies ?? {};
   thisPackage.devDependencies = thisPackage.devDependencies ?? {};
   thisPackage.devDependencies = _objectSpread(_objectSpread({}, thisPackage.devDependencies), deps);
   thisPackage.devDependencies = Object.fromEntries(Object.entries(thisPackage.devDependencies).sort());
-  writeFileSync(join(cur, 'package.json'), JSON.stringify(thisPackage, null, 2)); // cleanup
+  writeFileSync(join(cur, 'package.json'), JSON.stringify(thisPackage, null, 2));
 
+  // cleanup
   rimraf(tmp);
   process.chdir(cur);
 });

package/module/file.js

@@ -2,16 +2,13 @@
 import { prompt } from './utils/prompt';
 import { cli } from './cli';
 import { readFileSync } from 'fs';
-
 const argv = require('minimist')(process.argv.slice(2));
-
 const question = [{
   _: true,
   type: 'string',
   name: 'file',
   message: 'file'
 }];
-
 (async () => {
   const {
     file

package/module/generators/client.js

@@ -15,7 +15,8 @@ export default (async (name, contractInfo, outPath, tsClientOptions) => {
   } = contractInfo;
   const context = new RenderContext(contractInfo, {
     client: tsClientOptions ?? {}
-  }); // const options = context.options.client;
+  });
+  // const options = context.options.client;
 
   const localname = pascal(name) + '.client.ts';
   const TypesFile = pascal(name) + '.types';
@@ -27,19 +28,19 @@ export default (async (name, contractInfo, outPath, tsClientOptions) => {
   let QueryClient = null;
   let ReadOnlyInstance = null;
   const body = [];
-  body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`)); // query messages
+  body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`));
 
+  // query messages
   if (QueryMsg) {
     QueryClient = pascal(`${name}QueryClient`);
     ReadOnlyInstance = pascal(`${name}ReadOnlyInterface`);
     body.push(w.createQueryInterface(context, ReadOnlyInstance, QueryMsg));
     body.push(w.createQueryClass(context, QueryClient, ReadOnlyInstance, QueryMsg));
-  } // execute messages
-
+  }
 
+  // execute messages
   if (ExecuteMsg) {
     const children = getMessageProperties(ExecuteMsg);
-
     if (children.length > 0) {
       Client = pascal(`${name}Client`);
       Instance = pascal(`${name}Interface`);
@@ -47,12 +48,10 @@ export default (async (name, contractInfo, outPath, tsClientOptions) => {
       body.push(w.createExecuteClass(context, Client, Instance, context.options.client.execExtendsQuery ? QueryClient : null, ExecuteMsg));
     }
   }
-
   if (typeHash.hasOwnProperty('Coin')) {
     // @ts-ignore
     delete context.utils.Coin;
   }
-
   const imports = context.getImports();
   const code = header + generate(t.program([...imports, ...body])).code;
   mkdirp(outPath);

package/module/generators/create-helpers.js

@@ -10,7 +10,6 @@ const header = `/**
 * and run the transpile command or yarn proto command to regenerate this bundle.
 */
 \n`;
-
 const write = (outPath, file, content, varname) => {
   const outFile = join(outPath, file);
   mkdirp(dirname(outFile));
@@ -23,15 +22,12 @@ const write = (outPath, file, content, varname) => {
     filename: outFile
   };
 };
-
 export const createHelpers = (input, builderContext) => {
   const files = [];
-
   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/module/generators/message-composer.js

@@ -15,18 +15,19 @@ export default (async (name, contractInfo, outPath, messageComposerOptions) => {
   } = contractInfo;
   const context = new RenderContext(contractInfo, {
     messageComposer: messageComposerOptions ?? {}
-  }); // const options = context.options.messageComposer;
+  });
+  // const options = context.options.messageComposer;
 
   const localname = pascal(name) + '.message-composer.ts';
   const TypesFile = pascal(name) + '.types';
   const ExecuteMsg = findExecuteMsg(schemas);
   const typeHash = await findAndParseTypes(schemas);
   const body = [];
-  body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`)); // execute messages
+  body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`));
 
+  // execute messages
   if (ExecuteMsg) {
     const children = getMessageProperties(ExecuteMsg);
-
     if (children.length > 0) {
       const TheClass = pascal(`${name}MessageComposer`);
       const Interface = pascal(`${name}Message`);
@@ -34,12 +35,10 @@ export default (async (name, contractInfo, outPath, messageComposerOptions) => {
       body.push(w.createMessageComposerClass(context, TheClass, Interface, ExecuteMsg));
     }
   }
-
   if (typeHash.hasOwnProperty('Coin')) {
     // @ts-ignore
     delete context.utils.Coin;
   }
-
   const imports = context.getImports();
   const code = header + generate(t.program([...imports, ...body])).code;
   mkdirp(outPath);

package/module/generators/msg-builder.js

@@ -9,52 +9,48 @@ import generate from "@babel/generator";
 import { getMessageProperties } from "wasm-ast-types";
 import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
 import { RenderContext } from 'wasm-ast-types';
-export default (async (name, contractInfo, outPath, msgBuilderOptions) => {
+export default (async (name, contractInfo, outPath, messageBuilderOptions) => {
   const {
     schemas
   } = contractInfo;
   const context = new RenderContext(contractInfo, {
-    msgBuilder: msgBuilderOptions ?? {}
+    messageBuilder: messageBuilderOptions ?? {}
   });
-  const localname = pascal(name) + ".msg-builder.ts";
+  const localname = pascal(name) + ".message-builder.ts";
   const TypesFile = pascal(name) + ".types";
   const ExecuteMsg = findExecuteMsg(schemas);
   const typeHash = await findAndParseTypes(schemas);
   const body = [];
   body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`));
-  body.push(w.importStmt(["CamelCasedProperties"], "type-fest")); // execute messages
+  body.push(w.importStmt(["CamelCasedProperties"], "type-fest"));
 
+  // execute messages
   if (ExecuteMsg) {
     const children = getMessageProperties(ExecuteMsg);
-
     if (children.length > 0) {
       const className = pascal(`${name}ExecuteMsgBuilder`);
-      body.push(w.createMsgBuilderClass(context, className, ExecuteMsg));
+      body.push(w.createMessageBuilderClass(context, className, ExecuteMsg));
     }
   }
-
-  const QueryMsg = findQueryMsg(schemas); // query messages
-
+  const QueryMsg = findQueryMsg(schemas);
+  // query messages
   if (QueryMsg) {
     const children = getMessageProperties(QueryMsg);
-
     if (children.length > 0) {
       const className = pascal(`${name}QueryMsgBuilder`);
-      body.push(w.createMsgBuilderClass(context, className, QueryMsg));
+      body.push(w.createMessageBuilderClass(context, className, QueryMsg));
     }
   }
-
   if (typeHash.hasOwnProperty("Coin")) {
     // @ts-ignore
     delete context.utils.Coin;
   }
-
   const imports = context.getImports();
   const code = header + generate(t.program([...imports, ...body])).code;
   mkdirp(outPath);
   writeFileSync(join(outPath, localname), code);
   return [{
-    type: "msg-builder",
+    type: "message-builder",
     contract: name,
     localname,
     filename: join(outPath, localname)

package/module/generators/react-query.js

@@ -27,19 +27,21 @@ export default (async (contractName, contractInfo, outPath, reactQueryOptions) =
   const QueryClient = pascal(`${contractName}QueryClient`);
   const body = [];
   const clientImports = [];
-  QueryMsg && clientImports.push(QueryClient); // check that there are commands within the exec msg
+  QueryMsg && clientImports.push(QueryClient);
 
+  // check that there are commands within the exec msg
   const shouldGenerateMutationHooks = ExecuteMsg && options?.version === 'v4' && options?.mutations && getMessageProperties(ExecuteMsg).length > 0;
-
   if (shouldGenerateMutationHooks) {
     clientImports.push(ExecuteClient);
-  } // general contract imports
-
+  }
 
-  body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`)); // client imports
+  // general contract imports
+  body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`));
 
-  body.push(w.importStmt(clientImports, `./${ContractFile}`)); // query messages
+  // client imports
+  body.push(w.importStmt(clientImports, `./${ContractFile}`));
 
+  // query messages
   if (QueryMsg) {
     [].push.apply(body, w.createReactQueryHooks({
       context,
@@ -48,7 +50,6 @@ export default (async (contractName, contractInfo, outPath, reactQueryOptions) =
       QueryClient
     }));
   }
-
   if (shouldGenerateMutationHooks) {
     [].push.apply(body, w.createReactQueryMutationHooks({
       context,
@@ -57,12 +58,10 @@ export default (async (contractName, contractInfo, outPath, reactQueryOptions) =
       ExecuteClient
     }));
   }
-
   if (typeHash.hasOwnProperty('Coin')) {
     // @ts-ignore
     delete context.utils.Coin;
   }
-
   const imports = context.getImports();
   const code = header + generate(t.program([...imports, ...body])).code;
   mkdirp(outPath);

package/module/generators/recoil.js

@@ -25,8 +25,9 @@ export default (async (name, contractInfo, outPath, recoilOptions) => {
   let ReadOnlyInstance = null;
   const body = [];
   body.push(w.importStmt(['cosmWasmClient'], './chain'));
-  body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`)); // query messages
+  body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`));
 
+  // query messages
   if (QueryMsg) {
     QueryClient = pascal(`${name}QueryClient`);
     ReadOnlyInstance = pascal(`${name}ReadOnlyInterface`);
@@ -35,12 +36,10 @@ export default (async (name, contractInfo, outPath, recoilOptions) => {
     body.push(w.createRecoilQueryClient(context, name, QueryClient));
     [].push.apply(body, w.createRecoilSelectors(context, name, QueryClient, QueryMsg));
   }
-
   if (typeHash.hasOwnProperty('Coin')) {
     // @ts-ignore
     delete context.utils.Coin;
   }
-
   const imports = context.getImports();
   const code = header + generate(t.program([...imports, ...body])).code;
   mkdirp(outPath);

package/module/generators/types.js

@@ -19,30 +19,28 @@ export default (async (name, contractInfo, outPath, tsTypesOptions) => {
   const localname = pascal(name) + '.types.ts';
   const ExecuteMsg = findExecuteMsg(schemas);
   const typeHash = await findAndParseTypes(schemas);
-  const body = []; // TYPES
+  const body = [];
 
+  // TYPES
   Object.values(typeHash).forEach(type => {
     body.push(clean(type));
-  }); // alias the ExecuteMsg (deprecated option)
+  });
 
+  // alias the ExecuteMsg (deprecated option)
   if (options.aliasExecuteMsg && ExecuteMsg) {
     body.push(t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier(`${name}ExecuteMsg`), null, t.tsTypeReference(t.identifier('ExecuteMsg')))));
   }
-
   function addEntryPointAlias(msgName) {
     body.push(t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier(`${name}${msgName}`), null, t.tsTypeReference(t.identifier(msgName)))));
   }
-
   if (options.aliasEntryPoints) {
     if (ExecuteMsg) {
       addEntryPointAlias('ExecuteMsg');
     }
-
     if (findQueryMsg(schemas)) {
       addEntryPointAlias('QueryMsg');
     }
   }
-
   const imports = context.getImports();
   const code = header + generate(t.program([...imports, ...body])).code;
   mkdirp(outPath);

package/module/plugins/client.js

@@ -8,16 +8,13 @@ export class ClientPlugin extends BuilderPluginBase {
   initContext(contract, options) {
     return new RenderContext(contract, options, this.builder.builderContext);
   }
-
   async doRender(name, context) {
     const {
       enabled
     } = this.option.client;
-
     if (!enabled) {
       return;
     }
-
     const {
       schemas
     } = context.contract;
@@ -31,20 +28,20 @@ export class ClientPlugin extends BuilderPluginBase {
     let QueryClient = null;
     let ReadOnlyInstance = null;
     const body = [];
-    body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`)); // query messages
+    body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`));
 
+    // query messages
     if (QueryMsg) {
       QueryClient = pascal(`${name}QueryClient`);
       ReadOnlyInstance = pascal(`${name}ReadOnlyInterface`);
       body.push(w.createQueryInterface(context, ReadOnlyInstance, QueryMsg));
       body.push(w.createQueryClass(context, QueryClient, ReadOnlyInstance, QueryMsg));
       context.addProviderInfo(name, w.PROVIDER_TYPES.QUERY_CLIENT_TYPE, QueryClient, localname);
-    } // execute messages
-
+    }
 
+    // execute messages
     if (ExecuteMsg) {
       const children = getMessageProperties(ExecuteMsg);
-
       if (children.length > 0) {
         Client = pascal(`${name}Client`);
         Instance = pascal(`${name}Interface`);
@@ -53,17 +50,14 @@ export class ClientPlugin extends BuilderPluginBase {
         context.addProviderInfo(name, w.PROVIDER_TYPES.SIGNING_CLIENT_TYPE, Client, localname);
       }
     }
-
     if (typeHash.hasOwnProperty("Coin")) {
       // @ts-ignore
       delete context.utils.Coin;
     }
-
     return [{
       type: TYPE,
       localname,
       body
     }];
   }
-
 }

package/module/plugins/{msg-builder.js → message-builder.js}

@@ -3,61 +3,53 @@ import * as w from 'wasm-ast-types';
 import { findAndParseTypes, findQueryMsg, findExecuteMsg } from '../utils';
 import { getMessageProperties, RenderContext } from 'wasm-ast-types';
 import { BuilderPluginBase } from './plugin-base';
-export class MsgBuilderPlugin extends BuilderPluginBase {
+export class MessageBuilderPlugin extends BuilderPluginBase {
   initContext(contract, options) {
     return new RenderContext(contract, options, this.builder.builderContext);
   }
-
   async doRender(name, context) {
     const {
       enabled
-    } = this.option.msgBuilder;
-
+    } = this.option.messageBuilder;
     if (!enabled) {
       return;
     }
-
     const {
       schemas
     } = context.contract;
-    const localname = pascal(name) + '.msg-builder.ts';
+    const localname = pascal(name) + '.message-builder.ts';
     const TypesFile = pascal(name) + '.types';
     const ExecuteMsg = findExecuteMsg(schemas);
     const typeHash = await findAndParseTypes(schemas);
     const body = [];
     body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`));
-    body.push(w.importStmt(['CamelCasedProperties'], 'type-fest')); // execute messages
+    body.push(w.importStmt(['CamelCasedProperties'], 'type-fest'));
 
+    // execute messages
     if (ExecuteMsg) {
       const children = getMessageProperties(ExecuteMsg);
-
       if (children.length > 0) {
         const className = pascal(`${name}ExecuteMsgBuilder`);
-        body.push(w.createMsgBuilderClass(context, className, ExecuteMsg));
+        body.push(w.createMessageBuilderClass(context, className, ExecuteMsg));
       }
     }
-
-    const QueryMsg = findQueryMsg(schemas); // query messages
-
+    const QueryMsg = findQueryMsg(schemas);
+    // query messages
     if (QueryMsg) {
       const children = getMessageProperties(QueryMsg);
-
       if (children.length > 0) {
         const className = pascal(`${name}QueryMsgBuilder`);
-        body.push(w.createMsgBuilderClass(context, className, QueryMsg));
+        body.push(w.createMessageBuilderClass(context, className, QueryMsg));
       }
     }
-
     if (typeHash.hasOwnProperty('Coin')) {
       // @ts-ignore
       delete context.utils.Coin;
     }
-
     return [{
-      type: 'msg-builder',
+      type: 'message-builder',
       localname,
       body
     }];
   }
-
 }