@cosmwasm/ts-codegen 0.6.1 → 0.7.2

package/module/{utils.js → utils/schemas.js}

@@ -1,9 +1,15 @@
+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';
 import { compile } from 'json-schema-to-typescript';
 import { parser } from './parse';
-export const readSchemas = ({
+export const readSchemas = async ({
   schemaDir,
   argv,
   clean = true
@@ -49,4 +55,15 @@ export const findAndParseTypes = async schemas => {
 
   const typeHash = parser(allTypes);
   return typeHash;
+};
+export const getDefinitionSchema = schemas => {
+  const aggregateSchema = {
+    definitions: {//
+    }
+  };
+  schemas.forEach(schema => {
+    schema.definitions = schema.definitions || {};
+    aggregateSchema.definitions = _objectSpread(_objectSpread({}, aggregateSchema.definitions), schema.definitions);
+  });
+  return aggregateSchema;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.6.1",
+  "version": "0.7.2",
   "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",
@@ -85,12 +85,12 @@
     "fuzzy": "0.1.3",
     "glob": "8.0.3",
     "inquirerer": "0.1.3",
-    "json-schema-to-typescript": "10.1.5",
+    "json-schema-to-typescript": "11.0.1",
     "long": "^5.2.0",
     "minimist": "1.2.6",
     "mkdirp": "1.0.4",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.5.1"
+    "wasm-ast-types": "^0.6.1"
   },
-  "gitHead": "213e10e01a8784d82d003821d6d9490b97b7b480"
+  "gitHead": "8c35eebc33e7109da33ecb5f5bdeffc9a1b0d9af"
 }

package/types/cleanse.d.ts

@@ -0,0 +1 @@
+export declare const cleanse: (obj: any) => any;

package/types/generators/from-partial.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (name: string, schemas: any[], outPath: string) => Promise<void>;
+export default _default;

package/types/generators/react-query.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (contractName: string, schemas: any[], outPath: string, reactQueryOptions?: ReactQueryOptions) => Promise<void>;
+export default _default;

package/types/generators/recoil.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (name: string, schemas: any[], outPath: string) => Promise<void>;
+export default _default;

package/types/generators/ts-client.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (name: string, schemas: any[], outPath: string) => Promise<void>;
+export default _default;

package/types/imports.d.ts

@@ -0,0 +1 @@
+export declare const cosmjsAminoImportStatements: (typeHash: any) => any;

package/types/index.d.ts

@@ -1,6 +1,6 @@
-
-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 { default as tsClient } from './generators/ts-client';
+export { default as fromPartial } from './generators/from-partial';
+export { default as reactQuery } from './generators/react-query';
+export { default as recoil } from './generators/recoil';
 export * from './utils';
+export * from './utils/imports';

package/types/react-query.d.ts

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

package/types/ts-codegen.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/types/utils/clean.d.ts

@@ -0,0 +1 @@
+export declare const clean: (obj: any) => any;

package/types/utils/cleanse.d.ts

@@ -0,0 +1 @@
+export declare const cleanse: (obj: any) => any;

package/types/utils/header.d.ts

@@ -0,0 +1 @@
+export declare const header: string;

package/types/utils/imports.d.ts

@@ -0,0 +1 @@
+export declare const cosmjsAminoImportStatements: (typeHash: any) => any;

package/types/utils/index.d.ts

@@ -0,0 +1 @@
+export * from './schemas';

package/types/utils/parse.d.ts

@@ -0,0 +1 @@
+export declare const parser: (codes: any) => {};

package/types/utils/prompt.d.ts

@@ -0,0 +1,3 @@
+export function getFuzzySearch(list: any): (answers: any, input: any) => Promise<any>;
+export function getFuzzySearchNames(nameValueItemList: any): (answers: any, input: any) => Promise<any>;
+export function prompt(questions?: any[], argv?: {}): Promise<any>;

package/types/utils/schemas.d.ts

@@ -0,0 +1,10 @@
+import { JSONSchema } from 'wasm-ast-types';
+export declare const readSchemas: ({ schemaDir, argv, clean }: {
+    schemaDir: any;
+    argv: any;
+    clean?: boolean;
+}) => Promise<any>;
+export declare const findQueryMsg: (schemas: any) => any;
+export declare const findExecuteMsg: (schemas: any) => any;
+export declare const findAndParseTypes: (schemas: any) => Promise<{}>;
+export declare const getDefinitionSchema: (schemas: JSONSchema[]) => JSONSchema;

package/types/utils.d.ts

@@ -1,4 +1,10 @@
-export declare const readSchemas: ({ schemaDir, argv }: {
+import { JSONSchema } from 'wasm-ast-types';
+export declare const readSchemas: ({ schemaDir, argv, clean }: {
     schemaDir: any;
     argv: any;
-}) => any[];
+    clean?: boolean;
+}) => Promise<any>;
+export declare const findQueryMsg: (schemas: any) => any;
+export declare const findExecuteMsg: (schemas: any) => any;
+export declare const findAndParseTypes: (schemas: any) => Promise<{}>;
+export declare const getDefinitionSchema: (schemas: JSONSchema[]) => JSONSchema;

package/main/commands/boilerplate.js

@@ -1,195 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-var _typeof = require("@babel/runtime/helpers/typeof");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var shell = _interopRequireWildcard(require("shelljs"));
-
-var _prompt = require("../prompt");
-
-var _dargs = _interopRequireDefault(require("dargs"));
-
-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; }
-
-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 glob = require('glob').sync;
-
-var fs = require('fs');
-
-var path = require('path');
-
-var repo = 'git@github.com:pyramation/tmpl-cosmwasm-module.git';
-
-var _default = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(argv) {
-    var _yield$prompt, name, questions, fullname, email, args, results, scopedResults, license, files, _loop, i, _ret;
-
-    return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            if (shell.which('git')) {
-              _context.next = 3;
-              break;
-            }
-
-            shell.echo('Sorry, this script requires git');
-            return _context.abrupt("return", shell.exit(1));
-
-          case 3:
-            _context.next = 5;
-            return (0, _prompt.prompt)([{
-              type: 'string',
-              name: 'name',
-              message: 'Enter your new module name'
-            }], argv);
-
-          case 5:
-            _yield$prompt = _context.sent;
-            name = _yield$prompt.name;
-            shell.exec("git clone ".concat(repo, " ").concat(name));
-            shell.cd(name);
-            questions = JSON.parse(fs.readFileSync(".questions.json"));
-            fullname = shell.exec('git config --global user.name', {
-              silent: true
-            }).trim();
-            email = shell.exec('git config --global user.email', {
-              silent: true
-            }).trim(); // @__USERNAME__/__MODULENAME__
-            // __PACKAGE_IDENTIFIER__
-
-            args = (0, _dargs["default"])(_objectSpread(_objectSpread({
-              _: []
-            }, argv), {}, {
-              __MODULENAME__: name,
-              __USERFULLNAME__: fullname,
-              __USEREMAIL__: email
-            }), {
-              allowCamelCase: true
-            });
-            _context.next = 15;
-            return (0, _prompt.prompt)(questions, args);
-
-          case 15:
-            results = _context.sent;
-            _context.next = 18;
-            return (0, _prompt.prompt)([{
-              name: '__LICENSE__',
-              message: 'Which license?',
-              choices: ['MIT', 'closed'],
-              type: 'list',
-              required: true
-            }], []);
-
-          case 18:
-            license = _context.sent;
-
-            if (!(results.__ACCESS__ === 'public')) {
-              _context.next = 23;
-              break;
-            }
-
-            _context.next = 22;
-            return (0, _prompt.prompt)([{
-              type: 'confirm',
-              name: 'scoped',
-              message: 'use npm scopes?',
-              required: true
-            }], []);
-
-          case 22:
-            scopedResults = _context.sent;
-
-          case 23:
-            files = [].concat(glob(process.cwd() + '/**/.*')).concat(glob(process.cwd() + '/**/*'));
-
-            _loop = function _loop(i) {
-              var templateFile = files[i];
-              if (fs.lstatSync(templateFile).isDirectory()) return "continue";
-              var content = fs.readFileSync(templateFile).toString();
-
-              if (path.basename(templateFile) === 'LICENSE' && license.__LICENSE__ === 'closed') {
-                content = "Copyright (c) 2022 __USERFULLNAME__ <__USEREMAIL__> - All Rights Reserved\nUnauthorized copying via any medium is strictly prohibited\nProprietary and confidential";
-              }
-
-              Object.keys(results).forEach(function (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, "@".concat(results.__USERNAME__, "/").concat(results.__MODULENAME__));
-                } else {
-                  content = content.replace(/__PACKAGE_IDENTIFIER__/g, "".concat(results.__MODULENAME__));
-                }
-              } else {
-                content = content.replace(/__PACKAGE_IDENTIFIER__/g, "@".concat(results.__USERNAME__, "/").concat(results.__MODULENAME__));
-              }
-
-              if (path.basename(templateFile) === 'README.md') {
-                content = "# ".concat(results.__MODULENAME__);
-              }
-
-              fs.writeFileSync(templateFile, content);
-            };
-
-            i = 0;
-
-          case 26:
-            if (!(i < files.length)) {
-              _context.next = 33;
-              break;
-            }
-
-            _ret = _loop(i);
-
-            if (!(_ret === "continue")) {
-              _context.next = 30;
-              break;
-            }
-
-            return _context.abrupt("continue", 30);
-
-          case 30:
-            i++;
-            _context.next = 26;
-            break;
-
-          case 33:
-            shell.rm('-rf', '.git');
-            shell.rm('-rf', '.questions.json');
-            console.log("\n\n       |||\n      (o o)\n  ooO--(_)--Ooo-\n\n  \u2728 Great work!\n  ");
-
-          case 36:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-
-  return function (_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-exports["default"] = _default;

package/main/utils.js

@@ -1,123 +0,0 @@
-"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 _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _glob = require("glob");
-
-var _fs = require("fs");
-
-var _cleanse = require("./cleanse");
-
-var _jsonSchemaToTypescript = require("json-schema-to-typescript");
-
-var _parse = require("./parse");
-
-var readSchemas = function readSchemas(_ref) {
-  var schemaDir = _ref.schemaDir,
-      argv = _ref.argv,
-      _ref$clean = _ref.clean,
-      clean = _ref$clean === void 0 ? true : _ref$clean;
-  var fn = clean ? _cleanse.cleanse : function (str) {
-    return str;
-  };
-  var files = (0, _glob.sync)(schemaDir + '/**/*.json');
-  var schemas = files.map(function (file) {
-    return JSON.parse((0, _fs.readFileSync)(file, 'utf-8'));
-  });
-
-  if (argv.packed) {
-    if (schemas.length !== 1) {
-      throw new Error('packed option only supports one file');
-    }
-
-    return Object.values(fn(schemas[0]));
-  }
-
-  return fn(schemas);
-};
-
-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 === 'ExecuteMsg' || schema.title === 'ExecuteMsg_for_Empty' || // if cleanse is used, this is never
-    schema.title === 'ExecuteMsgForEmpty';
-  });
-  return ExecuteMsg;
-};
-
-exports.findExecuteMsg = findExecuteMsg;
-
-var findAndParseTypes = /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(schemas) {
-    var Types, allTypes, typ, _i, _Object$keys, key, result, typeHash;
-
-    return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            Types = schemas;
-            allTypes = [];
-            _context.t0 = _regenerator["default"].keys(Types);
-
-          case 3:
-            if ((_context.t1 = _context.t0()).done) {
-              _context.next = 12;
-              break;
-            }
-
-            typ = _context.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;
-              }
-            }
-
-            _context.next = 8;
-            return (0, _jsonSchemaToTypescript.compile)(Types[typ], Types[typ].title);
-
-          case 8:
-            result = _context.sent;
-            allTypes.push(result);
-            _context.next = 3;
-            break;
-
-          case 12:
-            typeHash = (0, _parse.parser)(allTypes);
-            return _context.abrupt("return", typeHash);
-
-          case 14:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-
-  return function findAndParseTypes(_x) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-
-exports.findAndParseTypes = findAndParseTypes;

package/module/commands/boilerplate.js

@@ -1,116 +0,0 @@
-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 '../prompt';
-import dargs from 'dargs';
-
-const glob = require('glob').sync;
-
-const fs = require('fs');
-
-const path = require('path');
-
-const repo = 'git@github.com:pyramation/tmpl-cosmwasm-module.git';
-export default (async argv => {
-  if (!shell.which('git')) {
-    shell.echo('Sorry, this script requires git');
-    return shell.exit(1);
-  }
-
-  const {
-    name
-  } = await prompt([{
-    type: 'string',
-    name: 'name',
-    message: 'Enter your new module name'
-  }], argv);
-  shell.exec(`git clone ${repo} ${name}`);
-  shell.cd(name);
-  const questions = JSON.parse(fs.readFileSync(`.questions.json`));
-  const fullname = shell.exec('git config --global user.name', {
-    silent: true
-  }).trim();
-  const email = shell.exec('git config --global user.email', {
-    silent: true
-  }).trim(); // @__USERNAME__/__MODULENAME__
-  // __PACKAGE_IDENTIFIER__
-
-  const args = dargs(_objectSpread(_objectSpread({
-    _: []
-  }, argv), {}, {
-    __MODULENAME__: name,
-    __USERFULLNAME__: fullname,
-    __USEREMAIL__: email
-  }), {
-    allowCamelCase: true
-  });
-  const results = await prompt(questions, args);
-  let scopedResults;
-  const license = await prompt([{
-    name: '__LICENSE__',
-    message: 'Which license?',
-    choices: ['MIT', 'closed'],
-    type: 'list',
-    required: true
-  }], []);
-
-  if (results.__ACCESS__ === 'public') {
-    scopedResults = await prompt([{
-      type: 'confirm',
-      name: 'scoped',
-      message: 'use npm scopes?',
-      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) 2022 __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__}`);
-      } else {
-        content = content.replace(/__PACKAGE_IDENTIFIER__/g, `${results.__MODULENAME__}`);
-      }
-    } else {
-      content = content.replace(/__PACKAGE_IDENTIFIER__/g, `@${results.__USERNAME__}/${results.__MODULENAME__}`);
-    }
-
-    if (path.basename(templateFile) === 'README.md') {
-      content = `# ${results.__MODULENAME__}`;
-    }
-
-    fs.writeFileSync(templateFile, content);
-  }
-
-  shell.rm('-rf', '.git');
-  shell.rm('-rf', '.questions.json');
-  console.log(`
-
-       |||
-      (o o)
-  ooO--(_)--Ooo-
-
-  ✨ Great work!
-  `);
-});