wasm-ast-types 0.13.0 → 0.14.0

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

@@ -49,12 +49,7 @@ var createReactQueryHooks = function createReactQueryHooks(_ref) {
     }));
   }
 
-  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 queryMsgs = (0, _utils.getMessageProperties)(queryMsg).map(function (schema) {
     // list_voters
     var underscoreName = Object.keys(schema.properties)[0]; // listVoters
 
@@ -68,6 +63,39 @@ var createReactQueryHooks = function createReactQueryHooks(_ref) {
 
     var getterKey = (0, _case.camel)("".concat(contractName).concat((0, _case.pascal)(methodName)));
     var jsonschema = schema.properties[underscoreName];
+    return {
+      underscoreName: underscoreName,
+      methodName: methodName,
+      hookParamsTypeName: hookParamsTypeName,
+      hookName: hookName,
+      responseType: responseType,
+      getterKey: getterKey,
+      jsonschema: jsonschema
+    };
+  });
+  var queryFactoryName = "".concat((0, _case.camel)(contractName), "Queries");
+
+  if (options.queryFactory) {
+    body.push(createReactQueryFactory({
+      context: context,
+      queryFactoryName: queryFactoryName,
+      queryKeysName: queryKeysName,
+      queryMsgs: queryMsgs
+    }));
+  }
+
+  body.push(createReactQueryHookGenericInterface({
+    context: context,
+    QueryClient: QueryClient,
+    genericQueryInterfaceName: genericQueryInterfaceName
+  }));
+  body.push.apply(body, (0, _toConsumableArray2["default"])(queryMsgs.reduce(function (m, _ref2) {
+    var methodName = _ref2.methodName,
+        hookParamsTypeName = _ref2.hookParamsTypeName,
+        hookName = _ref2.hookName,
+        responseType = _ref2.responseType,
+        getterKey = _ref2.getterKey,
+        jsonschema = _ref2.jsonschema;
     return [createReactQueryHookInterface({
       context: context,
       hookParamsTypeName: hookParamsTypeName,
@@ -91,20 +119,9 @@ var createReactQueryHooks = function createReactQueryHooks(_ref) {
 
 exports.createReactQueryHooks = createReactQueryHooks;
 
-var createReactQueryHook = function createReactQueryHook(_ref2) {
+function buildQueryFn(methodName, jsonschema, options) {
   var _jsonschema$propertie;
 
-  var context = _ref2.context,
-      hookName = _ref2.hookName,
-      hookParamsTypeName = _ref2.hookParamsTypeName,
-      responseType = _ref2.responseType,
-      hookKeyName = _ref2.hookKeyName,
-      queryKeysName = _ref2.queryKeysName,
-      methodName = _ref2.methodName,
-      jsonschema = _ref2.jsonschema;
-  context.addUtil('useQuery');
-  context.addUtil('UseQueryOptions');
-  var options = context.options.reactQuery;
   var keys = Object.keys((_jsonschema$propertie = jsonschema.properties) !== null && _jsonschema$propertie !== void 0 ? _jsonschema$propertie : {});
   var args = [];
 
@@ -114,13 +131,40 @@ var createReactQueryHook = function createReactQueryHook(_ref2) {
     })))];
   }
 
+  var rejectInvalidClient = t.callExpression(t.memberExpression(t.identifier('Promise'), t.identifier('reject')), [t.newExpression(t.identifier('Error'), [t.stringLiteral('Invalid client')])]);
+  return t.arrowFunctionExpression([], (0, _babel.optionalConditionalExpression)(t.identifier('client'), t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(methodName)), args), rejectInvalidClient, options.optionalClient), false);
+}
+
+var ENABLED_QUERY_OPTION = 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))));
+
+function buildQueryOptions(options) {
+  return 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');
+}
+
+var createReactQueryHook = function createReactQueryHook(_ref3) {
+  var _jsonschema$propertie2;
+
+  var context = _ref3.context,
+      hookName = _ref3.hookName,
+      hookParamsTypeName = _ref3.hookParamsTypeName,
+      responseType = _ref3.responseType,
+      hookKeyName = _ref3.hookKeyName,
+      queryKeysName = _ref3.queryKeysName,
+      methodName = _ref3.methodName,
+      jsonschema = _ref3.jsonschema;
+  context.addUtil('useQuery');
+  context.addUtil('UseQueryOptions');
+  var options = context.options.reactQuery;
+  var keys = Object.keys((_jsonschema$propertie2 = jsonschema.properties) !== null && _jsonschema$propertie2 !== void 0 ? _jsonschema$propertie2 : {});
   var props = ['client', 'options'];
 
   if (keys.length) {
     props = ['client', 'args', 'options'];
   }
 
-  var selectResponseGenericTypeName = 'TData';
+  var selectResponseGenericTypeName = GENERIC_SELECT_RESPONSE_NAME;
   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.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(selectResponseGenericTypeName))]))))], t.blockStatement([t.returnStatement((0, _utils.callExpression)(t.identifier('useQuery'), [generateUseQueryQueryKey({
@@ -129,8 +173,7 @@ var createReactQueryHook = function createReactQueryHook(_ref2) {
     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
+  }), buildQueryFn(methodName, jsonschema, options), buildQueryOptions(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);
@@ -154,12 +197,12 @@ export interface Cw4UpdateMembersMutation {
 }
 ```
  */
-var createReactQueryMutationArgsInterface = function createReactQueryMutationArgsInterface(_ref3) {
-  var context = _ref3.context,
-      ExecuteClient = _ref3.ExecuteClient,
-      mutationHookParamsTypeName = _ref3.mutationHookParamsTypeName,
-      useMutationTypeParameter = _ref3.useMutationTypeParameter,
-      jsonschema = _ref3.jsonschema;
+var createReactQueryMutationArgsInterface = function createReactQueryMutationArgsInterface(_ref4) {
+  var context = _ref4.context,
+      ExecuteClient = _ref4.ExecuteClient,
+      mutationHookParamsTypeName = _ref4.mutationHookParamsTypeName,
+      useMutationTypeParameter = _ref4.useMutationTypeParameter,
+      jsonschema = _ref4.jsonschema;
   var typedUseMutationOptions = t.tsTypeReference(t.identifier('UseMutationOptions'), useMutationTypeParameter);
   var body = [(0, _utils.tsPropertySignature)(t.identifier('client'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(ExecuteClient))), false)];
   var msgType = (0, _types2.getParamsTypeAnnotation)(context, jsonschema);
@@ -183,14 +226,14 @@ var createReactQueryMutationArgsInterface = function createReactQueryMutationArg
 
 exports.createReactQueryMutationArgsInterface = createReactQueryMutationArgsInterface;
 
-var createReactQueryMutationHooks = function createReactQueryMutationHooks(_ref4) {
-  var context = _ref4.context,
-      execMsg = _ref4.execMsg,
-      contractName = _ref4.contractName,
-      ExecuteClient = _ref4.ExecuteClient;
+var createReactQueryMutationHooks = function createReactQueryMutationHooks(_ref5) {
+  var context = _ref5.context,
+      execMsg = _ref5.execMsg,
+      contractName = _ref5.contractName,
+      ExecuteClient = _ref5.ExecuteClient;
   // merge the user options with the defaults
   return (0, _utils.getMessageProperties)(execMsg).reduce(function (m, schema) {
-    var _jsonschema$propertie2, _Object$keys;
+    var _jsonschema$propertie3, _Object$keys;
 
     // update_members
     var execMethodUnderscoreName = Object.keys(schema.properties)[0]; // updateMembers
@@ -201,7 +244,7 @@ var createReactQueryMutationHooks = function createReactQueryMutationHooks(_ref4
 
     var mutationHookName = "use".concat(mutationHookParamsTypeName);
     var jsonschema = schema.properties[execMethodUnderscoreName];
-    var properties = (_jsonschema$propertie2 = jsonschema.properties) !== null && _jsonschema$propertie2 !== void 0 ? _jsonschema$propertie2 : {}; // TODO: there should be a better way to do this
+    var properties = (_jsonschema$propertie3 = jsonschema.properties) !== null && _jsonschema$propertie3 !== void 0 ? _jsonschema$propertie3 : {}; // TODO: there should be a better way to do this
 
     var hasMsg = !!((_Object$keys = Object.keys(properties)) !== null && _Object$keys !== void 0 && _Object$keys.length || jsonschema !== null && jsonschema !== void 0 && jsonschema.$ref); // <ExecuteResult, Error, Cw4UpdateMembersMutation>
 
@@ -248,13 +291,13 @@ export const useCw4UpdateMembersMutation = ({ client, options }: Omit<Cw4UpdateM
   )
 ```
  */
-var createReactQueryMutationHook = function createReactQueryMutationHook(_ref5) {
-  var context = _ref5.context,
-      mutationHookName = _ref5.mutationHookName,
-      mutationHookParamsTypeName = _ref5.mutationHookParamsTypeName,
-      execMethodName = _ref5.execMethodName,
-      useMutationTypeParameter = _ref5.useMutationTypeParameter,
-      hasMsg = _ref5.hasMsg;
+var createReactQueryMutationHook = function createReactQueryMutationHook(_ref6) {
+  var context = _ref6.context,
+      mutationHookName = _ref6.mutationHookName,
+      mutationHookParamsTypeName = _ref6.mutationHookParamsTypeName,
+      execMethodName = _ref6.execMethodName,
+      useMutationTypeParameter = _ref6.useMutationTypeParameter,
+      hasMsg = _ref6.hasMsg;
   context.addUtil('useMutation');
   context.addUtil('UseMutationOptions');
   var useMutationFunctionArgs = [(0, _babel.shorthandProperty)('client')];
@@ -270,11 +313,11 @@ var createReactQueryMutationHook = function createReactQueryMutationHook(_ref5)
 
 exports.createReactQueryMutationHook = createReactQueryMutationHook;
 
-function createReactQueryKeys(_ref6) {
-  var context = _ref6.context,
-      queryKeysName = _ref6.queryKeysName,
-      camelContractName = _ref6.camelContractName,
-      underscoreNames = _ref6.underscoreNames;
+function createReactQueryKeys(_ref7) {
+  var context = _ref7.context,
+      queryKeysName = _ref7.queryKeysName,
+      camelContractName = _ref7.camelContractName,
+      underscoreNames = _ref7.underscoreNames;
   var options = context.options.reactQuery;
   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
@@ -293,29 +336,56 @@ function createReactQueryKeys(_ref6) {
   })))))]));
 }
 
-function createReactQueryHookGenericInterface(_ref7) {
-  var context = _ref7.context,
-      QueryClient = _ref7.QueryClient,
-      genericQueryInterfaceName = _ref7.genericQueryInterfaceName;
+function createReactQueryFactory(_ref8) {
+  var context = _ref8.context,
+      queryFactoryName = _ref8.queryFactoryName,
+      queryKeysName = _ref8.queryKeysName,
+      queryMsgs = _ref8.queryMsgs;
+  var options = context.options.reactQuery;
+  return t.exportNamedDeclaration(t.variableDeclaration('const', [t.variableDeclarator(t.identifier(queryFactoryName), t.objectExpression((0, _toConsumableArray2["default"])(queryMsgs.map(function (_ref9) {
+    var _jsonschema$propertie4;
+
+    var methodName = _ref9.methodName,
+        hookParamsTypeName = _ref9.hookParamsTypeName,
+        responseType = _ref9.responseType,
+        jsonschema = _ref9.jsonschema;
+    var hasArgs = Object.keys((_jsonschema$propertie4 = jsonschema.properties) !== null && _jsonschema$propertie4 !== void 0 ? _jsonschema$propertie4 : {}).length > 0;
+    var methodQueryOptionsFn = t.arrowFunctionExpression([(0, _utils.tsObjectPattern)([(0, _babel.shorthandProperty)('client')].concat((0, _toConsumableArray2["default"])(hasArgs ? [(0, _babel.shorthandProperty)('args')] : []), [(0, _babel.shorthandProperty)('options')]), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(hookParamsTypeName), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))]))))], t.objectExpression([// 1: queryKey
+    t.objectProperty(t.identifier('queryKey'), t.callExpression(t.memberExpression(t.identifier(queryKeysName), t.identifier(methodName)), [t.optionalMemberExpression(t.identifier('client'), t.identifier('contractAddress'), false, true)].concat((0, _toConsumableArray2["default"])(hasArgs ? [t.identifier('args')] : [])))), // 2: queryFn
+    t.objectProperty(t.identifier('queryFn'), buildQueryFn(methodName, jsonschema, options)), // 3: spread options
+    t.spreadElement(t.identifier('options')), // 4. enabled
+    ENABLED_QUERY_OPTION]));
+    methodQueryOptionsFn.typeParameters = t.tsTypeParameterDeclaration([t.tsTypeParameter(undefined, t.tsTypeReference(t.identifier(responseType)), GENERIC_SELECT_RESPONSE_NAME)]);
+    methodQueryOptionsFn.returnType = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))])));
+    return t.objectProperty( // key id is the camel method name
+    t.identifier((0, _case.camel)(methodName)), methodQueryOptionsFn);
+  }))))]));
+}
+
+var GENERIC_SELECT_RESPONSE_NAME = 'TData';
+
+function createReactQueryHookGenericInterface(_ref10) {
+  var context = _ref10.context,
+      QueryClient = _ref10.QueryClient,
+      genericQueryInterfaceName = _ref10.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 typedUseQueryOptions = t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(genericResponseTypeName)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))]));
   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)));
+  t.tsTypeParameter(undefined, t.tSTypeReference(t.identifier(genericResponseTypeName)), GENERIC_SELECT_RESPONSE_NAME)]), [], 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;
+var createReactQueryHookInterface = function createReactQueryHookInterface(_ref11) {
+  var context = _ref11.context,
+      QueryClient = _ref11.QueryClient,
+      hookParamsTypeName = _ref11.hookParamsTypeName,
+      queryInterfaceName = _ref11.queryInterfaceName,
+      responseType = _ref11.responseType,
+      jsonschema = _ref11.jsonschema;
   // merge the user options with the defaults
   var options = context.options.reactQuery;
   var body = [];
@@ -326,17 +396,17 @@ var createReactQueryHookInterface = function createReactQueryHookInterface(_ref8
     t.tsTypeLiteral(props))));
   }
 
-  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(hookParamsTypeName), t.tsTypeParameterDeclaration([t.tSTypeParameter(undefined, undefined, 'TData')]), [t.tSExpressionWithTypeArguments(t.identifier(queryInterfaceName), t.tsTypeParameterInstantiation([// 1: response
+  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(hookParamsTypeName), t.tsTypeParameterDeclaration([t.tSTypeParameter(undefined, undefined, GENERIC_SELECT_RESPONSE_NAME)]), [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)));
+  t.tSTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))]))], t.tsInterfaceBody(body)));
 };
 
 exports.createReactQueryHookInterface = createReactQueryHookInterface;
 
 var getProps = function getProps(context, jsonschema) {
-  var _jsonschema$propertie3;
+  var _jsonschema$propertie5;
 
-  var keys = Object.keys((_jsonschema$propertie3 = jsonschema.properties) !== null && _jsonschema$propertie3 !== void 0 ? _jsonschema$propertie3 : {});
+  var keys = Object.keys((_jsonschema$propertie5 = jsonschema.properties) !== null && _jsonschema$propertie5 !== void 0 ? _jsonschema$propertie5 : {});
   if (!keys.length) return [];
   return keys.map(function (prop) {
     var _getPropertyType = (0, _types2.getPropertyType)(context, jsonschema, prop),
@@ -347,12 +417,12 @@ var getProps = function getProps(context, jsonschema) {
   });
 };
 
-var generateUseQueryQueryKey = function generateUseQueryQueryKey(_ref9) {
-  var hookKeyName = _ref9.hookKeyName,
-      queryKeysName = _ref9.queryKeysName,
-      methodName = _ref9.methodName,
-      props = _ref9.props,
-      options = _ref9.options;
+var generateUseQueryQueryKey = function generateUseQueryQueryKey(_ref12) {
+  var hookKeyName = _ref12.hookKeyName,
+      queryKeysName = _ref12.queryKeysName,
+      methodName = _ref12.methodName,
+      props = _ref12.props,
+      options = _ref12.options;
   var optionalClient = options.optionalClient,
       queryKeys = options.queryKeys;
   var hasArgs = props.includes('args');

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

@@ -58,6 +58,19 @@ it('createReactQueryHooks', function () {
     contractName: 'Sg721',
     QueryClient: 'Sg721QueryClient'
   })));
+  (0, _testUtils.expectCode)(t.program((0, _reactQuery.createReactQueryHooks)({
+    context: (0, _testUtils.makeContext)(_query_msg["default"], {
+      reactQuery: {
+        optionalClient: true,
+        version: 'v4',
+        queryKeys: true,
+        queryFactory: true
+      }
+    }),
+    queryMsg: _query_msg["default"],
+    contractName: 'Sg721',
+    QueryClient: 'Sg721QueryClient'
+  })));
   (0, _testUtils.expectCode)(t.program((0, _reactQuery.createReactQueryMutationHooks)({
     context: execCtx,
     execMsg: _execute_msg_for__empty["default"],

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

@@ -25,12 +25,7 @@ export const createReactQueryHooks = ({
     }));
   }
 
-  body.push(createReactQueryHookGenericInterface({
-    context,
-    QueryClient,
-    genericQueryInterfaceName
-  }));
-  body.push(...getMessageProperties(queryMsg).reduce((m, schema) => {
+  const queryMsgs = getMessageProperties(queryMsg).map(schema => {
     // list_voters
     const underscoreName = Object.keys(schema.properties)[0]; // listVoters
 
@@ -44,6 +39,40 @@ export const createReactQueryHooks = ({
 
     const getterKey = camel(`${contractName}${pascal(methodName)}`);
     const jsonschema = schema.properties[underscoreName];
+    return {
+      underscoreName,
+      methodName,
+      hookParamsTypeName,
+      hookName,
+      responseType,
+      getterKey,
+      jsonschema
+    };
+  });
+  const queryFactoryName = `${camel(contractName)}Queries`;
+
+  if (options.queryFactory) {
+    body.push(createReactQueryFactory({
+      context,
+      queryFactoryName,
+      queryKeysName,
+      queryMsgs
+    }));
+  }
+
+  body.push(createReactQueryHookGenericInterface({
+    context,
+    QueryClient,
+    genericQueryInterfaceName
+  }));
+  body.push(...queryMsgs.reduce((m, {
+    methodName,
+    hookParamsTypeName,
+    hookName,
+    responseType,
+    getterKey,
+    jsonschema
+  }) => {
     return [createReactQueryHookInterface({
       context,
       hookParamsTypeName,
@@ -64,6 +93,29 @@ export const createReactQueryHooks = ({
   }, []));
   return body;
 };
+
+function buildQueryFn(methodName, jsonschema, options) {
+  const keys = Object.keys(jsonschema.properties ?? {});
+  let args = [];
+
+  if (keys.length) {
+    args = [t.objectExpression([...keys.map(prop => {
+      return t.objectProperty(t.identifier(camel(prop)), t.memberExpression(t.identifier('args'), t.identifier(camel(prop))));
+    })])];
+  }
+
+  const rejectInvalidClient = t.callExpression(t.memberExpression(t.identifier('Promise'), t.identifier('reject')), [t.newExpression(t.identifier('Error'), [t.stringLiteral('Invalid client')])]);
+  return t.arrowFunctionExpression([], optionalConditionalExpression(t.identifier('client'), t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(methodName)), args), rejectInvalidClient, options.optionalClient), false);
+}
+
+const ENABLED_QUERY_OPTION = 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))));
+
+function buildQueryOptions(options) {
+  return 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');
+}
+
 export const createReactQueryHook = ({
   context,
   hookName,
@@ -78,21 +130,13 @@ export const createReactQueryHook = ({
   context.addUtil('UseQueryOptions');
   const options = context.options.reactQuery;
   const keys = Object.keys(jsonschema.properties ?? {});
-  let args = [];
-
-  if (keys.length) {
-    args = [t.objectExpression([...keys.map(prop => {
-      return t.objectProperty(t.identifier(camel(prop)), t.memberExpression(t.identifier('args'), t.identifier(camel(prop))));
-    })])];
-  }
-
   let props = ['client', 'options'];
 
   if (keys.length) {
     props = ['client', 'args', 'options'];
   }
 
-  const selectResponseGenericTypeName = 'TData';
+  const selectResponseGenericTypeName = GENERIC_SELECT_RESPONSE_NAME;
   const queryFunctionDeclaration = t.functionDeclaration(t.identifier(hookName), [tsObjectPattern([...props.map(prop => {
     return t.objectProperty(t.identifier(prop), t.identifier(prop), false, true);
   })], t.tsTypeAnnotation(t.tsTypeReference(t.identifier(hookParamsTypeName), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(selectResponseGenericTypeName))]))))], t.blockStatement([t.returnStatement(callExpression(t.identifier('useQuery'), [generateUseQueryQueryKey({
@@ -101,8 +145,7 @@ export const createReactQueryHook = ({
     methodName,
     props,
     options
-  }), t.arrowFunctionExpression([], 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
+  }), buildQueryFn(methodName, jsonschema, options), buildQueryOptions(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);
@@ -250,6 +293,34 @@ function createReactQueryKeys({
   shorthandProperty('args')])]), t.tSTypeReference(t.identifier('const'))))))]))]));
 }
 
+function createReactQueryFactory({
+  context,
+  queryFactoryName,
+  queryKeysName,
+  queryMsgs
+}) {
+  const options = context.options.reactQuery;
+  return t.exportNamedDeclaration(t.variableDeclaration('const', [t.variableDeclarator(t.identifier(queryFactoryName), t.objectExpression([...queryMsgs.map(({
+    methodName,
+    hookParamsTypeName,
+    responseType,
+    jsonschema
+  }) => {
+    const hasArgs = Object.keys(jsonschema.properties ?? {}).length > 0;
+    const methodQueryOptionsFn = t.arrowFunctionExpression([tsObjectPattern([shorthandProperty('client'), ...(hasArgs ? [shorthandProperty('args')] : []), shorthandProperty('options')], t.tsTypeAnnotation(t.tsTypeReference(t.identifier(hookParamsTypeName), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))]))))], t.objectExpression([// 1: queryKey
+    t.objectProperty(t.identifier('queryKey'), t.callExpression(t.memberExpression(t.identifier(queryKeysName), t.identifier(methodName)), [t.optionalMemberExpression(t.identifier('client'), t.identifier('contractAddress'), false, true), ...(hasArgs ? [t.identifier('args')] : [])])), // 2: queryFn
+    t.objectProperty(t.identifier('queryFn'), buildQueryFn(methodName, jsonschema, options)), // 3: spread options
+    t.spreadElement(t.identifier('options')), // 4. enabled
+    ENABLED_QUERY_OPTION]));
+    methodQueryOptionsFn.typeParameters = t.tsTypeParameterDeclaration([t.tsTypeParameter(undefined, t.tsTypeReference(t.identifier(responseType)), GENERIC_SELECT_RESPONSE_NAME)]);
+    methodQueryOptionsFn.returnType = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))])));
+    return t.objectProperty( // key id is the camel method name
+    t.identifier(camel(methodName)), methodQueryOptionsFn);
+  })]))]));
+}
+
+const GENERIC_SELECT_RESPONSE_NAME = 'TData';
+
 function createReactQueryHookGenericInterface({
   context,
   QueryClient,
@@ -257,14 +328,13 @@ function createReactQueryHookGenericInterface({
 }) {
   const options = context.options.reactQuery;
   const genericResponseTypeName = 'TResponse';
-  const genericSelectResponseTypeName = 'TData';
   context.addUtil('UseQueryOptions'); // UseQueryOptions<TResponse, Error, TData>,
 
-  const typedUseQueryOptions = t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(genericResponseTypeName)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(genericSelectResponseTypeName))]));
+  const typedUseQueryOptions = t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(genericResponseTypeName)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))]));
   const body = [tsPropertySignature(t.identifier('client'), t.tsTypeAnnotation(options.optionalClient ? t.tsUnionType([t.tsTypeReference(t.identifier(QueryClient)), t.tsUndefinedKeyword()]) : t.tsTypeReference(t.identifier(QueryClient))), false), tsPropertySignature(t.identifier('options'), t.tsTypeAnnotation(options.version === 'v4' ? t.tSIntersectionType([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)));
+  t.tsTypeParameter(undefined, t.tSTypeReference(t.identifier(genericResponseTypeName)), GENERIC_SELECT_RESPONSE_NAME)]), [], t.tSInterfaceBody(body)));
 }
 
 export const createReactQueryHookInterface = ({
@@ -285,9 +355,9 @@ export const createReactQueryHookInterface = ({
     t.tsTypeLiteral(props))));
   }
 
-  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(hookParamsTypeName), t.tsTypeParameterDeclaration([t.tSTypeParameter(undefined, undefined, 'TData')]), [t.tSExpressionWithTypeArguments(t.identifier(queryInterfaceName), t.tsTypeParameterInstantiation([// 1: response
+  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(hookParamsTypeName), t.tsTypeParameterDeclaration([t.tSTypeParameter(undefined, undefined, GENERIC_SELECT_RESPONSE_NAME)]), [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)));
+  t.tSTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))]))], t.tsInterfaceBody(body)));
 };
 
 const getProps = (context, jsonschema) => {

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

@@ -43,6 +43,19 @@ it('createReactQueryHooks', () => {
     contractName: 'Sg721',
     QueryClient: 'Sg721QueryClient'
   })));
+  expectCode(t.program(createReactQueryHooks({
+    context: makeContext(query_msg, {
+      reactQuery: {
+        optionalClient: true,
+        version: 'v4',
+        queryKeys: true,
+        queryFactory: true
+      }
+    }),
+    queryMsg: query_msg,
+    contractName: 'Sg721',
+    QueryClient: 'Sg721QueryClient'
+  })));
   expectCode(t.program(createReactQueryMutationHooks({
     context: execCtx,
     execMsg: execute_msg,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.13.0",
+  "version": "0.14.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",
@@ -88,5 +88,5 @@
     "case": "1.6.3",
     "deepmerge": "4.2.2"
   },
-  "gitHead": "e46828bd476d30465a35a8021e611938abf89846"
+  "gitHead": "e58a660b6265fc94bdd11f311afe9fac11708c51"
 }

package/src/context/context.ts

@@ -10,6 +10,7 @@ export interface ReactQueryOptions {
     mutations?: boolean;
     camelize?: boolean;
     queryKeys?: boolean
+    queryFactory?: boolean
 }
 
 export interface TSClientOptions {