wasm-ast-types 0.9.0 → 0.10.0

package/main/client/client.js

@@ -33,7 +33,7 @@ exports.FIXED_EXECUTE_PARAMS = FIXED_EXECUTE_PARAMS;
 var createWasmQueryMethod = function createWasmQueryMethod(context, jsonschema) {
   var underscoreName = Object.keys(jsonschema.properties)[0];
   var methodName = (0, _case.camel)(underscoreName);
-  var responseType = (0, _case.pascal)("".concat(methodName, "Response"));
+  var responseType = (0, _types2.getResponseType)(context, underscoreName);
   var obj = (0, _types2.createTypedObjectParams)(context, jsonschema.properties[underscoreName]);
   var args = getWasmMethodArgs(context, jsonschema.properties[underscoreName]);
   var actionArg = t.objectProperty(t.identifier(underscoreName), t.objectExpression(args));
@@ -174,7 +174,7 @@ var createQueryInterface = function createQueryInterface(context, className, que
   var methods = (0, _utils.getMessageProperties)(queryMsg).map(function (jsonschema) {
     var underscoreName = Object.keys(jsonschema.properties)[0];
     var methodName = (0, _case.camel)(underscoreName);
-    var responseType = (0, _case.pascal)("".concat(methodName, "Response"));
+    var responseType = (0, _types2.getResponseType)(context, underscoreName);
     return createPropertyFunctionWithObjectParams(context, methodName, responseType, jsonschema.properties[underscoreName]);
   });
   return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(className), null, [], t.tSInterfaceBody([t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword()))].concat((0, _toConsumableArray2["default"])(methods)))));

package/main/client/test/ts-client.arrays-ref.spec.js

@@ -6,11 +6,9 @@ var _arraysRef = _interopRequireDefault(require("../../../../../__fixtures__/mis
 
 var _client = require("../client");
 
-var _context = require("../../context");
-
 var _testUtils = require("../../../test-utils");
 
-var ctx = new _context.RenderContext(_arraysRef["default"]);
+var ctx = (0, _testUtils.makeContext)(_arraysRef["default"]);
 it('execute_msg_for__empty', function () {
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _arraysRef["default"]));
 });

package/main/client/test/ts-client.arrays.spec.js

@@ -6,11 +6,9 @@ var _arrays = _interopRequireDefault(require("../../../../../__fixtures__/misc/s
 
 var _client = require("../client");
 
-var _context = require("../../context");
-
 var _testUtils = require("../../../test-utils");
 
-var ctx = new _context.RenderContext(_arrays["default"]);
+var ctx = (0, _testUtils.makeContext)(_arrays["default"]);
 it('execute_msg_for__empty', function () {
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _arrays["default"]));
 });

package/main/client/test/ts-client.cw-named-groups.test.js

@@ -6,11 +6,9 @@ var _execute_msg = _interopRequireDefault(require("../../../../../__fixtures__/d
 
 var _client = require("../client");
 
-var _context = require("../../context");
-
 var _testUtils = require("../../../test-utils");
 
-var ctx = new _context.RenderContext(_execute_msg["default"]);
+var ctx = (0, _testUtils.makeContext)(_execute_msg["default"]);
 it('execute_msg', function () {
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _execute_msg["default"]));
 });

package/main/client/test/ts-client.cw-proposal-single.test.js

@@ -8,23 +8,21 @@ var _query_msg = _interopRequireDefault(require("../../../../../__fixtures__/dao
 
 var _client = require("../client");
 
-var _context = require("../../context");
-
 var _testUtils = require("../../../test-utils");
 
 it('execute_msg_for', function () {
-  var ctx = new _context.RenderContext(_execute_msg["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _execute_msg["default"]));
 });
 it('query classes', function () {
-  var ctx = new _context.RenderContext(_query_msg["default"]);
+  var ctx = (0, _testUtils.makeContext)(_query_msg["default"]);
   (0, _testUtils.expectCode)((0, _client.createQueryClass)(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', _query_msg["default"]));
 });
 it('execute classes array types', function () {
-  var ctx = new _context.RenderContext(_execute_msg["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg["default"]);
   (0, _testUtils.expectCode)((0, _client.createExecuteClass)(ctx, 'SG721Client', 'SG721Instance', null, _execute_msg["default"]));
 });
 it('execute interfaces no extends', function () {
-  var ctx = new _context.RenderContext(_execute_msg["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg["default"]);
   (0, _testUtils.expectCode)((0, _client.createExecuteInterface)(ctx, 'SG721Instance', null, _execute_msg["default"]));
 });

package/main/client/test/ts-client.empty-enums.spec.js

@@ -6,11 +6,9 @@ var _query_msg = _interopRequireDefault(require("../../../../../__fixtures__/dao
 
 var _client = require("../client");
 
-var _context = require("../../context");
-
 var _testUtils = require("../../../test-utils");
 
-var ctx = new _context.RenderContext(_query_msg["default"]);
+var ctx = (0, _testUtils.makeContext)(_query_msg["default"]);
 it('query classes', function () {
   (0, _testUtils.expectCode)((0, _client.createQueryClass)(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', _query_msg["default"]));
 });

package/main/client/test/ts-client.issues.test.js

@@ -10,8 +10,6 @@ var _testUtils = require("../../../test-utils");
 
 var _client = require("../client");
 
-var _context5 = require("../../context");
-
 var _jestInCase = _interopRequireDefault(require("jest-in-case"));
 
 var contracts = (0, _testUtils.globContracts)('issues/55');
@@ -22,7 +20,7 @@ var contracts = (0, _testUtils.globContracts)('issues/55');
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            ctx = new _context5.RenderContext(opts.content);
+            ctx = (0, _testUtils.makeContext)(opts.content);
             (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, opts.content));
 
           case 2:
@@ -44,7 +42,7 @@ var contracts = (0, _testUtils.globContracts)('issues/55');
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            ctx = new _context5.RenderContext(opts.content);
+            ctx = (0, _testUtils.makeContext)(opts.content);
             (0, _testUtils.expectCode)((0, _client.createQueryClass)(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', opts.content));
 
           case 2:
@@ -66,7 +64,7 @@ var contracts = (0, _testUtils.globContracts)('issues/55');
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            ctx = new _context5.RenderContext(opts.content);
+            ctx = (0, _testUtils.makeContext)(opts.content);
             (0, _testUtils.expectCode)((0, _client.createExecuteClass)(ctx, 'SG721Client', 'SG721Instance', null, opts.content));
 
           case 2:
@@ -88,7 +86,7 @@ var contracts = (0, _testUtils.globContracts)('issues/55');
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
-            ctx = new _context5.RenderContext(opts.content);
+            ctx = (0, _testUtils.makeContext)(opts.content);
             (0, _testUtils.expectCode)((0, _client.createExecuteInterface)(ctx, 'SG721Instance', null, opts.content));
 
           case 2:

package/main/client/test/ts-client.sg721.spec.js

@@ -6,11 +6,9 @@ var _execute_msg_for__empty = _interopRequireDefault(require("../../../../../__f
 
 var _client = require("../client");
 
-var _context = require("../../context");
-
 var _testUtils = require("../../../test-utils");
 
-var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
 it('execute_msg_for__empty', function () {
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _execute_msg_for__empty["default"]));
 });

package/main/client/test/ts-client.spec.js

@@ -32,75 +32,73 @@ var _tokens_response = _interopRequireDefault(require("../../../../../__fixtures
 
 var _client = require("../client");
 
-var _context = require("../../context");
-
 var _testUtils = require("../../../test-utils");
 
 it('approval_response', function () {
-  var ctx = new _context.RenderContext(_approval_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_approval_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _approval_response["default"]));
 });
 it('all_nft_info_response', function () {
-  var ctx = new _context.RenderContext(_all_nft_info_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_all_nft_info_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _all_nft_info_response["default"]));
 });
 it('approvals_response', function () {
-  var ctx = new _context.RenderContext(_approvals_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_approvals_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _approvals_response["default"]));
 });
 it('collection_info_response', function () {
-  var ctx = new _context.RenderContext(_collection_info_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_collection_info_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _collection_info_response["default"]));
 });
 it('contract_info_response', function () {
-  var ctx = new _context.RenderContext(_contract_info_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_contract_info_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _contract_info_response["default"]));
 });
 it('instantiate_msg', function () {
-  var ctx = new _context.RenderContext(_instantiate_msg["default"]);
+  var ctx = (0, _testUtils.makeContext)(_instantiate_msg["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _instantiate_msg["default"]));
 });
 it('nft_info_response', function () {
-  var ctx = new _context.RenderContext(_nft_info_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_nft_info_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _nft_info_response["default"]));
 });
 it('num_tokens_response', function () {
-  var ctx = new _context.RenderContext(_num_tokens_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_num_tokens_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _num_tokens_response["default"]));
 });
 it('operators_response', function () {
-  var ctx = new _context.RenderContext(_operators_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_operators_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _operators_response["default"]));
 });
 it('owner_of_response', function () {
-  var ctx = new _context.RenderContext(_owner_of_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_owner_of_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _owner_of_response["default"]));
 });
 it('tokens_response', function () {
-  var ctx = new _context.RenderContext(_tokens_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_tokens_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _tokens_response["default"]));
 });
 it('query classes', function () {
-  var ctx = new _context.RenderContext(_query_msg["default"]);
+  var ctx = (0, _testUtils.makeContext)(_query_msg["default"]);
   (0, _testUtils.expectCode)((0, _client.createQueryClass)(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', _query_msg["default"]));
 });
 it('execute classes', function () {
-  var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _client.createExecuteClass)(ctx, 'SG721Client', 'SG721Instance', 'SG721QueryClient', _execute_msg_for__empty["default"]));
 });
 it('execute classes no extends', function () {
-  var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _client.createExecuteClass)(ctx, 'SG721Client', 'SG721Instance', null, _execute_msg_for__empty["default"]));
 });
 it('execute classes array types', function () {
-  var ctx = new _context.RenderContext(_execute_msg["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg["default"]);
   (0, _testUtils.expectCode)((0, _client.createExecuteClass)(ctx, 'SG721Client', 'SG721Instance', null, _execute_msg["default"]));
 });
 it('execute interfaces no extends', function () {
-  var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _client.createExecuteInterface)(ctx, 'SG721Instance', null, _execute_msg_for__empty["default"]));
 });
 it('query interfaces', function () {
-  var ctx = new _context.RenderContext(_query_msg["default"]);
+  var ctx = (0, _testUtils.makeContext)(_query_msg["default"]);
   (0, _testUtils.expectCode)((0, _client.createQueryInterface)(ctx, 'SG721ReadOnlyInstance', _query_msg["default"]));
 });

package/main/client/test/ts-client.vectis.spec.js

@@ -14,43 +14,41 @@ var _relay_transaction = _interopRequireDefault(require("../../../../../__fixtur
 
 var _client = require("../client");
 
-var _context = require("../../context");
-
 var _testUtils = require("../../../test-utils");
 
 it('cosmos_msg_for__empty', function () {
-  var ctx = new _context.RenderContext(_cosmos_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_cosmos_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _cosmos_msg_for__empty["default"]));
 });
 it('execute_msg_for__empty', function () {
-  var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _execute_msg_for__empty["default"]));
 });
 it('can_execute_relay_response', function () {
-  var ctx = new _context.RenderContext(_can_execute_relay_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_can_execute_relay_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _can_execute_relay_response["default"]));
 });
 it('info_response', function () {
-  var ctx = new _context.RenderContext(_info_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_info_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _info_response["default"]));
 });
 it('relay_transaction', function () {
-  var ctx = new _context.RenderContext(_relay_transaction["default"]);
+  var ctx = (0, _testUtils.makeContext)(_relay_transaction["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _relay_transaction["default"]));
 });
 it('query classes', function () {
-  var ctx = new _context.RenderContext(_cosmos_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_cosmos_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _client.createQueryClass)(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', _cosmos_msg_for__empty["default"]));
 });
 it('query classes', function () {
-  var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _client.createQueryClass)(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', _execute_msg_for__empty["default"]));
 });
 it('execute classes array types', function () {
-  var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _client.createExecuteClass)(ctx, 'SG721Client', 'SG721Instance', null, _execute_msg_for__empty["default"]));
 });
 it('execute interfaces no extends', function () {
-  var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _client.createExecuteInterface)(ctx, 'SG721Instance', null, _execute_msg_for__empty["default"]));
 });

package/main/context/context.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.defaultOptions = exports.RenderContext = void 0;
+exports.getDefinitionSchema = exports.defaultOptions = exports.RenderContext = void 0;
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
@@ -17,6 +17,11 @@ var _imports = require("./imports");
 
 var _deepmerge = _interopRequireDefault(require("deepmerge"));
 
+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 defaultOptions = {
   types: {
     enabled: true,
@@ -42,12 +47,28 @@ var defaultOptions = {
 };
 exports.defaultOptions = defaultOptions;
 
+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;
+
 var RenderContext = /*#__PURE__*/function () {
-  function RenderContext(schema, options) {
+  function RenderContext(contract, options) {
     (0, _classCallCheck2["default"])(this, RenderContext);
-    (0, _defineProperty2["default"])(this, "schema", void 0);
+    (0, _defineProperty2["default"])(this, "contract", void 0);
     (0, _defineProperty2["default"])(this, "utils", []);
-    this.schema = schema;
+    (0, _defineProperty2["default"])(this, "schema", void 0);
+    this.contract = contract;
+    this.schema = getDefinitionSchema(contract.schemas);
     this.options = (0, _deepmerge["default"])(defaultOptions, options !== null && options !== void 0 ? options : {});
   }
 

package/main/message-composer/message-composer.spec.js

@@ -6,15 +6,13 @@ var _execute_msg_for__empty = _interopRequireDefault(require("../../../../__fixt
 
 var _messageComposer = require("./message-composer");
 
-var _context = require("../context");
-
 var _testUtils = require("../../test-utils");
 
 it('execute classes', function () {
-  var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _messageComposer.createMessageComposerClass)(ctx, 'SG721MessageComposer', 'SG721Message', _execute_msg_for__empty["default"]));
 });
 it('createMessageComposerInterface', function () {
-  var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _messageComposer.createMessageComposerInterface)(ctx, 'SG721Message', _execute_msg_for__empty["default"]));
 });

package/main/react-query/react-query.js

@@ -64,7 +64,7 @@ var createReactQueryHooks = function createReactQueryHooks(_ref) {
 
     var hookName = "use".concat(hookParamsTypeName); // listVotersResponse
 
-    var responseType = (0, _case.pascal)("".concat(methodName, "Response")); // cw3FlexMultisigListVoters
+    var responseType = (0, _types2.getResponseType)(context, underscoreName); // cw3FlexMultisigListVoters
 
     var getterKey = (0, _case.camel)("".concat(contractName).concat((0, _case.pascal)(methodName)));
     var jsonschema = schema.properties[underscoreName];

package/main/react-query/react-query.spec.js

@@ -10,8 +10,6 @@ var _query_msg = _interopRequireDefault(require("../../../../__fixtures__/basic/
 
 var _execute_msg_for__empty = _interopRequireDefault(require("../../../../__fixtures__/basic/execute_msg_for__empty.json"));
 
-var _context = require("../context");
-
 var _reactQuery = require("./react-query");
 
 var _testUtils = require("../../test-utils");
@@ -20,8 +18,8 @@ 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 execCtx = new _context.RenderContext(_execute_msg_for__empty["default"]);
-var queryCtx = new _context.RenderContext(_query_msg["default"]);
+var execCtx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
+var queryCtx = (0, _testUtils.makeContext)(_query_msg["default"]);
 it('createReactQueryHooks', function () {
   (0, _testUtils.expectCode)(t.program((0, _reactQuery.createReactQueryHooks)({
     context: queryCtx,
@@ -30,7 +28,7 @@ it('createReactQueryHooks', function () {
     QueryClient: 'Sg721QueryClient'
   })));
   (0, _testUtils.expectCode)(t.program((0, _reactQuery.createReactQueryHooks)({
-    context: new _context.RenderContext(_query_msg["default"], {
+    context: (0, _testUtils.makeContext)(_query_msg["default"], {
       reactQuery: {
         optionalClient: true
       }
@@ -40,7 +38,7 @@ it('createReactQueryHooks', function () {
     QueryClient: 'Sg721QueryClient'
   })));
   (0, _testUtils.expectCode)(t.program((0, _reactQuery.createReactQueryHooks)({
-    context: new _context.RenderContext(_query_msg["default"], {
+    context: (0, _testUtils.makeContext)(_query_msg["default"], {
       reactQuery: {
         version: 'v4'
       }
@@ -50,7 +48,7 @@ it('createReactQueryHooks', function () {
     QueryClient: 'Sg721QueryClient'
   })));
   (0, _testUtils.expectCode)(t.program((0, _reactQuery.createReactQueryHooks)({
-    context: new _context.RenderContext(_query_msg["default"], {
+    context: (0, _testUtils.makeContext)(_query_msg["default"], {
       reactQuery: {
         optionalClient: true,
         version: 'v4'

package/main/recoil/recoil.js

@@ -17,10 +17,9 @@ 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 createRecoilSelector = function createRecoilSelector(context, keyPrefix, QueryClient, methodName) {
+var createRecoilSelector = function createRecoilSelector(context, keyPrefix, QueryClient, methodName, responseType) {
   context.addUtil('selectorFamily');
   var selectorName = (0, _case.camel)("".concat(methodName, "Selector"));
-  var responseType = (0, _case.pascal)("".concat(methodName, "Response"));
   var getterKey = (0, _case.camel)("".concat(keyPrefix).concat((0, _case.pascal)(methodName)));
   return t.exportNamedDeclaration(t.variableDeclaration('const', [t.variableDeclarator(t.identifier(selectorName), (0, _utils.callExpression)(t.identifier('selectorFamily'), [t.objectExpression([t.objectProperty(t.identifier('key'), t.stringLiteral(getterKey)), t.objectProperty(t.identifier('get'), t.arrowFunctionExpression([t.objectPattern([t.objectProperty(t.identifier('params'), t.identifier('params'), false, true), t.restElement(t.identifier('queryClientParams'))])], t.arrowFunctionExpression([t.objectPattern([t.objectProperty(t.identifier('get'), t.identifier('get'), false, true)])], t.blockStatement([t.variableDeclaration('const', [t.variableDeclarator(t.identifier('client'), t.callExpression(t.identifier('get'), [t.callExpression(t.identifier('queryClient'), [t.identifier('queryClientParams')])]))]), t.returnStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(methodName)), [t.spreadElement(t.identifier('params'))])))]), true)))])], t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType)), t.tsIntersectionType([t.tsTypeReference(t.identifier('QueryClientParams')), t.tsTypeLiteral([t.tsPropertySignature(t.identifier('params'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Parameters'), t.tsTypeParameterInstantiation([t.tsIndexedAccessType(t.tsTypeReference(t.identifier(QueryClient)), t.tsLiteralType(t.stringLiteral(methodName)))]))))])])])))]));
 };
@@ -31,7 +30,8 @@ var createRecoilSelectors = function createRecoilSelectors(context, keyPrefix, Q
   return (0, _utils.getMessageProperties)(queryMsg).map(function (schema) {
     var underscoreName = Object.keys(schema.properties)[0];
     var methodName = (0, _case.camel)(underscoreName);
-    return createRecoilSelector(context, keyPrefix, QueryClient, methodName);
+    var responseType = (0, _utils.getResponseType)(context, underscoreName);
+    return createRecoilSelector(context, keyPrefix, QueryClient, methodName, responseType);
   });
 };
 

package/main/recoil/recoil.spec.js

@@ -10,17 +10,15 @@ var _query_msg = _interopRequireDefault(require("../../../../__fixtures__/basic/
 
 var _recoil = require("./recoil");
 
-var _context = require("../context");
-
 var _testUtils = require("../../test-utils");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 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 ctx = new _context.RenderContext(_query_msg["default"]);
+var ctx = (0, _testUtils.makeContext)(_query_msg["default"]);
 it('selector', function () {
-  (0, _testUtils.expectCode)((0, _recoil.createRecoilSelector)(ctx, 'SG721', 'SG721QueryClient', 'governanceModules'));
+  (0, _testUtils.expectCode)((0, _recoil.createRecoilSelector)(ctx, 'SG721', 'SG721QueryClient', 'governanceModules', 'GovernanceModulesResponse'));
 });
 it('selectors', function () {
   (0, _testUtils.expectCode)(t.program((0, _recoil.createRecoilSelectors)(ctx, 'SG721', 'SG721QueryClient', _query_msg["default"])));

package/main/utils/types.js

@@ -9,7 +9,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getParamsTypeAnnotation = exports.createTypedObjectParams = void 0;
 exports.getPropertySignatureFromProp = getPropertySignatureFromProp;
-exports.getTypeFromRef = exports.getType = exports.getPropertyType = void 0;
+exports.getPropertyType = void 0;
+exports.getResponseType = getResponseType;
+exports.getTypeFromRef = exports.getType = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
@@ -27,6 +29,16 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(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 getResponseType(context, underscoreName) {
+  var _context$contract$res, _context$contract, _context$contract$res2, _context$contract$res3;
+
+  var methodName = (0, _case.camel)(underscoreName);
+  return (0, _case.pascal)((_context$contract$res = (_context$contract = context.contract) === null || _context$contract === void 0 ? void 0 : (_context$contract$res2 = _context$contract.responses) === null || _context$contract$res2 === void 0 ? void 0 : (_context$contract$res3 = _context$contract$res2[underscoreName]) === null || _context$contract$res3 === void 0 ? void 0 : _context$contract$res3.title) !== null && _context$contract$res !== void 0 ? _context$contract$res : // after v1.1 is adopted, we can deprecate this and require the above response
+  "".concat(methodName, "Response"));
+}
+
+;
+
 var getTypeStrFromRef = function getTypeStrFromRef($ref) {
   if ($ref !== null && $ref !== void 0 && $ref.startsWith('#/definitions/')) {
     return $ref.replace('#/definitions/', '');

package/module/client/client.js

@@ -1,14 +1,14 @@
 import * as t from '@babel/types';
-import { camel, pascal } from 'case';
+import { camel } from 'case';
 import { bindMethod, typedIdentifier, promiseTypeAnnotation, classDeclaration, classProperty, arrowFunctionExpression, getMessageProperties } from '../utils';
-import { getPropertyType, getType, createTypedObjectParams } from '../utils/types';
+import { getPropertyType, getType, createTypedObjectParams, getResponseType } from '../utils/types';
 import { identifier, propertySignature } from '../utils/babel';
 export const CONSTANT_EXEC_PARAMS = [t.assignmentPattern(identifier('fee', t.tsTypeAnnotation(t.tsUnionType([t.tSNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), false), t.stringLiteral('auto')), identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), identifier('funds', t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))), true)];
 export const FIXED_EXECUTE_PARAMS = [identifier('fee', t.tsTypeAnnotation(t.tsUnionType([t.tsNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), true), identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), identifier('funds', t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))), true)];
 export const createWasmQueryMethod = (context, jsonschema) => {
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
-  const responseType = pascal(`${methodName}Response`);
+  const responseType = getResponseType(context, underscoreName);
   const obj = createTypedObjectParams(context, jsonschema.properties[underscoreName]);
   const args = getWasmMethodArgs(context, jsonschema.properties[underscoreName]);
   const actionArg = t.objectProperty(t.identifier(underscoreName), t.objectExpression(args));
@@ -113,7 +113,7 @@ export const createQueryInterface = (context, className, queryMsg) => {
   const methods = getMessageProperties(queryMsg).map(jsonschema => {
     const underscoreName = Object.keys(jsonschema.properties)[0];
     const methodName = camel(underscoreName);
-    const responseType = pascal(`${methodName}Response`);
+    const responseType = getResponseType(context, underscoreName);
     return createPropertyFunctionWithObjectParams(context, methodName, responseType, jsonschema.properties[underscoreName]);
   });
   return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(className), null, [], t.tSInterfaceBody([t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword())), ...methods])));

package/module/client/test/ts-client.arrays-ref.spec.js

@@ -1,8 +1,7 @@
 import message from '../../../../../__fixtures__/misc/schema/arrays-ref.json';
 import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
-import { RenderContext } from '../../context';
-import { expectCode } from '../../../test-utils';
-const ctx = new RenderContext(message);
+import { expectCode, makeContext } from '../../../test-utils';
+const ctx = makeContext(message);
 it('execute_msg_for__empty', () => {
   expectCode(createTypeInterface(ctx, message));
 });

package/module/client/test/ts-client.arrays.spec.js

@@ -1,8 +1,7 @@
 import message from '../../../../../__fixtures__/misc/schema/arrays.json';
 import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
-import { RenderContext } from '../../context';
-import { expectCode } from '../../../test-utils';
-const ctx = new RenderContext(message);
+import { expectCode, makeContext } from '../../../test-utils';
+const ctx = makeContext(message);
 it('execute_msg_for__empty', () => {
   expectCode(createTypeInterface(ctx, message));
 });

package/module/client/test/ts-client.cw-named-groups.test.js

@@ -1,8 +1,7 @@
 import execute_msg from '../../../../../__fixtures__/daodao/cw-named-groups/execute_msg.json';
 import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
-import { RenderContext } from '../../context';
-import { expectCode } from '../../../test-utils';
-const ctx = new RenderContext(execute_msg);
+import { expectCode, makeContext } from '../../../test-utils';
+const ctx = makeContext(execute_msg);
 it('execute_msg', () => {
   expectCode(createTypeInterface(ctx, execute_msg));
 });

package/module/client/test/ts-client.cw-proposal-single.test.js

@@ -1,21 +1,20 @@
 import execute_msg from '../../../../../__fixtures__/daodao/cw-proposal-single/execute_msg.json';
 import query_msg from '../../../../../__fixtures__/daodao/cw-proposal-single/query_msg.json';
 import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
-import { RenderContext } from '../../context';
-import { expectCode } from '../../../test-utils';
+import { expectCode, makeContext } from '../../../test-utils';
 it('execute_msg_for', () => {
-  const ctx = new RenderContext(execute_msg);
+  const ctx = makeContext(execute_msg);
   expectCode(createTypeInterface(ctx, execute_msg));
 });
 it('query classes', () => {
-  const ctx = new RenderContext(query_msg);
+  const ctx = makeContext(query_msg);
   expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', query_msg));
 });
 it('execute classes array types', () => {
-  const ctx = new RenderContext(execute_msg);
+  const ctx = makeContext(execute_msg);
   expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execute_msg));
 });
 it('execute interfaces no extends', () => {
-  const ctx = new RenderContext(execute_msg);
+  const ctx = makeContext(execute_msg);
   expectCode(createExecuteInterface(ctx, 'SG721Instance', null, execute_msg));
 });

package/module/client/test/ts-client.empty-enums.spec.js

@@ -1,8 +1,7 @@
 import query_msg from '../../../../../__fixtures__/daodao/cw-admin-factory/query_msg.json';
 import { createQueryClass, createQueryInterface } from '../client';
-import { RenderContext } from '../../context';
-import { expectCode } from '../../../test-utils';
-const ctx = new RenderContext(query_msg);
+import { expectCode, makeContext } from '../../../test-utils';
+const ctx = makeContext(query_msg);
 it('query classes', () => {
   expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', query_msg));
 });

package/module/client/test/ts-client.issues.test.js

@@ -1,22 +1,21 @@
-import { globContracts } from '../../../test-utils';
+import { globContracts, makeContext } from '../../../test-utils';
 import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
-import { RenderContext } from '../../context';
 import { expectCode } from '../../../test-utils';
 import cases from 'jest-in-case';
 const contracts = globContracts('issues/55');
 cases('execute_msg_for__empty', async opts => {
-  const ctx = new RenderContext(opts.content);
+  const ctx = makeContext(opts.content);
   expectCode(createTypeInterface(ctx, opts.content));
 }, contracts);
 cases('query classes', async opts => {
-  const ctx = new RenderContext(opts.content);
+  const ctx = makeContext(opts.content);
   expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', opts.content));
 }, contracts);
 cases('execute class', async opts => {
-  const ctx = new RenderContext(opts.content);
+  const ctx = makeContext(opts.content);
   expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, opts.content));
 }, contracts);
 cases('execute interface', async opts => {
-  const ctx = new RenderContext(opts.content);
+  const ctx = makeContext(opts.content);
   expectCode(createExecuteInterface(ctx, 'SG721Instance', null, opts.content));
 }, contracts);

package/module/client/test/ts-client.sg721.spec.js

@@ -1,8 +1,7 @@
 import execute_msg_for__empty from '../../../../../__fixtures__/sg721/execute_msg_for__empty.json';
 import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
-import { RenderContext } from '../../context';
-import { expectCode } from '../../../test-utils';
-const ctx = new RenderContext(execute_msg_for__empty);
+import { expectCode, makeContext } from '../../../test-utils';
+const ctx = makeContext(execute_msg_for__empty);
 it('execute_msg_for__empty', () => {
   expectCode(createTypeInterface(ctx, execute_msg_for__empty));
 });

package/module/client/test/ts-client.spec.js

@@ -13,73 +13,72 @@ import operators_response from '../../../../../__fixtures__/basic/operators_resp
 import owner_of_response from '../../../../../__fixtures__/basic/owner_of_response.json';
 import tokens_response from '../../../../../__fixtures__/basic/tokens_response.json';
 import { createQueryClass, createQueryInterface, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
-import { RenderContext } from '../../context';
-import { expectCode } from '../../../test-utils';
+import { expectCode, makeContext } from '../../../test-utils';
 it('approval_response', () => {
-  const ctx = new RenderContext(approval_response);
+  const ctx = makeContext(approval_response);
   expectCode(createTypeInterface(ctx, approval_response));
 });
 it('all_nft_info_response', () => {
-  const ctx = new RenderContext(all_nft_info_response);
+  const ctx = makeContext(all_nft_info_response);
   expectCode(createTypeInterface(ctx, all_nft_info_response));
 });
 it('approvals_response', () => {
-  const ctx = new RenderContext(approvals_response);
+  const ctx = makeContext(approvals_response);
   expectCode(createTypeInterface(ctx, approvals_response));
 });
 it('collection_info_response', () => {
-  const ctx = new RenderContext(collection_info_response);
+  const ctx = makeContext(collection_info_response);
   expectCode(createTypeInterface(ctx, collection_info_response));
 });
 it('contract_info_response', () => {
-  const ctx = new RenderContext(contract_info_response);
+  const ctx = makeContext(contract_info_response);
   expectCode(createTypeInterface(ctx, contract_info_response));
 });
 it('instantiate_msg', () => {
-  const ctx = new RenderContext(instantiate_msg);
+  const ctx = makeContext(instantiate_msg);
   expectCode(createTypeInterface(ctx, instantiate_msg));
 });
 it('nft_info_response', () => {
-  const ctx = new RenderContext(nft_info_response);
+  const ctx = makeContext(nft_info_response);
   expectCode(createTypeInterface(ctx, nft_info_response));
 });
 it('num_tokens_response', () => {
-  const ctx = new RenderContext(num_tokens_response);
+  const ctx = makeContext(num_tokens_response);
   expectCode(createTypeInterface(ctx, num_tokens_response));
 });
 it('operators_response', () => {
-  const ctx = new RenderContext(operators_response);
+  const ctx = makeContext(operators_response);
   expectCode(createTypeInterface(ctx, operators_response));
 });
 it('owner_of_response', () => {
-  const ctx = new RenderContext(owner_of_response);
+  const ctx = makeContext(owner_of_response);
   expectCode(createTypeInterface(ctx, owner_of_response));
 });
 it('tokens_response', () => {
-  const ctx = new RenderContext(tokens_response);
+  const ctx = makeContext(tokens_response);
   expectCode(createTypeInterface(ctx, tokens_response));
 });
 it('query classes', () => {
-  const ctx = new RenderContext(query_msg);
+  const ctx = makeContext(query_msg);
   expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', query_msg));
 });
 it('execute classes', () => {
-  const ctx = new RenderContext(execute_msg);
+  const ctx = makeContext(execute_msg);
   expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', 'SG721QueryClient', execute_msg));
 });
 it('execute classes no extends', () => {
-  const ctx = new RenderContext(execute_msg);
+  const ctx = makeContext(execute_msg);
   expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execute_msg));
 });
 it('execute classes array types', () => {
-  const ctx = new RenderContext(execute_msg_named_groups);
+  const ctx = makeContext(execute_msg_named_groups);
   expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execute_msg_named_groups));
 });
 it('execute interfaces no extends', () => {
-  const ctx = new RenderContext(execute_msg);
+  const ctx = makeContext(execute_msg);
   expectCode(createExecuteInterface(ctx, 'SG721Instance', null, execute_msg));
 });
 it('query interfaces', () => {
-  const ctx = new RenderContext(query_msg);
+  const ctx = makeContext(query_msg);
   expectCode(createQueryInterface(ctx, 'SG721ReadOnlyInstance', query_msg));
 });

package/module/client/test/ts-client.vectis.spec.js

@@ -4,41 +4,40 @@ import can_execute_relay_response from '../../../../../__fixtures__/vectis/govec
 import info_response from '../../../../../__fixtures__/vectis/govec/info_response.json';
 import relay_transaction from '../../../../../__fixtures__/vectis/govec/relay_transaction.json';
 import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
-import { RenderContext } from '../../context';
-import { expectCode } from '../../../test-utils';
+import { expectCode, makeContext } from '../../../test-utils';
 it('cosmos_msg_for__empty', () => {
-  const ctx = new RenderContext(cosmos_msg_for__empty);
+  const ctx = makeContext(cosmos_msg_for__empty);
   expectCode(createTypeInterface(ctx, cosmos_msg_for__empty));
 });
 it('execute_msg_for__empty', () => {
-  const ctx = new RenderContext(execute_msg_for__empty);
+  const ctx = makeContext(execute_msg_for__empty);
   expectCode(createTypeInterface(ctx, execute_msg_for__empty));
 });
 it('can_execute_relay_response', () => {
-  const ctx = new RenderContext(can_execute_relay_response);
+  const ctx = makeContext(can_execute_relay_response);
   expectCode(createTypeInterface(ctx, can_execute_relay_response));
 });
 it('info_response', () => {
-  const ctx = new RenderContext(info_response);
+  const ctx = makeContext(info_response);
   expectCode(createTypeInterface(ctx, info_response));
 });
 it('relay_transaction', () => {
-  const ctx = new RenderContext(relay_transaction);
+  const ctx = makeContext(relay_transaction);
   expectCode(createTypeInterface(ctx, relay_transaction));
 });
 it('query classes', () => {
-  const ctx = new RenderContext(cosmos_msg_for__empty);
+  const ctx = makeContext(cosmos_msg_for__empty);
   expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', cosmos_msg_for__empty));
 });
 it('query classes', () => {
-  const ctx = new RenderContext(execute_msg_for__empty);
+  const ctx = makeContext(execute_msg_for__empty);
   expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', execute_msg_for__empty));
 });
 it('execute classes array types', () => {
-  const ctx = new RenderContext(execute_msg_for__empty);
+  const ctx = makeContext(execute_msg_for__empty);
   expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execute_msg_for__empty));
 });
 it('execute interfaces no extends', () => {
-  const ctx = new RenderContext(execute_msg_for__empty);
+  const ctx = makeContext(execute_msg_for__empty);
   expectCode(createExecuteInterface(ctx, 'SG721Instance', null, execute_msg_for__empty));
 });

package/module/context/context.js

@@ -1,7 +1,13 @@
 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 { convertUtilsToImportList, getImportStatements } from "./imports";
 import deepmerge from "deepmerge"; /// Plugin Types
 
+;
 export const defaultOptions = {
   types: {
     enabled: true,
@@ -25,13 +31,27 @@ export const defaultOptions = {
     queryKeys: false
   }
 };
+export const getDefinitionSchema = schemas => {
+  const aggregateSchema = {
+    definitions: {//
+    }
+  };
+  schemas.forEach(schema => {
+    schema.definitions = schema.definitions || {};
+    aggregateSchema.definitions = _objectSpread(_objectSpread({}, aggregateSchema.definitions), schema.definitions);
+  });
+  return aggregateSchema;
+};
 export class RenderContext {
-  constructor(schema, options) {
-    _defineProperty(this, "schema", void 0);
+  constructor(contract, options) {
+    _defineProperty(this, "contract", void 0);
 
     _defineProperty(this, "utils", []);
 
-    this.schema = schema;
+    _defineProperty(this, "schema", void 0);
+
+    this.contract = contract;
+    this.schema = getDefinitionSchema(contract.schemas);
     this.options = deepmerge(defaultOptions, options ?? {});
   }
 

package/module/message-composer/message-composer.spec.js

@@ -1,12 +1,11 @@
 import execute_msg from '../../../../__fixtures__/basic/execute_msg_for__empty.json';
 import { createMessageComposerClass, createMessageComposerInterface } from './message-composer';
-import { RenderContext } from '../context';
-import { expectCode } from '../../test-utils';
+import { expectCode, makeContext } from '../../test-utils';
 it('execute classes', () => {
-  const ctx = new RenderContext(execute_msg);
+  const ctx = makeContext(execute_msg);
   expectCode(createMessageComposerClass(ctx, 'SG721MessageComposer', 'SG721Message', execute_msg));
 });
 it('createMessageComposerInterface', () => {
-  const ctx = new RenderContext(execute_msg);
+  const ctx = makeContext(execute_msg);
   expectCode(createMessageComposerInterface(ctx, 'SG721Message', execute_msg));
 });

package/module/react-query/react-query.js

@@ -2,7 +2,7 @@ import * as t from '@babel/types';
 import { camel, pascal } from 'case';
 import { callExpression, getMessageProperties, identifier, tsObjectPattern, tsPropertySignature } from '../utils';
 import { omitTypeReference, optionalConditionalExpression, propertySignature, shorthandProperty } from '../utils/babel';
-import { getParamsTypeAnnotation, getPropertyType } from '../utils/types';
+import { getParamsTypeAnnotation, getPropertyType, getResponseType } from '../utils/types';
 import { FIXED_EXECUTE_PARAMS } from '../client';
 export const createReactQueryHooks = ({
   context,
@@ -40,7 +40,7 @@ export const createReactQueryHooks = ({
 
     const hookName = `use${hookParamsTypeName}`; // listVotersResponse
 
-    const responseType = pascal(`${methodName}Response`); // cw3FlexMultisigListVoters
+    const responseType = getResponseType(context, underscoreName); // cw3FlexMultisigListVoters
 
     const getterKey = camel(`${contractName}${pascal(methodName)}`);
     const jsonschema = schema.properties[underscoreName];

package/module/react-query/react-query.spec.js

@@ -1,11 +1,10 @@
 import * as t from '@babel/types';
 import query_msg from '../../../../__fixtures__/basic/query_msg.json';
 import execute_msg from '../../../../__fixtures__/basic/execute_msg_for__empty.json';
-import { RenderContext } from '../context';
 import { createReactQueryHooks, createReactQueryMutationHooks } from './react-query';
-import { expectCode } from '../../test-utils';
-const execCtx = new RenderContext(execute_msg);
-const queryCtx = new RenderContext(query_msg);
+import { expectCode, makeContext } from '../../test-utils';
+const execCtx = makeContext(execute_msg);
+const queryCtx = makeContext(query_msg);
 it('createReactQueryHooks', () => {
   expectCode(t.program(createReactQueryHooks({
     context: queryCtx,
@@ -14,7 +13,7 @@ it('createReactQueryHooks', () => {
     QueryClient: 'Sg721QueryClient'
   })));
   expectCode(t.program(createReactQueryHooks({
-    context: new RenderContext(query_msg, {
+    context: makeContext(query_msg, {
       reactQuery: {
         optionalClient: true
       }
@@ -24,7 +23,7 @@ it('createReactQueryHooks', () => {
     QueryClient: 'Sg721QueryClient'
   })));
   expectCode(t.program(createReactQueryHooks({
-    context: new RenderContext(query_msg, {
+    context: makeContext(query_msg, {
       reactQuery: {
         version: 'v4'
       }
@@ -34,7 +33,7 @@ it('createReactQueryHooks', () => {
     QueryClient: 'Sg721QueryClient'
   })));
   expectCode(t.program(createReactQueryHooks({
-    context: new RenderContext(query_msg, {
+    context: makeContext(query_msg, {
       reactQuery: {
         optionalClient: true,
         version: 'v4'

package/module/recoil/recoil.js

@@ -1,10 +1,9 @@
 import * as t from '@babel/types';
 import { camel, pascal } from 'case';
-import { callExpression, getMessageProperties } from '../utils';
-export const createRecoilSelector = (context, keyPrefix, QueryClient, methodName) => {
+import { callExpression, getMessageProperties, getResponseType } from '../utils';
+export const createRecoilSelector = (context, keyPrefix, QueryClient, methodName, responseType) => {
   context.addUtil('selectorFamily');
   const selectorName = camel(`${methodName}Selector`);
-  const responseType = pascal(`${methodName}Response`);
   const getterKey = camel(`${keyPrefix}${pascal(methodName)}`);
   return t.exportNamedDeclaration(t.variableDeclaration('const', [t.variableDeclarator(t.identifier(selectorName), callExpression(t.identifier('selectorFamily'), [t.objectExpression([t.objectProperty(t.identifier('key'), t.stringLiteral(getterKey)), t.objectProperty(t.identifier('get'), t.arrowFunctionExpression([t.objectPattern([t.objectProperty(t.identifier('params'), t.identifier('params'), false, true), t.restElement(t.identifier('queryClientParams'))])], t.arrowFunctionExpression([t.objectPattern([t.objectProperty(t.identifier('get'), t.identifier('get'), false, true)])], t.blockStatement([t.variableDeclaration('const', [t.variableDeclarator(t.identifier('client'), t.callExpression(t.identifier('get'), [t.callExpression(t.identifier('queryClient'), [t.identifier('queryClientParams')])]))]), t.returnStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(methodName)), [t.spreadElement(t.identifier('params'))])))]), true)))])], t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType)), t.tsIntersectionType([t.tsTypeReference(t.identifier('QueryClientParams')), t.tsTypeLiteral([t.tsPropertySignature(t.identifier('params'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Parameters'), t.tsTypeParameterInstantiation([t.tsIndexedAccessType(t.tsTypeReference(t.identifier(QueryClient)), t.tsLiteralType(t.stringLiteral(methodName)))]))))])])])))]));
 };
@@ -12,7 +11,8 @@ export const createRecoilSelectors = (context, keyPrefix, QueryClient, queryMsg)
   return getMessageProperties(queryMsg).map(schema => {
     const underscoreName = Object.keys(schema.properties)[0];
     const methodName = camel(underscoreName);
-    return createRecoilSelector(context, keyPrefix, QueryClient, methodName);
+    const responseType = getResponseType(context, underscoreName);
+    return createRecoilSelector(context, keyPrefix, QueryClient, methodName, responseType);
   });
 };
 export const createRecoilQueryClientType = () => ({

package/module/recoil/recoil.spec.js

@@ -1,11 +1,10 @@
 import * as t from '@babel/types';
 import query_msg from '../../../../__fixtures__/basic/query_msg.json';
 import { createRecoilSelector, createRecoilSelectors, createRecoilQueryClient } from './recoil';
-import { RenderContext } from '../context';
-import { expectCode } from '../../test-utils';
-const ctx = new RenderContext(query_msg);
+import { expectCode, makeContext } from '../../test-utils';
+const ctx = makeContext(query_msg);
 it('selector', () => {
-  expectCode(createRecoilSelector(ctx, 'SG721', 'SG721QueryClient', 'governanceModules'));
+  expectCode(createRecoilSelector(ctx, 'SG721', 'SG721QueryClient', 'governanceModules', 'GovernanceModulesResponse'));
 });
 it('selectors', () => {
   expectCode(t.program(createRecoilSelectors(ctx, 'SG721', 'SG721QueryClient', query_msg)));

package/module/utils/types.js

@@ -1,6 +1,12 @@
 import * as t from '@babel/types';
-import { camel } from 'case';
+import { camel, pascal } from 'case';
 import { propertySignature } from './babel';
+export function getResponseType(context, underscoreName) {
+  const methodName = camel(underscoreName);
+  return pascal(context.contract?.responses?.[underscoreName]?.title ?? // after v1.1 is adopted, we can deprecate this and require the above response
+  `${methodName}Response`);
+}
+;
 
 const getTypeStrFromRef = $ref => {
   if ($ref?.startsWith('#/definitions/')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/pyramation/cosmwasm-typescript-gen/tree/master/packages/wasm-ast-types#readme",
@@ -86,5 +86,5 @@
     "case": "1.6.3",
     "deepmerge": "4.2.2"
   },
-  "gitHead": "3b7ca02c9283c346a365d8426d3034af355afcac"
+  "gitHead": "94c5785d947e329df1cc9108cc33bb7a0c21af60"
 }

package/types/context/context.d.ts

@@ -20,6 +20,25 @@ export interface TSTypesOptions {
     enabled?: boolean;
     aliasExecuteMsg?: boolean;
 }
+interface KeyedSchema {
+    [key: string]: JSONSchema;
+}
+export interface IDLObject {
+    contract_name: string;
+    contract_version: string;
+    idl_version: string;
+    instantiate: JSONSchema;
+    execute: JSONSchema;
+    query: JSONSchema;
+    migrate: JSONSchema;
+    sudo: JSONSchema;
+    responses: KeyedSchema;
+}
+export interface ContractInfo {
+    schemas: JSONSchema[];
+    responses?: Record<string, JSONSchema>;
+    idlObject?: IDLObject;
+}
 export interface RenderOptions {
     types?: TSTypesOptions;
     recoil?: RecoilOptions;
@@ -28,15 +47,18 @@ export interface RenderOptions {
     reactQuery?: ReactQueryOptions;
 }
 export interface RenderContext {
-    schema: JSONSchema;
+    contract: ContractInfo;
     options: RenderOptions;
 }
 export declare const defaultOptions: RenderOptions;
+export declare const getDefinitionSchema: (schemas: JSONSchema[]) => JSONSchema;
 export declare class RenderContext implements RenderContext {
-    schema: JSONSchema;
+    contract: ContractInfo;
     utils: string[];
-    constructor(schema: JSONSchema, options?: RenderOptions);
+    schema: JSONSchema;
+    constructor(contract: ContractInfo, options?: RenderOptions);
     refLookup($ref: string): JSONSchema;
     addUtil(util: string): void;
     getImports(): any[];
 }
+export {};

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

@@ -7,6 +7,7 @@ interface ReactQueryHookQuery {
     hookName: string;
     hookParamsTypeName: string;
     hookKeyName: string;
+    queryKeysName: string;
     responseType: string;
     methodName: string;
     jsonschema: any;
@@ -17,8 +18,8 @@ interface ReactQueryHooks {
     contractName: string;
     QueryClient: string;
 }
-export declare const createReactQueryHooks: ({ context, queryMsg, contractName, QueryClient }: ReactQueryHooks) => t.ExportNamedDeclaration[];
-export declare const createReactQueryHook: ({ context, hookName, hookParamsTypeName, responseType, hookKeyName, methodName, jsonschema }: ReactQueryHookQuery) => t.ExportNamedDeclaration;
+export declare const createReactQueryHooks: ({ context, queryMsg, contractName, QueryClient }: ReactQueryHooks) => any[];
+export declare const createReactQueryHook: ({ context, hookName, hookParamsTypeName, responseType, hookKeyName, queryKeysName, methodName, jsonschema }: ReactQueryHookQuery) => t.ExportNamedDeclaration;
 interface ReactQueryMutationHookInterface {
     context: RenderContext;
     ExecuteClient: string;

package/types/recoil/recoil.d.ts

@@ -1,7 +1,7 @@
 import * as t from '@babel/types';
 import { QueryMsg } from '../types';
 import { RenderContext } from '../context';
-export declare const createRecoilSelector: (context: RenderContext, keyPrefix: string, QueryClient: string, methodName: string) => t.ExportNamedDeclaration;
+export declare const createRecoilSelector: (context: RenderContext, keyPrefix: string, QueryClient: string, methodName: string, responseType: string) => t.ExportNamedDeclaration;
 export declare const createRecoilSelectors: (context: RenderContext, keyPrefix: string, QueryClient: string, queryMsg: QueryMsg) => any;
 export declare const createRecoilQueryClientType: () => {
     type: string;

package/types/utils/types.d.ts

@@ -2,6 +2,7 @@ import * as t from '@babel/types';
 import { TSTypeAnnotation } from '@babel/types';
 import { RenderContext } from '../context';
 import { JSONSchema } from '../types';
+export declare function getResponseType(context: RenderContext, underscoreName: string): string;
 export declare const getTypeFromRef: ($ref: any) => t.TSTypeReference;
 export declare const getType: (type: any) => t.TSBooleanKeyword | t.TSNumberKeyword | t.TSStringKeyword;
 export declare const getPropertyType: (context: RenderContext, schema: JSONSchema, prop: string) => {