@cosmwasm/ts-codegen 0.6.0 → 0.7.1

package/main/cli.js

@@ -11,7 +11,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _prompt = require("./prompt");
+var _prompt = require("./utils/prompt");
 
 var _cmds = require("./cmds");
 

package/main/cmds.js

@@ -7,8 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Commands = void 0;
 
-var _boilerplate2 = _interopRequireDefault(require("./commands/boilerplate"));
-
 var _fromPartial = _interopRequireDefault(require("./commands/from-partial"));
 
 var _generate2 = _interopRequireDefault(require("./commands/generate"));
@@ -19,7 +17,6 @@ var _recoil2 = _interopRequireDefault(require("./commands/recoil"));
 
 var Commands = {};
 exports.Commands = Commands;
-Commands['boilerplate'] = _boilerplate2["default"];
 Commands['from-partial'] = _fromPartial["default"];
 Commands['generate'] = _generate2["default"];
 Commands['react-query'] = _reactQuery["default"];

package/main/commands/from-partial.js

@@ -11,9 +11,9 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _prompt = require("../prompt");
+var _prompt = require("../utils/prompt");
 
-var _fromPartial = _interopRequireDefault(require("../from-partial"));
+var _fromPartial = _interopRequireDefault(require("../generators/from-partial"));
 
 var _utils = require("../utils");
 
@@ -51,14 +51,18 @@ var _default = /*#__PURE__*/function () {
             schema = _yield$prompt.schema;
             out = _yield$prompt.out;
             name = _yield$prompt.name;
-            schemas = (0, _utils.readSchemas)({
+            _context.next = 9;
+            return (0, _utils.readSchemas)({
               schemaDir: schema,
               argv: argv
             });
-            _context.next = 10;
+
+          case 9:
+            schemas = _context.sent;
+            _context.next = 12;
             return (0, _fromPartial["default"])(name, schemas, out);
 
-          case 10:
+          case 12:
           case "end":
             return _context.stop();
         }

package/main/commands/generate.js

@@ -11,9 +11,9 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _prompt = require("../prompt");
+var _prompt = require("../utils/prompt");
 
-var _generate = _interopRequireDefault(require("../generate"));
+var _tsClient = _interopRequireDefault(require("../generators/ts-client"));
 
 var _utils = require("../utils");
 
@@ -51,14 +51,18 @@ var _default = /*#__PURE__*/function () {
             schema = _yield$prompt.schema;
             out = _yield$prompt.out;
             name = _yield$prompt.name;
-            schemas = (0, _utils.readSchemas)({
+            _context.next = 9;
+            return (0, _utils.readSchemas)({
               schemaDir: schema,
               argv: argv
             });
-            _context.next = 10;
-            return (0, _generate["default"])(name, schemas, out);
 
-          case 10:
+          case 9:
+            schemas = _context.sent;
+            _context.next = 12;
+            return (0, _tsClient["default"])(name, schemas, out);
+
+          case 12:
           case "end":
             return _context.stop();
         }

package/main/commands/react-query.js

@@ -13,9 +13,9 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _prompt = require("../prompt");
+var _prompt = require("../utils/prompt");
 
-var _reactQuery = _interopRequireDefault(require("../react-query"));
+var _reactQuery = _interopRequireDefault(require("../generators/react-query"));
 
 var _utils = require("../utils");
 
@@ -71,14 +71,18 @@ var _default = /*#__PURE__*/function () {
             out = _yield$prompt.out;
             name = _yield$prompt.name;
             options = (0, _objectWithoutProperties2["default"])(_yield$prompt, _excluded);
-            schemas = (0, _utils.readSchemas)({
+            _context.next = 10;
+            return (0, _utils.readSchemas)({
               schemaDir: schema,
               argv: argv
             });
-            _context.next = 11;
+
+          case 10:
+            schemas = _context.sent;
+            _context.next = 13;
             return (0, _reactQuery["default"])(name, schemas, out, options);
 
-          case 11:
+          case 13:
           case "end":
             return _context.stop();
         }

package/main/commands/recoil.js

@@ -11,9 +11,9 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _prompt = require("../prompt");
+var _prompt = require("../utils/prompt");
 
-var _recoil = _interopRequireDefault(require("../recoil"));
+var _recoil = _interopRequireDefault(require("../generators/recoil"));
 
 var _utils = require("../utils");
 
@@ -51,14 +51,18 @@ var _default = /*#__PURE__*/function () {
             schema = _yield$prompt.schema;
             out = _yield$prompt.out;
             name = _yield$prompt.name;
-            schemas = (0, _utils.readSchemas)({
+            _context.next = 9;
+            return (0, _utils.readSchemas)({
               schemaDir: schema,
               argv: argv
             });
-            _context.next = 10;
+
+          case 9:
+            schemas = _context.sent;
+            _context.next = 12;
             return (0, _recoil["default"])(name, schemas, out);
 
-          case 10:
+          case 12:
           case "end":
             return _context.stop();
         }

package/main/file.js

@@ -7,7 +7,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _prompt = require("./prompt");
+var _prompt = require("./utils/prompt");
 
 var _cli = require("./cli");
 

package/main/{from-partial.js → generators/from-partial.js}

@@ -15,7 +15,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _case = require("case");
 
-var _header = require("./header");
+var _header = require("../utils/header");
 
 var _path = require("path");
 
@@ -29,7 +29,7 @@ var _fs = require("fs");
 
 var _generator = _interopRequireDefault(require("@babel/generator"));
 
-var _utils = require("./utils");
+var _utils = require("../utils");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -37,7 +37,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var _default = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(name, schemas, outPath) {
-    var FromPartialFile, Contract, ExecuteMsg, typeHash, body, children, TheClass, Interface, code;
+    var FromPartialFile, Contract, ExecuteMsg, typeHash, body, context, children, TheClass, Interface, code;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -59,7 +59,8 @@ var _default = /*#__PURE__*/function () {
               body.push(w.importStmt(['Coin'], '@cosmjs/amino'));
             }
 
-            body.push(w.importStmt(Object.keys(typeHash), "./".concat(Contract).replace(/\.ts$/, ''))); // execute messages
+            body.push(w.importStmt(Object.keys(typeHash), "./".concat(Contract).replace(/\.ts$/, '')));
+            context = new w.RenderContext((0, _utils.getDefinitionSchema)(schemas)); // execute messages
 
             if (ExecuteMsg) {
               children = (0, w.getMessageProperties)(ExecuteMsg);
@@ -67,8 +68,8 @@ var _default = /*#__PURE__*/function () {
               if (children.length > 0) {
                 TheClass = (0, _case.pascal)("".concat(name, "MessageComposer"));
                 Interface = (0, _case.pascal)("".concat(name, "Message"));
-                body.push(w.createFromPartialInterface(Interface, ExecuteMsg));
-                body.push(w.createFromPartialClass(TheClass, Interface, ExecuteMsg));
+                body.push(w.createFromPartialInterface(context, Interface, ExecuteMsg));
+                body.push(w.createFromPartialClass(context, TheClass, Interface, ExecuteMsg));
               }
             }
 
@@ -76,7 +77,7 @@ var _default = /*#__PURE__*/function () {
             (0, _mkdirp.sync)(outPath);
             (0, _fs.writeFileSync)((0, _path.join)(outPath, FromPartialFile), code);
 
-          case 16:
+          case 17:
           case "end":
             return _context.stop();
         }

package/main/{react-query.js → generators/react-query.js}

@@ -15,7 +15,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _case = require("case");
 
-var _header = require("./header");
+var _header = require("../utils/header");
 
 var _path = require("path");
 
@@ -29,29 +29,33 @@ var _fs = require("fs");
 
 var _generator = _interopRequireDefault(require("@babel/generator"));
 
-var _utils = require("./utils");
+var _utils = require("../utils");
 
-var _imports = require("./imports");
+var _imports = require("../utils/imports");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 var _default = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(contractName, schemas, outPath, options) {
-    var ReactQueryFile, Contract, QueryMsg, ExecuteMsg, typeHash, ExecuteClient, QueryClient, body, reactQueryImports, clientImports, shouldGenerateMutationHooks, code;
+  var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(contractName, schemas, outPath, reactQueryOptions) {
+    var context, options, ReactQueryFile, Contract, QueryMsg, ExecuteMsg, typeHash, ExecuteClient, QueryClient, body, reactQueryImports, clientImports, shouldGenerateMutationHooks, code;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
+            context = new w.RenderContext((0, _utils.getDefinitionSchema)(schemas), {
+              reactQuery: reactQueryOptions !== null && reactQueryOptions !== void 0 ? reactQueryOptions : {}
+            });
+            options = context.options.reactQuery;
             ReactQueryFile = (0, _case.pascal)("".concat(contractName, "Contract")) + '.react-query.ts';
             Contract = (0, _case.pascal)("".concat(contractName, "Contract"));
             QueryMsg = (0, _utils.findQueryMsg)(schemas);
             ExecuteMsg = (0, _utils.findExecuteMsg)(schemas);
-            _context.next = 6;
+            _context.next = 8;
             return (0, _utils.findAndParseTypes)(schemas);
 
-          case 6:
+          case 8:
             typeHash = _context.sent;
             ExecuteClient = (0, _case.pascal)("".concat(contractName, "Client"));
             QueryClient = (0, _case.pascal)("".concat(contractName, "QueryClient"));
@@ -78,19 +82,19 @@ var _default = /*#__PURE__*/function () {
 
             if (QueryMsg) {
               [].push.apply(body, w.createReactQueryHooks({
+                context: context,
                 queryMsg: QueryMsg,
                 contractName: contractName,
-                QueryClient: QueryClient,
-                options: options
+                QueryClient: QueryClient
               }));
             }
 
             if (shouldGenerateMutationHooks) {
               [].push.apply(body, w.createReactQueryMutationHooks({
+                context: context,
                 execMsg: ExecuteMsg,
                 contractName: contractName,
-                ExecuteClient: ExecuteClient,
-                options: options
+                ExecuteClient: ExecuteClient
               }));
             }
 
@@ -98,7 +102,7 @@ var _default = /*#__PURE__*/function () {
             (0, _mkdirp.sync)(outPath);
             (0, _fs.writeFileSync)((0, _path.join)(outPath, ReactQueryFile), code);
 
-          case 23:
+          case 25:
           case "end":
             return _context.stop();
         }

package/main/{recoil.js → generators/recoil.js}

@@ -15,7 +15,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _case = require("case");
 
-var _header = require("./header");
+var _header = require("../utils/header");
 
 var _path = require("path");
 
@@ -29,7 +29,7 @@ var _fs = require("fs");
 
 var _generator = _interopRequireDefault(require("@babel/generator"));
 
-var _utils = require("./utils");
+var _utils = require("../utils");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -37,7 +37,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var _default = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(name, schemas, outPath) {
-    var RecoilFile, Contract, QueryMsg, typeHash, QueryClient, ReadOnlyInstance, body, code;
+    var RecoilFile, Contract, QueryMsg, typeHash, QueryClient, ReadOnlyInstance, body, context, code;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -55,22 +55,23 @@ var _default = /*#__PURE__*/function () {
             body = [];
             body.push(w.importStmt(['selectorFamily'], 'recoil'));
             body.push(w.importStmt(['cosmWasmClient'], './chain'));
-            body.push(w.importStmt(Object.keys(typeHash), "./".concat(Contract).replace(/\.ts$/, ''))); // query messages
+            body.push(w.importStmt(Object.keys(typeHash), "./".concat(Contract).replace(/\.ts$/, '')));
+            context = new w.RenderContext((0, _utils.getDefinitionSchema)(schemas)); // query messages
 
             if (QueryMsg) {
               QueryClient = (0, _case.pascal)("".concat(name, "QueryClient"));
               ReadOnlyInstance = (0, _case.pascal)("".concat(name, "ReadOnlyInterface"));
               body.push(w.importStmt([QueryClient], "./".concat(Contract)));
               body.push(w.createRecoilQueryClientType());
-              body.push(w.createRecoilQueryClient(name, QueryClient));
-              [].push.apply(body, w.createRecoilSelectors(name, QueryClient, QueryMsg));
+              body.push(w.createRecoilQueryClient(context, name, QueryClient));
+              [].push.apply(body, w.createRecoilSelectors(context, name, QueryClient, QueryMsg));
             }
 
             code = _header.header + (0, _generator["default"])(t.program(body)).code;
             (0, _mkdirp.sync)(outPath);
             (0, _fs.writeFileSync)((0, _path.join)(outPath, RecoilFile), code);
 
-          case 16:
+          case 17:
           case "end":
             return _context.stop();
         }

package/main/{generate.js → generators/ts-client.js}

@@ -15,7 +15,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _case = require("case");
 
-var _header = require("./header");
+var _header = require("../utils/header");
 
 var _path = require("path");
 
@@ -29,11 +29,11 @@ var _fs = require("fs");
 
 var _generator = _interopRequireDefault(require("@babel/generator"));
 
-var _clean = require("./clean");
+var _clean = require("../utils/clean");
 
-var _utils = require("./utils");
+var _utils = require("../utils");
 
-var _imports = require("./imports");
+var _imports = require("../utils/imports");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -41,7 +41,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var _default = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(name, schemas, outPath) {
-    var Contract, QueryMsg, ExecuteMsg, typeHash, Client, Instance, QueryClient, ReadOnlyInstance, body, children, code;
+    var Contract, QueryMsg, ExecuteMsg, typeHash, Client, Instance, QueryClient, ReadOnlyInstance, body, context, children, code;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -66,13 +66,14 @@ var _default = /*#__PURE__*/function () {
               body.push((0, _clean.clean)(type));
             }); // alias the ExecuteMsg
 
-            ExecuteMsg && body.push(t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier("".concat(name, "ExecuteMsg")), null, t.tsTypeReference(t.identifier('ExecuteMsg'))))); // query messages
+            ExecuteMsg && body.push(t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier("".concat(name, "ExecuteMsg")), null, t.tsTypeReference(t.identifier('ExecuteMsg')))));
+            context = new w.RenderContext((0, _utils.getDefinitionSchema)(schemas)); // query messages
 
             if (QueryMsg) {
               QueryClient = (0, _case.pascal)("".concat(name, "QueryClient"));
               ReadOnlyInstance = (0, _case.pascal)("".concat(name, "ReadOnlyInterface"));
-              body.push(w.createQueryInterface(ReadOnlyInstance, QueryMsg));
-              body.push(w.createQueryClass(QueryClient, ReadOnlyInstance, QueryMsg));
+              body.push(w.createQueryInterface(context, ReadOnlyInstance, QueryMsg));
+              body.push(w.createQueryClass(context, QueryClient, ReadOnlyInstance, QueryMsg));
             } // execute messages
 
 
@@ -82,8 +83,8 @@ var _default = /*#__PURE__*/function () {
               if (children.length > 0) {
                 Client = (0, _case.pascal)("".concat(name, "Client"));
                 Instance = (0, _case.pascal)("".concat(name, "Interface"));
-                body.push(w.createExecuteInterface(Instance, ReadOnlyInstance, ExecuteMsg));
-                body.push(w.createExecuteClass(Client, Instance, QueryClient, ExecuteMsg));
+                body.push(w.createExecuteInterface(context, Instance, ReadOnlyInstance, ExecuteMsg));
+                body.push(w.createExecuteClass(context, Client, Instance, QueryClient, ExecuteMsg));
               }
             }
 
@@ -91,7 +92,7 @@ var _default = /*#__PURE__*/function () {
             (0, _mkdirp.sync)(outPath);
             (0, _fs.writeFileSync)((0, _path.join)(outPath, Contract), code);
 
-          case 20:
+          case 21:
           case "end":
             return _context.stop();
         }

package/main/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  generate: true,
+  tsClient: true,
   fromPartial: true,
   reactQuery: true,
   recoil: true
@@ -17,12 +17,6 @@ Object.defineProperty(exports, "fromPartial", {
     return _fromPartial["default"];
   }
 });
-Object.defineProperty(exports, "generate", {
-  enumerable: true,
-  get: function get() {
-    return _generate["default"];
-  }
-});
 Object.defineProperty(exports, "reactQuery", {
   enumerable: true,
   get: function get() {
@@ -35,14 +29,20 @@ Object.defineProperty(exports, "recoil", {
     return _recoil["default"];
   }
 });
+Object.defineProperty(exports, "tsClient", {
+  enumerable: true,
+  get: function get() {
+    return _tsClient["default"];
+  }
+});
 
-var _generate = _interopRequireDefault(require("./generate"));
+var _tsClient = _interopRequireDefault(require("./generators/ts-client"));
 
-var _fromPartial = _interopRequireDefault(require("./from-partial"));
+var _fromPartial = _interopRequireDefault(require("./generators/from-partial"));
 
-var _reactQuery = _interopRequireDefault(require("./react-query"));
+var _reactQuery = _interopRequireDefault(require("./generators/react-query"));
 
-var _recoil = _interopRequireDefault(require("./recoil"));
+var _recoil = _interopRequireDefault(require("./generators/recoil"));
 
 var _utils = require("./utils");
 
@@ -58,7 +58,7 @@ Object.keys(_utils).forEach(function (key) {
   });
 });
 
-var _imports = require("./imports");
+var _imports = require("./utils/imports");
 
 Object.keys(_imports).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/main/{header.js → utils/header.js}

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.header = void 0;
 
-var _package = _interopRequireDefault(require("../package.json"));
+var _package = _interopRequireDefault(require("../../package.json"));
 
 var version = process.env.NODE_ENV === 'test' ? 'latest' : _package["default"].version;
 var header = "/**\n* This file was automatically generated by ".concat(_package["default"].name, "@").concat(version, ".\n* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,\n* and run the ").concat(_package["default"].name, " generate command to regenerate this file.\n*/\n\n");

package/main/utils/index.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _schemas = require("./schemas");
+
+Object.keys(_schemas).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _schemas[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _schemas[key];
+    }
+  });
+});