@cosmwasm/ts-codegen 0.28.0 → 0.29.0

package/README.md

@@ -141,6 +141,7 @@ Typescript types and interfaces are generated in separate files so they can be i
   | ----------------------------- | ---------------------------------------------------  |
   | `types.enabled`               | enable type generation                               |
   | `types.aliasExecuteMsg`       | generate a type alias based on the contract name     |
+  | `types.aliasEntryPoints`               | generate type aliases for the entry points based on the contract name     |
 
 ### Client
 

package/main/generators/types.js

@@ -41,11 +41,15 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var _default = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(name, contractInfo, outPath, tsTypesOptions) {
-    var schemas, context, options, localname, ExecuteMsg, typeHash, body, imports, code, filename;
+    var schemas, context, options, localname, ExecuteMsg, typeHash, body, addEntryPointAlias, imports, code, filename;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
+            addEntryPointAlias = function _addEntryPointAlias(msgName) {
+              body.push(t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier("".concat(name).concat(msgName)), null, t.tsTypeReference(t.identifier(msgName)))));
+            };
+
             schemas = contractInfo.schemas;
             context = new _wasmAstTypes.RenderContext(contractInfo, {
               types: tsTypesOptions !== null && tsTypesOptions !== void 0 ? tsTypesOptions : {}
@@ -53,21 +57,31 @@ var _default = /*#__PURE__*/function () {
             options = context.options.types;
             localname = (0, _case.pascal)(name) + '.types.ts';
             ExecuteMsg = (0, _utils.findExecuteMsg)(schemas);
-            _context.next = 7;
+            _context.next = 8;
             return (0, _utils.findAndParseTypes)(schemas);
 
-          case 7:
+          case 8:
             typeHash = _context.sent;
             body = []; // TYPES
 
             Object.values(typeHash).forEach(function (type) {
               body.push((0, _clean.clean)(type));
-            }); // alias the ExecuteMsg
+            }); // alias the ExecuteMsg (deprecated option)
 
             if (options.aliasExecuteMsg && ExecuteMsg) {
               body.push(t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier("".concat(name, "ExecuteMsg")), null, t.tsTypeReference(t.identifier('ExecuteMsg')))));
             }
 
+            if (options.aliasEntryPoints) {
+              if (ExecuteMsg) {
+                addEntryPointAlias('ExecuteMsg');
+              }
+
+              if ((0, _utils.findQueryMsg)(schemas)) {
+                addEntryPointAlias('QueryMsg');
+              }
+            }
+
             imports = context.getImports();
             code = _header.header + (0, _generator["default"])(t.program([].concat((0, _toConsumableArray2["default"])(imports), body))).code;
             (0, _mkdirp.sync)(outPath);
@@ -80,7 +94,7 @@ var _default = /*#__PURE__*/function () {
               filename: filename
             }]);
 
-          case 17:
+          case 19:
           case "end":
             return _context.stop();
         }

package/module/generators/types.js

@@ -6,7 +6,7 @@ import * as t from '@babel/types';
 import { writeFileSync } from 'fs';
 import generate from "@babel/generator";
 import { clean } from "../utils/clean";
-import { findAndParseTypes, findExecuteMsg } from '../utils';
+import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
 import { RenderContext } from "wasm-ast-types";
 export default (async (name, contractInfo, outPath, tsTypesOptions) => {
   const {
@@ -23,12 +23,26 @@ export default (async (name, contractInfo, outPath, tsTypesOptions) => {
 
   Object.values(typeHash).forEach(type => {
     body.push(clean(type));
-  }); // alias the ExecuteMsg
+  }); // 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.28.0",
+  "version": "0.29.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.21.0"
+    "wasm-ast-types": "^0.22.0"
   },
-  "gitHead": "90fb688d19f477d246f9021ac91d824c96b8f3fc"
+  "gitHead": "45ac1ece2da95df09f949d692c95c66de0205408"
 }

package/src/generators/types.ts

@@ -6,7 +6,7 @@ import * as t from '@babel/types';
 import { writeFileSync } from 'fs';
 import generate from "@babel/generator";
 import { clean } from "../utils/clean";
-import { findAndParseTypes, findExecuteMsg } from '../utils';
+import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
 import { ContractInfo, RenderContext, TSTypesOptions } from "wasm-ast-types";
 import { BuilderFile } from "../builder";
 
@@ -36,7 +36,7 @@ export default async (
     )
   });
 
-  // alias the ExecuteMsg
+  // alias the ExecuteMsg (deprecated option)
   if (options.aliasExecuteMsg && ExecuteMsg) {
     body.push(
       t.exportNamedDeclaration(
@@ -49,6 +49,28 @@ export default async (
     );
   }
 
+  function addEntryPointAlias(msgName: string) {
+    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([