wasm-ast-types 0.4.1 → 0.5.0

package/main/utils/types.js

@@ -7,7 +7,9 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getType = exports.getPropertyType = exports.createTypedObjectParams = void 0;
+exports.getParamsTypeAnnotation = exports.createTypedObjectParams = void 0;
+exports.getPropertySignatureFromProp = getPropertySignatureFromProp;
+exports.getTypeFromRef = exports.getType = exports.getPropertyType = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
@@ -51,12 +53,22 @@ var getTypeFromRef = function getTypeFromRef($ref) {
   }
 };
 
+exports.getTypeFromRef = getTypeFromRef;
+
 var getArrayTypeFromRef = function getArrayTypeFromRef($ref) {
   return t.tsArrayType(getTypeFromRef($ref));
 };
 
-var getArrayTypeFromType = function getArrayTypeFromType(type) {
-  return t.tsArrayType(getType(type));
+var getArrayTypeFromItems = function getArrayTypeFromItems(items) {
+  if (items.type === 'array') {
+    if (Array.isArray(items.items)) {
+      return t.tsArrayType(t.tsArrayType(getType(items.items[0].type)));
+    } else {
+      return t.tsArrayType(getArrayTypeFromItems(items.items));
+    }
+  }
+
+  return t.tsArrayType(getType(items.type));
 };
 
 var getType = function getType(type) {
@@ -69,8 +81,6 @@ var getType = function getType(type) {
 
     case 'integer':
       return t.tsNumberKeyword();
-    // case 'object':
-    // return t.tsObjectKeyword();
 
     default:
       throw new Error('contact maintainers [unknown type]: ' + type);
@@ -129,7 +139,7 @@ var getPropertyType = function getPropertyType(schema, prop) {
       } else if (info.items.title) {
         type = t.tsArrayType(t.tsTypeReference(t.identifier(info.items.title)));
       } else if (info.items.type) {
-        type = getArrayTypeFromType(info.items.type);
+        type = getArrayTypeFromItems(info.items);
       } else {
         throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
       }
@@ -177,79 +187,95 @@ var getPropertyType = function getPropertyType(schema, prop) {
 
 exports.getPropertyType = getPropertyType;
 
-var createTypedObjectParams = function createTypedObjectParams(jsonschema) {
-  var _jsonschema$propertie;
-
-  var camelize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-  var keys = Object.keys((_jsonschema$propertie = jsonschema.properties) !== null && _jsonschema$propertie !== void 0 ? _jsonschema$propertie : {});
-  if (!keys.length) return;
-  var typedParams = keys.map(function (prop) {
-    if (jsonschema.properties[prop].type === 'object') {
-      if (jsonschema.properties[prop].title) {
-        return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(jsonschema.properties[prop].title))));
-      } else {
-        throw new Error('createTypedObjectParams() contact maintainer');
-      }
+function getPropertySignatureFromProp(jsonschema, prop, camelize) {
+  if (jsonschema.properties[prop].type === 'object') {
+    if (jsonschema.properties[prop].title) {
+      return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(jsonschema.properties[prop].title))));
+    } else {
+      throw new Error('createTypedObjectParams() contact maintainer');
     }
+  }
 
-    if (Array.isArray(jsonschema.properties[prop].allOf)) {
-      var _jsonschema$required;
+  if (Array.isArray(jsonschema.properties[prop].allOf)) {
+    var _jsonschema$required;
 
-      var isOptional = !((_jsonschema$required = jsonschema.required) !== null && _jsonschema$required !== void 0 && _jsonschema$required.includes(prop));
-      var unionTypes = jsonschema.properties[prop].allOf.map(function (el) {
-        if (el.title) return el.title;
-        if (el.$ref) return getTypeStrFromRef(el.$ref);
-        return el.type;
-      });
-      var uniqUnionTypes = (0, _toConsumableArray2["default"])(new Set(unionTypes));
+    var isOptional = !((_jsonschema$required = jsonschema.required) !== null && _jsonschema$required !== void 0 && _jsonschema$required.includes(prop));
+    var unionTypes = jsonschema.properties[prop].allOf.map(function (el) {
+      if (el.title) return el.title;
+      if (el.$ref) return getTypeStrFromRef(el.$ref);
+      return el.type;
+    });
+    var uniqUnionTypes = (0, _toConsumableArray2["default"])(new Set(unionTypes));
 
-      if (uniqUnionTypes.length === 1) {
-        return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(uniqUnionTypes[0]))), isOptional);
-      } else {
-        return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(uniqUnionTypes.map(function (typ) {
-          return t.tsTypeReference(t.identifier(typ));
-        }))), isOptional);
-      }
-    } else if (Array.isArray(jsonschema.properties[prop].oneOf)) {
-      var _jsonschema$required2;
+    if (uniqUnionTypes.length === 1) {
+      return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(uniqUnionTypes[0]))), isOptional);
+    } else {
+      return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(uniqUnionTypes.map(function (typ) {
+        return t.tsTypeReference(t.identifier(typ));
+      }))), isOptional);
+    }
+  } else if (Array.isArray(jsonschema.properties[prop].oneOf)) {
+    var _jsonschema$required2;
 
-      var _isOptional = !((_jsonschema$required2 = jsonschema.required) !== null && _jsonschema$required2 !== void 0 && _jsonschema$required2.includes(prop));
+    var _isOptional = !((_jsonschema$required2 = jsonschema.required) !== null && _jsonschema$required2 !== void 0 && _jsonschema$required2.includes(prop));
 
-      var _unionTypes = jsonschema.properties[prop].oneOf.map(function (el) {
-        if (el.title) return el.title;
-        if (el.$ref) return getTypeStrFromRef(el.$ref);
-        return el.type;
-      });
+    var _unionTypes = jsonschema.properties[prop].oneOf.map(function (el) {
+      if (el.title) return el.title;
+      if (el.$ref) return getTypeStrFromRef(el.$ref);
+      return el.type;
+    });
 
-      var _uniqUnionTypes = (0, _toConsumableArray2["default"])(new Set(_unionTypes));
+    var _uniqUnionTypes = (0, _toConsumableArray2["default"])(new Set(_unionTypes));
 
-      if (_uniqUnionTypes.length === 1) {
-        return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(_uniqUnionTypes[0]))), _isOptional);
-      } else {
-        return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(_uniqUnionTypes.map(function (typ) {
-          return t.tsTypeReference(t.identifier(typ));
-        }))), _isOptional);
-      }
+    if (_uniqUnionTypes.length === 1) {
+      return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(_uniqUnionTypes[0]))), _isOptional);
+    } else {
+      return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(_uniqUnionTypes.map(function (typ) {
+        return t.tsTypeReference(t.identifier(typ));
+      }))), _isOptional);
     }
+  }
 
-    try {
-      getPropertyType(jsonschema, prop);
-    } catch (e) {
-      console.log(e);
-      console.log(jsonschema, prop);
-    }
+  try {
+    getPropertyType(jsonschema, prop);
+  } catch (e) {
+    console.log(e);
+    console.log(jsonschema, prop);
+  }
+
+  var _getPropertyType = getPropertyType(jsonschema, prop),
+      type = _getPropertyType.type,
+      optional = _getPropertyType.optional;
 
-    var _getPropertyType = getPropertyType(jsonschema, prop),
-        type = _getPropertyType.type,
-        optional = _getPropertyType.optional;
+  return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(type), optional);
+}
 
-    return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(type), optional);
+var getParamsTypeAnnotation = function getParamsTypeAnnotation(jsonschema) {
+  var _jsonschema$propertie;
+
+  var camelize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  var keys = Object.keys((_jsonschema$propertie = jsonschema.properties) !== null && _jsonschema$propertie !== void 0 ? _jsonschema$propertie : {});
+  if (!keys.length) return undefined;
+  var typedParams = keys.map(function (prop) {
+    return getPropertySignatureFromProp(jsonschema, prop, camelize);
   });
+  return t.tsTypeAnnotation(t.tsTypeLiteral((0, _toConsumableArray2["default"])(typedParams)));
+};
+
+exports.getParamsTypeAnnotation = getParamsTypeAnnotation;
+
+var createTypedObjectParams = function createTypedObjectParams(jsonschema) {
+  var _jsonschema$propertie2;
+
+  var camelize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  var keys = Object.keys((_jsonschema$propertie2 = jsonschema.properties) !== null && _jsonschema$propertie2 !== void 0 ? _jsonschema$propertie2 : {});
+  if (!keys.length) return; // const typedParams = keys.map(prop => getPropertySignatureFromProp(jsonschema, prop, camelize));
+
   var params = keys.map(function (prop) {
     return t.objectProperty(camelize ? t.identifier((0, _case.camel)(prop)) : t.identifier(prop), camelize ? t.identifier((0, _case.camel)(prop)) : t.identifier(prop), false, true);
   });
   var obj = t.objectPattern((0, _toConsumableArray2["default"])(params));
-  obj.typeAnnotation = t.tsTypeAnnotation(t.tsTypeLiteral((0, _toConsumableArray2["default"])(typedParams)));
+  obj.typeAnnotation = getParamsTypeAnnotation(jsonschema, camelize);
   return obj;
 };
 

package/main/wasm.arrays.spec.js

@@ -0,0 +1,30 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _generator = _interopRequireDefault(require("@babel/generator"));
+
+var _schema = _interopRequireDefault(require("./../../../__fixtures__/arrays/schema/schema.json"));
+
+var _wasm = require("./wasm");
+
+var expectCode = function expectCode(ast) {
+  expect((0, _generator["default"])(ast).code).toMatchSnapshot();
+};
+
+var printCode = function printCode(ast) {
+  console.log((0, _generator["default"])(ast).code);
+};
+
+it('execute_msg_for__empty', function () {
+  expectCode((0, _wasm.createTypeInterface)(_schema["default"]));
+});
+it('query classes', function () {
+  expectCode((0, _wasm.createQueryClass)('SG721QueryClient', 'SG721ReadOnlyInstance', _schema["default"]));
+});
+it('execute classes array types', function () {
+  expectCode((0, _wasm.createExecuteClass)('SG721Client', 'SG721Instance', null, _schema["default"]));
+});
+it('execute interfaces no extends', function () {
+  expectCode((0, _wasm.createExecuteInterface)('SG721Instance', null, _schema["default"]));
+});

package/main/wasm.js

@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createWasmQueryMethod = exports.createWasmExecMethod = exports.createTypeOrInterface = exports.createTypeInterface = exports.createQueryInterface = exports.createQueryClass = exports.createPropertyFunctionWithObjectParamsForExec = exports.createPropertyFunctionWithObjectParams = exports.createExecuteInterface = exports.createExecuteClass = void 0;
+exports.createWasmQueryMethod = exports.createWasmExecMethod = exports.createTypeOrInterface = exports.createTypeInterface = exports.createQueryInterface = exports.createQueryClass = exports.createPropertyFunctionWithObjectParamsForExec = exports.createPropertyFunctionWithObjectParams = exports.createExecuteInterface = exports.createExecuteClass = exports.FIXED_EXECUTE_PARAMS = exports.CONSTANT_EXEC_PARAMS = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
@@ -60,6 +60,8 @@ var createQueryClass = function createQueryClass(className, implementsClassName,
 };
 
 exports.createQueryClass = createQueryClass;
+var CONSTANT_EXEC_PARAMS = [t.assignmentPattern((0, _babel.identifier)('fee', t.tsTypeAnnotation(t.tsUnionType([t.tSNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), false), t.stringLiteral('auto')), (0, _babel.identifier)('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), (0, _babel.identifier)('funds', t.tsTypeAnnotation((0, _babel.tsTypeOperator)(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
+exports.CONSTANT_EXEC_PARAMS = CONSTANT_EXEC_PARAMS;
 
 var createWasmExecMethod = function createWasmExecMethod(jsonschema) {
   var _jsonschema$propertie2;
@@ -71,9 +73,8 @@ var createWasmExecMethod = function createWasmExecMethod(jsonschema) {
   var args = Object.keys(properties).map(function (prop) {
     return t.objectProperty(t.identifier(prop), t.identifier((0, _case.camel)(prop)), false, prop === (0, _case.camel)(prop));
   });
-  var constantParams = [t.assignmentPattern((0, _babel.identifier)('fee', t.tsTypeAnnotation(t.tsUnionType([t.tSNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), false), t.stringLiteral('auto')), (0, _babel.identifier)('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), (0, _babel.identifier)('funds', t.tsTypeAnnotation((0, _babel.tsTypeOperator)(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
   return t.classProperty(t.identifier(methodName), (0, _utils.arrowFunctionExpression)(obj ? [// props
-  obj].concat(constantParams) : constantParams, t.blockStatement([t.returnStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('execute')), [t.memberExpression(t.thisExpression(), t.identifier('sender')), t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.objectExpression([t.objectProperty(t.identifier(underscoreName), t.objectExpression((0, _toConsumableArray2["default"])(args)))]), t.identifier('fee'), t.identifier('memo'), t.identifier('funds')])))]), // return type
+  obj].concat(CONSTANT_EXEC_PARAMS) : CONSTANT_EXEC_PARAMS, t.blockStatement([t.returnStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('execute')), [t.memberExpression(t.thisExpression(), t.identifier('sender')), t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.objectExpression([t.objectProperty(t.identifier(underscoreName), t.objectExpression((0, _toConsumableArray2["default"])(args)))]), t.identifier('fee'), t.identifier('memo'), t.identifier('funds')])))]), // return type
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tSTypeReference(t.identifier('ExecuteResult'))]))), true));
 };
 
@@ -132,14 +133,15 @@ var createPropertyFunctionWithObjectParams = function createPropertyFunctionWith
 };
 
 exports.createPropertyFunctionWithObjectParams = createPropertyFunctionWithObjectParams;
+var FIXED_EXECUTE_PARAMS = [(0, _babel.identifier)('fee', t.tsTypeAnnotation(t.tsUnionType([t.tsNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), true), (0, _babel.identifier)('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), (0, _babel.identifier)('funds', t.tsTypeAnnotation((0, _babel.tsTypeOperator)(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
+exports.FIXED_EXECUTE_PARAMS = FIXED_EXECUTE_PARAMS;
 
 var createPropertyFunctionWithObjectParamsForExec = function createPropertyFunctionWithObjectParamsForExec(methodName, responseType, jsonschema) {
   var obj = (0, _types2.createTypedObjectParams)(jsonschema);
-  var fixedParams = [(0, _babel.identifier)('fee', t.tsTypeAnnotation(t.tsUnionType([t.tsNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), true), (0, _babel.identifier)('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), (0, _babel.identifier)('funds', t.tsTypeAnnotation((0, _babel.tsTypeOperator)(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
   var func = {
     type: 'TSFunctionType',
     typeAnnotation: (0, _utils.promiseTypeAnnotation)(responseType),
-    parameters: obj ? [obj].concat(fixedParams) : fixedParams
+    parameters: obj ? [obj].concat(FIXED_EXECUTE_PARAMS) : FIXED_EXECUTE_PARAMS
   };
   return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
 };

package/module/react-query.js

@@ -1,17 +1,29 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 import * as t from '@babel/types';
 import { camel, pascal } from 'case';
-import { tsPropertySignature, tsObjectPattern, callExpression, getMessageProperties } from './utils';
-import { typeRefOrOptionalUnion, propertySignature, optionalConditionalExpression } from './utils/babel';
-import { getPropertyType } from './utils/types';
+import { callExpression, getMessageProperties, identifier, tsObjectPattern, tsPropertySignature } from './utils';
+import { omitTypeReference, optionalConditionalExpression, propertySignature, shorthandProperty, typeRefOrOptionalUnion } from './utils/babel';
+import { getParamsTypeAnnotation, getPropertyType, getTypeFromRef } from './utils/types';
+import { FIXED_EXECUTE_PARAMS } from './wasm'; // TODO: this mutations boolean is not actually used here and only at a higher level
+
 const DEFAULT_OPTIONS = {
-  optionalClient: false
+  optionalClient: false,
+  v4: false,
+  mutations: false
 };
 export const createReactQueryHooks = ({
   queryMsg,
   contractName,
   QueryClient,
-  options = DEFAULT_OPTIONS
+  options = {}
 }) => {
+  // merge the user options with the defaults
+  options = _objectSpread(_objectSpread({}, DEFAULT_OPTIONS), options);
   return getMessageProperties(queryMsg).reduce((m, schema) => {
     const underscoreName = Object.keys(schema.properties)[0];
     const methodName = camel(underscoreName);
@@ -44,8 +56,10 @@ export const createReactQueryHook = ({
   hookKeyName,
   methodName,
   jsonschema,
-  options = DEFAULT_OPTIONS
+  options = {}
 }) => {
+  // merge the user options with the defaults
+  options = _objectSpread(_objectSpread({}, DEFAULT_OPTIONS), options);
   const keys = Object.keys(jsonschema.properties ?? {});
   let args = [];
 
@@ -63,16 +77,138 @@ export const createReactQueryHook = ({
 
   return t.exportNamedDeclaration(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.blockStatement([t.returnStatement(callExpression(t.identifier('useQuery'), [t.arrayExpression([t.stringLiteral(hookKeyName), t.optionalMemberExpression(t.identifier('client'), t.identifier('contractAddress'), false, options.optionalClient)]), t.arrowFunctionExpression([], optionalConditionalExpression(t.identifier('client'), t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(methodName)), args), t.identifier('undefined'), 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.optionalMemberExpression(t.identifier('options'), t.identifier('enabled'), false, true)))]) : t.identifier('options')], t.tsTypeParameterInstantiation([typeRefOrOptionalUnion(t.identifier(responseType), options.optionalClient), 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.blockStatement([t.returnStatement(callExpression(t.identifier('useQuery'), [t.arrayExpression(generateUseQueryQueryKey(hookKeyName, props, options.optionalClient)), t.arrowFunctionExpression([], optionalConditionalExpression(t.identifier('client'), t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(methodName)), args), t.identifier('undefined'), 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([typeRefOrOptionalUnion(t.identifier(responseType), options.optionalClient), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(responseType)), t.tsArrayType(t.tsParenthesizedType(t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])))])))])));
+};
+
+/**
+ * Example:
+```
+export interface Cw4UpdateMembersMutation {
+  client: Cw4GroupClient
+  args: {
+    tokenId: string
+    remove: string[]
+  }
+  options?: Omit<
+    UseMutationOptions<ExecuteResult, Error, Pick<Cw4UpdateMembersMutation, 'args'>>,
+    'mutationFn'
+  >
+}
+```
+ */
+export const createReactQueryMutationArgsInterface = ({
+  ExecuteClient,
+  mutationHookParamsTypeName,
+  useMutationTypeParameter,
+  jsonschema
+}) => {
+  const typedUseMutationOptions = t.tsTypeReference(t.identifier('UseMutationOptions'), useMutationTypeParameter);
+  const body = [tsPropertySignature(t.identifier('client'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(ExecuteClient))), false)];
+  let msgType = getParamsTypeAnnotation(jsonschema); // TODO: this should not have to be done manually.
+
+  if (!msgType && jsonschema?.$ref?.startsWith('#/definitions/')) {
+    let refName = jsonschema?.$ref;
+
+    if (/_for_[A-Z]/.test(refName)) {
+      refName = refName.replace(/_for_/, 'For');
+    }
+
+    msgType = t.tsTypeAnnotation(getTypeFromRef(refName));
+  }
+
+  if (msgType) {
+    body.push(t.tsPropertySignature(t.identifier('msg'), msgType));
+  } //  fee: number | StdFee | "auto" = "auto", memo?: string, funds?: readonly Coin[]
+
+
+  const optionalArgs = t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation(t.tsTypeLiteral(FIXED_EXECUTE_PARAMS.map(param => propertySignature(param.name, param.typeAnnotation, param.optional)))));
+  optionalArgs.optional = true;
+  body.push(optionalArgs);
+  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(mutationHookParamsTypeName), null, [], t.tsInterfaceBody(body)));
+};
+export const createReactQueryMutationHooks = ({
+  execMsg,
+  contractName,
+  ExecuteClient,
+  options = {}
+}) => {
+  // merge the user options with the defaults
+  return getMessageProperties(execMsg).reduce((m, schema) => {
+    // update_members
+    const execMethodUnderscoreName = Object.keys(schema.properties)[0]; // updateMembers
+
+    const execMethodName = camel(execMethodUnderscoreName); // Cw20UpdateMembersMutation
+
+    const mutationHookParamsTypeName = `${pascal(contractName)}${pascal(execMethodName)}Mutation`; // useCw20UpdateMembersMutation
+
+    const mutationHookName = `use${mutationHookParamsTypeName}`;
+    const jsonschema = schema.properties[execMethodUnderscoreName];
+    const properties = jsonschema.properties ?? {}; // TODO: there should be a better way to do this
+
+    const hasMsg = !!(Object.keys(properties)?.length || jsonschema?.$ref); // <ExecuteResult, Error, Cw4UpdateMembersMutation>
+
+    const useMutationTypeParameter = generateMutationTypeParameter(mutationHookParamsTypeName, hasMsg);
+    return [createReactQueryMutationArgsInterface({
+      mutationHookParamsTypeName,
+      ExecuteClient,
+      jsonschema,
+      useMutationTypeParameter
+    }), createReactQueryMutationHook({
+      execMethodName,
+      mutationHookName,
+      mutationHookParamsTypeName,
+      hasMsg,
+      useMutationTypeParameter
+    }), ...m];
+  }, []);
+};
+/**
+ * Generates the mutation type parameter. If args exist, we use a pick. If not, we just return the params type.
+ */
+
+function generateMutationTypeParameter(mutationHookParamsTypeName, hasArgs) {
+  return t.tsTypeParameterInstantiation([// Data
+  t.tSTypeReference(t.identifier('ExecuteResult')), // Error
+  t.tsTypeReference(t.identifier('Error')), // Variables
+  t.tsTypeReference(t.identifier(mutationHookParamsTypeName))]);
+}
+
+/**
+ *
+ * Example:
+```
+export const useCw4UpdateMembersMutation = ({ client, options }: Omit<Cw4UpdateMembersMutation, 'args'>) =>
+  useMutation<ExecuteResult, Error, Pick<Cw4UpdateMembersMutation, 'args'>>(
+    ({ args }) => client.updateMembers(args),
+    options
+  )
+```
+ */
+export const createReactQueryMutationHook = ({
+  mutationHookName,
+  mutationHookParamsTypeName,
+  execMethodName,
+  useMutationTypeParameter,
+  hasMsg
+}) => {
+  const useMutationFunctionArgs = [shorthandProperty('client')];
+  if (hasMsg) useMutationFunctionArgs.push(shorthandProperty('msg'));
+  useMutationFunctionArgs.push(t.objectProperty(t.identifier('args'), t.assignmentPattern(t.objectPattern(FIXED_EXECUTE_PARAMS.map(param => shorthandProperty(param.name))), t.objectExpression([]))));
+  return t.exportNamedDeclaration(t.functionDeclaration(t.identifier(mutationHookName), [identifier('options', t.tsTypeAnnotation(omitTypeReference(t.tsTypeReference(t.identifier('UseMutationOptions'), useMutationTypeParameter), 'mutationFn')), true)], t.blockStatement([t.returnStatement(callExpression(t.identifier('useMutation'), [t.arrowFunctionExpression([t.objectPattern(useMutationFunctionArgs)], t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(execMethodName)), (hasMsg ? [t.identifier('msg')] : []).concat(FIXED_EXECUTE_PARAMS.map(param => t.identifier(param.name)))), false // not async
+  ), t.identifier('options')], useMutationTypeParameter))])));
 };
 export const createReactQueryHookInterface = ({
   QueryClient,
   hookParamsTypeName,
   responseType,
   jsonschema,
-  options = DEFAULT_OPTIONS
+  options = {}
 }) => {
-  const body = [tsPropertySignature(t.identifier('client'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(QueryClient))), options.optionalClient), tsPropertySignature(t.identifier('options'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([typeRefOrOptionalUnion(t.identifier(responseType), options.optionalClient), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(responseType)), t.tsArrayType(t.tsParenthesizedType(t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])))]))), true)];
+  // merge the user options with the defaults
+  options = _objectSpread(_objectSpread({}, DEFAULT_OPTIONS), options);
+  const typedUseQueryOptions = t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([typeRefOrOptionalUnion(t.identifier(responseType), options.optionalClient), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(responseType)), t.tsArrayType(t.tsParenthesizedType(t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])))]));
+  const body = [tsPropertySignature(t.identifier('client'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(QueryClient))), options.optionalClient), tsPropertySignature(t.identifier('options'), t.tsTypeAnnotation(options.v4 ? t.tSIntersectionType([omitTypeReference(typedUseQueryOptions, "'queryKey' | 'queryFn' | 'initialData'"), t.tSTypeLiteral([t.tsPropertySignature(t.identifier('initialData?'), t.tsTypeAnnotation(t.tsUndefinedKeyword()))])]) : typedUseQueryOptions), true)];
   const props = getProps(jsonschema, true);
 
   if (props.length) {
@@ -92,4 +228,14 @@ const getProps = (jsonschema, camelize) => {
     } = getPropertyType(jsonschema, prop);
     return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(type), optional);
   });
-};
+};
+
+function generateUseQueryQueryKey(hookKeyName, props, optionalClient) {
+  const queryKey = [t.stringLiteral(hookKeyName), t.optionalMemberExpression(t.identifier('client'), t.identifier('contractAddress'), false, optionalClient)];
+
+  if (props.includes('args')) {
+    queryKey.push(t.callExpression(t.memberExpression(t.identifier('JSON'), t.identifier('stringify')), [t.identifier('args')]));
+  }
+
+  return queryKey;
+}

package/module/react-query.spec.js

@@ -1,7 +1,8 @@
 import generate from '@babel/generator';
 import * as t from '@babel/types';
 import query_msg from './../../../__fixtures__/basic/query_msg.json';
-import { createReactQueryHooks } from './react-query';
+import execute_msg from './../../../__fixtures__/basic/execute_msg_for__empty.json';
+import { createReactQueryHooks, createReactQueryMutationHooks } from './react-query';
 
 const expectCode = ast => {
   expect(generate(ast).code).toMatchSnapshot();
@@ -39,4 +40,26 @@ it('createReactQueryHooks', () => {
       optionalClient: true
     }
   })));
+  expectCode(t.program(createReactQueryHooks({
+    queryMsg: query_msg,
+    contractName: 'Sg721',
+    QueryClient: 'Sg721QueryClient',
+    options: {
+      v4: true
+    }
+  })));
+  expectCode(t.program(createReactQueryHooks({
+    queryMsg: query_msg,
+    contractName: 'Sg721',
+    QueryClient: 'Sg721QueryClient',
+    options: {
+      optionalClient: true,
+      v4: true
+    }
+  })));
+  expectCode(t.program(createReactQueryMutationHooks({
+    execMsg: execute_msg,
+    contractName: 'Sg721',
+    ExecuteClient: 'Sg721Client'
+  })));
 });

package/module/recoil.spec.js

@@ -18,5 +18,5 @@ it('selectors', () => {
   expectCode(t.program(createRecoilSelectors('SG721', 'SG721QueryClient', query_msg)));
 });
 it('client', () => {
-  printCode(createRecoilQueryClient('SG721', 'SG721QueryClient'));
+  expectCode(createRecoilQueryClient('SG721', 'SG721QueryClient'));
 });

package/module/utils/babel.js

@@ -1,5 +1,6 @@
 import * as t from '@babel/types';
 import { snake } from "case";
+// t.TSPropertySignature - kind?
 export const propertySignature = (name, typeAnnotation, optional = false) => {
   return {
     type: 'TSPropertySignature',
@@ -164,4 +165,18 @@ export const optionalConditionalExpression = (test, expression, alternate, optio
 export const typeRefOrOptionalUnion = (identifier, optional = false) => {
   const typeReference = t.tsTypeReference(identifier);
   return optional ? t.tsUnionType([typeReference, t.tsUndefinedKeyword()]) : typeReference;
+};
+export const parameterizedTypeReference = (identifier, from, omit) => {
+  return t.tsTypeReference(t.identifier(identifier), t.tsTypeParameterInstantiation([from, typeof omit === 'string' ? t.tsLiteralType(t.stringLiteral(omit)) : t.tsUnionType(omit.map(o => t.tsLiteralType(t.stringLiteral(o))))]));
+};
+/**
+ * omitTypeReference(t.tsTypeReference(t.identifier('Cw4UpdateMembersMutation'),),'args').....
+ * Omit<Cw4UpdateMembersMutation, 'args'>
+ */
+
+export const omitTypeReference = (from, omit) => {
+  return parameterizedTypeReference('Omit', from, omit);
+};
+export const pickTypeReference = (from, pick) => {
+  return parameterizedTypeReference('Pick', from, pick);
 };