wasm-ast-types 0.24.0 → 0.26.0

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

@@ -15,7 +15,6 @@ export const createReactQueryHooks = ({
   const underscoreNames = getMessageProperties(queryMsg).map(schema => Object.keys(schema.properties)[0]);
   const body = [];
   const queryKeysName = `${camel(contractName)}QueryKeys`;
-
   if (options.queryKeys) {
     body.push(createReactQueryKeys({
       context,
@@ -24,19 +23,18 @@ export const createReactQueryHooks = ({
       underscoreNames
     }));
   }
-
   const queryMsgs = getMessageProperties(queryMsg).map(schema => {
     // list_voters
-    const underscoreName = Object.keys(schema.properties)[0]; // listVoters
-
-    const methodName = camel(underscoreName); // Cw3FlexMultisigListVotersQuery
-
-    const hookParamsTypeName = `${pascal(contractName)}${pascal(methodName)}Query`; // useCw3FlexMultisigListVotersQuery
-
-    const hookName = `use${hookParamsTypeName}`; // listVotersResponse
-
-    const responseType = getResponseType(context, underscoreName); // cw3FlexMultisigListVoters
-
+    const underscoreName = Object.keys(schema.properties)[0];
+    // listVoters
+    const methodName = camel(underscoreName);
+    // Cw3FlexMultisigListVotersQuery
+    const hookParamsTypeName = `${pascal(contractName)}${pascal(methodName)}Query`;
+    // useCw3FlexMultisigListVotersQuery
+    const hookName = `use${hookParamsTypeName}`;
+    // listVotersResponse
+    const responseType = getResponseType(context, underscoreName);
+    // cw3FlexMultisigListVoters
     const getterKey = camel(`${contractName}${pascal(methodName)}`);
     const jsonschema = schema.properties[underscoreName];
     return {
@@ -50,7 +48,6 @@ export const createReactQueryHooks = ({
     };
   });
   const queryFactoryName = `${camel(contractName)}Queries`;
-
   if (options.queryFactory) {
     body.push(createReactQueryFactory({
       context,
@@ -59,7 +56,6 @@ export const createReactQueryHooks = ({
       queryMsgs
     }));
   }
-
   body.push(createReactQueryHookGenericInterface({
     context,
     QueryClient,
@@ -93,29 +89,25 @@ export const createReactQueryHooks = ({
   }, []));
   return body;
 };
-
 function buildQueryFn(methodName, jsonschema, options) {
   const keys = Object.keys(jsonschema.properties ?? {});
   let args = [];
-
   if (keys.length) {
     args = [t.objectExpression([...keys.map(prop => {
       return t.objectProperty(t.identifier(camel(prop)), t.memberExpression(t.identifier('args'), t.identifier(camel(prop))));
     })])];
   }
-
   const rejectInvalidClient = t.callExpression(t.memberExpression(t.identifier('Promise'), t.identifier('reject')), [t.newExpression(t.identifier('Error'), [t.stringLiteral('Invalid client')])]);
   return t.arrowFunctionExpression([], optionalConditionalExpression(t.identifier('client'), t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(methodName)), args), rejectInvalidClient, options.optionalClient), false);
 }
-
-const ENABLED_QUERY_OPTION = t.objectProperty(t.identifier('enabled'), t.logicalExpression('&&', t.unaryExpression('!', t.unaryExpression('!', t.identifier('client'))), t.conditionalExpression( // explicitly check for undefined
+const ENABLED_QUERY_OPTION = t.objectProperty(t.identifier('enabled'), t.logicalExpression('&&', t.unaryExpression('!', t.unaryExpression('!', t.identifier('client'))), t.conditionalExpression(
+// explicitly check for undefined
 t.binaryExpression('!=', t.optionalMemberExpression(t.identifier('options'), t.identifier('enabled'), false, true), t.identifier('undefined')), t.memberExpression(t.identifier('options'), t.identifier('enabled')), t.booleanLiteral(true))));
-
 function buildQueryOptions(options) {
-  return options.optionalClient ? t.objectExpression([t.spreadElement(t.identifier('options')), t.objectProperty(t.identifier('enabled'), t.logicalExpression('&&', t.unaryExpression('!', t.unaryExpression('!', t.identifier('client'))), t.conditionalExpression( // explicitly check for undefined
+  return options.optionalClient ? t.objectExpression([t.spreadElement(t.identifier('options')), t.objectProperty(t.identifier('enabled'), t.logicalExpression('&&', t.unaryExpression('!', t.unaryExpression('!', t.identifier('client'))), t.conditionalExpression(
+  // explicitly check for undefined
   t.binaryExpression('!=', t.optionalMemberExpression(t.identifier('options'), t.identifier('enabled'), false, true), t.identifier('undefined')), t.memberExpression(t.identifier('options'), t.identifier('enabled')), t.booleanLiteral(true))))]) : t.identifier('options');
 }
-
 export const createReactQueryHook = ({
   context,
   hookName,
@@ -131,11 +123,9 @@ export const createReactQueryHook = ({
   const options = context.options.reactQuery;
   const keys = Object.keys(jsonschema.properties ?? {});
   let props = ['client', 'options'];
-
   if (keys.length) {
     props = ['client', 'args', 'options'];
   }
-
   const selectResponseGenericTypeName = GENERIC_SELECT_RESPONSE_NAME;
   const queryFunctionDeclaration = t.functionDeclaration(t.identifier(hookName), [tsObjectPattern([...props.map(prop => {
     return t.objectProperty(t.identifier(prop), t.identifier(prop), false, true);
@@ -145,12 +135,12 @@ export const createReactQueryHook = ({
     methodName,
     props,
     options
-  }), buildQueryFn(methodName, jsonschema, options), buildQueryOptions(options)], t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(selectResponseGenericTypeName))])))])); // Add the TData type parameters
+  }), buildQueryFn(methodName, jsonschema, options), buildQueryOptions(options)], t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(selectResponseGenericTypeName))])))]));
 
+  // Add the TData type parameters
   queryFunctionDeclaration.typeParameters = t.tsTypeParameterDeclaration([t.tsTypeParameter(undefined, t.tSTypeReference(t.identifier(responseType)), selectResponseGenericTypeName)]);
   return t.exportNamedDeclaration(queryFunctionDeclaration);
 };
-
 /**
  * Example:
 ```
@@ -178,15 +168,15 @@ export const createReactQueryMutationArgsInterface = ({
   const typedUseMutationOptions = t.tsTypeReference(t.identifier('UseMutationOptions'), useMutationTypeParameter);
   const body = [tsPropertySignature(t.identifier('client'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(ExecuteClient))), false)];
   const msgType = createTypedObjectParams(context, jsonschema)?.typeAnnotation;
-
   if (msgType) {
-    body.push(t.tsPropertySignature(t.identifier('msg'), // @ts-ignore
+    body.push(t.tsPropertySignature(t.identifier('msg'),
+    // @ts-ignore
     msgType));
   }
-
   context.addUtil('StdFee');
   context.addUtil('Coin');
-  const optionalArgs = t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation( // @ts-ignore:next-line
+  const optionalArgs = t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation(
+  // @ts-ignore:next-line
   t.tsTypeLiteral([propertySignature('fee', OPTIONAL_FEE_PARAM.typeAnnotation, true), propertySignature('memo', OPTIONAL_MEMO_PARAM.typeAnnotation, true), propertySignature('funds', OPTIONAL_FUNDS_PARAM.typeAnnotation, true)])));
   optionalArgs.optional = true;
   body.push(optionalArgs);
@@ -201,18 +191,20 @@ export const createReactQueryMutationHooks = ({
   // 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 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 properties = jsonschema.properties ?? {};
 
-    const hasMsg = !!(Object.keys(properties)?.length || jsonschema?.$ref); // <ExecuteResult, Error, Cw4UpdateMembersMutation>
+    // TODO: there should be a better way to do this
+    const hasMsg = !!(Object.keys(properties)?.length || jsonschema?.$ref);
 
+    // <ExecuteResult, Error, Cw4UpdateMembersMutation>
     const useMutationTypeParameter = generateMutationTypeParameter(context, mutationHookParamsTypeName);
     return [createReactQueryMutationArgsInterface({
       context,
@@ -230,18 +222,20 @@ export const createReactQueryMutationHooks = ({
     }), ...m];
   }, []);
 };
+
 /**
  * Generates the mutation type parameter. If args exist, we use a pick. If not, we just return the params type.
  */
-
 const generateMutationTypeParameter = (context, mutationHookParamsTypeName) => {
   context.addUtil('ExecuteResult');
-  return t.tsTypeParameterInstantiation([// Data
-  t.tSTypeReference(t.identifier('ExecuteResult')), // Error
-  t.tsTypeReference(t.identifier('Error')), // Variables
+  return t.tsTypeParameterInstantiation([
+  // Data
+  t.tSTypeReference(t.identifier('ExecuteResult')),
+  // Error
+  t.tsTypeReference(t.identifier('Error')),
+  // Variables
   t.tsTypeReference(t.identifier(mutationHookParamsTypeName))]);
 };
-
 /**
  *
  * Example:
@@ -269,7 +263,6 @@ 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([t.identifier('fee'), t.identifier('memo'), t.identifier('funds')])), false // not async
   ), t.identifier('options')], useMutationTypeParameter))])));
 };
-
 function createReactQueryKeys({
   context,
   queryKeysName,
@@ -278,21 +271,29 @@ function createReactQueryKeys({
 }) {
   const options = context.options.reactQuery;
   const contractAddressTypeAnnotation = t.tsTypeAnnotation(options.optionalClient ? t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()]) : t.tSStringKeyword());
-  return t.exportNamedDeclaration(t.variableDeclaration('const', [t.variableDeclarator(t.identifier(queryKeysName), t.objectExpression([// 1: contract
-  t.objectProperty(t.identifier('contract'), t.tSAsExpression(t.arrayExpression([t.objectExpression([t.objectProperty(t.identifier('contract'), t.stringLiteral(camelContractName))])]), t.tSTypeReference(t.identifier('const')))), // 2: address
-  t.objectProperty(t.identifier('address'), t.arrowFunctionExpression([identifier('contractAddress', contractAddressTypeAnnotation)], t.tSAsExpression(t.arrayExpression([t.objectExpression([// 1
+  return t.exportNamedDeclaration(t.variableDeclaration('const', [t.variableDeclarator(t.identifier(queryKeysName), t.objectExpression([
+  // 1: contract
+  t.objectProperty(t.identifier('contract'), t.tSAsExpression(t.arrayExpression([t.objectExpression([t.objectProperty(t.identifier('contract'), t.stringLiteral(camelContractName))])]), t.tSTypeReference(t.identifier('const')))),
+  // 2: address
+  t.objectProperty(t.identifier('address'), t.arrowFunctionExpression([identifier('contractAddress', contractAddressTypeAnnotation)], t.tSAsExpression(t.arrayExpression([t.objectExpression([
+  // 1
   t.spreadElement(t.memberExpression(t.memberExpression(t.identifier(queryKeysName), t.identifier('contract')), t.numericLiteral(0), true // computed
-  )), t.objectProperty(t.identifier('address'), t.identifier('contractAddress'))])]), t.tSTypeReference(t.identifier('const'))))), // 3: methods
-  ...underscoreNames.map(underscoreMethodName => t.objectProperty( // key id is the camel method name
-  t.identifier(camel(underscoreMethodName)), t.arrowFunctionExpression([identifier('contractAddress', contractAddressTypeAnnotation), identifier('args', // Record<string, unknown>
+  )), t.objectProperty(t.identifier('address'), t.identifier('contractAddress'))])]), t.tSTypeReference(t.identifier('const'))))),
+  // 3: methods
+  ...underscoreNames.map(underscoreMethodName => t.objectProperty(
+  // key id is the camel method name
+  t.identifier(camel(underscoreMethodName)), t.arrowFunctionExpression([identifier('contractAddress', contractAddressTypeAnnotation), identifier('args',
+  // Record<string, unknown>
   t.tSTypeAnnotation(t.tsTypeReference(t.identifier('Record'), t.tsTypeParameterInstantiation([t.tsStringKeyword(), t.tsUnknownKeyword()]))), true // optional
-  )], t.tSAsExpression(t.arrayExpression([t.objectExpression([//...cw3FlexMultisigQueryKeys.address(contractAddress)[0]
+  )], t.tSAsExpression(t.arrayExpression([t.objectExpression([
+  //...cw3FlexMultisigQueryKeys.address(contractAddress)[0]
   t.spreadElement(t.memberExpression(t.callExpression(t.memberExpression(t.identifier(queryKeysName), t.identifier('address')), [t.identifier('contractAddress')]), t.numericLiteral(0), true // computed
-  )), // method: list_voters
-  t.objectProperty(t.identifier('method'), t.stringLiteral(underscoreMethodName)), // args
+  )),
+  // method: list_voters
+  t.objectProperty(t.identifier('method'), t.stringLiteral(underscoreMethodName)),
+  // args
   shorthandProperty('args')])]), t.tSTypeReference(t.identifier('const'))))))]))]));
 }
-
 function createReactQueryFactory({
   context,
   queryFactoryName,
@@ -307,20 +308,23 @@ function createReactQueryFactory({
     jsonschema
   }) => {
     const hasArgs = Object.keys(jsonschema.properties ?? {}).length > 0;
-    const methodQueryOptionsFn = t.arrowFunctionExpression([tsObjectPattern([shorthandProperty('client'), ...(hasArgs ? [shorthandProperty('args')] : []), shorthandProperty('options')], t.tsTypeAnnotation(t.tsTypeReference(t.identifier(hookParamsTypeName), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))]))))], t.objectExpression([// 1: queryKey
-    t.objectProperty(t.identifier('queryKey'), t.callExpression(t.memberExpression(t.identifier(queryKeysName), t.identifier(methodName)), [t.optionalMemberExpression(t.identifier('client'), t.identifier('contractAddress'), false, true), ...(hasArgs ? [t.identifier('args')] : [])])), // 2: queryFn
-    t.objectProperty(t.identifier('queryFn'), buildQueryFn(methodName, jsonschema, options)), // 3: spread options
-    t.spreadElement(t.identifier('options')), // 4. enabled
+    const methodQueryOptionsFn = t.arrowFunctionExpression([tsObjectPattern([shorthandProperty('client'), ...(hasArgs ? [shorthandProperty('args')] : []), shorthandProperty('options')], t.tsTypeAnnotation(t.tsTypeReference(t.identifier(hookParamsTypeName), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))]))))], t.objectExpression([
+    // 1: queryKey
+    t.objectProperty(t.identifier('queryKey'), t.callExpression(t.memberExpression(t.identifier(queryKeysName), t.identifier(methodName)), [t.optionalMemberExpression(t.identifier('client'), t.identifier('contractAddress'), false, true), ...(hasArgs ? [t.identifier('args')] : [])])),
+    // 2: queryFn
+    t.objectProperty(t.identifier('queryFn'), buildQueryFn(methodName, jsonschema, options)),
+    // 3: spread options
+    t.spreadElement(t.identifier('options')),
+    // 4. enabled
     ENABLED_QUERY_OPTION]));
     methodQueryOptionsFn.typeParameters = t.tsTypeParameterDeclaration([t.tsTypeParameter(undefined, t.tsTypeReference(t.identifier(responseType)), GENERIC_SELECT_RESPONSE_NAME)]);
     methodQueryOptionsFn.returnType = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))])));
-    return t.objectProperty( // key id is the camel method name
+    return t.objectProperty(
+    // key id is the camel method name
     t.identifier(camel(methodName)), methodQueryOptionsFn);
   })]))]));
 }
-
 const GENERIC_SELECT_RESPONSE_NAME = 'TData';
-
 function createReactQueryHookGenericInterface({
   context,
   QueryClient,
@@ -328,15 +332,17 @@ function createReactQueryHookGenericInterface({
 }) {
   const options = context.options.reactQuery;
   const genericResponseTypeName = 'TResponse';
-  context.addUtil('UseQueryOptions'); // UseQueryOptions<TResponse, Error, TData>,
+  context.addUtil('UseQueryOptions');
 
+  // UseQueryOptions<TResponse, Error, TData>,
   const typedUseQueryOptions = t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(genericResponseTypeName)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))]));
   const body = [tsPropertySignature(t.identifier('client'), t.tsTypeAnnotation(options.optionalClient ? t.tsUnionType([t.tsTypeReference(t.identifier(QueryClient)), t.tsUndefinedKeyword()]) : t.tsTypeReference(t.identifier(QueryClient))), false), tsPropertySignature(t.identifier('options'), t.tsTypeAnnotation(options.version === 'v4' ? t.tSIntersectionType([omitTypeReference(typedUseQueryOptions, "'queryKey' | 'queryFn' | 'initialData'"), t.tSTypeLiteral([t.tsPropertySignature(t.identifier('initialData?'), t.tsTypeAnnotation(t.tsUndefinedKeyword()))])]) : typedUseQueryOptions), true)];
-  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(genericQueryInterfaceName), t.tsTypeParameterDeclaration([// 1: TResponse
-  t.tsTypeParameter(undefined, undefined, genericResponseTypeName), // 2: TData
+  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(genericQueryInterfaceName), t.tsTypeParameterDeclaration([
+  // 1: TResponse
+  t.tsTypeParameter(undefined, undefined, genericResponseTypeName),
+  // 2: TData
   t.tsTypeParameter(undefined, t.tSTypeReference(t.identifier(genericResponseTypeName)), GENERIC_SELECT_RESPONSE_NAME)]), [], t.tSInterfaceBody(body)));
 }
-
 export const createReactQueryHookInterface = ({
   context,
   QueryClient,
@@ -349,17 +355,17 @@ export const createReactQueryHookInterface = ({
   const options = context.options.reactQuery;
   const body = [];
   const props = getProps(context, jsonschema);
-
   if (props.length) {
-    body.push(t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation( // @ts-ignore:next-line
+    body.push(t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation(
+    // @ts-ignore:next-line
     t.tsTypeLiteral(props))));
   }
-
-  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(hookParamsTypeName), t.tsTypeParameterDeclaration([t.tSTypeParameter(undefined, undefined, GENERIC_SELECT_RESPONSE_NAME)]), [t.tSExpressionWithTypeArguments(t.identifier(queryInterfaceName), t.tsTypeParameterInstantiation([// 1: response
-  t.tsTypeReference(t.identifier(responseType)), // 2: select generic
+  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(hookParamsTypeName), t.tsTypeParameterDeclaration([t.tSTypeParameter(undefined, undefined, GENERIC_SELECT_RESPONSE_NAME)]), [t.tSExpressionWithTypeArguments(t.identifier(queryInterfaceName), t.tsTypeParameterInstantiation([
+  // 1: response
+  t.tsTypeReference(t.identifier(responseType)),
+  // 2: select generic
   t.tSTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))]))], t.tsInterfaceBody(body)));
 };
-
 const getProps = (context, jsonschema) => {
   const keys = Object.keys(jsonschema.properties ?? {});
   if (!keys.length) return [];
@@ -371,7 +377,6 @@ const getProps = (context, jsonschema) => {
     return propertySignature(context.options.reactQuery.camelize ? camel(prop) : prop, t.tsTypeAnnotation(type), optional);
   });
 };
-
 const generateUseQueryQueryKey = ({
   hookKeyName,
   queryKeysName,
@@ -385,18 +390,14 @@ const generateUseQueryQueryKey = ({
   } = options;
   const hasArgs = props.includes('args');
   const contractAddressExpression = t.optionalMemberExpression(t.identifier('client'), t.identifier('contractAddress'), false, optionalClient);
-
   if (queryKeys) {
     const callArgs = [contractAddressExpression];
     if (hasArgs) callArgs.push(t.identifier('args'));
     return t.callExpression(t.memberExpression(t.identifier(queryKeysName), t.identifier(camel(methodName))), callArgs);
   }
-
   const queryKey = [t.stringLiteral(hookKeyName), contractAddressExpression];
-
   if (hasArgs) {
     queryKey.push(t.callExpression(t.memberExpression(t.identifier('JSON'), t.identifier('stringify')), [t.identifier('args')]));
   }
-
   return t.arrayExpression(queryKey);
 };

package/module/utils/babel.js

@@ -1,7 +1,8 @@
 import * as t from '@babel/types';
 import { snake } from "case";
-import { refLookup } from './ref'; // t.TSPropertySignature - kind?
+import { refLookup } from './ref';
 
+// t.TSPropertySignature - kind?
 export const propertySignature = (name, typeAnnotation, optional = false) => {
   return {
     type: 'TSPropertySignature',
@@ -25,7 +26,6 @@ export const tsTypeOperator = (typeAnnotation, operator) => {
 export const getMessageProperties = msg => {
   let results = [];
   let objs = [];
-
   if (msg.anyOf) {
     objs = msg.anyOf;
   } else if (msg.oneOf) {
@@ -33,7 +33,6 @@ export const getMessageProperties = msg => {
   } else if (msg.allOf) {
     objs = msg.allOf;
   }
-
   for (const obj of objs) {
     if (obj.properties) {
       results.push(obj);
@@ -45,7 +44,6 @@ export const getMessageProperties = msg => {
       }
     }
   }
-
   return results;
 };
 export const tsPropertySignature = (key, typeAnnotation, optional) => {
@@ -82,11 +80,9 @@ export const abstractClassDeclaration = (name, body, implementsExressions = [],
 };
 export const classDeclaration = (name, body, implementsExressions = [], superClass = null) => {
   const declaration = t.classDeclaration(t.identifier(name), superClass, t.classBody(body));
-
   if (implementsExressions.length) {
     declaration.implements = implementsExressions;
   }
-
   return declaration;
 };
 export const classProperty = (name, typeAnnotation = null, isReadonly = false, isStatic = false, noImplicitOverride = false) => {
@@ -148,12 +144,10 @@ export const getFieldDimensionality = field => {
   let typeName = field.type;
   const isArray = typeName.endsWith('[]');
   let dimensions = 0;
-
   if (isArray) {
     dimensions = typeName.match(/\[\]/g).length - 1;
     typeName = typeName.replace(/\[\]/g, '');
   }
-
   return {
     typeName,
     dimensions,
@@ -164,12 +158,10 @@ export const memberExpressionOrIdentifier = names => {
   if (names.length === 1) {
     return t.identifier(names[0]);
   }
-
   if (names.length === 2) {
     const [b, a] = names;
     return t.memberExpression(t.identifier(a), t.identifier(b));
   }
-
   const [name, ...rest] = names;
   return t.memberExpression(memberExpressionOrIdentifier(rest), t.identifier(name));
 };
@@ -177,19 +169,17 @@ export const memberExpressionOrIdentifierSnake = names => {
   if (names.length === 1) {
     return t.identifier(snake(names[0]));
   }
-
   if (names.length === 2) {
     const [b, a] = names;
     return t.memberExpression(t.identifier(snake(a)), t.identifier(snake(b)));
   }
-
   const [name, ...rest] = names;
   return t.memberExpression(memberExpressionOrIdentifierSnake(rest), t.identifier(snake(name)));
 };
+
 /**
  * If optional, return a conditional, otherwise just the expression
  */
-
 export const optionalConditionalExpression = (test, expression, alternate, optional = false) => {
   return optional ? t.conditionalExpression(test, expression, alternate) : expression;
 };
@@ -200,11 +190,11 @@ export const typeRefOrUnionWithUndefined = (identifier, optional = false) => {
 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);
 };

package/module/utils/babel.spec.js

@@ -6,39 +6,65 @@ it('top import', async () => {
   expectCode(importStmt(['CosmWasmClient', 'ExecuteResult', 'SigningCosmWasmClient'], '@cosmjs/cosmwasm-stargate'));
 });
 it('interfaces', async () => {
-  expectCode(t.program([t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier('SG721ReadOnlyInstance'), null, [], t.tSInterfaceBody([t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword())), // methods
-  t.tSPropertySignature(t.identifier('tokens'), t.tsTypeAnnotation(t.tsFunctionType(null, [typedIdentifier('owner', t.tsTypeAnnotation(t.tsStringKeyword())), typedIdentifier('startAfter', t.tsTypeAnnotation(t.tsStringKeyword()), true), typedIdentifier('limit', t.tsTypeAnnotation(t.tsStringKeyword()), true)], promiseTypeAnnotation('TokensResponse'))))]))), // extends 
-  t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier('SG721Instance'), null, [t.tSExpressionWithTypeArguments(t.identifier('SG721ReadOnlyInstance'))], t.tSInterfaceBody([// contract address
-  t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword())), // METHOD
+  expectCode(t.program([t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier('SG721ReadOnlyInstance'), null, [], t.tSInterfaceBody([t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword())),
+  // methods
+
+  t.tSPropertySignature(t.identifier('tokens'), t.tsTypeAnnotation(t.tsFunctionType(null, [typedIdentifier('owner', t.tsTypeAnnotation(t.tsStringKeyword())), typedIdentifier('startAfter', t.tsTypeAnnotation(t.tsStringKeyword()), true), typedIdentifier('limit', t.tsTypeAnnotation(t.tsStringKeyword()), true)], promiseTypeAnnotation('TokensResponse'))))]))),
+  // extends 
+
+  t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier('SG721Instance'), null, [t.tSExpressionWithTypeArguments(t.identifier('SG721ReadOnlyInstance'))], t.tSInterfaceBody([
+  // contract address
+
+  t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword())),
+  // METHOD
   t.tSPropertySignature(t.identifier('mint'), t.tsTypeAnnotation(t.tsFunctionType(null, [typedIdentifier('sender', t.tsTypeAnnotation(t.tsStringKeyword())), typedIdentifier('anotherProp', t.tsTypeAnnotation(t.tsStringKeyword())), typedIdentifier('prop3', t.tsTypeAnnotation(t.tsStringKeyword()))], promiseTypeAnnotation('ExecuteResult'))))])))]));
 });
 it('readonly classes', async () => {
-  expectCode(t.program([t.exportNamedDeclaration(classDeclaration('SG721QueryClient', [// client
-  classProperty('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CosmWasmClient')))), // contractAddress
-  classProperty('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword())), // constructor
-  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
-  bindMethod('approval'), bindMethod('otherProp'), bindMethod('hello'), bindMethod('mintme')])), // methods:
-  t.classProperty(t.identifier('approval'), arrowFunctionExpression([// props
-  typedIdentifier('owner', t.tsTypeAnnotation(t.tsStringKeyword())), // 
-  typedIdentifier('spender', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement([t.returnStatement(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('queryContractSmart')), [t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.objectExpression([// props
+  expectCode(t.program([t.exportNamedDeclaration(classDeclaration('SG721QueryClient', [
+  // client
+  classProperty('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CosmWasmClient')))),
+  // contractAddress
+  classProperty('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword())),
+  // constructor
+  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
+  bindMethod('approval'), bindMethod('otherProp'), bindMethod('hello'), bindMethod('mintme')])),
+  // methods:
+  t.classProperty(t.identifier('approval'), arrowFunctionExpression([
+  // props
+  typedIdentifier('owner', t.tsTypeAnnotation(t.tsStringKeyword())),
+  // 
+  typedIdentifier('spender', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement([t.returnStatement(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('queryContractSmart')), [t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.objectExpression([
+  // props
   t.objectProperty(t.identifier('owner'), t.identifier('owner'), false, true), t.objectProperty(t.identifier('spender'), t.identifier('spender'), false, true)])]))]), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tSTypeReference(t.identifier('ApprovalResponse'))]))), true))], [t.tSExpressionWithTypeArguments(t.identifier('SG721ReadOnlyInstance'))]))]));
 });
 it('mutation classes', async () => {
-  expectCode(t.program([t.exportNamedDeclaration(classDeclaration('SG721Client', [// client
-  classProperty('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient')))), // contractAddress
-  classProperty('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword())), // constructor
-  t.classMethod('constructor', t.identifier('constructor'), [typedIdentifier('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient')))), typedIdentifier('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement([// super()
-  t.expressionStatement(t.callExpression(t.super(), [t.identifier('client'), t.identifier('contractAddress')])), // 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
-  bindMethod('approval'), bindMethod('otherProp'), bindMethod('hello'), bindMethod('mintme')])), // methods:
-  t.classProperty(t.identifier('mint'), arrowFunctionExpression([// props
-  typedIdentifier('sender', t.tsTypeAnnotation(t.tsStringKeyword())), typedIdentifier('tokenId', t.tsTypeAnnotation(t.tsStringKeyword())), typedIdentifier('owner', t.tsTypeAnnotation(t.tsStringKeyword())), typedIdentifier('token_uri', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement([t.returnStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('execute')), [t.identifier('sender'), t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.objectExpression([t.objectProperty(t.identifier('mint'), t.objectExpression([t.objectProperty(t.identifier('token_id'), t.identifier('tokenId')), t.objectProperty(t.identifier('owner'), t.identifier('owner')), t.objectProperty(t.identifier('token_uri'), t.identifier('token_uri')), t.objectProperty(t.identifier('expression'), t.objectExpression([]))]))]), t.stringLiteral('auto')])))]), // return type
+  expectCode(t.program([t.exportNamedDeclaration(classDeclaration('SG721Client', [
+  // client
+  classProperty('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient')))),
+  // contractAddress
+  classProperty('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword())),
+  // constructor
+  t.classMethod('constructor', t.identifier('constructor'), [typedIdentifier('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient')))), typedIdentifier('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement([
+  // super()
+  t.expressionStatement(t.callExpression(t.super(), [t.identifier('client'), t.identifier('contractAddress')])),
+  // 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
+  bindMethod('approval'), bindMethod('otherProp'), bindMethod('hello'), bindMethod('mintme')])),
+  // methods:
+  t.classProperty(t.identifier('mint'), arrowFunctionExpression([
+  // props
+  typedIdentifier('sender', t.tsTypeAnnotation(t.tsStringKeyword())), typedIdentifier('tokenId', t.tsTypeAnnotation(t.tsStringKeyword())), typedIdentifier('owner', t.tsTypeAnnotation(t.tsStringKeyword())), typedIdentifier('token_uri', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement([t.returnStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('execute')), [t.identifier('sender'), t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.objectExpression([t.objectProperty(t.identifier('mint'), t.objectExpression([t.objectProperty(t.identifier('token_id'), t.identifier('tokenId')), t.objectProperty(t.identifier('owner'), t.identifier('owner')), t.objectProperty(t.identifier('token_uri'), t.identifier('token_uri')), t.objectProperty(t.identifier('expression'), t.objectExpression([]))]))]), t.stringLiteral('auto')])))]),
+  // return type
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tSTypeReference(t.identifier('ExecuteResult'))]))), true))], [t.tSExpressionWithTypeArguments(t.identifier('SG721ReadOnlyInstance'))], t.identifier('SG721QueryClient')))]));
 });
 it('object parms', () => {
   const obj = t.objectPattern([t.objectProperty(t.identifier('includeExpired'), t.identifier('includeExpired'), false, true), t.objectProperty(t.identifier('tokenId'), t.identifier('tokenId'), false, true)]);
   obj.typeAnnotation = t.tsTypeAnnotation(t.tsTypeLiteral([t.tsPropertySignature(t.identifier('includeExpired'), t.tsTypeAnnotation(t.tsBooleanKeyword())), t.tsPropertySignature(t.identifier('tokenId'), t.tsTypeAnnotation(t.tsStringKeyword()))]));
-  expectCode(t.program([t.expressionStatement(t.assignmentExpression('=', t.identifier('ownerOf'), arrowFunctionExpression([obj], t.blockStatement([// body
+  expectCode(t.program([t.expressionStatement(t.assignmentExpression('=', t.identifier('ownerOf'), arrowFunctionExpression([obj], t.blockStatement([
+    // body
   ], []), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier('OwnerOfResponse'))]))))))]));
 });