wasm-ast-types 0.4.3 → 0.6.0

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

@@ -0,0 +1,222 @@
+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 { getParamsTypeAnnotation, getPropertyType } from '../utils/types';
+import { FIXED_EXECUTE_PARAMS } from '../client';
+export const createReactQueryHooks = ({
+  context,
+  queryMsg,
+  contractName,
+  QueryClient
+}) => {
+  const options = context.options.reactQuery;
+  return 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 responseType = pascal(`${methodName}Response`);
+    const getterKey = camel(`${contractName}${pascal(methodName)}`);
+    const jsonschema = schema.properties[underscoreName];
+    return [createReactQueryHookInterface({
+      context,
+      hookParamsTypeName,
+      responseType,
+      QueryClient,
+      jsonschema,
+      options
+    }), createReactQueryHook({
+      context,
+      methodName,
+      hookName,
+      hookParamsTypeName,
+      responseType,
+      hookKeyName: getterKey,
+      jsonschema
+    }), ...m];
+  }, []);
+};
+export const createReactQueryHook = ({
+  context,
+  hookName,
+  hookParamsTypeName,
+  responseType,
+  hookKeyName,
+  methodName,
+  jsonschema
+}) => {
+  const options = context.options.reactQuery;
+  const keys = Object.keys(jsonschema.properties ?? {});
+  let args = [];
+
+  if (keys.length) {
+    args = [t.objectExpression([...keys.map(prop => {
+      return t.objectProperty(t.identifier(camel(prop)), t.memberExpression(t.identifier('args'), t.identifier(camel(prop))));
+    })])];
+  }
+
+  let props = ['client', 'options'];
+
+  if (keys.length) {
+    props = ['client', 'args', 'options'];
+  }
+
+  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()])))])))])));
+};
+
+/**
+ * Example:
+```
+export interface Cw4UpdateMembersMutation {
+  client: Cw4GroupClient
+  args: {
+    tokenId: string
+    remove: string[]
+  }
+  options?: Omit<
+    UseMutationOptions<ExecuteResult, Error, Pick<Cw4UpdateMembersMutation, 'args'>>,
+    'mutationFn'
+  >
+}
+```
+ */
+export const createReactQueryMutationArgsInterface = ({
+  context,
+  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)];
+  const msgType = getParamsTypeAnnotation(context, jsonschema);
+
+  if (msgType) {
+    body.push(t.tsPropertySignature(t.identifier('msg'), msgType));
+  } //  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)))));
+  optionalArgs.optional = true;
+  body.push(optionalArgs);
+  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(mutationHookParamsTypeName), null, [], t.tsInterfaceBody(body)));
+};
+export const createReactQueryMutationHooks = ({
+  context,
+  execMsg,
+  contractName,
+  ExecuteClient
+}) => {
+  // 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({
+      context,
+      mutationHookParamsTypeName,
+      ExecuteClient,
+      jsonschema,
+      useMutationTypeParameter
+    }), createReactQueryMutationHook({
+      context,
+      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 = ({
+  context,
+  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 = ({
+  context,
+  QueryClient,
+  hookParamsTypeName,
+  responseType,
+  jsonschema
+}) => {
+  // merge the user options with the defaults
+  const options = context.options.reactQuery;
+  const typedUseQueryOptions = t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([typeRefOrOptionalUnion(t.identifier(responseType), options.optionalClient), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(responseType)), t.tsArrayType(t.tsParenthesizedType(t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])))]));
+  const body = [tsPropertySignature(t.identifier('client'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(QueryClient))), options.optionalClient), tsPropertySignature(t.identifier('options'), t.tsTypeAnnotation(options.v4 ? t.tSIntersectionType([omitTypeReference(typedUseQueryOptions, "'queryKey' | 'queryFn' | 'initialData'"), t.tSTypeLiteral([t.tsPropertySignature(t.identifier('initialData?'), t.tsTypeAnnotation(t.tsUndefinedKeyword()))])]) : typedUseQueryOptions), true)];
+  const props = getProps(context, jsonschema);
+
+  if (props.length) {
+    body.push(t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation(t.tsTypeLiteral(props))));
+  }
+
+  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(hookParamsTypeName), null, [], t.tsInterfaceBody(body)));
+};
+
+const getProps = (context, jsonschema) => {
+  const keys = Object.keys(jsonschema.properties ?? {});
+  if (!keys.length) return [];
+  return keys.map(prop => {
+    const {
+      type,
+      optional
+    } = getPropertyType(context, jsonschema, prop);
+    return propertySignature(context.options.reactQuery.camelize ? camel(prop) : prop, t.tsTypeAnnotation(type), optional);
+  });
+};
+
+const generateUseQueryQueryKey = (hookKeyName, props, optionalClient) => {
+  const queryKey = [t.stringLiteral(hookKeyName), t.optionalMemberExpression(t.identifier('client'), t.identifier('contractAddress'), false, optionalClient)];
+
+  if (props.includes('args')) {
+    queryKey.push(t.callExpression(t.memberExpression(t.identifier('JSON'), t.identifier('stringify')), [t.identifier('args')]));
+  }
+
+  return queryKey;
+};

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

@@ -0,0 +1,53 @@
+import * as t from '@babel/types';
+import query_msg from '../../../../__fixtures__/basic/query_msg.json';
+import execute_msg from '../../../../__fixtures__/basic/execute_msg_for__empty.json';
+import { RenderContext } from '../context';
+import { createReactQueryHooks, createReactQueryMutationHooks } from './react-query';
+import { expectCode } from '../../test-utils';
+const execCtx = new RenderContext(execute_msg);
+const queryCtx = new RenderContext(query_msg);
+it('createReactQueryHooks', () => {
+  expectCode(t.program(createReactQueryHooks({
+    context: queryCtx,
+    queryMsg: query_msg,
+    contractName: 'Sg721',
+    QueryClient: 'Sg721QueryClient'
+  })));
+  expectCode(t.program(createReactQueryHooks({
+    context: new RenderContext(query_msg, {
+      reactQuery: {
+        optionalClient: true
+      }
+    }),
+    queryMsg: query_msg,
+    contractName: 'Sg721',
+    QueryClient: 'Sg721QueryClient'
+  })));
+  expectCode(t.program(createReactQueryHooks({
+    context: new RenderContext(query_msg, {
+      reactQuery: {
+        v4: true
+      }
+    }),
+    queryMsg: query_msg,
+    contractName: 'Sg721',
+    QueryClient: 'Sg721QueryClient'
+  })));
+  expectCode(t.program(createReactQueryHooks({
+    context: new RenderContext(query_msg, {
+      reactQuery: {
+        optionalClient: true,
+        v4: true
+      }
+    }),
+    queryMsg: query_msg,
+    contractName: 'Sg721',
+    QueryClient: 'Sg721QueryClient'
+  })));
+  expectCode(t.program(createReactQueryMutationHooks({
+    context: execCtx,
+    execMsg: execute_msg,
+    contractName: 'Sg721',
+    ExecuteClient: 'Sg721Client'
+  })));
+});

package/module/recoil/index.js

@@ -0,0 +1 @@
+export * from './recoil';

package/module/{recoil.js → recoil/recoil.js}

@@ -1,31 +1,17 @@
 import * as t from '@babel/types';
 import { camel, pascal } from 'case';
-import { callExpression, getMessageProperties } from './utils';
-export const createWasmRecoilMethod = jsonschema => {
-  const underscoreName = Object.keys(jsonschema.properties)[0];
-  const methodName = camel(underscoreName);
-  const responseType = pascal(`${methodName}Response`);
-  const properties = jsonschema.properties[underscoreName].properties ?? {};
-
-  if (Object.keys(properties).length > 0) {} else {}
-};
-export const createRecoilSelector = (keyPrefix, QueryClient, methodName) => {
-  // const propertyNames = getMessageProperties(queryMsg)
-  //   .map(method => Object.keys(method.properties)?.[0])
-  //   .filter(Boolean);
-  // const methods = getMessageProperties(queryMsg)
-  //   .map(schema => createWasmRecoilMethod(schema))
+import { callExpression, getMessageProperties } from '../utils';
+export const createRecoilSelector = (context, keyPrefix, QueryClient, methodName) => {
   const selectorName = camel(`${methodName}Selector`);
   const responseType = pascal(`${methodName}Response`);
   const getterKey = camel(`${keyPrefix}${pascal(methodName)}`);
-  return t.exportNamedDeclaration(t.variableDeclaration('const', [t.variableDeclarator(t.identifier(selectorName), callExpression(t.identifier('selectorFamily'), [t.objectExpression([t.objectProperty(t.identifier('key'), t.stringLiteral(getterKey)), t.objectProperty(t.identifier('get'), t.arrowFunctionExpression([t.objectPattern([t.objectProperty(t.identifier('params'), t.identifier('params'), false, true), t.restElement(t.identifier('queryClientParams'))])], t.arrowFunctionExpression([t.objectPattern([t.objectProperty(t.identifier('get'), t.identifier('get'), false, true)])], t.blockStatement([t.variableDeclaration('const', [t.variableDeclarator(t.identifier('client'), t.callExpression(t.identifier('get'), [t.callExpression(t.identifier('queryClient'), [t.identifier('queryClientParams')])]))]), t.returnStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(methodName)), [// t.identifier('params')
-  t.spreadElement(t.identifier('params'))])))]), true)))])], t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType)), t.tsIntersectionType([t.tsTypeReference(t.identifier('QueryClientParams')), t.tsTypeLiteral([t.tsPropertySignature(t.identifier('params'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Parameters'), t.tsTypeParameterInstantiation([t.tsIndexedAccessType(t.tsTypeReference(t.identifier(QueryClient)), t.tsLiteralType(t.stringLiteral(methodName)))]))))])])])))]));
+  return t.exportNamedDeclaration(t.variableDeclaration('const', [t.variableDeclarator(t.identifier(selectorName), callExpression(t.identifier('selectorFamily'), [t.objectExpression([t.objectProperty(t.identifier('key'), t.stringLiteral(getterKey)), t.objectProperty(t.identifier('get'), t.arrowFunctionExpression([t.objectPattern([t.objectProperty(t.identifier('params'), t.identifier('params'), false, true), t.restElement(t.identifier('queryClientParams'))])], t.arrowFunctionExpression([t.objectPattern([t.objectProperty(t.identifier('get'), t.identifier('get'), false, true)])], t.blockStatement([t.variableDeclaration('const', [t.variableDeclarator(t.identifier('client'), t.callExpression(t.identifier('get'), [t.callExpression(t.identifier('queryClient'), [t.identifier('queryClientParams')])]))]), t.returnStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(methodName)), [t.spreadElement(t.identifier('params'))])))]), true)))])], t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType)), t.tsIntersectionType([t.tsTypeReference(t.identifier('QueryClientParams')), t.tsTypeLiteral([t.tsPropertySignature(t.identifier('params'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Parameters'), t.tsTypeParameterInstantiation([t.tsIndexedAccessType(t.tsTypeReference(t.identifier(QueryClient)), t.tsLiteralType(t.stringLiteral(methodName)))]))))])])])))]));
 };
-export const createRecoilSelectors = (keyPrefix, QueryClient, queryMsg) => {
+export const createRecoilSelectors = (context, keyPrefix, QueryClient, queryMsg) => {
   return getMessageProperties(queryMsg).map(schema => {
     const underscoreName = Object.keys(schema.properties)[0];
     const methodName = camel(underscoreName);
-    return createRecoilSelector(keyPrefix, QueryClient, methodName);
+    return createRecoilSelector(context, keyPrefix, QueryClient, methodName);
   });
 };
 export const createRecoilQueryClientType = () => ({
@@ -52,7 +38,7 @@ export const createRecoilQueryClientType = () => ({
     }]
   }
 });
-export const createRecoilQueryClient = (keyPrefix, QueryClient) => {
+export const createRecoilQueryClient = (context, keyPrefix, QueryClient) => {
   const getterKey = camel(`${keyPrefix}${'QueryClient'}`);
   return t.exportNamedDeclaration(t.variableDeclaration('const', [t.variableDeclarator(t.identifier('queryClient'), callExpression(t.identifier('selectorFamily'), [t.objectExpression([t.objectProperty(t.identifier('key'), t.stringLiteral(getterKey)), t.objectProperty(t.identifier('get'), t.arrowFunctionExpression([t.objectPattern([t.objectProperty(t.identifier('contractAddress'), t.identifier('contractAddress'), false, true)])], t.arrowFunctionExpression([t.objectPattern([t.objectProperty(t.identifier('get'), t.identifier('get'), false, true)])], t.blockStatement([t.variableDeclaration('const', [t.variableDeclarator(t.identifier('client'), t.callExpression(t.identifier('get'), [t.identifier('cosmWasmClient')]))]), t.returnStatement(t.newExpression(t.identifier(QueryClient), [t.identifier('client'), t.identifier('contractAddress')]))]), false)))])], t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(QueryClient)), t.tsTypeReference(t.identifier('QueryClientParams'))])))]));
 };

package/module/recoil/recoil.spec.js

@@ -0,0 +1,15 @@
+import * as t from '@babel/types';
+import query_msg from '../../../../__fixtures__/basic/query_msg.json';
+import { createRecoilSelector, createRecoilSelectors, createRecoilQueryClient } from './recoil';
+import { RenderContext } from '../context';
+import { expectCode } from '../../test-utils';
+const ctx = new RenderContext(query_msg);
+it('selector', () => {
+  expectCode(createRecoilSelector(ctx, 'SG721', 'SG721QueryClient', 'governanceModules'));
+});
+it('selectors', () => {
+  expectCode(t.program(createRecoilSelectors(ctx, 'SG721', 'SG721QueryClient', query_msg)));
+});
+it('client', () => {
+  expectCode(createRecoilQueryClient(ctx, 'SG721', 'SG721QueryClient'));
+});

package/module/utils/babel.js

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

package/module/utils/babel.spec.js

@@ -1,16 +1,7 @@
 import { importStmt } from './babel';
-import generate from '@babel/generator';
 import * as t from '@babel/types';
 import { bindMethod, typedIdentifier, promiseTypeAnnotation, classDeclaration, classProperty, arrowFunctionExpression } from './babel';
-
-const expectCode = ast => {
-  expect(generate(ast).code).toMatchSnapshot();
-};
-
-const printCode = ast => {
-  console.log(generate(ast).code);
-};
-
+import { expectCode } from '../../test-utils';
 it('top import', async () => {
   expectCode(importStmt(['CosmWasmClient', 'ExecuteResult', 'SigningCosmWasmClient'], '@cosmjs/cosmwasm-stargate'));
 });

package/module/utils/index.js

@@ -1 +1,2 @@
-export * from './babel';
+export * from './babel';
+export * from './types';

package/module/utils/types.js

@@ -3,31 +3,15 @@ import { camel } from 'case';
 import { propertySignature } from './babel';
 
 const getTypeStrFromRef = $ref => {
-  switch ($ref) {
-    case '#/definitions/Binary':
-      return 'Binary';
-
-    default:
-      if ($ref?.startsWith('#/definitions/')) {
-        return $ref.replace('#/definitions/', '');
-      }
-
-      throw new Error('what is $ref: ' + $ref);
+  if ($ref?.startsWith('#/definitions/')) {
+    return $ref.replace('#/definitions/', '');
   }
-};
-
-const getTypeFromRef = $ref => {
-  switch ($ref) {
-    case '#/definitions/Binary':
-      return t.tsTypeReference(t.identifier('Binary'));
 
-    default:
-      if ($ref?.startsWith('#/definitions/')) {
-        return t.tsTypeReference(t.identifier($ref.replace('#/definitions/', '')));
-      }
+  throw new Error('what is $ref: ' + $ref);
+};
 
-      throw new Error('what is $ref: ' + $ref);
-  }
+export const getTypeFromRef = $ref => {
+  return t.tsTypeReference(t.identifier(getTypeStrFromRef($ref)));
 };
 
 const getArrayTypeFromRef = $ref => {
@@ -61,7 +45,7 @@ export const getType = type => {
       throw new Error('contact maintainers [unknown type]: ' + type);
   }
 };
-export const getPropertyType = (schema, prop) => {
+export const getPropertyType = (context, schema, prop) => {
   const props = schema.properties ?? {};
   let info = props[prop];
   let type = null;
@@ -150,65 +134,90 @@ 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(context, 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(context, jsonschema, prop);
+  } catch (e) {
+    console.log(e);
+    console.log(jsonschema, prop);
+  }
+
+  const {
+    type,
+    optional
+  } = getPropertyType(context, jsonschema, prop);
+  return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(type), optional);
+}
+export const getParamsTypeAnnotation = (context, jsonschema, camelize = true) => {
+  const keys = Object.keys(jsonschema.properties ?? {});
+
+  if (!keys.length && jsonschema.$ref) {
+    return t.tsTypeAnnotation(getTypeFromRef(jsonschema.$ref));
+  }
+
+  if (!keys.length) return undefined;
+  const typedParams = keys.map(prop => getPropertySignatureFromProp(context, jsonschema, prop, camelize));
+  return t.tsTypeAnnotation(t.tsTypeLiteral([...typedParams]));
+};
+export const createTypedObjectParams = (context, jsonschema, camelize = true) => {
+  const keys = Object.keys(jsonschema.properties ?? {});
+
+  if (!keys.length) {
+    // is there a ref?
+    if (jsonschema.$ref) {
+      const obj = context.refLookup(jsonschema.$ref);
+
+      if (obj) {
+        return createTypedObjectParams(context, obj, camelize);
+      }
+    } // no results...
+
+
+    return;
+  }
 
-    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(context, jsonschema, camelize);
   return obj;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.4.3",
+  "version": "0.6.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",
@@ -48,41 +48,43 @@
     "url": "https://github.com/pyramation/cosmwasm-typescript-gen/issues"
   },
   "devDependencies": {
-    "@babel/cli": "7.17.10",
-    "@babel/core": "7.18.5",
-    "@babel/eslint-parser": "^7.18.2",
-    "@babel/generator": "7.18.2",
-    "@babel/node": "^7.18.5",
-    "@babel/parser": "^7.18.5",
-    "@babel/plugin-proposal-class-properties": "7.17.12",
-    "@babel/plugin-proposal-export-default-from": "7.17.12",
-    "@babel/plugin-proposal-object-rest-spread": "7.18.0",
-    "@babel/plugin-transform-runtime": "7.18.5",
-    "@babel/preset-env": "7.18.2",
-    "@babel/preset-typescript": "^7.17.12",
-    "@babel/traverse": "7.18.5",
-    "@types/jest": "^28.1.2",
+    "@babel/cli": "7.18.10",
+    "@babel/core": "7.18.10",
+    "@babel/eslint-parser": "^7.18.9",
+    "@babel/generator": "7.18.12",
+    "@babel/node": "^7.18.10",
+    "@babel/parser": "^7.18.11",
+    "@babel/plugin-proposal-class-properties": "7.18.6",
+    "@babel/plugin-proposal-export-default-from": "7.18.10",
+    "@babel/plugin-proposal-object-rest-spread": "7.18.9",
+    "@babel/plugin-transform-runtime": "7.18.10",
+    "@babel/preset-env": "7.18.10",
+    "@babel/preset-typescript": "^7.18.6",
+    "@babel/traverse": "7.18.11",
+    "@types/jest": "^28.1.6",
     "babel-core": "7.0.0-bridge.0",
-    "babel-jest": "28.1.1",
+    "babel-jest": "^28.1.3",
     "babel-watch": "^7.0.0",
     "cross-env": "^7.0.2",
-    "eslint": "8.17.0",
+    "eslint": "8.21.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-prettier": "^4.2.1",
     "glob": "8.0.3",
-    "jest": "^28.1.1",
+    "jest": "28.1.3",
     "jest-in-case": "^1.0.2",
     "mkdirp": "1.0.4",
     "prettier": "^2.7.1",
     "regenerator-runtime": "^0.13.7",
-    "ts-jest": "^28.0.5",
+    "ts-jest": "^28.0.7",
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@babel/runtime": "^7.18.3",
-    "@babel/types": "7.18.4",
+    "@babel/runtime": "^7.18.9",
+    "@babel/types": "7.18.10",
+    "@jest/transform": "28.1.3",
     "ast-stringify": "0.1.0",
-    "case": "1.6.3"
+    "case": "1.6.3",
+    "deepmerge": "4.2.2"
   },
-  "gitHead": "c5fc4992d9da5f1c9da1f2c34469994dee7801df"
+  "gitHead": "51e6e530adc95d8118606379848080dd9bc3c25a"
 }