wasm-ast-types 0.4.3 → 0.5.0

package/README.md

@@ -1 +1,130 @@
 # wasm-ast-types
+
+## working with ASTs
+
+### 1 edit the fixture
+
+edit `./scripts/fixture.ts`, for example:
+
+```js
+// ./scripts/fixture.ts
+export interface InstantiateMsg {
+    admin?: string | null;
+    members: Member[];
+}
+```
+
+### 2 run AST generator
+
+```
+yarn test:ast
+```
+
+### 3 look at the JSON produced
+
+```
+code ./scripts/test-output.json
+```
+
+We use the npm module `ast-stringify` to strip out unneccesary props, and generate a JSON for reference.
+
+You will see a `File` and `Program`... only concern yourself with the `body[]`:
+
+```json
+{
+  "type": "File",
+  "errors": [],
+  "program": {
+    "type": "Program",
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "exportKind": "type",
+        "specifiers": [],
+        "source": null,
+        "declaration": {
+          "type": "TSInterfaceDeclaration",
+          "id": {
+            "type": "Identifier",
+            "name": "InstantiateMsg"
+          },
+          "body": {
+            "type": "TSInterfaceBody",
+            "body": [
+              {
+                "type": "TSPropertySignature",
+                "key": {
+                  "type": "Identifier",
+                  "name": "admin"
+                },
+                "computed": false,
+                "optional": true,
+                "typeAnnotation": {
+                  "type": "TSTypeAnnotation",
+                  "typeAnnotation": {
+                    "type": "TSUnionType",
+                    "types": [
+                      {
+                        "type": "TSStringKeyword"
+                      },
+                      {
+                        "type": "TSNullKeyword"
+                      }
+                    ]
+                  }
+                }
+              },
+              {
+                "type": "TSPropertySignature",
+                "key": {
+                  "type": "Identifier",
+                  "name": "members"
+                },
+                "computed": false,
+                "typeAnnotation": {
+                  "type": "TSTypeAnnotation",
+                  "typeAnnotation": {
+                    "type": "TSArrayType",
+                    "elementType": {
+                      "type": "TSTypeReference",
+                      "typeName": {
+                        "type": "Identifier",
+                        "name": "Member"
+                      }
+                    }
+                  }
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  },
+  "comments": []
+}
+```
+
+### 4 code with `@babel/types` using the JSON as a reference
+
+NOTE: 4 continued ideally you should be writing a test with your generator!
+
+```js
+import * as t from '@babel/types';
+
+export const createNewGenerator = () => {
+    return t.exportNamedDeclaration(
+        t.tsInterfaceDeclaration(
+            t.identifier('InstantiateMsg'),
+            null,
+            [],
+            t.tsInterfaceBody([
+                // ... more code ...
+            ])
+        )
+    );
+};
+```

package/main/react-query.js

@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createReactQueryHooks = exports.createReactQueryHookInterface = exports.createReactQueryHook = void 0;
+exports.createReactQueryMutationHooks = exports.createReactQueryMutationHook = exports.createReactQueryMutationArgsInterface = exports.createReactQueryHooks = exports.createReactQueryHookInterface = exports.createReactQueryHook = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
@@ -23,6 +23,8 @@ var _babel = require("./utils/babel");
 
 var _types2 = require("./utils/types");
 
+var _wasm = require("./wasm");
+
 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; }
@@ -33,7 +35,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 var DEFAULT_OPTIONS = {
   optionalClient: false,
-  v4: false
+  v4: false,
+  mutations: false
 };
 
 var createReactQueryHooks = function createReactQueryHooks(_ref) {
@@ -108,17 +111,151 @@ var createReactQueryHook = function createReactQueryHook(_ref2) {
 
 exports.createReactQueryHook = createReactQueryHook;
 
-var createReactQueryHookInterface = function createReactQueryHookInterface(_ref3) {
-  var QueryClient = _ref3.QueryClient,
-      hookParamsTypeName = _ref3.hookParamsTypeName,
-      responseType = _ref3.responseType,
-      jsonschema = _ref3.jsonschema,
-      _ref3$options = _ref3.options,
-      options = _ref3$options === void 0 ? {} : _ref3$options;
+/**
+ * Example:
+```
+export interface Cw4UpdateMembersMutation {
+  client: Cw4GroupClient
+  args: {
+    tokenId: string
+    remove: string[]
+  }
+  options?: Omit<
+    UseMutationOptions<ExecuteResult, Error, Pick<Cw4UpdateMembersMutation, 'args'>>,
+    'mutationFn'
+  >
+}
+```
+ */
+var createReactQueryMutationArgsInterface = function createReactQueryMutationArgsInterface(_ref3) {
+  var _jsonschema$$ref;
+
+  var ExecuteClient = _ref3.ExecuteClient,
+      mutationHookParamsTypeName = _ref3.mutationHookParamsTypeName,
+      useMutationTypeParameter = _ref3.useMutationTypeParameter,
+      jsonschema = _ref3.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)(jsonschema); // TODO: this should not have to be done manually.
+
+  if (!msgType && jsonschema !== null && jsonschema !== void 0 && (_jsonschema$$ref = jsonschema.$ref) !== null && _jsonschema$$ref !== void 0 && _jsonschema$$ref.startsWith('#/definitions/')) {
+    var refName = jsonschema === null || jsonschema === void 0 ? void 0 : jsonschema.$ref;
+
+    if (/_for_[A-Z]/.test(refName)) {
+      refName = refName.replace(/_for_/, 'For');
+    }
+
+    msgType = t.tsTypeAnnotation((0, _types2.getTypeFromRef)(refName));
+  }
+
+  if (msgType) {
+    body.push(t.tsPropertySignature(t.identifier('msg'), msgType));
+  } //  fee: number | StdFee | "auto" = "auto", memo?: string, funds?: readonly Coin[]
+
+
+  var optionalArgs = t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation(t.tsTypeLiteral(_wasm.FIXED_EXECUTE_PARAMS.map(function (param) {
+    return (0, _babel.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)));
+};
+
+exports.createReactQueryMutationArgsInterface = createReactQueryMutationArgsInterface;
+
+var createReactQueryMutationHooks = function createReactQueryMutationHooks(_ref4) {
+  var execMsg = _ref4.execMsg,
+      contractName = _ref4.contractName,
+      ExecuteClient = _ref4.ExecuteClient,
+      _ref4$options = _ref4.options,
+      options = _ref4$options === void 0 ? {} : _ref4$options;
+  // merge the user options with the defaults
+  return (0, _utils.getMessageProperties)(execMsg).reduce(function (m, schema) {
+    var _jsonschema$propertie2, _Object$keys;
+
+    // update_members
+    var execMethodUnderscoreName = Object.keys(schema.properties)[0]; // updateMembers
+
+    var execMethodName = (0, _case.camel)(execMethodUnderscoreName); // Cw20UpdateMembersMutation
+
+    var mutationHookParamsTypeName = "".concat((0, _case.pascal)(contractName)).concat((0, _case.pascal)(execMethodName), "Mutation"); // useCw20UpdateMembersMutation
+
+    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 hasMsg = !!((_Object$keys = Object.keys(properties)) !== null && _Object$keys !== void 0 && _Object$keys.length || jsonschema !== null && jsonschema !== void 0 && jsonschema.$ref); // <ExecuteResult, Error, Cw4UpdateMembersMutation>
+
+    var useMutationTypeParameter = generateMutationTypeParameter(mutationHookParamsTypeName, hasMsg);
+    return [createReactQueryMutationArgsInterface({
+      mutationHookParamsTypeName: mutationHookParamsTypeName,
+      ExecuteClient: ExecuteClient,
+      jsonschema: jsonschema,
+      useMutationTypeParameter: useMutationTypeParameter
+    }), createReactQueryMutationHook({
+      execMethodName: execMethodName,
+      mutationHookName: mutationHookName,
+      mutationHookParamsTypeName: mutationHookParamsTypeName,
+      hasMsg: hasMsg,
+      useMutationTypeParameter: useMutationTypeParameter
+    })].concat((0, _toConsumableArray2["default"])(m));
+  }, []);
+};
+/**
+ * Generates the mutation type parameter. If args exist, we use a pick. If not, we just return the params type.
+ */
+
+
+exports.createReactQueryMutationHooks = createReactQueryMutationHooks;
+
+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
+  )
+```
+ */
+var createReactQueryMutationHook = function createReactQueryMutationHook(_ref5) {
+  var mutationHookName = _ref5.mutationHookName,
+      mutationHookParamsTypeName = _ref5.mutationHookParamsTypeName,
+      execMethodName = _ref5.execMethodName,
+      useMutationTypeParameter = _ref5.useMutationTypeParameter,
+      hasMsg = _ref5.hasMsg;
+  var useMutationFunctionArgs = [(0, _babel.shorthandProperty)('client')];
+  if (hasMsg) useMutationFunctionArgs.push((0, _babel.shorthandProperty)('msg'));
+  useMutationFunctionArgs.push(t.objectProperty(t.identifier('args'), t.assignmentPattern(t.objectPattern(_wasm.FIXED_EXECUTE_PARAMS.map(function (param) {
+    return (0, _babel.shorthandProperty)(param.name);
+  })), t.objectExpression([]))));
+  return t.exportNamedDeclaration(t.functionDeclaration(t.identifier(mutationHookName), [(0, _utils.identifier)('options', t.tsTypeAnnotation((0, _babel.omitTypeReference)(t.tsTypeReference(t.identifier('UseMutationOptions'), useMutationTypeParameter), 'mutationFn')), true)], t.blockStatement([t.returnStatement((0, _utils.callExpression)(t.identifier('useMutation'), [t.arrowFunctionExpression([t.objectPattern(useMutationFunctionArgs)], t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(execMethodName)), (hasMsg ? [t.identifier('msg')] : []).concat(_wasm.FIXED_EXECUTE_PARAMS.map(function (param) {
+    return t.identifier(param.name);
+  }))), false // not async
+  ), t.identifier('options')], useMutationTypeParameter))])));
+};
+
+exports.createReactQueryMutationHook = createReactQueryMutationHook;
+
+var createReactQueryHookInterface = function createReactQueryHookInterface(_ref6) {
+  var QueryClient = _ref6.QueryClient,
+      hookParamsTypeName = _ref6.hookParamsTypeName,
+      responseType = _ref6.responseType,
+      jsonschema = _ref6.jsonschema,
+      _ref6$options = _ref6.options,
+      options = _ref6$options === void 0 ? {} : _ref6$options;
   // merge the user options with the defaults
   options = _objectSpread(_objectSpread({}, DEFAULT_OPTIONS), options);
   var typedUseQueryOptions = t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([(0, _babel.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()])))]));
-  var body = [(0, _utils.tsPropertySignature)(t.identifier('client'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(QueryClient))), options.optionalClient), (0, _utils.tsPropertySignature)(t.identifier('options'), t.tsTypeAnnotation(options.v4 ? t.tSIntersectionType([t.tsTypeReference(t.identifier('Omit'), t.tsTypeParameterInstantiation([typedUseQueryOptions, t.tsLiteralType(t.stringLiteral("'queryKey' | 'queryFn' | 'initialData'"))])), t.tSTypeLiteral([t.tsPropertySignature(t.identifier('initialData?'), t.tsTypeAnnotation(t.tsUndefinedKeyword()))])]) : typedUseQueryOptions), true)];
+  var body = [(0, _utils.tsPropertySignature)(t.identifier('client'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(QueryClient))), options.optionalClient), (0, _utils.tsPropertySignature)(t.identifier('options'), t.tsTypeAnnotation(options.v4 ? t.tSIntersectionType([(0, _babel.omitTypeReference)(typedUseQueryOptions, "'queryKey' | 'queryFn' | 'initialData'"), t.tSTypeLiteral([t.tsPropertySignature(t.identifier('initialData?'), t.tsTypeAnnotation(t.tsUndefinedKeyword()))])]) : typedUseQueryOptions), true)];
   var props = getProps(jsonschema, true);
 
   if (props.length) {
@@ -131,9 +268,9 @@ var createReactQueryHookInterface = function createReactQueryHookInterface(_ref3
 exports.createReactQueryHookInterface = createReactQueryHookInterface;
 
 var getProps = function getProps(jsonschema, camelize) {
-  var _jsonschema$propertie2;
+  var _jsonschema$propertie3;
 
-  var keys = Object.keys((_jsonschema$propertie2 = jsonschema.properties) !== null && _jsonschema$propertie2 !== void 0 ? _jsonschema$propertie2 : {});
+  var keys = Object.keys((_jsonschema$propertie3 = jsonschema.properties) !== null && _jsonschema$propertie3 !== void 0 ? _jsonschema$propertie3 : {});
   if (!keys.length) return [];
   return keys.map(function (prop) {
     var _getPropertyType = (0, _types2.getPropertyType)(jsonschema, prop),

package/main/react-query.spec.js

@@ -10,6 +10,8 @@ var t = _interopRequireWildcard(require("@babel/types"));
 
 var _query_msg = _interopRequireDefault(require("./../../../__fixtures__/basic/query_msg.json"));
 
+var _execute_msg_for__empty = _interopRequireDefault(require("./../../../__fixtures__/basic/execute_msg_for__empty.json"));
+
 var _reactQuery = require("./react-query");
 
 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); }
@@ -69,4 +71,9 @@ it('createReactQueryHooks', function () {
       v4: true
     }
   })));
+  expectCode(t.program((0, _reactQuery.createReactQueryMutationHooks)({
+    execMsg: _execute_msg_for__empty["default"],
+    contractName: 'Sg721',
+    ExecuteClient: 'Sg721Client'
+  })));
 });

package/main/utils/babel.js

@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.typedIdentifier = exports.typeRefOrOptionalUnion = exports.tsTypeOperator = exports.tsPropertySignature = exports.tsObjectPattern = exports.shorthandProperty = exports.recursiveNamespace = exports.propertySignature = exports.promiseTypeAnnotation = exports.optionalConditionalExpression = exports.memberExpressionOrIdentifierSnake = exports.memberExpressionOrIdentifier = exports.importStmt = exports.importAminoMsg = exports.identifier = exports.getMessageProperties = exports.getFieldDimensionality = exports.classProperty = exports.classDeclaration = exports.callExpression = exports.bindMethod = exports.arrowFunctionExpression = exports.arrayTypeNDimensions = exports.FieldTypeAsts = void 0;
+exports.typedIdentifier = exports.typeRefOrOptionalUnion = exports.tsTypeOperator = exports.tsPropertySignature = exports.tsObjectPattern = exports.shorthandProperty = exports.recursiveNamespace = exports.propertySignature = exports.promiseTypeAnnotation = exports.pickTypeReference = exports.parameterizedTypeReference = exports.optionalConditionalExpression = exports.omitTypeReference = exports.memberExpressionOrIdentifierSnake = exports.memberExpressionOrIdentifier = exports.importStmt = exports.importAminoMsg = exports.identifier = exports.getMessageProperties = exports.getFieldDimensionality = exports.classProperty = exports.classDeclaration = exports.callExpression = exports.bindMethod = exports.arrowFunctionExpression = exports.arrayTypeNDimensions = exports.FieldTypeAsts = void 0;
 
 var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
 
@@ -21,6 +21,7 @@ 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; }
 
+// t.TSPropertySignature - kind?
 var propertySignature = function propertySignature(name, typeAnnotation) {
   var optional = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   return {
@@ -279,4 +280,29 @@ var typeRefOrOptionalUnion = function typeRefOrOptionalUnion(identifier) {
   return optional ? t.tsUnionType([typeReference, t.tsUndefinedKeyword()]) : typeReference;
 };
 
-exports.typeRefOrOptionalUnion = typeRefOrOptionalUnion;
+exports.typeRefOrOptionalUnion = typeRefOrOptionalUnion;
+
+var parameterizedTypeReference = function 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(function (o) {
+    return t.tsLiteralType(t.stringLiteral(o));
+  }))]));
+};
+/**
+ * omitTypeReference(t.tsTypeReference(t.identifier('Cw4UpdateMembersMutation'),),'args').....
+ * Omit<Cw4UpdateMembersMutation, 'args'>
+ */
+
+
+exports.parameterizedTypeReference = parameterizedTypeReference;
+
+var omitTypeReference = function omitTypeReference(from, omit) {
+  return parameterizedTypeReference('Omit', from, omit);
+};
+
+exports.omitTypeReference = omitTypeReference;
+
+var pickTypeReference = function pickTypeReference(from, pick) {
+  return parameterizedTypeReference('Pick', from, pick);
+};
+
+exports.pickTypeReference = pickTypeReference;

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,6 +53,8 @@ var getTypeFromRef = function getTypeFromRef($ref) {
   }
 };
 
+exports.getTypeFromRef = getTypeFromRef;
+
 var getArrayTypeFromRef = function getArrayTypeFromRef($ref) {
   return t.tsArrayType(getTypeFromRef($ref));
 };
@@ -183,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.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

@@ -6,12 +6,15 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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,
-  v4: false
+  v4: false,
+  mutations: false
 };
 export const createReactQueryHooks = ({
   queryMsg,
@@ -77,6 +80,124 @@ export const createReactQueryHook = ({
   })], 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,
@@ -87,7 +208,7 @@ export const createReactQueryHookInterface = ({
   // 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([t.tsTypeReference(t.identifier('Omit'), t.tsTypeParameterInstantiation([typedUseQueryOptions, t.tsLiteralType(t.stringLiteral("'queryKey' | 'queryFn' | 'initialData'"))])), t.tSTypeLiteral([t.tsPropertySignature(t.identifier('initialData?'), t.tsTypeAnnotation(t.tsUndefinedKeyword()))])]) : typedUseQueryOptions), true)];
+  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) {

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();
@@ -56,4 +57,9 @@ it('createReactQueryHooks', () => {
       v4: true
     }
   })));
+  expectCode(t.program(createReactQueryMutationHooks({
+    execMsg: execute_msg,
+    contractName: 'Sg721',
+    ExecuteClient: 'Sg721Client'
+  })));
 });

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);
 };

package/module/utils/types.js

@@ -16,7 +16,7 @@ const getTypeStrFromRef = $ref => {
   }
 };
 
-const getTypeFromRef = $ref => {
+export const getTypeFromRef = $ref => {
   switch ($ref) {
     case '#/definitions/Binary':
       return t.tsTypeReference(t.identifier('Binary'));
@@ -150,65 +150,72 @@ export const getPropertyType = (schema, prop) => {
     optional
   };
 };
-export const createTypedObjectParams = (jsonschema, camelize = true) => {
-  const keys = Object.keys(jsonschema.properties ?? {});
-  if (!keys.length) return;
-  const typedParams = keys.map(prop => {
-    if (jsonschema.properties[prop].type === 'object') {
-      if (jsonschema.properties[prop].title) {
-        return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(jsonschema.properties[prop].title))));
-      } else {
-        throw new Error('createTypedObjectParams() contact maintainer');
-      }
+export function getPropertySignatureFromProp(jsonschema, prop, camelize) {
+  if (jsonschema.properties[prop].type === 'object') {
+    if (jsonschema.properties[prop].title) {
+      return propertySignature(camelize ? 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)) {
-      const isOptional = !jsonschema.required?.includes(prop);
-      const unionTypes = jsonschema.properties[prop].allOf.map(el => {
-        if (el.title) return el.title;
-        if (el.$ref) return getTypeStrFromRef(el.$ref);
-        return el.type;
-      });
-      const uniqUnionTypes = [...new Set(unionTypes)];
-
-      if (uniqUnionTypes.length === 1) {
-        return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(uniqUnionTypes[0]))), isOptional);
-      } else {
-        return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(uniqUnionTypes.map(typ => t.tsTypeReference(t.identifier(typ))))), isOptional);
-      }
-    } else if (Array.isArray(jsonschema.properties[prop].oneOf)) {
-      const isOptional = !jsonschema.required?.includes(prop);
-      const unionTypes = jsonschema.properties[prop].oneOf.map(el => {
-        if (el.title) return el.title;
-        if (el.$ref) return getTypeStrFromRef(el.$ref);
-        return el.type;
-      });
-      const uniqUnionTypes = [...new Set(unionTypes)];
-
-      if (uniqUnionTypes.length === 1) {
-        return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(uniqUnionTypes[0]))), isOptional);
-      } else {
-        return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(uniqUnionTypes.map(typ => t.tsTypeReference(t.identifier(typ))))), isOptional);
-      }
+  if (Array.isArray(jsonschema.properties[prop].allOf)) {
+    const isOptional = !jsonschema.required?.includes(prop);
+    const unionTypes = jsonschema.properties[prop].allOf.map(el => {
+      if (el.title) return el.title;
+      if (el.$ref) return getTypeStrFromRef(el.$ref);
+      return el.type;
+    });
+    const uniqUnionTypes = [...new Set(unionTypes)];
+
+    if (uniqUnionTypes.length === 1) {
+      return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(uniqUnionTypes[0]))), isOptional);
+    } else {
+      return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(uniqUnionTypes.map(typ => t.tsTypeReference(t.identifier(typ))))), isOptional);
     }
-
-    try {
-      getPropertyType(jsonschema, prop);
-    } catch (e) {
-      console.log(e);
-      console.log(jsonschema, prop);
+  } else if (Array.isArray(jsonschema.properties[prop].oneOf)) {
+    const isOptional = !jsonschema.required?.includes(prop);
+    const unionTypes = jsonschema.properties[prop].oneOf.map(el => {
+      if (el.title) return el.title;
+      if (el.$ref) return getTypeStrFromRef(el.$ref);
+      return el.type;
+    });
+    const uniqUnionTypes = [...new Set(unionTypes)];
+
+    if (uniqUnionTypes.length === 1) {
+      return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(uniqUnionTypes[0]))), isOptional);
+    } else {
+      return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(uniqUnionTypes.map(typ => t.tsTypeReference(t.identifier(typ))))), isOptional);
     }
+  }
+
+  try {
+    getPropertyType(jsonschema, prop);
+  } catch (e) {
+    console.log(e);
+    console.log(jsonschema, prop);
+  }
+
+  const {
+    type,
+    optional
+  } = getPropertyType(jsonschema, prop);
+  return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(type), optional);
+}
+export const getParamsTypeAnnotation = (jsonschema, camelize = true) => {
+  const keys = Object.keys(jsonschema.properties ?? {});
+  if (!keys.length) return undefined;
+  const typedParams = keys.map(prop => getPropertySignatureFromProp(jsonschema, prop, camelize));
+  return t.tsTypeAnnotation(t.tsTypeLiteral([...typedParams]));
+};
+export const createTypedObjectParams = (jsonschema, camelize = true) => {
+  const keys = Object.keys(jsonschema.properties ?? {});
+  if (!keys.length) return; // const typedParams = keys.map(prop => getPropertySignatureFromProp(jsonschema, prop, camelize));
 
-    const {
-      type,
-      optional
-    } = getPropertyType(jsonschema, prop);
-    return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(type), optional);
-  });
   const params = keys.map(prop => {
     return t.objectProperty(camelize ? t.identifier(camel(prop)) : t.identifier(prop), camelize ? t.identifier(camel(prop)) : t.identifier(prop), false, true);
   });
   const obj = t.objectPattern([...params]);
-  obj.typeAnnotation = t.tsTypeAnnotation(t.tsTypeLiteral([...typedParams]));
+  obj.typeAnnotation = getParamsTypeAnnotation(jsonschema, camelize);
   return obj;
 };

package/module/wasm.js

@@ -27,6 +27,7 @@ export const createQueryClass = (className, implementsClassName, queryMsg) => {
   t.classMethod('constructor', t.identifier('constructor'), [typedIdentifier('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CosmWasmClient')))), typedIdentifier('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement([// client/contract set
   t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('client'))), t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.identifier('contractAddress'))), ...bindings])), ...methods], [t.tSExpressionWithTypeArguments(t.identifier(implementsClassName))]));
 };
+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(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
 export const createWasmExecMethod = jsonschema => {
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
@@ -35,9 +36,8 @@ export const createWasmExecMethod = jsonschema => {
   const args = Object.keys(properties).map(prop => {
     return t.objectProperty(t.identifier(prop), t.identifier(camel(prop)), false, prop === camel(prop));
   });
-  const constantParams = [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(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
   return t.classProperty(t.identifier(methodName), arrowFunctionExpression(obj ? [// props
-  obj, ...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([...args]))]), t.identifier('fee'), t.identifier('memo'), t.identifier('funds')])))]), // return type
+  obj, ...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([...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));
 };
 export const createExecuteClass = (className, implementsClassName, extendsClassName, execMsg) => {
@@ -81,13 +81,13 @@ export const createPropertyFunctionWithObjectParams = (methodName, responseType,
   };
   return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
 };
+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(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
 export const createPropertyFunctionWithObjectParamsForExec = (methodName, responseType, jsonschema) => {
   const obj = createTypedObjectParams(jsonschema);
-  const fixedParams = [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(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
   const func = {
     type: 'TSFunctionType',
     typeAnnotation: promiseTypeAnnotation(responseType),
-    parameters: obj ? [obj, ...fixedParams] : fixedParams
+    parameters: obj ? [obj, ...FIXED_EXECUTE_PARAMS] : FIXED_EXECUTE_PARAMS
   };
   return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.4.3",
+  "version": "0.5.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",
@@ -84,5 +84,5 @@
     "ast-stringify": "0.1.0",
     "case": "1.6.3"
   },
-  "gitHead": "c5fc4992d9da5f1c9da1f2c34469994dee7801df"
+  "gitHead": "871479982969e89f40b75ca5c85e8bed34a824da"
 }

package/types/react-query.d.ts

@@ -1,5 +1,5 @@
 import * as t from '@babel/types';
-import { QueryMsg } from './types';
+import { QueryMsg, ExecuteMsg } from './types';
 
 interface ReactQueryHooks {
     queryMsg: QueryMsg
@@ -19,6 +19,7 @@ interface ReactQueryHookQuery {
 export declare interface ReactQueryOptions {
     optionalClient?: boolean
     v4?: boolean
+    mutations?: boolean
 }
 export declare const createReactQueryHooks: ({ queryMsg, contractName, QueryClient, options }: ReactQueryHooks) => any;
 export declare const createReactQueryHook: ({ hookName, hookParamsTypeName, responseType, hookKeyName, methodName, jsonschema }: ReactQueryHookQuery) => t.ExportNamedDeclaration;
@@ -29,4 +30,41 @@ interface ReactQueryHookQueryInterface {
     jsonschema: any;
 }
 export declare const createReactQueryHookInterface: ({ QueryClient, hookParamsTypeName, responseType, jsonschema }: ReactQueryHookQueryInterface) => t.ExportNamedDeclaration;
+
+interface ReactQueryMutationHooks {
+    execMsg: ExecuteMsg
+    contractName: string
+    ExecuteClient: string
+    options?: ReactQueryOptions
+}
+export declare const createReactQueryMutationHooks: ({ execMsg, contractName, ExecuteClient, options }: ReactQueryMutationHooks) => any
+
+interface ReactQueryMutationHook {
+    mutationHookName: string;
+    mutationHookParamsTypeName: string;
+    execMethodName: string;
+    execArgs: t.ObjectProperty[]
+    options?: ReactQueryOptions
+}
+
+export declare const createReactQueryMutationHook: ({
+    mutationHookName,
+    mutationHookParamsTypeName,
+    execMethodName,
+    execArgs,
+    options,
+}: ReactQueryMutationHook) => any
+
+interface ReactQueryMutationHookInterface {
+    ExecuteClient: string
+    mutationHookParamsTypeName: string;
+    jsonschema: any
+}
+
+export declare const createReactQueryMutationArgsInterface: ({
+    ExecuteClient,
+    mutationHookParamsTypeName,
+    jsonschema
+}: ReactQueryMutationHookInterface) => t.ExportNamedDeclaration;
+
 export { };