@cosmwasm/ts-codegen 0.5.6 → 0.6.0

package/main/commands/react-query.js

@@ -51,6 +51,16 @@ var _default = /*#__PURE__*/function () {
               name: 'optionalClient',
               message: 'optionalClient?',
               "default": false
+            }, {
+              type: 'confirm',
+              name: 'v4',
+              message: 'Use react-query v4?',
+              "default": false
+            }, {
+              type: 'confirm',
+              name: 'mutations',
+              message: 'Geneate useMutation hooks? Must be used with v4.',
+              "default": false
             }];
             _context.next = 3;
             return (0, _prompt.prompt)(questions, argv);

package/main/generate.js

@@ -33,6 +33,8 @@ var _clean = require("./clean");
 
 var _utils = require("./utils");
 
+var _imports = require("./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; }
@@ -58,17 +60,13 @@ var _default = /*#__PURE__*/function () {
             ReadOnlyInstance = null;
             body = [];
             body.push(w.importStmt(['CosmWasmClient', 'ExecuteResult', 'SigningCosmWasmClient'], '@cosmjs/cosmwasm-stargate'));
-
-            if (typeHash.hasOwnProperty('Coin')) {
-              body.push(w.importStmt(['StdFee'], '@cosmjs/amino'));
-            } else {
-              body.push(w.importStmt(['Coin', 'StdFee'], '@cosmjs/amino'));
-            } // TYPES
-
+            body.push((0, _imports.cosmjsAminoImportStatements)(typeHash)); // TYPES
 
             Object.values(typeHash).forEach(function (type) {
               body.push((0, _clean.clean)(type));
-            }); // query messages
+            }); // alias the ExecuteMsg
+
+            ExecuteMsg && body.push(t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier("".concat(name, "ExecuteMsg")), null, t.tsTypeReference(t.identifier('ExecuteMsg'))))); // query messages
 
             if (QueryMsg) {
               QueryClient = (0, _case.pascal)("".concat(name, "QueryClient"));
@@ -93,7 +91,7 @@ var _default = /*#__PURE__*/function () {
             (0, _mkdirp.sync)(outPath);
             (0, _fs.writeFileSync)((0, _path.join)(outPath, Contract), code);
 
-          case 19:
+          case 20:
           case "end":
             return _context.stop();
         }

package/main/imports.js

@@ -0,0 +1,26 @@
+"use strict";
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.cosmjsAminoImportStatements = void 0;
+
+var w = _interopRequireWildcard(require("wasm-ast-types"));
+
+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 cosmjsAminoImportStatements = function cosmjsAminoImportStatements(typeHash) {
+  var cosmjsImports = ['StdFee']; // If the coin is not provided by the generation already, import it from cosmjs
+
+  if (!typeHash.hasOwnProperty('Coin')) {
+    cosmjsImports.unshift('Coin');
+  }
+
+  return w.importStmt(cosmjsImports, '@cosmjs/amino');
+};
+
+exports.cosmjsAminoImportStatements = cosmjsAminoImportStatements;

package/main/index.js

@@ -56,4 +56,18 @@ Object.keys(_utils).forEach(function (key) {
       return _utils[key];
     }
   });
+});
+
+var _imports = require("./imports");
+
+Object.keys(_imports).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _imports[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _imports[key];
+    }
+  });
 });

package/main/react-query.js

@@ -31,48 +31,74 @@ var _generator = _interopRequireDefault(require("@babel/generator"));
 
 var _utils = require("./utils");
 
+var _imports = require("./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(name, schemas, outPath, options) {
-    var ReactQueryFile, Contract, QueryMsg, typeHash, QueryClient, ReadOnlyInstance, body, code;
+  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;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            ReactQueryFile = (0, _case.pascal)("".concat(name, "Contract")) + '.react-query.ts';
-            Contract = (0, _case.pascal)("".concat(name, "Contract"));
+            ReactQueryFile = (0, _case.pascal)("".concat(contractName, "Contract")) + '.react-query.ts';
+            Contract = (0, _case.pascal)("".concat(contractName, "Contract"));
             QueryMsg = (0, _utils.findQueryMsg)(schemas);
-            _context.next = 5;
+            ExecuteMsg = (0, _utils.findExecuteMsg)(schemas);
+            _context.next = 6;
             return (0, _utils.findAndParseTypes)(schemas);
 
-          case 5:
+          case 6:
             typeHash = _context.sent;
-            QueryClient = null;
-            ReadOnlyInstance = null;
+            ExecuteClient = (0, _case.pascal)("".concat(contractName, "Client"));
+            QueryClient = (0, _case.pascal)("".concat(contractName, "QueryClient"));
             body = [];
-            body.push(w.importStmt(['useQuery', 'UseQueryOptions'], 'react-query'));
-            body.push(w.importStmt(Object.keys(typeHash), "./".concat(Contract))); // query messages
+            reactQueryImports = ['useQuery', 'UseQueryOptions'];
+            clientImports = [];
+            QueryMsg && clientImports.push(QueryClient); // check that there are commands within the exec msg
+
+            shouldGenerateMutationHooks = ExecuteMsg && (options === null || options === void 0 ? void 0 : options.v4) && (options === null || options === void 0 ? void 0 : options.mutations) && (0, w.getMessageProperties)(ExecuteMsg).length > 0;
+
+            if (shouldGenerateMutationHooks) {
+              body.push(w.importStmt(['ExecuteResult'], '@cosmjs/cosmwasm-stargate'));
+              body.push((0, _imports.cosmjsAminoImportStatements)(typeHash));
+              reactQueryImports.push('useMutation', 'UseMutationOptions');
+              clientImports.push(ExecuteClient);
+            } // react-query imports
+
+
+            body.push(w.importStmt(reactQueryImports, options !== null && options !== void 0 && options.v4 ? '@tanstack/react-query' : 'react-query')); // general contract imports
+
+            body.push(w.importStmt(Object.keys(typeHash), "./".concat(Contract))); // client imports
+
+            body.push(w.importStmt(clientImports, "./".concat(Contract))); // 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)));
               [].push.apply(body, w.createReactQueryHooks({
                 queryMsg: QueryMsg,
-                contractName: name,
+                contractName: contractName,
                 QueryClient: QueryClient,
                 options: options
               }));
             }
 
+            if (shouldGenerateMutationHooks) {
+              [].push.apply(body, w.createReactQueryMutationHooks({
+                execMsg: ExecuteMsg,
+                contractName: contractName,
+                ExecuteClient: ExecuteClient,
+                options: options
+              }));
+            }
+
             code = _header.header + (0, _generator["default"])(t.program(body)).code;
             (0, _mkdirp.sync)(outPath);
             (0, _fs.writeFileSync)((0, _path.join)(outPath, ReactQueryFile), code);
 
-          case 15:
+          case 23:
           case "end":
             return _context.stop();
         }

package/module/commands/react-query.js

@@ -26,6 +26,16 @@ export default (async argv => {
     name: 'optionalClient',
     message: 'optionalClient?',
     default: false
+  }, {
+    type: 'confirm',
+    name: 'v4',
+    message: 'Use react-query v4?',
+    default: false
+  }, {
+    type: 'confirm',
+    name: 'mutations',
+    message: 'Geneate useMutation hooks? Must be used with v4.',
+    default: false
   }];
 
   const _await$prompt = await prompt(questions, argv),

package/module/generate.js

@@ -8,7 +8,8 @@ import { writeFileSync } from 'fs';
 import generate from "@babel/generator";
 import { clean } from "./clean";
 import { getMessageProperties } from "wasm-ast-types";
-import { findAndParseTypes, findExecuteMsg, findQueryMsg } from "./utils";
+import { findAndParseTypes, findExecuteMsg, findQueryMsg } from './utils';
+import { cosmjsAminoImportStatements } from './imports';
 export default (async (name, schemas, outPath) => {
   const Contract = pascal(`${name}Contract`) + '.ts';
   const QueryMsg = findQueryMsg(schemas);
@@ -20,17 +21,13 @@ export default (async (name, schemas, outPath) => {
   let ReadOnlyInstance = null;
   const body = [];
   body.push(w.importStmt(['CosmWasmClient', 'ExecuteResult', 'SigningCosmWasmClient'], '@cosmjs/cosmwasm-stargate'));
-
-  if (typeHash.hasOwnProperty('Coin')) {
-    body.push(w.importStmt(['StdFee'], '@cosmjs/amino'));
-  } else {
-    body.push(w.importStmt(['Coin', 'StdFee'], '@cosmjs/amino'));
-  } // TYPES
-
+  body.push(cosmjsAminoImportStatements(typeHash)); // TYPES
 
   Object.values(typeHash).forEach(type => {
     body.push(clean(type));
-  }); // query messages
+  }); // alias the ExecuteMsg
+
+  ExecuteMsg && body.push(t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier(`${name}ExecuteMsg`), null, t.tsTypeReference(t.identifier('ExecuteMsg'))))); // query messages
 
   if (QueryMsg) {
     QueryClient = pascal(`${name}QueryClient`);

package/module/imports.js

@@ -0,0 +1,10 @@
+import * as w from 'wasm-ast-types';
+export const cosmjsAminoImportStatements = typeHash => {
+  const cosmjsImports = ['StdFee']; // If the coin is not provided by the generation already, import it from cosmjs
+
+  if (!typeHash.hasOwnProperty('Coin')) {
+    cosmjsImports.unshift('Coin');
+  }
+
+  return w.importStmt(cosmjsImports, '@cosmjs/amino');
+};

package/module/index.js

@@ -2,4 +2,5 @@ export { default as generate } from './generate';
 export { default as fromPartial } from './from-partial';
 export { default as reactQuery } from './react-query';
 export { default as recoil } from './recoil';
-export * from './utils';
+export * from './utils';
+export * from './imports';

package/module/react-query.js

@@ -6,30 +6,56 @@ import * as w from 'wasm-ast-types';
 import * as t from '@babel/types';
 import { writeFileSync } from 'fs';
 import generate from "@babel/generator";
-import { findAndParseTypes, findQueryMsg } from "./utils";
-export default (async (name, schemas, outPath, options) => {
-  const ReactQueryFile = pascal(`${name}Contract`) + '.react-query.ts';
-  const Contract = pascal(`${name}Contract`);
+import { findAndParseTypes, findExecuteMsg, findQueryMsg } from './utils';
+import { getMessageProperties } from "wasm-ast-types";
+import { cosmjsAminoImportStatements } from './imports';
+export default (async (contractName, schemas, outPath, options) => {
+  const ReactQueryFile = pascal(`${contractName}Contract`) + '.react-query.ts';
+  const Contract = pascal(`${contractName}Contract`);
   const QueryMsg = findQueryMsg(schemas);
+  const ExecuteMsg = findExecuteMsg(schemas);
   const typeHash = await findAndParseTypes(schemas);
-  let QueryClient = null;
-  let ReadOnlyInstance = null;
+  const ExecuteClient = pascal(`${contractName}Client`);
+  const QueryClient = pascal(`${contractName}QueryClient`);
   const body = [];
-  body.push(w.importStmt(['useQuery', 'UseQueryOptions'], 'react-query'));
-  body.push(w.importStmt(Object.keys(typeHash), `./${Contract}`)); // query messages
+  const reactQueryImports = ['useQuery', 'UseQueryOptions'];
+  const clientImports = [];
+  QueryMsg && clientImports.push(QueryClient); // check that there are commands within the exec msg
+
+  const shouldGenerateMutationHooks = ExecuteMsg && options?.v4 && options?.mutations && getMessageProperties(ExecuteMsg).length > 0;
+
+  if (shouldGenerateMutationHooks) {
+    body.push(w.importStmt(['ExecuteResult'], '@cosmjs/cosmwasm-stargate'));
+    body.push(cosmjsAminoImportStatements(typeHash));
+    reactQueryImports.push('useMutation', 'UseMutationOptions');
+    clientImports.push(ExecuteClient);
+  } // react-query imports
+
+
+  body.push(w.importStmt(reactQueryImports, options?.v4 ? '@tanstack/react-query' : 'react-query')); // general contract imports
+
+  body.push(w.importStmt(Object.keys(typeHash), `./${Contract}`)); // client imports
+
+  body.push(w.importStmt(clientImports, `./${Contract}`)); // query messages
 
   if (QueryMsg) {
-    QueryClient = pascal(`${name}QueryClient`);
-    ReadOnlyInstance = pascal(`${name}ReadOnlyInterface`);
-    body.push(w.importStmt([QueryClient], `./${Contract}`));
     [].push.apply(body, w.createReactQueryHooks({
       queryMsg: QueryMsg,
-      contractName: name,
+      contractName: contractName,
       QueryClient,
       options
     }));
   }
 
+  if (shouldGenerateMutationHooks) {
+    [].push.apply(body, w.createReactQueryMutationHooks({
+      execMsg: ExecuteMsg,
+      contractName: contractName,
+      ExecuteClient,
+      options
+    }));
+  }
+
   const code = header + generate(t.program(body)).code;
   mkdirp(outPath);
   writeFileSync(join(outPath, ReactQueryFile), code);

package/module/utils.js

@@ -2,7 +2,7 @@ import { sync as glob } from 'glob';
 import { readFileSync } from 'fs';
 import { cleanse } from './cleanse';
 import { compile } from 'json-schema-to-typescript';
-import { parser } from "./parse";
+import { parser } from './parse';
 export const readSchemas = ({
   schemaDir,
   argv,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.5.6",
+  "version": "0.6.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",
@@ -90,7 +90,7 @@
     "minimist": "1.2.6",
     "mkdirp": "1.0.4",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.4.1"
+    "wasm-ast-types": "^0.5.0"
   },
-  "gitHead": "d2f3372cfcf0775c012deea29ecaed400fa7202e"
+  "gitHead": "871479982969e89f40b75ca5c85e8bed34a824da"
 }

package/types/react-query.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (name: string, schemas: any[], outPath: string, options?: { optionalClient?: boolean }) => Promise<void>;
+declare const _default: (name: string, schemas: any[], outPath: string, options?: { optionalClient?: boolean, v4?: boolean, mutations?: boolean }) => Promise<void>;
 export default _default;