@cosmwasm/ts-codegen 0.34.2 → 0.35.0

package/main/utils/schemas.js

@@ -1,191 +1,144 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.readSchemas = exports.findQueryMsg = exports.findExecuteMsg = exports.findAndParseTypes = void 0;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _glob = require("glob");
-
 var _fs = require("fs");
-
 var _cleanse = require("./cleanse");
-
 var _jsonSchemaToTypescript = require("@pyramation/json-schema-to-typescript");
-
 var _parse = require("./parse");
-
 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) { (0, _defineProperty2["default"])(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; }
-
 ;
-
 var readSchemas = /*#__PURE__*/function () {
   var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(_ref) {
     var schemaDir, _ref$clean, clean, fn, files, schemas, idlObject, contract_name, contract_version, idl_version, responses, instantiate, execute, query, migrate, sudo;
-
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            schemaDir = _ref.schemaDir, _ref$clean = _ref.clean, clean = _ref$clean === void 0 ? true : _ref$clean;
-            fn = clean ? _cleanse.cleanse : function (str) {
-              return str;
-            };
-            files = (0, _glob.sync)(schemaDir + '/**/*.json').filter(function (file) {
-              return !file.match(/\/raw\//);
-            });
-            schemas = files.map(function (file) {
-              return JSON.parse((0, _fs.readFileSync)(file, 'utf-8'));
-            });
-
-            if (!(schemas.length > 1)) {
-              _context.next = 6;
-              break;
-            }
-
-            return _context.abrupt("return", {
-              schemas: fn(schemas)
-            });
-
-          case 6:
-            if (!(schemas.length === 0)) {
-              _context.next = 8;
-              break;
-            }
-
-            throw new Error('Error [too few files]: requires one schema file per contract');
-
-          case 8:
-            if (!(schemas.length !== 1)) {
-              _context.next = 10;
-              break;
-            }
-
-            throw new Error('Error [too many files]: CosmWasm v1.1 schemas supports one file');
-
-          case 10:
-            idlObject = schemas[0];
-            contract_name = idlObject.contract_name, contract_version = idlObject.contract_version, idl_version = idlObject.idl_version, responses = idlObject.responses, instantiate = idlObject.instantiate, execute = idlObject.execute, query = idlObject.query, migrate = idlObject.migrate, sudo = idlObject.sudo;
-
-            if (!(typeof idl_version !== 'string')) {
-              _context.next = 14;
-              break;
-            }
-
-            return _context.abrupt("return", {
-              schemas: fn(schemas)
-            });
-
-          case 14:
-            return _context.abrupt("return", {
-              schemas: [].concat((0, _toConsumableArray2["default"])(Object.values(fn({
-                instantiate: instantiate,
-                execute: execute,
-                query: query,
-                migrate: migrate,
-                sudo: sudo
-              })).filter(Boolean)), (0, _toConsumableArray2["default"])(Object.values(fn(_objectSpread({}, responses))).filter(Boolean))),
-              responses: responses,
-              idlObject: idlObject
-            });
-
-          case 15:
-          case "end":
-            return _context.stop();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          schemaDir = _ref.schemaDir, _ref$clean = _ref.clean, clean = _ref$clean === void 0 ? true : _ref$clean;
+          fn = clean ? _cleanse.cleanse : function (str) {
+            return str;
+          };
+          files = (0, _glob.sync)(schemaDir + '/**/*.json').filter(function (file) {
+            return !file.match(/\/raw\//);
+          });
+          schemas = files.map(function (file) {
+            return JSON.parse((0, _fs.readFileSync)(file, 'utf-8'));
+          });
+          if (!(schemas.length > 1)) {
+            _context.next = 6;
+            break;
+          }
+          return _context.abrupt("return", {
+            schemas: fn(schemas)
+          });
+        case 6:
+          if (!(schemas.length === 0)) {
+            _context.next = 8;
+            break;
+          }
+          throw new Error('Error [too few files]: requires one schema file per contract');
+        case 8:
+          if (!(schemas.length !== 1)) {
+            _context.next = 10;
+            break;
+          }
+          throw new Error('Error [too many files]: CosmWasm v1.1 schemas supports one file');
+        case 10:
+          idlObject = schemas[0];
+          contract_name = idlObject.contract_name, contract_version = idlObject.contract_version, idl_version = idlObject.idl_version, responses = idlObject.responses, instantiate = idlObject.instantiate, execute = idlObject.execute, query = idlObject.query, migrate = idlObject.migrate, sudo = idlObject.sudo;
+          if (!(typeof idl_version !== 'string')) {
+            _context.next = 14;
+            break;
+          }
+          return _context.abrupt("return", {
+            schemas: fn(schemas)
+          });
+        case 14:
+          return _context.abrupt("return", {
+            schemas: [].concat((0, _toConsumableArray2["default"])(Object.values(fn({
+              instantiate: instantiate,
+              execute: execute,
+              query: query,
+              migrate: migrate,
+              sudo: sudo
+            })).filter(Boolean)), (0, _toConsumableArray2["default"])(Object.values(fn(_objectSpread({}, responses))).filter(Boolean))),
+            responses: responses,
+            idlObject: idlObject
+          });
+        case 15:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
   }));
-
   return function readSchemas(_x) {
     return _ref2.apply(this, arguments);
   };
 }();
-
 exports.readSchemas = readSchemas;
-
 var findQueryMsg = function findQueryMsg(schemas) {
   var QueryMsg = schemas.find(function (schema) {
     return schema.title === 'QueryMsg';
   });
   return QueryMsg;
 };
-
 exports.findQueryMsg = findQueryMsg;
-
 var findExecuteMsg = function findExecuteMsg(schemas) {
   var ExecuteMsg = schemas.find(function (schema) {
     return schema.title.startsWith('ExecuteMsg');
   });
   return ExecuteMsg;
 };
-
 exports.findExecuteMsg = findExecuteMsg;
-
 var findAndParseTypes = /*#__PURE__*/function () {
   var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(schemas) {
     var Types, allTypes, typ, _i, _Object$keys, key, result, typeHash;
-
     return _regenerator["default"].wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            Types = schemas;
-            allTypes = [];
-            _context2.t0 = _regenerator["default"].keys(Types);
-
-          case 3:
-            if ((_context2.t1 = _context2.t0()).done) {
-              _context2.next = 12;
-              break;
-            }
-
-            typ = _context2.t1.value;
-
-            if (Types[typ].definitions) {
-              for (_i = 0, _Object$keys = Object.keys(Types[typ].definitions); _i < _Object$keys.length; _i++) {
-                key = _Object$keys[_i];
-                // set title
-                Types[typ].definitions[key].title = key;
-              }
-            }
-
-            _context2.next = 8;
-            return (0, _jsonSchemaToTypescript.compile)(Types[typ], Types[typ].title);
-
-          case 8:
-            result = _context2.sent;
-            allTypes.push(result);
-            _context2.next = 3;
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          Types = schemas;
+          allTypes = [];
+          _context2.t0 = _regenerator["default"].keys(Types);
+        case 3:
+          if ((_context2.t1 = _context2.t0()).done) {
+            _context2.next = 12;
             break;
-
-          case 12:
-            typeHash = (0, _parse.parser)(allTypes);
-            return _context2.abrupt("return", typeHash);
-
-          case 14:
-          case "end":
-            return _context2.stop();
-        }
+          }
+          typ = _context2.t1.value;
+          if (Types[typ].definitions) {
+            for (_i = 0, _Object$keys = Object.keys(Types[typ].definitions); _i < _Object$keys.length; _i++) {
+              key = _Object$keys[_i];
+              // set title
+              Types[typ].definitions[key].title = key;
+            }
+          }
+          _context2.next = 8;
+          return (0, _jsonSchemaToTypescript.compile)(Types[typ], Types[typ].title);
+        case 8:
+          result = _context2.sent;
+          allTypes.push(result);
+          _context2.next = 3;
+          break;
+        case 12:
+          typeHash = (0, _parse.parser)(allTypes);
+          return _context2.abrupt("return", typeHash);
+        case 14:
+        case "end":
+          return _context2.stop();
       }
     }, _callee2);
   }));
-
   return function findAndParseTypes(_x2) {
     return _ref3.apply(this, arguments);
   };
 }();
-
 exports.findAndParseTypes = findAndParseTypes;

package/main/utils/unused.js

@@ -1,50 +1,40 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.unused = void 0;
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var t = _interopRequireWildcard(require("@babel/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; }
-
 //@ts-nocheck
+
 // https://github.com/chuyik/babel-plugin-danger-remove-unused-import
 // https://github.com/chuyik/babel-plugin-danger-remove-unused-import/blob/c5454c21e94698a2464a12baa5590761932a71a8/License#L1
+
 var unused = {
   Program: {
     exit: function exit(path) {
       var UnRefBindings = new Map();
-
       for (var _i = 0, _Object$entries = Object.entries(path.scope.bindings); _i < _Object$entries.length; _i++) {
         var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i], 2),
-            name = _Object$entries$_i[0],
-            binding = _Object$entries$_i[1];
-
+          name = _Object$entries$_i[0],
+          binding = _Object$entries$_i[1];
         if (!binding.path.parentPath || binding.kind !== 'module') continue;
         var source = binding.path.parentPath.get('source');
         var importName = source.node.value;
         if (!t.isStringLiteral(source)) continue;
         var key = "".concat(importName, "(").concat(source.node.loc && source.node.loc.start.line, ")");
-
         if (!UnRefBindings.has(key)) {
           UnRefBindings.set(key, binding);
         }
-
         if (binding.referenced) {
           UnRefBindings.set(key, null);
         } else {
           var nodeType = binding.path.node.type;
-
           if (nodeType === 'ImportSpecifier') {
             binding.path.remove();
           } else if (nodeType === 'ImportDefaultSpecifier') {
@@ -56,7 +46,6 @@ var unused = {
           }
         }
       }
-
       UnRefBindings.forEach(function (binding, key) {
         if (binding && binding.path.parentPath) {
           binding.path.parentPath.remove();

package/module/builder/builder.js

@@ -13,7 +13,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";
@@ -25,13 +25,13 @@ const defaultOpts = {
     enabled: true,
     scope: 'contracts',
     bundleFile: 'bundle.ts'
-  }
+  },
+  useShorthandCtor: true
 };
 ;
 ;
 ;
 ;
-
 function getContract(contractOpt) {
   if (typeof contractOpt === 'string') {
     const name = basename(contractOpt);
@@ -41,18 +41,15 @@ function getContract(contractOpt) {
       dir: contractOpt
     };
   }
-
   return {
     name: pascal(contractOpt.name),
     dir: contractOpt.dir
   };
 }
-
 export class TSBuilder {
   loadDefaultPlugins() {
-    [].push.apply(this.plugins, [new TypesPlugin(this.options), new ClientPlugin(this.options), new MessageComposerPlugin(this.options), new ReactQueryPlugin(this.options), new RecoilPlugin(this.options), new MsgBuilderPlugin(this.options), new ContractsContextProviderPlugin(this.options)]);
+    [].push.apply(this.plugins, [new TypesPlugin(this.options), new ClientPlugin(this.options), new MessageComposerPlugin(this.options), new ReactQueryPlugin(this.options), new RecoilPlugin(this.options), new MessageBuilderPlugin(this.options), new ContractsContextProviderPlugin(this.options)]);
   }
-
   constructor({
     contracts,
     outPath,
@@ -60,86 +57,71 @@ export class TSBuilder {
     plugins
   }) {
     _defineProperty(this, "contracts", void 0);
-
     _defineProperty(this, "outPath", void 0);
-
     _defineProperty(this, "options", void 0);
-
     _defineProperty(this, "plugins", []);
-
     _defineProperty(this, "builderContext", new BuilderContext());
-
     _defineProperty(this, "files", []);
-
     this.contracts = contracts;
     this.outPath = outPath;
     this.options = deepmerge(deepmerge(defaultOptions, defaultOpts), options ?? {});
     this.loadDefaultPlugins();
-
     if (plugins && plugins.length) {
       [].push.apply(this.plugins, plugins);
     }
-
     this.plugins.forEach(plugin => plugin.setBuilder(this));
   }
-
   async build() {
     await this.process();
     await this.after();
-  } // lifecycle functions
-
+  }
 
+  // lifecycle functions
   async process() {
     for (const contractOpt of this.contracts) {
-      const contract = getContract(contractOpt); //resolve contract schema.
-
+      const contract = getContract(contractOpt);
+      //resolve contract schema.
       const contractInfo = await readSchemas({
         schemaDir: contract.dir
-      }); //lifecycle and plugins.
+      });
 
+      //lifecycle and plugins.
       await this.render(contract.name, contractInfo);
     }
   }
-
   async render(name, contractInfo) {
     for (const plugin of this.plugins) {
       let files = await plugin.render(name, contractInfo, this.outPath);
-
       if (files && files.length) {
         [].push.apply(this.files, files);
       }
     }
   }
-
   async after() {
     //create useContracts bundle file
     const contractsProviderBundlePlugin = new ContractsProviderBundlePlugin(this.options);
-    contractsProviderBundlePlugin.setBuilder(this); //contractContextProviders.ts
+    contractsProviderBundlePlugin.setBuilder(this);
 
+    //contractContextProviders.ts
     const files = await contractsProviderBundlePlugin.render("contractContextProviders", {
       schemas: []
     }, this.outPath);
-
     if (files && files.length) {
       [].push.apply(this.files, files);
     }
-
     const helpers = createHelpers({
       outPath: this.outPath,
       contracts: this.contracts,
       options: this.options,
       plugins: this.plugins
     }, this.builderContext);
-
     if (helpers && helpers.length) {
       [].push.apply(this.files, helpers);
     }
-
     if (this.options.bundle.enabled) {
       this.bundle();
     }
   }
-
   async bundle() {
     const allFiles = this.files;
     const bundleFile = this.options.bundle.bundleFile;
@@ -151,14 +133,11 @@ export class TSBuilder {
     });
     const ast = recursiveModuleBundle(bundleVariables);
     let code = generate(t.program([...importPaths, ...ast])).code;
-
     if (this.options?.bundle?.bundlePath) {
       mkdirp(this.options?.bundle?.bundlePath);
     }
-
     mkdirp(this.outPath);
     if (code.trim() === '') code = 'export {};';
     writeFileSync(bundlePath, header + code);
   }
-
 }

package/module/bundler/bundler.js

@@ -8,14 +8,14 @@ export const recursiveModuleBundle = obj => {
       // 1. create variable for abci
       // 2. splat ALL _0, parms into abci
       // 3. export that variable
+
       const nmspc = t.variableDeclaration('const', [t.variableDeclarator(t.identifier(key), t.objectExpression(Object.keys(obj[key]).filter(a => a !== '__export').filter(a => a.startsWith('_')).map(a => t.spreadElement(t.identifier(a)))))]);
       const others = Object.keys(obj[key]).filter(a => a !== '__export').filter(a => !a.startsWith('_'));
-
       if (others.length) {
         throw new Error('namespace and package not supported, yet.');
-      } // return nmspc;
-
+      }
 
+      // return nmspc;
       return t.exportNamedDeclaration(nmspc, []);
     } else {
       // you can make a namespace for obj[key]

package/module/cli.js

@@ -11,7 +11,6 @@ export const cli = async argv => {
   var {
     cmd
   } = await prompt(question, argv);
-
   if (typeof commands[cmd] === 'function') {
     await commands[cmd](argv);
   } else {

package/module/commands/create-boilerplate.js

@@ -1,26 +1,18 @@
 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 * as shell from 'shelljs';
 import { prompt } from '../utils/prompt';
 import dargs from 'dargs';
-
 const glob = require('glob').sync;
-
 const fs = require('fs');
-
 const path = require('path');
-
 const repo = 'https://github.com/cosmology-tech/ts-codegen-module-boilerplate';
 export default (async argv => {
   if (!shell.which('git')) {
     shell.echo('Sorry, this script requires git');
     return shell.exit(1);
   }
-
   const {
     name
   } = await prompt([{
@@ -36,9 +28,10 @@ export default (async argv => {
   }).trim();
   const email = shell.exec('git config --global user.email', {
     silent: true
-  }).trim(); // @__USERNAME__/__MODULENAME__
-  // __PACKAGE_IDENTIFIER__
+  }).trim();
 
+  // @__USERNAME__/__MODULENAME__
+  // __PACKAGE_IDENTIFIER__
   const args = dargs(_objectSpread(_objectSpread({
     _: []
   }, argv), {}, {
@@ -57,7 +50,6 @@ export default (async argv => {
     type: 'list',
     required: true
   }], []);
-
   if (results.__ACCESS__ === 'public') {
     scopedResults = await prompt([{
       type: 'confirm',
@@ -66,26 +58,21 @@ export default (async argv => {
       required: true
     }], []);
   }
-
   const files = [].concat(glob(process.cwd() + '/**/.*')).concat(glob(process.cwd() + '/**/*'));
-
   for (let i = 0; i < files.length; i++) {
     const templateFile = files[i];
     if (fs.lstatSync(templateFile).isDirectory()) continue;
     let content = fs.readFileSync(templateFile).toString();
-
     if (path.basename(templateFile) === 'LICENSE' && license.__LICENSE__ === 'closed') {
       content = `Copyright (c) 2023 __USERFULLNAME__ <__USEREMAIL__> - All Rights Reserved
 Unauthorized copying via any medium is strictly prohibited
 Proprietary and confidential`;
     }
-
     Object.keys(results).forEach(key => {
       if (/^__/.test(key)) {
         content = content.replace(new RegExp(key, 'g'), results[key]);
       }
     });
-
     if (results.__ACCESS__ === 'public') {
       if (scopedResults.scoped) {
         content = content.replace(/__PACKAGE_IDENTIFIER__/g, `@${results.__USERNAME__}/${results.__MODULENAME__}`);
@@ -94,14 +81,14 @@ Proprietary and confidential`;
       }
     } else {
       content = content.replace(/__PACKAGE_IDENTIFIER__/g, `@${results.__USERNAME__}/${results.__MODULENAME__}`);
-    } // if (path.basename(templateFile) === 'README.md') {
+    }
+
+    // if (path.basename(templateFile) === 'README.md') {
     //     content = `# ${results.__MODULENAME__}`;
     // }
 
-
     fs.writeFileSync(templateFile, content);
   }
-
   shell.rm('-rf', '.git');
   shell.rm('-rf', '.questions.json');
   console.log(`