wasm-ast-types 0.9.0 → 0.11.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,15 @@ 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 _utils = require("../../utils");
+
+var ctx = (0, _testUtils.makeContext)(_arrays["default"]);
+it('getPropertyType', function () {
+  var ast = (0, _utils.getPropertyType)(ctx, _arrays["default"].oneOf[0].properties.update_edges, 'edges3');
+  (0, _testUtils.expectCode)(ast.type); // printCode(ast.type)
+});
 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"])));