wasm-ast-types 0.7.0 → 0.8.0

package/main/client/client.js

@@ -150,7 +150,8 @@ var createPropertyFunctionWithObjectParams = function createPropertyFunctionWith
     typeAnnotation: (0, _utils.promiseTypeAnnotation)(responseType),
     parameters: obj ? [obj] : []
   };
-  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
+  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation( // @ts-ignore:next-line
+  func));
 };
 
 exports.createPropertyFunctionWithObjectParams = createPropertyFunctionWithObjectParams;
@@ -163,7 +164,8 @@ var createPropertyFunctionWithObjectParamsForExec = function createPropertyFunct
     typeAnnotation: (0, _utils.promiseTypeAnnotation)(responseType),
     parameters: obj ? [obj].concat(FIXED_EXECUTE_PARAMS) : FIXED_EXECUTE_PARAMS
   };
-  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
+  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation( // @ts-ignore:next-line
+  func));
 };
 
 exports.createPropertyFunctionWithObjectParamsForExec = createPropertyFunctionWithObjectParamsForExec;
@@ -198,7 +200,8 @@ var createTypeOrInterface = function createTypeOrInterface(context, Type, jsonsc
 
     return (0, _babel.propertySignature)((0, _case.camel)(prop), t.tsTypeAnnotation(type), optional);
   });
-  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(Type), null, [], t.tsInterfaceBody((0, _toConsumableArray2["default"])(props))));
+  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(Type), null, [], t.tsInterfaceBody( // @ts-ignore:next-line
+  (0, _toConsumableArray2["default"])(props))));
 };
 
 exports.createTypeOrInterface = createTypeOrInterface;

package/main/message-composer/message-composer.js

@@ -84,5 +84,6 @@ var createPropertyFunctionWithObjectParamsForMessageComposer = function createPr
     typeAnnotation: t.tsTypeAnnotation(t.tsTypeReference(t.identifier(responseType))),
     parameters: obj ? [obj].concat(fixedParams) : fixedParams
   };
-  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
+  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation( // @ts-ignore:next-line
+  func));
 };

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

@@ -33,11 +33,17 @@ var createReactQueryHooks = function createReactQueryHooks(_ref) {
       contractName = _ref.contractName,
       QueryClient = _ref.QueryClient;
   var options = context.options.reactQuery;
-  return (0, _utils.getMessageProperties)(queryMsg).reduce(function (m, schema) {
+  var genericQueryInterfaceName = "".concat((0, _case.pascal)(contractName), "ReactQuery");
+  var body = [createReactQueryHookGenericInterface({
+    context: context,
+    QueryClient: QueryClient,
+    genericQueryInterfaceName: genericQueryInterfaceName
+  })];
+  body.push.apply(body, (0, _toConsumableArray2["default"])((0, _utils.getMessageProperties)(queryMsg).reduce(function (m, schema) {
     var underscoreName = Object.keys(schema.properties)[0];
     var methodName = (0, _case.camel)(underscoreName);
-    var hookName = "use".concat((0, _case.pascal)(contractName)).concat((0, _case.pascal)(methodName), "Query");
     var hookParamsTypeName = "".concat((0, _case.pascal)(contractName)).concat((0, _case.pascal)(methodName), "Query");
+    var hookName = "use".concat(hookParamsTypeName);
     var responseType = (0, _case.pascal)("".concat(methodName, "Response"));
     var getterKey = (0, _case.camel)("".concat(contractName).concat((0, _case.pascal)(methodName)));
     var jsonschema = schema.properties[underscoreName];
@@ -45,9 +51,9 @@ var createReactQueryHooks = function createReactQueryHooks(_ref) {
       context: context,
       hookParamsTypeName: hookParamsTypeName,
       responseType: responseType,
+      queryInterfaceName: genericQueryInterfaceName,
       QueryClient: QueryClient,
-      jsonschema: jsonschema,
-      options: options
+      jsonschema: jsonschema
     }), createReactQueryHook({
       context: context,
       methodName: methodName,
@@ -57,7 +63,8 @@ var createReactQueryHooks = function createReactQueryHooks(_ref) {
       hookKeyName: getterKey,
       jsonschema: jsonschema
     })].concat((0, _toConsumableArray2["default"])(m));
-  }, []);
+  }, [])));
+  return body;
 };
 
 exports.createReactQueryHooks = createReactQueryHooks;
@@ -92,8 +99,8 @@ var createReactQueryHook = function createReactQueryHook(_ref2) {
 
   return t.exportNamedDeclaration(t.functionDeclaration(t.identifier(hookName), [(0, _utils.tsObjectPattern)((0, _toConsumableArray2["default"])(props.map(function (prop) {
     return t.objectProperty(t.identifier(prop), t.identifier(prop), false, true);
-  })), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(hookParamsTypeName))))], t.blockStatement([t.returnStatement((0, _utils.callExpression)(t.identifier('useQuery'), [t.arrayExpression(generateUseQueryQueryKey(hookKeyName, props, options.optionalClient)), t.arrowFunctionExpression([], (0, _babel.optionalConditionalExpression)(t.identifier('client'), t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(methodName)), args), t.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([(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()])))])))])));
+  })), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(hookParamsTypeName))))], t.blockStatement([t.returnStatement((0, _utils.callExpression)(t.identifier('useQuery'), [t.arrayExpression(generateUseQueryQueryKey(hookKeyName, props, options.optionalClient)), t.arrowFunctionExpression([], (0, _babel.optionalConditionalExpression)(t.identifier('client'), t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(methodName)), args), t.callExpression(t.memberExpression(t.identifier('Promise'), t.identifier('reject')), [t.newExpression(t.identifier('Error'), [t.stringLiteral('Invalid client')])]), options.optionalClient), false), options.optionalClient ? t.objectExpression([t.spreadElement(t.identifier('options')), t.objectProperty(t.identifier('enabled'), t.logicalExpression('&&', t.unaryExpression('!', t.unaryExpression('!', t.identifier('client'))), t.conditionalExpression( // explicitly check for undefined
+  t.binaryExpression('!=', t.optionalMemberExpression(t.identifier('options'), t.identifier('enabled'), false, true), t.identifier('undefined')), t.memberExpression(t.identifier('options'), t.identifier('enabled')), t.booleanLiteral(true))))]) : t.identifier('options')], t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(responseType)), t.tsArrayType(t.tsParenthesizedType(t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])))])))])));
 };
 
 exports.createReactQueryHook = createReactQueryHook;
@@ -126,11 +133,15 @@ var createReactQueryMutationArgsInterface = function createReactQueryMutationArg
 
   if (msgType) {
     body.push(t.tsPropertySignature(t.identifier('msg'), msgType));
-  } //  fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]
+  }
 
+  context.addUtil('StdFee');
+  context.addUtil('Coin'); //  fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]
 
-  var optionalArgs = t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation(t.tsTypeLiteral(_client.FIXED_EXECUTE_PARAMS.map(function (param) {
-    return (0, _babel.propertySignature)(param.name, param.typeAnnotation, param.optional);
+  var optionalArgs = t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation( // @ts-ignore:next-line
+  t.tsTypeLiteral(_client.FIXED_EXECUTE_PARAMS.map(function (param) {
+    return (0, _babel.propertySignature)(param.name, // @ts-ignore:next-line
+    param.typeAnnotation, param.optional);
   }))));
   optionalArgs.optional = true;
   body.push(optionalArgs);
@@ -226,24 +237,36 @@ var createReactQueryMutationHook = function createReactQueryMutationHook(_ref5)
 
 exports.createReactQueryMutationHook = createReactQueryMutationHook;
 
-var createReactQueryHookInterface = function createReactQueryHookInterface(_ref6) {
+function createReactQueryHookGenericInterface(_ref6) {
   var context = _ref6.context,
       QueryClient = _ref6.QueryClient,
-      hookParamsTypeName = _ref6.hookParamsTypeName,
-      responseType = _ref6.responseType,
-      jsonschema = _ref6.jsonschema;
-  // merge the user options with the defaults
+      genericQueryInterfaceName = _ref6.genericQueryInterfaceName;
   var options = context.options.reactQuery;
+  var genericTypeName = 'TResponse';
   context.addUtil('UseQueryOptions');
-  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.version === 'v4' ? t.tSIntersectionType([(0, _babel.omitTypeReference)(typedUseQueryOptions, "'queryKey' | 'queryFn' | 'initialData'"), t.tSTypeLiteral([t.tsPropertySignature(t.identifier('initialData?'), t.tsTypeAnnotation(t.tsUndefinedKeyword()))])]) : typedUseQueryOptions), true)];
+  var typedUseQueryOptions = t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(genericTypeName)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(genericTypeName)), t.tsArrayType(t.tsParenthesizedType(t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])))]));
+  var body = [(0, _utils.tsPropertySignature)(t.identifier('client'), t.tsTypeAnnotation(options.optionalClient ? t.tsUnionType([t.tsTypeReference(t.identifier(QueryClient)), t.tsUndefinedKeyword()]) : t.tsTypeReference(t.identifier(QueryClient))), false), (0, _utils.tsPropertySignature)(t.identifier('options'), t.tsTypeAnnotation(options.version === 'v4' ? t.tSIntersectionType([(0, _babel.omitTypeReference)(typedUseQueryOptions, "'queryKey' | 'queryFn' | 'initialData'"), t.tSTypeLiteral([t.tsPropertySignature(t.identifier('initialData?'), t.tsTypeAnnotation(t.tsUndefinedKeyword()))])]) : typedUseQueryOptions), true)];
+  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(genericQueryInterfaceName), t.tsTypeParameterDeclaration([t.tsTypeParameter(undefined, undefined, genericTypeName)]), [], t.tSInterfaceBody(body)));
+}
+
+var createReactQueryHookInterface = function createReactQueryHookInterface(_ref7) {
+  var context = _ref7.context,
+      QueryClient = _ref7.QueryClient,
+      hookParamsTypeName = _ref7.hookParamsTypeName,
+      queryInterfaceName = _ref7.queryInterfaceName,
+      responseType = _ref7.responseType,
+      jsonschema = _ref7.jsonschema;
+  // merge the user options with the defaults
+  var options = context.options.reactQuery;
+  var body = [];
   var props = getProps(context, jsonschema);
 
   if (props.length) {
-    body.push(t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation(t.tsTypeLiteral(props))));
+    body.push(t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation( // @ts-ignore:next-line
+    t.tsTypeLiteral(props))));
   }
 
-  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(hookParamsTypeName), null, [], t.tsInterfaceBody(body)));
+  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(hookParamsTypeName), null, [t.tSExpressionWithTypeArguments(t.identifier(queryInterfaceName), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType))]))], t.tsInterfaceBody(body)));
 };
 
 exports.createReactQueryHookInterface = createReactQueryHookInterface;

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.pickTypeReference = exports.parameterizedTypeReference = exports.optionalConditionalExpression = exports.omitTypeReference = exports.memberExpressionOrIdentifierSnake = exports.memberExpressionOrIdentifier = exports.importStmt = exports.importAs = 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.typeRefOrUnionWithUndefined = 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.importAs = 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"));
 
@@ -280,13 +280,13 @@ var optionalConditionalExpression = function optionalConditionalExpression(test,
 
 exports.optionalConditionalExpression = optionalConditionalExpression;
 
-var typeRefOrOptionalUnion = function typeRefOrOptionalUnion(identifier) {
+var typeRefOrUnionWithUndefined = function typeRefOrUnionWithUndefined(identifier) {
   var optional = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var typeReference = t.tsTypeReference(identifier);
   return optional ? t.tsUnionType([typeReference, t.tsUndefinedKeyword()]) : typeReference;
 };
 
-exports.typeRefOrOptionalUnion = typeRefOrOptionalUnion;
+exports.typeRefOrUnionWithUndefined = typeRefOrUnionWithUndefined;
 
 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) {

package/main/utils/types.js

@@ -2,7 +2,7 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof = require("@babel/runtime/helpers/typeof");
+var _typeof3 = require("@babel/runtime/helpers/typeof");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -13,6 +13,8 @@ exports.getTypeFromRef = exports.getType = exports.getPropertyType = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var t = _interopRequireWildcard(require("@babel/types"));
@@ -23,7 +25,7 @@ var _babel = require("./babel");
 
 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; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 var getTypeStrFromRef = function getTypeStrFromRef($ref) {
   if ($ref !== null && $ref !== void 0 && $ref.startsWith('#/definitions/')) {
@@ -118,12 +120,16 @@ var getPropertyType = function getPropertyType(context, schema, prop) {
 
   if (typeof info.type === 'string') {
     if (info.type === 'array') {
-      if (info.items.$ref) {
-        type = getArrayTypeFromRef(info.items.$ref);
-      } else if (info.items.title) {
-        type = t.tsArrayType(t.tsTypeReference(t.identifier(info.items.title)));
-      } else if (info.items.type) {
-        type = getArrayTypeFromItems(info.items);
+      if ((0, _typeof2["default"])(info.items) === 'object' && !Array.isArray(info.items)) {
+        if (info.items.$ref) {
+          type = getArrayTypeFromRef(info.items.$ref);
+        } else if (info.items.title) {
+          type = t.tsArrayType(t.tsTypeReference(t.identifier(info.items.title)));
+        } else if (info.items.type) {
+          type = getArrayTypeFromItems(info.items);
+        } else {
+          throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
+        }
       } else {
         throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
       }
@@ -146,7 +152,7 @@ var getPropertyType = function getPropertyType(context, schema, prop) {
       throw new Error('please report this to maintainers (field type): ' + JSON.stringify(info, null, 2));
     }
 
-    if (_nullableType === 'array') {
+    if (_nullableType === 'array' && (0, _typeof2["default"])(info.items) === 'object' && !Array.isArray(info.items)) {
       type = t.tsArrayType(getType(info.items.type));
     } else {
       type = getType(_nullableType);
@@ -188,7 +194,8 @@ function getPropertySignatureFromProp(context, jsonschema, prop, camelize) {
       if (el.title) return el.title;
       if (el.$ref) return getTypeStrFromRef(el.$ref);
       return el.type;
-    });
+    }); // @ts-ignore:next-line
+
     var uniqUnionTypes = (0, _toConsumableArray2["default"])(new Set(unionTypes));
 
     if (uniqUnionTypes.length === 1) {
@@ -207,7 +214,8 @@ function getPropertySignatureFromProp(context, jsonschema, prop, camelize) {
       if (el.title) return el.title;
       if (el.$ref) return getTypeStrFromRef(el.$ref);
       return el.type;
-    });
+    }); // @ts-ignore:next-line
+
 
     var _uniqUnionTypes = (0, _toConsumableArray2["default"])(new Set(_unionTypes));
 
@@ -248,7 +256,8 @@ var getParamsTypeAnnotation = function getParamsTypeAnnotation(context, jsonsche
   var typedParams = keys.map(function (prop) {
     return getPropertySignatureFromProp(context, jsonschema, prop, camelize);
   });
-  return t.tsTypeAnnotation(t.tsTypeLiteral((0, _toConsumableArray2["default"])(typedParams)));
+  return t.tsTypeAnnotation(t.tsTypeLiteral( // @ts-ignore:next-line
+  (0, _toConsumableArray2["default"])(typedParams)));
 };
 
 exports.getParamsTypeAnnotation = getParamsTypeAnnotation;

package/module/client/client.js

@@ -95,7 +95,8 @@ export const createPropertyFunctionWithObjectParams = (context, methodName, resp
     typeAnnotation: promiseTypeAnnotation(responseType),
     parameters: obj ? [obj] : []
   };
-  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
+  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation( // @ts-ignore:next-line
+  func));
 };
 export const createPropertyFunctionWithObjectParamsForExec = (context, methodName, responseType, jsonschema) => {
   context.addUtil('Coin');
@@ -105,7 +106,8 @@ export const createPropertyFunctionWithObjectParamsForExec = (context, methodNam
     typeAnnotation: promiseTypeAnnotation(responseType),
     parameters: obj ? [obj, ...FIXED_EXECUTE_PARAMS] : FIXED_EXECUTE_PARAMS
   };
-  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
+  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation( // @ts-ignore:next-line
+  func));
 };
 export const createQueryInterface = (context, className, queryMsg) => {
   const methods = getMessageProperties(queryMsg).map(jsonschema => {
@@ -132,7 +134,8 @@ export const createTypeOrInterface = (context, Type, jsonschema) => {
     } = getPropertyType(context, jsonschema, prop);
     return propertySignature(camel(prop), t.tsTypeAnnotation(type), optional);
   });
-  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(Type), null, [], t.tsInterfaceBody([...props])));
+  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(Type), null, [], t.tsInterfaceBody( // @ts-ignore:next-line
+  [...props])));
 };
 export const createTypeInterface = (context, jsonschema) => {
   const Type = jsonschema.title;

package/module/message-composer/message-composer.js

@@ -53,5 +53,6 @@ const createPropertyFunctionWithObjectParamsForMessageComposer = (context, metho
     typeAnnotation: t.tsTypeAnnotation(t.tsTypeReference(t.identifier(responseType))),
     parameters: obj ? [obj, ...fixedParams] : fixedParams
   };
-  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
+  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation( // @ts-ignore:next-line
+  func));
 };

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

@@ -1,7 +1,7 @@
 import * as t from '@babel/types';
 import { camel, pascal } from 'case';
 import { callExpression, getMessageProperties, identifier, tsObjectPattern, tsPropertySignature } from '../utils';
-import { omitTypeReference, optionalConditionalExpression, propertySignature, shorthandProperty, typeRefOrOptionalUnion } from '../utils/babel';
+import { omitTypeReference, optionalConditionalExpression, propertySignature, shorthandProperty } from '../utils/babel';
 import { getParamsTypeAnnotation, getPropertyType } from '../utils/types';
 import { FIXED_EXECUTE_PARAMS } from '../client';
 export const createReactQueryHooks = ({
@@ -11,11 +11,17 @@ export const createReactQueryHooks = ({
   QueryClient
 }) => {
   const options = context.options.reactQuery;
-  return getMessageProperties(queryMsg).reduce((m, schema) => {
+  const genericQueryInterfaceName = `${pascal(contractName)}ReactQuery`;
+  const body = [createReactQueryHookGenericInterface({
+    context,
+    QueryClient,
+    genericQueryInterfaceName
+  })];
+  body.push(...getMessageProperties(queryMsg).reduce((m, schema) => {
     const underscoreName = Object.keys(schema.properties)[0];
     const methodName = camel(underscoreName);
-    const hookName = `use${pascal(contractName)}${pascal(methodName)}Query`;
     const hookParamsTypeName = `${pascal(contractName)}${pascal(methodName)}Query`;
+    const hookName = `use${hookParamsTypeName}`;
     const responseType = pascal(`${methodName}Response`);
     const getterKey = camel(`${contractName}${pascal(methodName)}`);
     const jsonschema = schema.properties[underscoreName];
@@ -23,9 +29,9 @@ export const createReactQueryHooks = ({
       context,
       hookParamsTypeName,
       responseType,
+      queryInterfaceName: genericQueryInterfaceName,
       QueryClient,
-      jsonschema,
-      options
+      jsonschema
     }), createReactQueryHook({
       context,
       methodName,
@@ -35,7 +41,8 @@ export const createReactQueryHooks = ({
       hookKeyName: getterKey,
       jsonschema
     }), ...m];
-  }, []);
+  }, []));
+  return body;
 };
 export const createReactQueryHook = ({
   context,
@@ -66,8 +73,8 @@ 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(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()])))])))])));
+  })], 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.callExpression(t.memberExpression(t.identifier('Promise'), t.identifier('reject')), [t.newExpression(t.identifier('Error'), [t.stringLiteral('Invalid client')])]), options.optionalClient), false), options.optionalClient ? t.objectExpression([t.spreadElement(t.identifier('options')), t.objectProperty(t.identifier('enabled'), t.logicalExpression('&&', t.unaryExpression('!', t.unaryExpression('!', t.identifier('client'))), t.conditionalExpression( // explicitly check for undefined
+  t.binaryExpression('!=', t.optionalMemberExpression(t.identifier('options'), t.identifier('enabled'), false, true), t.identifier('undefined')), t.memberExpression(t.identifier('options'), t.identifier('enabled')), t.booleanLiteral(true))))]) : t.identifier('options')], t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(responseType)), t.tsArrayType(t.tsParenthesizedType(t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])))])))])));
 };
 
 /**
@@ -99,10 +106,14 @@ export const createReactQueryMutationArgsInterface = ({
 
   if (msgType) {
     body.push(t.tsPropertySignature(t.identifier('msg'), msgType));
-  } //  fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]
+  }
 
+  context.addUtil('StdFee');
+  context.addUtil('Coin'); //  fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]
 
-  const optionalArgs = t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation(t.tsTypeLiteral(FIXED_EXECUTE_PARAMS.map(param => propertySignature(param.name, param.typeAnnotation, param.optional)))));
+  const optionalArgs = t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation( // @ts-ignore:next-line
+  t.tsTypeLiteral(FIXED_EXECUTE_PARAMS.map(param => propertySignature(param.name, // @ts-ignore:next-line
+  param.typeAnnotation, param.optional)))));
   optionalArgs.optional = true;
   body.push(optionalArgs);
   return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(mutationHookParamsTypeName), null, [], t.tsInterfaceBody(body)));
@@ -184,25 +195,39 @@ export const createReactQueryMutationHook = ({
   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))])));
 };
+
+function createReactQueryHookGenericInterface({
+  context,
+  QueryClient,
+  genericQueryInterfaceName
+}) {
+  const options = context.options.reactQuery;
+  const genericTypeName = 'TResponse';
+  context.addUtil('UseQueryOptions');
+  const typedUseQueryOptions = t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(genericTypeName)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(genericTypeName)), t.tsArrayType(t.tsParenthesizedType(t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])))]));
+  const body = [tsPropertySignature(t.identifier('client'), t.tsTypeAnnotation(options.optionalClient ? t.tsUnionType([t.tsTypeReference(t.identifier(QueryClient)), t.tsUndefinedKeyword()]) : t.tsTypeReference(t.identifier(QueryClient))), false), tsPropertySignature(t.identifier('options'), t.tsTypeAnnotation(options.version === 'v4' ? t.tSIntersectionType([omitTypeReference(typedUseQueryOptions, "'queryKey' | 'queryFn' | 'initialData'"), t.tSTypeLiteral([t.tsPropertySignature(t.identifier('initialData?'), t.tsTypeAnnotation(t.tsUndefinedKeyword()))])]) : typedUseQueryOptions), true)];
+  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(genericQueryInterfaceName), t.tsTypeParameterDeclaration([t.tsTypeParameter(undefined, undefined, genericTypeName)]), [], t.tSInterfaceBody(body)));
+}
+
 export const createReactQueryHookInterface = ({
   context,
   QueryClient,
   hookParamsTypeName,
+  queryInterfaceName,
   responseType,
   jsonschema
 }) => {
   // merge the user options with the defaults
   const options = context.options.reactQuery;
-  context.addUtil('UseQueryOptions');
-  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.version === 'v4' ? t.tSIntersectionType([omitTypeReference(typedUseQueryOptions, "'queryKey' | 'queryFn' | 'initialData'"), t.tSTypeLiteral([t.tsPropertySignature(t.identifier('initialData?'), t.tsTypeAnnotation(t.tsUndefinedKeyword()))])]) : typedUseQueryOptions), true)];
+  const body = [];
   const props = getProps(context, jsonschema);
 
   if (props.length) {
-    body.push(t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation(t.tsTypeLiteral(props))));
+    body.push(t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation( // @ts-ignore:next-line
+    t.tsTypeLiteral(props))));
   }
 
-  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(hookParamsTypeName), null, [], t.tsInterfaceBody(body)));
+  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(hookParamsTypeName), null, [t.tSExpressionWithTypeArguments(t.identifier(queryInterfaceName), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType))]))], t.tsInterfaceBody(body)));
 };
 
 const getProps = (context, jsonschema) => {

package/module/utils/babel.js

@@ -165,7 +165,7 @@ export const memberExpressionOrIdentifierSnake = names => {
 export const optionalConditionalExpression = (test, expression, alternate, optional = false) => {
   return optional ? t.conditionalExpression(test, expression, alternate) : expression;
 };
-export const typeRefOrOptionalUnion = (identifier, optional = false) => {
+export const typeRefOrUnionWithUndefined = (identifier, optional = false) => {
   const typeReference = t.tsTypeReference(identifier);
   return optional ? t.tsUnionType([typeReference, t.tsUndefinedKeyword()]) : typeReference;
 };

package/module/utils/types.js

@@ -86,12 +86,16 @@ export const getPropertyType = (context, schema, prop) => {
 
   if (typeof info.type === 'string') {
     if (info.type === 'array') {
-      if (info.items.$ref) {
-        type = getArrayTypeFromRef(info.items.$ref);
-      } else if (info.items.title) {
-        type = t.tsArrayType(t.tsTypeReference(t.identifier(info.items.title)));
-      } else if (info.items.type) {
-        type = getArrayTypeFromItems(info.items);
+      if (typeof info.items === 'object' && !Array.isArray(info.items)) {
+        if (info.items.$ref) {
+          type = getArrayTypeFromRef(info.items.$ref);
+        } else if (info.items.title) {
+          type = t.tsArrayType(t.tsTypeReference(t.identifier(info.items.title)));
+        } else if (info.items.type) {
+          type = getArrayTypeFromItems(info.items);
+        } else {
+          throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
+        }
       } else {
         throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
       }
@@ -112,7 +116,7 @@ export const getPropertyType = (context, schema, prop) => {
       throw new Error('please report this to maintainers (field type): ' + JSON.stringify(info, null, 2));
     }
 
-    if (nullableType === 'array') {
+    if (nullableType === 'array' && typeof info.items === 'object' && !Array.isArray(info.items)) {
       type = t.tsArrayType(getType(info.items.type));
     } else {
       type = getType(nullableType);
@@ -149,7 +153,8 @@ export function getPropertySignatureFromProp(context, jsonschema, prop, camelize
       if (el.title) return el.title;
       if (el.$ref) return getTypeStrFromRef(el.$ref);
       return el.type;
-    });
+    }); // @ts-ignore:next-line
+
     const uniqUnionTypes = [...new Set(unionTypes)];
 
     if (uniqUnionTypes.length === 1) {
@@ -163,7 +168,8 @@ export function getPropertySignatureFromProp(context, jsonschema, prop, camelize
       if (el.title) return el.title;
       if (el.$ref) return getTypeStrFromRef(el.$ref);
       return el.type;
-    });
+    }); // @ts-ignore:next-line
+
     const uniqUnionTypes = [...new Set(unionTypes)];
 
     if (uniqUnionTypes.length === 1) {
@@ -195,7 +201,8 @@ export const getParamsTypeAnnotation = (context, jsonschema, camelize = true) =>
 
   if (!keys.length) return undefined;
   const typedParams = keys.map(prop => getPropertySignatureFromProp(context, jsonschema, prop, camelize));
-  return t.tsTypeAnnotation(t.tsTypeLiteral([...typedParams]));
+  return t.tsTypeAnnotation(t.tsTypeLiteral( // @ts-ignore:next-line
+  [...typedParams]));
 };
 export const createTypedObjectParams = (context, jsonschema, camelize = true) => {
   const keys = Object.keys(jsonschema.properties ?? {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.7.0",
+  "version": "0.8.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",
@@ -86,5 +86,5 @@
     "case": "1.6.3",
     "deepmerge": "4.2.2"
   },
-  "gitHead": "09236055739cc020418f89a246d8a954353c7ec3"
+  "gitHead": "93256e4c8579d792ca727ef8f1e9ac47a5231726"
 }

package/types/{src/context → context}/imports.d.ts

@@ -10,6 +10,7 @@ export declare const UTILS: {
     MsgExecuteContractEncodeObject: string;
     Coin: string;
     toUtf8: string;
+    selectorFamily: string;
     StdFee: string;
     CosmWasmClient: string;
     ExecuteResult: string;

package/types/{src/react-query → react-query}/react-query.d.ts

@@ -17,7 +17,7 @@ interface ReactQueryHooks {
     contractName: string;
     QueryClient: string;
 }
-export declare const createReactQueryHooks: ({ context, queryMsg, contractName, QueryClient }: ReactQueryHooks) => any;
+export declare const createReactQueryHooks: ({ context, queryMsg, contractName, QueryClient }: ReactQueryHooks) => t.ExportNamedDeclaration[];
 export declare const createReactQueryHook: ({ context, hookName, hookParamsTypeName, responseType, hookKeyName, methodName, jsonschema }: ReactQueryHookQuery) => t.ExportNamedDeclaration;
 interface ReactQueryMutationHookInterface {
     context: RenderContext;
@@ -74,8 +74,9 @@ interface ReactQueryHookQueryInterface {
     context: RenderContext;
     QueryClient: string;
     hookParamsTypeName: string;
+    queryInterfaceName: string;
     responseType: string;
     jsonschema: any;
 }
-export declare const createReactQueryHookInterface: ({ context, QueryClient, hookParamsTypeName, responseType, jsonschema }: ReactQueryHookQueryInterface) => t.ExportNamedDeclaration;
+export declare const createReactQueryHookInterface: ({ context, QueryClient, hookParamsTypeName, queryInterfaceName, responseType, jsonschema }: ReactQueryHookQueryInterface) => t.ExportNamedDeclaration;
 export {};

package/types/{src/types.d.ts → types.d.ts}

@@ -33,7 +33,7 @@ export interface JSONSchema {
     oneOf?: JSONSchema[];
     properties?: Record<string, JSONSchema>;
     patternProperties?: Record<string, JSONSchema>;
-    items?: JSONSchema[] | JSONSchema;
+    items?: JSONSchema | JSONSchema[];
     additionalItems?: JSONSchema;
     required?: string[];
     title?: string;

package/types/{src/utils → utils}/babel.d.ts

@@ -44,7 +44,7 @@ export declare const memberExpressionOrIdentifierSnake: (names: any) => any;
  * If optional, return a conditional, otherwise just the expression
  */
 export declare const optionalConditionalExpression: (test: t.Expression, expression: t.Expression, alternate: t.Expression, optional?: boolean) => t.Expression;
-export declare const typeRefOrOptionalUnion: (identifier: t.Identifier, optional?: boolean) => t.TSType;
+export declare const typeRefOrUnionWithUndefined: (identifier: t.Identifier, optional?: boolean) => t.TSType;
 export declare const parameterizedTypeReference: (identifier: string, from: t.TSType, omit: string | Array<string>) => t.TSTypeReference;
 /**
  * omitTypeReference(t.tsTypeReference(t.identifier('Cw4UpdateMembersMutation'),),'args').....

package/types/src/client/test/ts-client.cw-named-groups.test.d.ts

@@ -1 +0,0 @@
-export {};

package/types/src/client/test/ts-client.cw-proposal-single.test.d.ts

@@ -1 +0,0 @@
-export {};

package/types/test-utils/index.d.ts

@@ -1,2 +0,0 @@
-export declare const expectCode: (ast: any) => void;
-export declare const printCode: (ast: any) => void;