@cosmwasm/ts-codegen 0.34.2 → 0.35.1

package/module/utils/schemas.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 { sync as glob } from 'glob';
 import { readFileSync } from 'fs';
 import { cleanse } from './cleanse';
@@ -17,7 +14,6 @@ export const readSchemas = async ({
   const fn = clean ? cleanse : str => str;
   const files = glob(schemaDir + '/**/*.json').filter(file => !file.match(/\/raw\//));
   const schemas = files.map(file => JSON.parse(readFileSync(file, 'utf-8')));
-
   if (schemas.length > 1) {
     // legacy
     // TODO add console.warn here
@@ -25,15 +21,12 @@ export const readSchemas = async ({
       schemas: fn(schemas)
     };
   }
-
   if (schemas.length === 0) {
     throw new Error('Error [too few files]: requires one schema file per contract');
   }
-
   if (schemas.length !== 1) {
     throw new Error('Error [too many files]: CosmWasm v1.1 schemas supports one file');
   }
-
   const idlObject = schemas[0];
   const {
     contract_name,
@@ -46,15 +39,14 @@ export const readSchemas = async ({
     migrate,
     sudo
   } = idlObject;
-
   if (typeof idl_version !== 'string') {
     // legacy
     return {
       schemas: fn(schemas)
     };
-  } // TODO use contract_name, etc.
-
+  }
 
+  // TODO use contract_name, etc.
   return {
     schemas: [...Object.values(fn({
       instantiate,
@@ -78,7 +70,6 @@ export const findExecuteMsg = schemas => {
 export const findAndParseTypes = async schemas => {
   const Types = schemas;
   const allTypes = [];
-
   for (const typ in Types) {
     if (Types[typ].definitions) {
       for (const key of Object.keys(Types[typ].definitions)) {
@@ -86,11 +77,9 @@ export const findAndParseTypes = async schemas => {
         Types[typ].definitions[key].title = key;
       }
     }
-
     const result = await compile(Types[typ], Types[typ].title);
     allTypes.push(result);
   }
-
   const typeHash = parser(allTypes);
   return typeHash;
 };

package/module/utils/unused.js

@@ -1,28 +1,27 @@
 //@ts-nocheck
-import * as t from '@babel/types'; // https://github.com/chuyik/babel-plugin-danger-remove-unused-import
+
+import * as t from '@babel/types';
+
+// https://github.com/chuyik/babel-plugin-danger-remove-unused-import
 // https://github.com/chuyik/babel-plugin-danger-remove-unused-import/blob/c5454c21e94698a2464a12baa5590761932a71a8/License#L1
 
 export const unused = {
   Program: {
     exit: path => {
       const UnRefBindings = new Map();
-
       for (const [name, binding] of Object.entries(path.scope.bindings)) {
         if (!binding.path.parentPath || binding.kind !== 'module') continue;
         const source = binding.path.parentPath.get('source');
         const importName = source.node.value;
         if (!t.isStringLiteral(source)) continue;
         const key = `${importName}(${source.node.loc && source.node.loc.start.line})`;
-
         if (!UnRefBindings.has(key)) {
           UnRefBindings.set(key, binding);
         }
-
         if (binding.referenced) {
           UnRefBindings.set(key, null);
         } else {
           const nodeType = binding.path.node.type;
-
           if (nodeType === 'ImportSpecifier') {
             binding.path.remove();
           } else if (nodeType === 'ImportDefaultSpecifier') {
@@ -34,7 +33,6 @@ export const unused = {
           }
         }
       }
-
       UnRefBindings.forEach((binding, key) => {
         if (binding && binding.path.parentPath) {
           binding.path.parentPath.remove();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.34.2",
+  "version": "0.35.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",
@@ -96,7 +96,7 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.25.0"
+    "wasm-ast-types": "^0.26.1"
   },
-  "gitHead": "0c404a0d94627610256c63f79dc2ffc3b741a845"
+  "gitHead": "0cad0afb48264cc726c06a6ff7a1453e7cabb4b5"
 }

package/src/builder/builder.ts

@@ -17,7 +17,7 @@ import generate from '@babel/generator';
 import * as t from '@babel/types';
 import { ReactQueryPlugin } from "../plugins/react-query";
 import { RecoilPlugin } from "../plugins/recoil";
-import { MsgBuilderPlugin } from "../plugins/msg-builder";
+import { MessageBuilderPlugin } from "../plugins/message-builder";
 import { MessageComposerPlugin } from "../plugins/message-composer";
 import { ClientPlugin } from "../plugins/client";
 import { TypesPlugin } from "../plugins/types";
@@ -30,7 +30,8 @@ const defaultOpts: TSBuilderOptions = {
         enabled: true,
         scope: 'contracts',
         bundleFile: 'bundle.ts'
-    }
+    },
+    useShorthandCtor: true
 }
 
 export interface TSBuilderInput {
@@ -55,13 +56,13 @@ export type TSBuilderOptions = {
     bundle?: BundleOptions;
     /**
      * Enable using shorthand constructor.
-     * Default: false
+     * Default: true
      */
     useShorthandCtor?: boolean;
     useContractsHooks?: UseContractsOptions;
 } & RenderOptions;
 
-export type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'msg-builder' | 'plugin';
+export type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'message-builder' | 'plugin';
 
 export interface BuilderFile {
     type: BuilderFileType;
@@ -109,7 +110,7 @@ export class TSBuilder {
             new MessageComposerPlugin(this.options),
             new ReactQueryPlugin(this.options),
             new RecoilPlugin(this.options),
-            new MsgBuilderPlugin(this.options),
+            new MessageBuilderPlugin(this.options),
             new ContractsContextProviderPlugin(this.options),
         ]);
     }
@@ -189,7 +190,7 @@ export class TSBuilder {
         }, this.builderContext);
 
         if (helpers && helpers.length) {
-          [].push.apply(this.files, helpers);
+            [].push.apply(this.files, helpers);
         }
 
         if (this.options.bundle.enabled) {

package/src/commands/generate.ts

@@ -64,7 +64,7 @@ export default async (argv) => {
                 type: 'list',
                 name: 'version',
                 message: 'which react-query version?',
-                default: 'v3',
+                default: 'v4',
                 choices: ['v3', 'v4']
             },
             {
@@ -91,17 +91,17 @@ export default async (argv) => {
     };
     const { mutations } = await prompt(questions3, argv);
 
-    const queryFactoryQuestions  = [];
+    const queryFactoryQuestions = [];
     if (queryKeys) {
-      [].push.apply(queryFactoryQuestions, [
-        // Only can use queryFactory if queryKeys is enabled
-        {
-          type: 'confirm',
-          name: 'queryFactory',
-          message: 'queryFactory? ',
-          default: false
-        }
-      ])
+        [].push.apply(queryFactoryQuestions, [
+            // Only can use queryFactory if queryKeys is enabled
+            {
+                type: 'confirm',
+                name: 'queryFactory',
+                message: 'queryFactory? ',
+                default: false
+            }
+        ])
     };
     const { queryFactory } = await prompt(queryFactoryQuestions, argv);
     ///////// END REACT QUERY
@@ -151,8 +151,9 @@ 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/src/generators/msg-builder.ts

@@ -8,23 +8,21 @@ import { writeFileSync } from "fs";
 import generate from "@babel/generator";
 import { ContractInfo, getMessageProperties } from "wasm-ast-types";
 import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
-import { RenderContext, MsgBuilderOptions } from 'wasm-ast-types';
+import { RenderContext, MessageBuilderOptions } from 'wasm-ast-types';
 import { BuilderFile } from "../builder";
-import babelTraverse from '@babel/traverse';
-import { parse as babelParse } from '@babel/parser'
 
 export default async (
   name: string,
   contractInfo: ContractInfo,
   outPath: string,
-  msgBuilderOptions?: MsgBuilderOptions
+  messageBuilderOptions?: MessageBuilderOptions
 ): Promise<BuilderFile[]> => {
   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);
@@ -41,7 +39,7 @@ export default async (
       const className = pascal(`${name}ExecuteMsgBuilder`);
 
       body.push(
-        w.createMsgBuilderClass(context, className, ExecuteMsg)
+        w.createMessageBuilderClass(context, className, ExecuteMsg)
       );
     }
   }
@@ -54,7 +52,7 @@ export default async (
       const className = pascal(`${name}QueryMsgBuilder`);
 
       body.push(
-        w.createMsgBuilderClass(context, className, QueryMsg)
+        w.createMessageBuilderClass(context, className, QueryMsg)
       );
     }
   }
@@ -71,7 +69,7 @@ export default async (
 
   return [
     {
-      type: "msg-builder",
+      type: "message-builder",
       contract: name,
       localname,
       filename: join(outPath, localname),

package/src/plugins/{msg-builder.ts → message-builder.ts}

@@ -11,7 +11,7 @@ import {
 import { BuilderFileType } from '../builder';
 import { BuilderPluginBase } from './plugin-base';
 
-export class MsgBuilderPlugin extends BuilderPluginBase<RenderOptions> {
+export class MessageBuilderPlugin extends BuilderPluginBase<RenderOptions> {
   initContext(
     contract: ContractInfo,
     options?: RenderOptions
@@ -30,7 +30,7 @@ export class MsgBuilderPlugin extends BuilderPluginBase<RenderOptions> {
       body: any[];
     }[]
   > {
-    const { enabled } = this.option.msgBuilder;
+    const { enabled } = this.option.messageBuilder;
 
     if (!enabled) {
       return;
@@ -38,7 +38,7 @@ export class MsgBuilderPlugin extends BuilderPluginBase<RenderOptions> {
 
     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);
@@ -54,7 +54,7 @@ export class MsgBuilderPlugin extends BuilderPluginBase<RenderOptions> {
       if (children.length > 0) {
         const className = pascal(`${name}ExecuteMsgBuilder`);
 
-        body.push(w.createMsgBuilderClass(context, className, ExecuteMsg));
+        body.push(w.createMessageBuilderClass(context, className, ExecuteMsg));
       }
     }
 
@@ -65,7 +65,7 @@ export class MsgBuilderPlugin extends BuilderPluginBase<RenderOptions> {
       if (children.length > 0) {
         const className = pascal(`${name}QueryMsgBuilder`);
 
-        body.push(w.createMsgBuilderClass(context, className, QueryMsg));
+        body.push(w.createMessageBuilderClass(context, className, QueryMsg));
       }
     }
 
@@ -76,7 +76,7 @@ export class MsgBuilderPlugin extends BuilderPluginBase<RenderOptions> {
 
     return [
       {
-        type: 'msg-builder',
+        type: 'message-builder',
         localname,
         body
       }

package/src/plugins/message-composer.ts

@@ -54,8 +54,8 @@ export class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
     if (ExecuteMsg) {
       const children = getMessageProperties(ExecuteMsg);
       if (children.length > 0) {
-        const TheClass = pascal(`${name}MessageComposer`);
-        const Interface = pascal(`${name}Message`);
+        const TheClass = pascal(`${name}MsgComposer`);
+        const Interface = pascal(`${name}Msg`);
 
         body.push(
           w.createMessageComposerInterface(context, Interface, ExecuteMsg)

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

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

package/types/src/generators/msg-builder.d.ts

@@ -1,5 +1,5 @@
 import { ContractInfo } from "wasm-ast-types";
-import { MsgBuilderOptions } from 'wasm-ast-types';
+import { MessageBuilderOptions } from 'wasm-ast-types';
 import { BuilderFile } from "../builder";
-declare const _default: (name: string, contractInfo: ContractInfo, outPath: string, msgBuilderOptions?: MsgBuilderOptions) => Promise<BuilderFile[]>;
+declare const _default: (name: string, contractInfo: ContractInfo, outPath: string, messageBuilderOptions?: MessageBuilderOptions) => Promise<BuilderFile[]>;
 export default _default;

package/types/src/generators/msg-builder.ts

@@ -1,5 +1,5 @@
 import { ContractInfo } from "wasm-ast-types";
-import { MsgBuilderOptions } from "wasm-ast-types";
+import { MessageBuilderOptions } from "wasm-ast-types";
 import { BuilderFile } from "../builder";
-declare const _default: (name: string, contractInfo: ContractInfo, outPath: string, msgBuilderOptions?: MsgBuilderOptions) => Promise<BuilderFile[]>;
+declare const _default: (name: string, contractInfo: ContractInfo, outPath: string, messageBuilderOptions?: MessageBuilderOptions) => Promise<BuilderFile[]>;
 export default _default;

package/types/src/plugins/message-builder.d.ts

@@ -0,0 +1,12 @@
+import { RenderContext, RenderContextBase, ContractInfo, RenderOptions } from 'wasm-ast-types';
+import { BuilderFileType } from '../builder';
+import { BuilderPluginBase } from './plugin-base';
+export declare class MessageBuilderPlugin extends BuilderPluginBase<RenderOptions> {
+    initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
+    doRender(name: string, context: RenderContext): Promise<{
+        type: BuilderFileType;
+        pluginType?: string;
+        localname: string;
+        body: any[];
+    }[]>;
+}

package/types/src/plugins/msg-builder.d.ts

@@ -1,7 +1,7 @@
 import { RenderContext, RenderContextBase, ContractInfo, RenderOptions } from 'wasm-ast-types';
 import { BuilderFileType } from '../builder';
 import { BuilderPluginBase } from './plugin-base';
-export declare class MsgBuilderPlugin extends BuilderPluginBase<RenderOptions> {
+export declare class MessageBuilderPlugin extends BuilderPluginBase<RenderOptions> {
     initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
     doRender(name: string, context: RenderContext): Promise<{
         type: BuilderFileType;