@cosmwasm/ts-codegen 0.14.2 → 0.15.0

package/README.md

@@ -47,8 +47,8 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
 Clone your project and `cd` into your contracts folder
 
 ```sh
-git clone git@github.com:public-awesome/stargaze-contracts.git
-cd stargaze-contracts/contracts/sg721/
+git clone https://github.com/public-awesome/launchpad.git
+cd launchpad/contracts/sg721-base/
 ```
 
 Run `cosmwasm-ts-codegen` to generate your code.
@@ -58,7 +58,8 @@ cosmwasm-ts-codegen generate \
           --plugin client \
           --schema ./schema \
           --out ./ts \
-          --name SG721
+          --name SG721 \
+          --no-bundle
 ```
 
 The output will be in the folder specified by `--out`, enjoy!
@@ -404,7 +405,28 @@ cd contracts/sg721/
 cargo schema
 ```
 ### Exporting Schemas
-#### `cosmwasm_std` Examples
+#### `cosmwasm v1.1` Example
+
+Using the new `write_api` method, you can export schemas:
+
+```rs
+use cosmwasm_schema::write_api;
+
+pub use cw4::{AdminResponse, MemberListResponse, MemberResponse, TotalWeightResponse};
+pub use cw4_group::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
+
+fn main() {
+    write_api! {
+        instantiate: InstantiateMsg,
+        execute: ExecuteMsg,
+        query: QueryMsg,
+    }
+}
+```
+
+#### `cosmwasm_std` Example
+
+Here is a legacy example:
 
 ```rs
 use cosmwasm_std::{Addr, CosmosMsg, Empty};

package/main/builder/builder.js

@@ -114,7 +114,7 @@ var TSBuilder = /*#__PURE__*/function () {
     key: "renderTypes",
     value: function () {
       var _renderTypes = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(contract) {
-        var _this$options$types, enabled, options, _yield$readSchemas, schemas, files;
+        var _this$options$types, enabled, options, contractInfo, files;
 
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) {
@@ -136,16 +136,15 @@ var TSBuilder = /*#__PURE__*/function () {
                 });
 
               case 5:
-                _yield$readSchemas = _context.sent;
-                schemas = _yield$readSchemas.schemas;
-                _context.next = 9;
-                return (0, _types["default"])(contract.name, schemas, this.outPath, options);
+                contractInfo = _context.sent;
+                _context.next = 8;
+                return (0, _types["default"])(contract.name, contractInfo, this.outPath, options);
 
-              case 9:
+              case 8:
                 files = _context.sent;
                 [].push.apply(this.files, files);
 
-              case 11:
+              case 10:
               case "end":
                 return _context.stop();
             }
@@ -163,7 +162,7 @@ var TSBuilder = /*#__PURE__*/function () {
     key: "renderClient",
     value: function () {
       var _renderClient = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(contract) {
-        var _this$options$client, enabled, options, _yield$readSchemas2, schemas, files;
+        var _this$options$client, enabled, options, contractInfo, files;
 
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) {
@@ -185,16 +184,15 @@ var TSBuilder = /*#__PURE__*/function () {
                 });
 
               case 5:
-                _yield$readSchemas2 = _context2.sent;
-                schemas = _yield$readSchemas2.schemas;
-                _context2.next = 9;
-                return (0, _client["default"])(contract.name, schemas, this.outPath, options);
+                contractInfo = _context2.sent;
+                _context2.next = 8;
+                return (0, _client["default"])(contract.name, contractInfo, this.outPath, options);
 
-              case 9:
+              case 8:
                 files = _context2.sent;
                 [].push.apply(this.files, files);
 
-              case 11:
+              case 10:
               case "end":
                 return _context2.stop();
             }
@@ -212,7 +210,7 @@ var TSBuilder = /*#__PURE__*/function () {
     key: "renderRecoil",
     value: function () {
       var _renderRecoil = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(contract) {
-        var _this$options$recoil, enabled, options, _yield$readSchemas3, schemas, files;
+        var _this$options$recoil, enabled, options, contractInfo, files;
 
         return _regenerator["default"].wrap(function _callee3$(_context3) {
           while (1) {
@@ -234,16 +232,15 @@ var TSBuilder = /*#__PURE__*/function () {
                 });
 
               case 5:
-                _yield$readSchemas3 = _context3.sent;
-                schemas = _yield$readSchemas3.schemas;
-                _context3.next = 9;
-                return (0, _recoil["default"])(contract.name, schemas, this.outPath, options);
+                contractInfo = _context3.sent;
+                _context3.next = 8;
+                return (0, _recoil["default"])(contract.name, contractInfo, this.outPath, options);
 
-              case 9:
+              case 8:
                 files = _context3.sent;
                 [].push.apply(this.files, files);
 
-              case 11:
+              case 10:
               case "end":
                 return _context3.stop();
             }
@@ -261,7 +258,7 @@ var TSBuilder = /*#__PURE__*/function () {
     key: "renderReactQuery",
     value: function () {
       var _renderReactQuery = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(contract) {
-        var _this$options$reactQu, enabled, options, _yield$readSchemas4, schemas, files;
+        var _this$options$reactQu, enabled, options, contractInfo, files;
 
         return _regenerator["default"].wrap(function _callee4$(_context4) {
           while (1) {
@@ -283,16 +280,15 @@ var TSBuilder = /*#__PURE__*/function () {
                 });
 
               case 5:
-                _yield$readSchemas4 = _context4.sent;
-                schemas = _yield$readSchemas4.schemas;
-                _context4.next = 9;
-                return (0, _reactQuery["default"])(contract.name, schemas, this.outPath, options);
+                contractInfo = _context4.sent;
+                _context4.next = 8;
+                return (0, _reactQuery["default"])(contract.name, contractInfo, this.outPath, options);
 
-              case 9:
+              case 8:
                 files = _context4.sent;
                 [].push.apply(this.files, files);
 
-              case 11:
+              case 10:
               case "end":
                 return _context4.stop();
             }
@@ -310,7 +306,7 @@ var TSBuilder = /*#__PURE__*/function () {
     key: "renderMessageComposer",
     value: function () {
       var _renderMessageComposer = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(contract) {
-        var _this$options$message, enabled, options, _yield$readSchemas5, schemas, files;
+        var _this$options$message, enabled, options, contractInfo, files;
 
         return _regenerator["default"].wrap(function _callee5$(_context5) {
           while (1) {
@@ -332,16 +328,15 @@ var TSBuilder = /*#__PURE__*/function () {
                 });
 
               case 5:
-                _yield$readSchemas5 = _context5.sent;
-                schemas = _yield$readSchemas5.schemas;
-                _context5.next = 9;
-                return (0, _messageComposer["default"])(contract.name, schemas, this.outPath, options);
+                contractInfo = _context5.sent;
+                _context5.next = 8;
+                return (0, _messageComposer["default"])(contract.name, contractInfo, this.outPath, options);
 
-              case 9:
+              case 8:
                 files = _context5.sent;
                 [].push.apply(this.files, files);
 
-              case 11:
+              case 10:
               case "end":
                 return _context5.stop();
             }

package/main/generators/client.js

@@ -38,16 +38,17 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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, tsClientOptions) {
-    var context, options, localname, TypesFile, QueryMsg, ExecuteMsg, typeHash, Client, Instance, QueryClient, ReadOnlyInstance, body, children, imports, code;
+  var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(name, contractInfo, outPath, tsClientOptions) {
+    var schemas, context, localname, TypesFile, QueryMsg, ExecuteMsg, typeHash, Client, Instance, QueryClient, ReadOnlyInstance, body, children, imports, 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), {
+            schemas = contractInfo.schemas;
+            context = new w.RenderContext(contractInfo, {
               client: tsClientOptions !== null && tsClientOptions !== void 0 ? tsClientOptions : {}
-            });
-            options = context.options.client;
+            }); // const options = context.options.client;
+
             localname = (0, _case.pascal)(name) + '.client.ts';
             TypesFile = (0, _case.pascal)(name) + '.types';
             QueryMsg = (0, _utils.findQueryMsg)(schemas);

package/main/generators/message-composer.js

@@ -38,16 +38,17 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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, messageComposerOptions) {
-    var context, options, localname, TypesFile, ExecuteMsg, typeHash, body, children, TheClass, Interface, imports, code;
+  var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(name, contractInfo, outPath, messageComposerOptions) {
+    var schemas, context, localname, TypesFile, ExecuteMsg, typeHash, body, children, TheClass, Interface, imports, 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), {
+            schemas = contractInfo.schemas;
+            context = new w.RenderContext(contractInfo, {
               messageComposer: messageComposerOptions !== null && messageComposerOptions !== void 0 ? messageComposerOptions : {}
-            });
-            options = context.options.messageComposer;
+            }); // const options = context.options.messageComposer;
+
             localname = (0, _case.pascal)(name) + '.message-composer.ts';
             TypesFile = (0, _case.pascal)(name) + '.types';
             ExecuteMsg = (0, _utils.findExecuteMsg)(schemas);

package/main/generators/react-query.js

@@ -38,13 +38,14 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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, reactQueryOptions) {
-    var context, options, localname, ContractFile, TypesFile, QueryMsg, ExecuteMsg, typeHash, ExecuteClient, QueryClient, body, clientImports, shouldGenerateMutationHooks, imports, code;
+  var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(contractName, contractInfo, outPath, reactQueryOptions) {
+    var schemas, context, options, localname, ContractFile, TypesFile, QueryMsg, ExecuteMsg, typeHash, ExecuteClient, QueryClient, body, clientImports, shouldGenerateMutationHooks, imports, 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), {
+            schemas = contractInfo.schemas;
+            context = new w.RenderContext(contractInfo, {
               reactQuery: reactQueryOptions !== null && reactQueryOptions !== void 0 ? reactQueryOptions : {}
             });
             options = context.options.reactQuery;
@@ -53,10 +54,10 @@ var _default = /*#__PURE__*/function () {
             TypesFile = (0, _case.pascal)("".concat(contractName)) + '.types';
             QueryMsg = (0, _utils.findQueryMsg)(schemas);
             ExecuteMsg = (0, _utils.findExecuteMsg)(schemas);
-            _context.next = 9;
+            _context.next = 10;
             return (0, _utils.findAndParseTypes)(schemas);
 
-          case 9:
+          case 10:
             typeHash = _context.sent;
             ExecuteClient = (0, _case.pascal)("".concat(contractName, "Client"));
             QueryClient = (0, _case.pascal)("".concat(contractName, "QueryClient"));
@@ -108,7 +109,7 @@ var _default = /*#__PURE__*/function () {
               filename: (0, _path.join)(outPath, localname)
             }]);
 
-          case 27:
+          case 28:
           case "end":
             return _context.stop();
         }

package/main/generators/recoil.js

@@ -38,13 +38,14 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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, recoilOptions) {
-    var context, options, localname, ContractFile, TypesFile, QueryMsg, typeHash, QueryClient, ReadOnlyInstance, body, imports, code;
+  var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(name, contractInfo, outPath, recoilOptions) {
+    var schemas, context, options, localname, ContractFile, TypesFile, QueryMsg, typeHash, QueryClient, ReadOnlyInstance, body, imports, 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), {
+            schemas = contractInfo.schemas;
+            context = new w.RenderContext(contractInfo, {
               recoil: recoilOptions !== null && recoilOptions !== void 0 ? recoilOptions : {}
             });
             options = context.options.recoil;
@@ -52,10 +53,10 @@ var _default = /*#__PURE__*/function () {
             ContractFile = (0, _case.pascal)(name) + '.client';
             TypesFile = (0, _case.pascal)(name) + '.types';
             QueryMsg = (0, _utils.findQueryMsg)(schemas);
-            _context.next = 8;
+            _context.next = 9;
             return (0, _utils.findAndParseTypes)(schemas);
 
-          case 8:
+          case 9:
             typeHash = _context.sent;
             QueryClient = null;
             ReadOnlyInstance = null;
@@ -87,7 +88,7 @@ var _default = /*#__PURE__*/function () {
               filename: (0, _path.join)(outPath, localname)
             }]);
 
-          case 21:
+          case 22:
           case "end":
             return _context.stop();
         }

package/main/generators/types.js

@@ -40,22 +40,23 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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, tsTypesOptions) {
-    var context, options, localname, ExecuteMsg, typeHash, body, imports, code, filename;
+  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;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            context = new _wasmAstTypes.RenderContext((0, _utils.getDefinitionSchema)(schemas), {
+            schemas = contractInfo.schemas;
+            context = new _wasmAstTypes.RenderContext(contractInfo, {
               types: tsTypesOptions !== null && tsTypesOptions !== void 0 ? tsTypesOptions : {}
             });
             options = context.options.types;
             localname = (0, _case.pascal)(name) + '.types.ts';
             ExecuteMsg = (0, _utils.findExecuteMsg)(schemas);
-            _context.next = 6;
+            _context.next = 7;
             return (0, _utils.findAndParseTypes)(schemas);
 
-          case 6:
+          case 7:
             typeHash = _context.sent;
             body = []; // TYPES
 
@@ -79,7 +80,7 @@ var _default = /*#__PURE__*/function () {
               filename: filename
             }]);
 
-          case 16:
+          case 17:
           case "end":
             return _context.stop();
         }

package/main/utils/schemas.js

@@ -5,12 +5,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.readSchemas = exports.getDefinitionSchema = exports.findQueryMsg = exports.findExecuteMsg = exports.findAndParseTypes = void 0;
+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");
@@ -27,7 +29,6 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 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 () {
@@ -87,13 +88,14 @@ var readSchemas = /*#__PURE__*/function () {
 
           case 14:
             return _context.abrupt("return", {
-              schemas: Object.values(fn({
+              schemas: [].concat((0, _toConsumableArray2["default"])(Object.values(fn({
                 instantiate: instantiate,
                 execute: execute,
                 query: query,
                 migrate: migrate,
                 sudo: sudo
-              })).filter(Boolean),
+              })).filter(Boolean)), (0, _toConsumableArray2["default"])(Object.values(fn(_objectSpread({}, responses))).filter(Boolean))),
+              responses: responses,
               idlObject: idlObject
             });
 
@@ -185,18 +187,4 @@ var findAndParseTypes = /*#__PURE__*/function () {
   };
 }();
 
-exports.findAndParseTypes = findAndParseTypes;
-
-var getDefinitionSchema = function getDefinitionSchema(schemas) {
-  var aggregateSchema = {
-    definitions: {//
-    }
-  };
-  schemas.forEach(function (schema) {
-    schema.definitions = schema.definitions || {};
-    aggregateSchema.definitions = _objectSpread(_objectSpread({}, aggregateSchema.definitions), schema.definitions);
-  });
-  return aggregateSchema;
-};
-
-exports.getDefinitionSchema = getDefinitionSchema;
+exports.findAndParseTypes = findAndParseTypes;

package/module/builder/builder.js

@@ -77,12 +77,10 @@ export class TSBuilder {
           options = _objectWithoutProperties(_this$options$types, _excluded);
 
     if (!enabled) return;
-    const {
-      schemas
-    } = await readSchemas({
+    const contractInfo = await readSchemas({
       schemaDir: contract.dir
     });
-    const files = await generateTypes(contract.name, schemas, this.outPath, options);
+    const files = await generateTypes(contract.name, contractInfo, this.outPath, options);
     [].push.apply(this.files, files);
   }
 
@@ -94,12 +92,10 @@ export class TSBuilder {
           options = _objectWithoutProperties(_this$options$client, _excluded2);
 
     if (!enabled) return;
-    const {
-      schemas
-    } = await readSchemas({
+    const contractInfo = await readSchemas({
       schemaDir: contract.dir
     });
-    const files = await generateClient(contract.name, schemas, this.outPath, options);
+    const files = await generateClient(contract.name, contractInfo, this.outPath, options);
     [].push.apply(this.files, files);
   }
 
@@ -111,12 +107,10 @@ export class TSBuilder {
           options = _objectWithoutProperties(_this$options$recoil, _excluded3);
 
     if (!enabled) return;
-    const {
-      schemas
-    } = await readSchemas({
+    const contractInfo = await readSchemas({
       schemaDir: contract.dir
     });
-    const files = await generateRecoil(contract.name, schemas, this.outPath, options);
+    const files = await generateRecoil(contract.name, contractInfo, this.outPath, options);
     [].push.apply(this.files, files);
   }
 
@@ -128,12 +122,10 @@ export class TSBuilder {
           options = _objectWithoutProperties(_this$options$reactQu, _excluded4);
 
     if (!enabled) return;
-    const {
-      schemas
-    } = await readSchemas({
+    const contractInfo = await readSchemas({
       schemaDir: contract.dir
     });
-    const files = await generateReactQuery(contract.name, schemas, this.outPath, options);
+    const files = await generateReactQuery(contract.name, contractInfo, this.outPath, options);
     [].push.apply(this.files, files);
   }
 
@@ -145,12 +137,10 @@ export class TSBuilder {
           options = _objectWithoutProperties(_this$options$message, _excluded5);
 
     if (!enabled) return;
-    const {
-      schemas
-    } = await readSchemas({
+    const contractInfo = await readSchemas({
       schemaDir: contract.dir
     });
-    const files = await generateMessageComposer(contract.name, schemas, this.outPath, options);
+    const files = await generateMessageComposer(contract.name, contractInfo, this.outPath, options);
     [].push.apply(this.files, files);
   }
 

package/module/generators/client.js

@@ -7,13 +7,16 @@ import * as t from '@babel/types';
 import { writeFileSync } from 'fs';
 import generate from "@babel/generator";
 import { getMessageProperties } from "wasm-ast-types";
-import { findAndParseTypes, findExecuteMsg, findQueryMsg, getDefinitionSchema } from '../utils';
+import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
 import { RenderContext } from "wasm-ast-types";
-export default (async (name, schemas, outPath, tsClientOptions) => {
-  const context = new RenderContext(getDefinitionSchema(schemas), {
+export default (async (name, contractInfo, outPath, tsClientOptions) => {
+  const {
+    schemas
+  } = contractInfo;
+  const context = new RenderContext(contractInfo, {
     client: tsClientOptions ?? {}
-  });
-  const options = context.options.client;
+  }); // const options = context.options.client;
+
   const localname = pascal(name) + '.client.ts';
   const TypesFile = pascal(name) + '.types';
   const QueryMsg = findQueryMsg(schemas);

package/module/generators/message-composer.js

@@ -7,13 +7,16 @@ import * as t from '@babel/types';
 import { writeFileSync } from 'fs';
 import generate from "@babel/generator";
 import { getMessageProperties } from "wasm-ast-types";
-import { findAndParseTypes, findExecuteMsg, getDefinitionSchema } from "../utils";
+import { findAndParseTypes, findExecuteMsg } from "../utils";
 import { RenderContext } from "wasm-ast-types";
-export default (async (name, schemas, outPath, messageComposerOptions) => {
-  const context = new RenderContext(getDefinitionSchema(schemas), {
+export default (async (name, contractInfo, outPath, messageComposerOptions) => {
+  const {
+    schemas
+  } = contractInfo;
+  const context = new RenderContext(contractInfo, {
     messageComposer: messageComposerOptions ?? {}
-  });
-  const options = context.options.messageComposer;
+  }); // const options = context.options.messageComposer;
+
   const localname = pascal(name) + '.message-composer.ts';
   const TypesFile = pascal(name) + '.types';
   const ExecuteMsg = findExecuteMsg(schemas);

package/module/generators/react-query.js

@@ -7,10 +7,13 @@ import { RenderContext } from 'wasm-ast-types';
 import * as t from '@babel/types';
 import { writeFileSync } from 'fs';
 import generate from "@babel/generator";
-import { findAndParseTypes, findExecuteMsg, findQueryMsg, getDefinitionSchema } from '../utils';
+import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
 import { getMessageProperties } from "wasm-ast-types";
-export default (async (contractName, schemas, outPath, reactQueryOptions) => {
-  const context = new RenderContext(getDefinitionSchema(schemas), {
+export default (async (contractName, contractInfo, outPath, reactQueryOptions) => {
+  const {
+    schemas
+  } = contractInfo;
+  const context = new RenderContext(contractInfo, {
     reactQuery: reactQueryOptions ?? {}
   });
   const options = context.options.reactQuery;

package/module/generators/recoil.js

@@ -6,10 +6,13 @@ 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, getDefinitionSchema } from "../utils";
+import { findAndParseTypes, findQueryMsg } from "../utils";
 import { RenderContext } from "wasm-ast-types";
-export default (async (name, schemas, outPath, recoilOptions) => {
-  const context = new RenderContext(getDefinitionSchema(schemas), {
+export default (async (name, contractInfo, outPath, recoilOptions) => {
+  const {
+    schemas
+  } = contractInfo;
+  const context = new RenderContext(contractInfo, {
     recoil: recoilOptions ?? {}
   });
   const options = context.options.recoil;

package/module/generators/types.js

@@ -6,10 +6,13 @@ import * as t from '@babel/types';
 import { writeFileSync } from 'fs';
 import generate from "@babel/generator";
 import { clean } from "../utils/clean";
-import { findAndParseTypes, findExecuteMsg, getDefinitionSchema } from '../utils';
+import { findAndParseTypes, findExecuteMsg } from '../utils';
 import { RenderContext } from "wasm-ast-types";
-export default (async (name, schemas, outPath, tsTypesOptions) => {
-  const context = new RenderContext(getDefinitionSchema(schemas), {
+export default (async (name, contractInfo, outPath, tsTypesOptions) => {
+  const {
+    schemas
+  } = contractInfo;
+  const context = new RenderContext(contractInfo, {
     types: tsTypesOptions ?? {}
   });
   const options = context.options.types;

package/module/utils/schemas.js

@@ -10,7 +10,6 @@ import { cleanse } from './cleanse';
 import { compile } from '@pyramation/json-schema-to-typescript';
 import { parser } from './parse';
 ;
-;
 export const readSchemas = async ({
   schemaDir,
   clean = true
@@ -57,13 +56,14 @@ export const readSchemas = async ({
 
 
   return {
-    schemas: Object.values(fn({
+    schemas: [...Object.values(fn({
       instantiate,
       execute,
       query,
       migrate,
       sudo
-    })).filter(Boolean),
+    })).filter(Boolean), ...Object.values(fn(_objectSpread({}, responses))).filter(Boolean)],
+    responses,
     idlObject
   };
 };
@@ -94,15 +94,4 @@ 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.14.2",
+  "version": "0.15.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",
@@ -94,7 +94,7 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.9.0"
+    "wasm-ast-types": "^0.10.0"
   },
-  "gitHead": "f1b4bb730177be7342b0867c162cc7edf5ce3a29"
+  "gitHead": "94c5785d947e329df1cc9108cc33bb7a0c21af60"
 }

package/main/types.js

@@ -1 +0,0 @@
-"use strict";

package/module/types.js

@@ -1 +0,0 @@
-export {};