wasm-ast-types 0.8.1 → 0.10.0

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

@@ -34,17 +34,38 @@ var createReactQueryHooks = function createReactQueryHooks(_ref) {
       QueryClient = _ref.QueryClient;
   var options = context.options.reactQuery;
   var genericQueryInterfaceName = "".concat((0, _case.pascal)(contractName), "ReactQuery");
-  var body = [createReactQueryHookGenericInterface({
+  var underscoreNames = (0, _utils.getMessageProperties)(queryMsg).map(function (schema) {
+    return Object.keys(schema.properties)[0];
+  });
+  var body = [];
+  var queryKeysName = "".concat((0, _case.camel)(contractName), "QueryKeys");
+
+  if (options.queryKeys) {
+    body.push(createReactQueryKeys({
+      context: context,
+      queryKeysName: queryKeysName,
+      camelContractName: (0, _case.camel)(contractName),
+      underscoreNames: underscoreNames
+    }));
+  }
+
+  body.push(createReactQueryHookGenericInterface({
     context: context,
     QueryClient: QueryClient,
     genericQueryInterfaceName: genericQueryInterfaceName
-  })];
+  }));
   body.push.apply(body, (0, _toConsumableArray2["default"])((0, _utils.getMessageProperties)(queryMsg).reduce(function (m, schema) {
-    var underscoreName = Object.keys(schema.properties)[0];
-    var methodName = (0, _case.camel)(underscoreName);
-    var hookParamsTypeName = "".concat((0, _case.pascal)(contractName)).concat((0, _case.pascal)(methodName), "Query");
-    var hookName = "use".concat(hookParamsTypeName);
-    var responseType = (0, _case.pascal)("".concat(methodName, "Response"));
+    // list_voters
+    var underscoreName = Object.keys(schema.properties)[0]; // listVoters
+
+    var methodName = (0, _case.camel)(underscoreName); // Cw3FlexMultisigListVotersQuery
+
+    var hookParamsTypeName = "".concat((0, _case.pascal)(contractName)).concat((0, _case.pascal)(methodName), "Query"); // useCw3FlexMultisigListVotersQuery
+
+    var hookName = "use".concat(hookParamsTypeName); // listVotersResponse
+
+    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];
     return [createReactQueryHookInterface({
@@ -59,6 +80,7 @@ var createReactQueryHooks = function createReactQueryHooks(_ref) {
       methodName: methodName,
       hookName: hookName,
       hookParamsTypeName: hookParamsTypeName,
+      queryKeysName: queryKeysName,
       responseType: responseType,
       hookKeyName: getterKey,
       jsonschema: jsonschema
@@ -77,6 +99,7 @@ var createReactQueryHook = function createReactQueryHook(_ref2) {
       hookParamsTypeName = _ref2.hookParamsTypeName,
       responseType = _ref2.responseType,
       hookKeyName = _ref2.hookKeyName,
+      queryKeysName = _ref2.queryKeysName,
       methodName = _ref2.methodName,
       jsonschema = _ref2.jsonschema;
   context.addUtil('useQuery');
@@ -97,10 +120,20 @@ var createReactQueryHook = function createReactQueryHook(_ref2) {
     props = ['client', 'args', 'options'];
   }
 
-  return t.exportNamedDeclaration(t.functionDeclaration(t.identifier(hookName), [(0, _utils.tsObjectPattern)((0, _toConsumableArray2["default"])(props.map(function (prop) {
+  var selectResponseGenericTypeName = 'TData';
+  var queryFunctionDeclaration = t.functionDeclaration(t.identifier(hookName), [(0, _utils.tsObjectPattern)((0, _toConsumableArray2["default"])(props.map(function (prop) {
     return t.objectProperty(t.identifier(prop), t.identifier(prop), false, true);
-  })), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(hookParamsTypeName))))], t.blockStatement([t.returnStatement((0, _utils.callExpression)(t.identifier('useQuery'), [t.arrayExpression(generateUseQueryQueryKey(hookKeyName, props, options.optionalClient)), t.arrowFunctionExpression([], (0, _babel.optionalConditionalExpression)(t.identifier('client'), t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(methodName)), args), t.callExpression(t.memberExpression(t.identifier('Promise'), t.identifier('reject')), [t.newExpression(t.identifier('Error'), [t.stringLiteral('Invalid client')])]), options.optionalClient), false), options.optionalClient ? t.objectExpression([t.spreadElement(t.identifier('options')), t.objectProperty(t.identifier('enabled'), t.logicalExpression('&&', t.unaryExpression('!', t.unaryExpression('!', t.identifier('client'))), t.conditionalExpression( // explicitly check for undefined
-  t.binaryExpression('!=', t.optionalMemberExpression(t.identifier('options'), t.identifier('enabled'), false, true), t.identifier('undefined')), t.memberExpression(t.identifier('options'), t.identifier('enabled')), t.booleanLiteral(true))))]) : t.identifier('options')], t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(responseType)), t.tsArrayType(t.tsParenthesizedType(t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])))])))])));
+  })), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(hookParamsTypeName), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(selectResponseGenericTypeName))]))))], t.blockStatement([t.returnStatement((0, _utils.callExpression)(t.identifier('useQuery'), [generateUseQueryQueryKey({
+    hookKeyName: hookKeyName,
+    queryKeysName: queryKeysName,
+    methodName: methodName,
+    props: props,
+    options: options
+  }), t.arrowFunctionExpression([], (0, _babel.optionalConditionalExpression)(t.identifier('client'), t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(methodName)), args), t.callExpression(t.memberExpression(t.identifier('Promise'), t.identifier('reject')), [t.newExpression(t.identifier('Error'), [t.stringLiteral('Invalid client')])]), options.optionalClient), false), options.optionalClient ? t.objectExpression([t.spreadElement(t.identifier('options')), t.objectProperty(t.identifier('enabled'), t.logicalExpression('&&', t.unaryExpression('!', t.unaryExpression('!', t.identifier('client'))), t.conditionalExpression( // explicitly check for undefined
+  t.binaryExpression('!=', t.optionalMemberExpression(t.identifier('options'), t.identifier('enabled'), false, true), t.identifier('undefined')), t.memberExpression(t.identifier('options'), t.identifier('enabled')), t.booleanLiteral(true))))]) : t.identifier('options')], t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(selectResponseGenericTypeName))])))])); // Add the TData type parameters
+
+  queryFunctionDeclaration.typeParameters = t.tsTypeParameterDeclaration([t.tsTypeParameter(undefined, t.tSTypeReference(t.identifier(responseType)), selectResponseGenericTypeName)]);
+  return t.exportNamedDeclaration(queryFunctionDeclaration);
 };
 
 exports.createReactQueryHook = createReactQueryHook;
@@ -237,25 +270,52 @@ var createReactQueryMutationHook = function createReactQueryMutationHook(_ref5)
 
 exports.createReactQueryMutationHook = createReactQueryMutationHook;
 
-function createReactQueryHookGenericInterface(_ref6) {
+function createReactQueryKeys(_ref6) {
   var context = _ref6.context,
-      QueryClient = _ref6.QueryClient,
-      genericQueryInterfaceName = _ref6.genericQueryInterfaceName;
+      queryKeysName = _ref6.queryKeysName,
+      camelContractName = _ref6.camelContractName,
+      underscoreNames = _ref6.underscoreNames;
   var options = context.options.reactQuery;
-  var genericTypeName = 'TResponse';
-  context.addUtil('UseQueryOptions');
-  var typedUseQueryOptions = t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(genericTypeName)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(genericTypeName)), t.tsArrayType(t.tsParenthesizedType(t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])))]));
-  var body = [(0, _utils.tsPropertySignature)(t.identifier('client'), t.tsTypeAnnotation(options.optionalClient ? t.tsUnionType([t.tsTypeReference(t.identifier(QueryClient)), t.tsUndefinedKeyword()]) : t.tsTypeReference(t.identifier(QueryClient))), false), (0, _utils.tsPropertySignature)(t.identifier('options'), t.tsTypeAnnotation(options.version === 'v4' ? t.tSIntersectionType([(0, _babel.omitTypeReference)(typedUseQueryOptions, "'queryKey' | 'queryFn' | 'initialData'"), t.tSTypeLiteral([t.tsPropertySignature(t.identifier('initialData?'), t.tsTypeAnnotation(t.tsUndefinedKeyword()))])]) : typedUseQueryOptions), true)];
-  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(genericQueryInterfaceName), t.tsTypeParameterDeclaration([t.tsTypeParameter(undefined, undefined, genericTypeName)]), [], t.tSInterfaceBody(body)));
+  var contractAddressTypeAnnotation = t.tsTypeAnnotation(options.optionalClient ? t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()]) : t.tSStringKeyword());
+  return t.exportNamedDeclaration(t.variableDeclaration('const', [t.variableDeclarator(t.identifier(queryKeysName), t.objectExpression([// 1: contract
+  t.objectProperty(t.identifier('contract'), t.tSAsExpression(t.arrayExpression([t.objectExpression([t.objectProperty(t.identifier('contract'), t.stringLiteral(camelContractName))])]), t.tSTypeReference(t.identifier('const')))), // 2: address
+  t.objectProperty(t.identifier('address'), t.arrowFunctionExpression([(0, _utils.identifier)('contractAddress', contractAddressTypeAnnotation)], t.tSAsExpression(t.arrayExpression([t.objectExpression([// 1
+  t.spreadElement(t.memberExpression(t.memberExpression(t.identifier(queryKeysName), t.identifier('contract')), t.numericLiteral(0), true // computed
+  )), t.objectProperty(t.identifier('address'), t.identifier('contractAddress'))])]), t.tSTypeReference(t.identifier('const')))))].concat((0, _toConsumableArray2["default"])(underscoreNames.map(function (underscoreMethodName) {
+    return t.objectProperty( // key id is the camel method name
+    t.identifier((0, _case.camel)(underscoreMethodName)), t.arrowFunctionExpression([(0, _utils.identifier)('contractAddress', contractAddressTypeAnnotation), (0, _utils.identifier)('args', // Record<string, unknown>
+    t.tSTypeAnnotation(t.tsTypeReference(t.identifier('Record'), t.tsTypeParameterInstantiation([t.tsStringKeyword(), t.tsUnknownKeyword()]))), true // optional
+    )], t.tSAsExpression(t.arrayExpression([t.objectExpression([//...cw3FlexMultisigQueryKeys.address(contractAddress)[0]
+    t.spreadElement(t.memberExpression(t.callExpression(t.memberExpression(t.identifier(queryKeysName), t.identifier('address')), [t.identifier('contractAddress')]), t.numericLiteral(0), true // computed
+    )), // method: list_voters
+    t.objectProperty(t.identifier('method'), t.stringLiteral(underscoreMethodName)), // args
+    (0, _babel.shorthandProperty)('args')])]), t.tSTypeReference(t.identifier('const')))));
+  })))))]));
 }
 
-var createReactQueryHookInterface = function createReactQueryHookInterface(_ref7) {
+function createReactQueryHookGenericInterface(_ref7) {
   var context = _ref7.context,
       QueryClient = _ref7.QueryClient,
-      hookParamsTypeName = _ref7.hookParamsTypeName,
-      queryInterfaceName = _ref7.queryInterfaceName,
-      responseType = _ref7.responseType,
-      jsonschema = _ref7.jsonschema;
+      genericQueryInterfaceName = _ref7.genericQueryInterfaceName;
+  var options = context.options.reactQuery;
+  var genericResponseTypeName = 'TResponse';
+  var genericSelectResponseTypeName = 'TData';
+  context.addUtil('UseQueryOptions'); // UseQueryOptions<TResponse, Error, TData>,
+
+  var typedUseQueryOptions = t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(genericResponseTypeName)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(genericSelectResponseTypeName))]));
+  var body = [(0, _utils.tsPropertySignature)(t.identifier('client'), t.tsTypeAnnotation(options.optionalClient ? t.tsUnionType([t.tsTypeReference(t.identifier(QueryClient)), t.tsUndefinedKeyword()]) : t.tsTypeReference(t.identifier(QueryClient))), false), (0, _utils.tsPropertySignature)(t.identifier('options'), t.tsTypeAnnotation(options.version === 'v4' ? t.tSIntersectionType([(0, _babel.omitTypeReference)(typedUseQueryOptions, "'queryKey' | 'queryFn' | 'initialData'"), t.tSTypeLiteral([t.tsPropertySignature(t.identifier('initialData?'), t.tsTypeAnnotation(t.tsUndefinedKeyword()))])]) : typedUseQueryOptions), true)];
+  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(genericQueryInterfaceName), t.tsTypeParameterDeclaration([// 1: TResponse
+  t.tsTypeParameter(undefined, undefined, genericResponseTypeName), // 2: TData
+  t.tsTypeParameter(undefined, t.tSTypeReference(t.identifier(genericResponseTypeName)), genericSelectResponseTypeName)]), [], t.tSInterfaceBody(body)));
+}
+
+var createReactQueryHookInterface = function createReactQueryHookInterface(_ref8) {
+  var context = _ref8.context,
+      QueryClient = _ref8.QueryClient,
+      hookParamsTypeName = _ref8.hookParamsTypeName,
+      queryInterfaceName = _ref8.queryInterfaceName,
+      responseType = _ref8.responseType,
+      jsonschema = _ref8.jsonschema;
   // merge the user options with the defaults
   var options = context.options.reactQuery;
   var body = [];
@@ -266,7 +326,9 @@ var createReactQueryHookInterface = function createReactQueryHookInterface(_ref7
     t.tsTypeLiteral(props))));
   }
 
-  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(hookParamsTypeName), null, [t.tSExpressionWithTypeArguments(t.identifier(queryInterfaceName), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType))]))], t.tsInterfaceBody(body)));
+  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(hookParamsTypeName), t.tsTypeParameterDeclaration([t.tSTypeParameter(undefined, undefined, 'TData')]), [t.tSExpressionWithTypeArguments(t.identifier(queryInterfaceName), t.tsTypeParameterInstantiation([// 1: response
+  t.tsTypeReference(t.identifier(responseType)), // 2: select generic
+  t.tSTypeReference(t.identifier('TData'))]))], t.tsInterfaceBody(body)));
 };
 
 exports.createReactQueryHookInterface = createReactQueryHookInterface;
@@ -285,12 +347,28 @@ var getProps = function getProps(context, jsonschema) {
   });
 };
 
-var generateUseQueryQueryKey = function generateUseQueryQueryKey(hookKeyName, props, optionalClient) {
-  var queryKey = [t.stringLiteral(hookKeyName), t.optionalMemberExpression(t.identifier('client'), t.identifier('contractAddress'), false, optionalClient)];
+var generateUseQueryQueryKey = function generateUseQueryQueryKey(_ref9) {
+  var hookKeyName = _ref9.hookKeyName,
+      queryKeysName = _ref9.queryKeysName,
+      methodName = _ref9.methodName,
+      props = _ref9.props,
+      options = _ref9.options;
+  var optionalClient = options.optionalClient,
+      queryKeys = options.queryKeys;
+  var hasArgs = props.includes('args');
+  var contractAddressExpression = t.optionalMemberExpression(t.identifier('client'), t.identifier('contractAddress'), false, optionalClient);
+
+  if (queryKeys) {
+    var callArgs = [contractAddressExpression];
+    if (hasArgs) callArgs.push(t.identifier('args'));
+    return t.callExpression(t.memberExpression(t.identifier(queryKeysName), t.identifier((0, _case.camel)(methodName))), callArgs);
+  }
+
+  var queryKey = [t.stringLiteral(hookKeyName), contractAddressExpression];
 
-  if (props.includes('args')) {
+  if (hasArgs) {
     queryKey.push(t.callExpression(t.memberExpression(t.identifier('JSON'), t.identifier('stringify')), [t.identifier('args')]));
   }
 
-  return queryKey;
+  return t.arrayExpression(queryKey);
 };

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

@@ -0,0 +1,21 @@
+import { globContracts, makeContext } from '../../../test-utils';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
+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 = makeContext(opts.content);
+  expectCode(createTypeInterface(ctx, opts.content));
+}, contracts);
+cases('query classes', async opts => {
+  const ctx = makeContext(opts.content);
+  expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', opts.content));
+}, contracts);
+cases('execute class', async opts => {
+  const ctx = makeContext(opts.content);
+  expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, opts.content));
+}, contracts);
+cases('execute interface', async opts => {
+  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));
 });