wasm-ast-types 0.4.3 → 0.6.0

package/module/{wasm.js → client/client.js}

@@ -1,25 +1,24 @@
 import * as t from '@babel/types';
 import { camel, pascal } from 'case';
-import { bindMethod, typedIdentifier, promiseTypeAnnotation, classDeclaration, classProperty, arrowFunctionExpression, getMessageProperties } from './utils';
-import { getPropertyType, getType, createTypedObjectParams } from './utils/types';
-import { identifier, tsTypeOperator, propertySignature } from './utils/babel';
-export const createWasmQueryMethod = jsonschema => {
+import { bindMethod, typedIdentifier, promiseTypeAnnotation, classDeclaration, classProperty, arrowFunctionExpression, getMessageProperties } from '../utils';
+import { getPropertyType, getType, createTypedObjectParams } from '../utils/types';
+import { identifier, propertySignature } from '../utils/babel';
+export const CONSTANT_EXEC_PARAMS = [t.assignmentPattern(identifier('fee', t.tsTypeAnnotation(t.tsUnionType([t.tSNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), false), t.stringLiteral('auto')), identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), identifier('funds', t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))), true)];
+export const FIXED_EXECUTE_PARAMS = [identifier('fee', t.tsTypeAnnotation(t.tsUnionType([t.tsNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), true), identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), identifier('funds', t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))), true)];
+export const createWasmQueryMethod = (context, jsonschema) => {
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
   const responseType = pascal(`${methodName}Response`);
-  const properties = jsonschema.properties[underscoreName].properties ?? {};
-  const obj = createTypedObjectParams(jsonschema.properties[underscoreName]);
-  const args = Object.keys(properties).map(prop => {
-    return t.objectProperty(t.identifier(prop), t.identifier(camel(prop)), false, true);
-  });
+  const obj = createTypedObjectParams(context, jsonschema.properties[underscoreName]);
+  const args = getWasmMethodArgs(context, jsonschema.properties[underscoreName]);
   const actionArg = t.objectProperty(t.identifier(underscoreName), t.objectExpression(args));
   return t.classProperty(t.identifier(methodName), arrowFunctionExpression(obj ? [obj] : [], 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([actionArg])]))]), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tSTypeReference(t.identifier(responseType))]))), true));
 };
-export const createQueryClass = (className, implementsClassName, queryMsg) => {
+export const createQueryClass = (context, className, implementsClassName, queryMsg) => {
   const propertyNames = getMessageProperties(queryMsg).map(method => Object.keys(method.properties)?.[0]).filter(Boolean);
   const bindings = propertyNames.map(camel).map(bindMethod);
   const methods = getMessageProperties(queryMsg).map(schema => {
-    return createWasmQueryMethod(schema);
+    return createWasmQueryMethod(context, schema);
   });
   return t.exportNamedDeclaration(classDeclaration(className, [// client
   classProperty('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CosmWasmClient')))), // contractAddress
@@ -27,24 +26,36 @@ export const createQueryClass = (className, implementsClassName, queryMsg) => {
   t.classMethod('constructor', t.identifier('constructor'), [typedIdentifier('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CosmWasmClient')))), typedIdentifier('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement([// client/contract set
   t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('client'))), t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.identifier('contractAddress'))), ...bindings])), ...methods], [t.tSExpressionWithTypeArguments(t.identifier(implementsClassName))]));
 };
-export const createWasmExecMethod = jsonschema => {
-  const underscoreName = Object.keys(jsonschema.properties)[0];
-  const methodName = camel(underscoreName);
-  const properties = jsonschema.properties[underscoreName].properties ?? {};
-  const obj = createTypedObjectParams(jsonschema.properties[underscoreName]);
-  const args = Object.keys(properties).map(prop => {
+export const getWasmMethodArgs = (context, jsonschema) => {
+  let keys = Object.keys(jsonschema.properties ?? {}); // only 1 degree $ref-lookup
+
+  if (!keys.length && jsonschema.$ref) {
+    const obj = context.refLookup(jsonschema.$ref);
+
+    if (obj) {
+      keys = Object.keys(obj.properties ?? {});
+    }
+  }
+
+  const args = keys.map(prop => {
     return t.objectProperty(t.identifier(prop), t.identifier(camel(prop)), false, prop === camel(prop));
   });
-  const constantParams = [t.assignmentPattern(identifier('fee', t.tsTypeAnnotation(t.tsUnionType([t.tSNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), false), t.stringLiteral('auto')), identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), identifier('funds', t.tsTypeAnnotation(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
+  return args;
+};
+export const createWasmExecMethod = (context, jsonschema) => {
+  const underscoreName = Object.keys(jsonschema.properties)[0];
+  const methodName = camel(underscoreName);
+  const obj = createTypedObjectParams(context, jsonschema.properties[underscoreName]);
+  const args = getWasmMethodArgs(context, jsonschema.properties[underscoreName]);
   return t.classProperty(t.identifier(methodName), arrowFunctionExpression(obj ? [// props
-  obj, ...constantParams] : constantParams, t.blockStatement([t.returnStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('execute')), [t.memberExpression(t.thisExpression(), t.identifier('sender')), t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.objectExpression([t.objectProperty(t.identifier(underscoreName), t.objectExpression([...args]))]), t.identifier('fee'), t.identifier('memo'), t.identifier('funds')])))]), // return type
+  obj, ...CONSTANT_EXEC_PARAMS] : CONSTANT_EXEC_PARAMS, t.blockStatement([t.returnStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('execute')), [t.memberExpression(t.thisExpression(), t.identifier('sender')), t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.objectExpression([t.objectProperty(t.identifier(underscoreName), t.objectExpression([...args]))]), t.identifier('fee'), t.identifier('memo'), t.identifier('funds')])))]), // return type
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tSTypeReference(t.identifier('ExecuteResult'))]))), true));
 };
-export const createExecuteClass = (className, implementsClassName, extendsClassName, execMsg) => {
+export const createExecuteClass = (context, className, implementsClassName, extendsClassName, execMsg) => {
   const propertyNames = getMessageProperties(execMsg).map(method => Object.keys(method.properties)?.[0]).filter(Boolean);
   const bindings = propertyNames.map(camel).map(bindMethod);
   const methods = getMessageProperties(execMsg).map(schema => {
-    return createWasmExecMethod(schema);
+    return createWasmExecMethod(context, schema);
   });
   const blockStmt = [];
 
@@ -61,19 +72,19 @@ export const createExecuteClass = (className, implementsClassName, extendsClassN
   classProperty('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword())), // constructor
   t.classMethod('constructor', t.identifier('constructor'), [typedIdentifier('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient')))), typedIdentifier('sender', t.tsTypeAnnotation(t.tsStringKeyword())), typedIdentifier('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement(blockStmt)), ...methods], [t.tSExpressionWithTypeArguments(t.identifier(implementsClassName))], extendsClassName ? t.identifier(extendsClassName) : null));
 };
-export const createExecuteInterface = (className, extendsClassName, execMsg) => {
+export const createExecuteInterface = (context, className, extendsClassName, execMsg) => {
   const methods = getMessageProperties(execMsg).map(jsonschema => {
     const underscoreName = Object.keys(jsonschema.properties)[0];
     const methodName = camel(underscoreName);
-    return createPropertyFunctionWithObjectParamsForExec(methodName, 'ExecuteResult', jsonschema.properties[underscoreName]);
+    return createPropertyFunctionWithObjectParamsForExec(context, methodName, 'ExecuteResult', jsonschema.properties[underscoreName]);
   });
   const extendsAst = extendsClassName ? [t.tSExpressionWithTypeArguments(t.identifier(extendsClassName))] : [];
   return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(className), null, extendsAst, t.tSInterfaceBody([// contract address
   t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword())), // contract address
   t.tSPropertySignature(t.identifier('sender'), t.tsTypeAnnotation(t.tsStringKeyword())), ...methods])));
 };
-export const createPropertyFunctionWithObjectParams = (methodName, responseType, jsonschema) => {
-  const obj = createTypedObjectParams(jsonschema);
+export const createPropertyFunctionWithObjectParams = (context, methodName, responseType, jsonschema) => {
+  const obj = createTypedObjectParams(context, jsonschema);
   const func = {
     type: 'TSFunctionType',
     typeAnnotation: promiseTypeAnnotation(responseType),
@@ -81,26 +92,25 @@ export const createPropertyFunctionWithObjectParams = (methodName, responseType,
   };
   return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
 };
-export const createPropertyFunctionWithObjectParamsForExec = (methodName, responseType, jsonschema) => {
-  const obj = createTypedObjectParams(jsonschema);
-  const fixedParams = [identifier('fee', t.tsTypeAnnotation(t.tsUnionType([t.tsNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), true), identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), identifier('funds', t.tsTypeAnnotation(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
+export const createPropertyFunctionWithObjectParamsForExec = (context, methodName, responseType, jsonschema) => {
+  const obj = createTypedObjectParams(context, jsonschema);
   const func = {
     type: 'TSFunctionType',
     typeAnnotation: promiseTypeAnnotation(responseType),
-    parameters: obj ? [obj, ...fixedParams] : fixedParams
+    parameters: obj ? [obj, ...FIXED_EXECUTE_PARAMS] : FIXED_EXECUTE_PARAMS
   };
   return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
 };
-export const createQueryInterface = (className, queryMsg) => {
+export const createQueryInterface = (context, className, queryMsg) => {
   const methods = getMessageProperties(queryMsg).map(jsonschema => {
     const underscoreName = Object.keys(jsonschema.properties)[0];
     const methodName = camel(underscoreName);
     const responseType = pascal(`${methodName}Response`);
-    return createPropertyFunctionWithObjectParams(methodName, responseType, jsonschema.properties[underscoreName]);
+    return createPropertyFunctionWithObjectParams(context, methodName, responseType, jsonschema.properties[underscoreName]);
   });
   return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(className), null, [], t.tSInterfaceBody([t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword())), ...methods])));
 };
-export const createTypeOrInterface = (Type, jsonschema) => {
+export const createTypeOrInterface = (context, Type, jsonschema) => {
   if (jsonschema.type !== 'object') {
     if (!jsonschema.type) {
       return t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier(Type), null, t.tsTypeReference(t.identifier(jsonschema.title))));
@@ -113,12 +123,12 @@ export const createTypeOrInterface = (Type, jsonschema) => {
     const {
       type,
       optional
-    } = getPropertyType(jsonschema, prop);
+    } = getPropertyType(context, jsonschema, prop);
     return propertySignature(camel(prop), t.tsTypeAnnotation(type), optional);
   });
   return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(Type), null, [], t.tsInterfaceBody([...props])));
 };
-export const createTypeInterface = jsonschema => {
+export const createTypeInterface = (context, jsonschema) => {
   const Type = jsonschema.title;
-  return createTypeOrInterface(Type, jsonschema);
+  return createTypeOrInterface(context, Type, jsonschema);
 };

package/module/client/index.js

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

package/module/client/test/ts-client.arrays.spec.js

@@ -0,0 +1,17 @@
+import message from '../../../../../__fixtures__/misc/schema/arrays.json';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
+import { RenderContext } from '../../context';
+import { expectCode } from '../../../test-utils';
+const ctx = new RenderContext(message);
+it('execute_msg_for__empty', () => {
+  expectCode(createTypeInterface(ctx, message));
+});
+it('query classes', () => {
+  expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', message));
+});
+it('execute classes array types', () => {
+  expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, message));
+});
+it('execute interfaces no extends', () => {
+  expectCode(createExecuteInterface(ctx, 'SG721Instance', null, message));
+});

package/module/client/test/ts-client.cw-named-groups.test.js

@@ -0,0 +1,17 @@
+import execute_msg from '../../../../../__fixtures__/daodao/cw-named-groups/execute_msg.json';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
+import { RenderContext } from '../../context';
+import { expectCode } from '../../../test-utils';
+const ctx = new RenderContext(execute_msg);
+it('execute_msg', () => {
+  expectCode(createTypeInterface(ctx, execute_msg));
+});
+it('query classes', () => {
+  expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', execute_msg));
+});
+it('execute classes array types', () => {
+  expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execute_msg));
+});
+it('execute interfaces no extends', () => {
+  expectCode(createExecuteInterface(ctx, 'SG721Instance', null, execute_msg));
+});

package/module/client/test/ts-client.cw-proposal-single.test.js

@@ -0,0 +1,21 @@
+import execute_msg from '../../../../../__fixtures__/daodao/cw-proposal-single/execute_msg.json';
+import query_msg from '../../../../../__fixtures__/daodao/cw-proposal-single/query_msg.json';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
+import { RenderContext } from '../../context';
+import { expectCode } from '../../../test-utils';
+it('execute_msg_for', () => {
+  const ctx = new RenderContext(execute_msg);
+  expectCode(createTypeInterface(ctx, execute_msg));
+});
+it('query classes', () => {
+  const ctx = new RenderContext(query_msg);
+  expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', query_msg));
+});
+it('execute classes array types', () => {
+  const ctx = new RenderContext(execute_msg);
+  expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execute_msg));
+});
+it('execute interfaces no extends', () => {
+  const ctx = new RenderContext(execute_msg);
+  expectCode(createExecuteInterface(ctx, 'SG721Instance', null, execute_msg));
+});

package/module/client/test/ts-client.empty-enums.spec.js

@@ -0,0 +1,11 @@
+import query_msg from '../../../../../__fixtures__/daodao/cw-admin-factory/query_msg.json';
+import { createQueryClass, createQueryInterface } from '../client';
+import { RenderContext } from '../../context';
+import { expectCode } from '../../../test-utils';
+const ctx = new RenderContext(query_msg);
+it('query classes', () => {
+  expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', query_msg));
+});
+it('query interface', () => {
+  expectCode(createQueryInterface(ctx, 'ReadOnlyInstance', query_msg));
+});

package/module/client/test/ts-client.sg721.spec.js

@@ -0,0 +1,17 @@
+import execute_msg_for__empty from '../../../../../__fixtures__/sg721/execute_msg_for__empty.json';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
+import { RenderContext } from '../../context';
+import { expectCode } from '../../../test-utils';
+const ctx = new RenderContext(execute_msg_for__empty);
+it('execute_msg_for__empty', () => {
+  expectCode(createTypeInterface(ctx, execute_msg_for__empty));
+});
+it('query classes', () => {
+  expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', execute_msg_for__empty));
+});
+it('execute classes array types', () => {
+  expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execute_msg_for__empty));
+});
+it('execute interfaces no extends', () => {
+  expectCode(createExecuteInterface(ctx, 'SG721Instance', null, execute_msg_for__empty));
+});

package/module/client/test/ts-client.spec.js

@@ -0,0 +1,85 @@
+import execute_msg_named_groups from '../../../../../__fixtures__/daodao/cw-named-groups/execute_msg.json';
+import query_msg from '../../../../../__fixtures__/basic/query_msg.json';
+import execute_msg from '../../../../../__fixtures__/basic/execute_msg_for__empty.json';
+import approval_response from '../../../../../__fixtures__/basic/approval_response.json';
+import all_nft_info_response from '../../../../../__fixtures__/basic/all_nft_info_response.json';
+import approvals_response from '../../../../../__fixtures__/basic/approvals_response.json';
+import collection_info_response from '../../../../../__fixtures__/basic/collection_info_response.json';
+import contract_info_response from '../../../../../__fixtures__/basic/contract_info_response.json';
+import instantiate_msg from '../../../../../__fixtures__/basic/instantiate_msg.json';
+import nft_info_response from '../../../../../__fixtures__/basic/nft_info_response.json';
+import num_tokens_response from '../../../../../__fixtures__/basic/num_tokens_response.json';
+import operators_response from '../../../../../__fixtures__/basic/operators_response.json';
+import owner_of_response from '../../../../../__fixtures__/basic/owner_of_response.json';
+import tokens_response from '../../../../../__fixtures__/basic/tokens_response.json';
+import { createQueryClass, createQueryInterface, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
+import { RenderContext } from '../../context';
+import { expectCode } from '../../../test-utils';
+it('approval_response', () => {
+  const ctx = new RenderContext(approval_response);
+  expectCode(createTypeInterface(ctx, approval_response));
+});
+it('all_nft_info_response', () => {
+  const ctx = new RenderContext(all_nft_info_response);
+  expectCode(createTypeInterface(ctx, all_nft_info_response));
+});
+it('approvals_response', () => {
+  const ctx = new RenderContext(approvals_response);
+  expectCode(createTypeInterface(ctx, approvals_response));
+});
+it('collection_info_response', () => {
+  const ctx = new RenderContext(collection_info_response);
+  expectCode(createTypeInterface(ctx, collection_info_response));
+});
+it('contract_info_response', () => {
+  const ctx = new RenderContext(contract_info_response);
+  expectCode(createTypeInterface(ctx, contract_info_response));
+});
+it('instantiate_msg', () => {
+  const ctx = new RenderContext(instantiate_msg);
+  expectCode(createTypeInterface(ctx, instantiate_msg));
+});
+it('nft_info_response', () => {
+  const ctx = new RenderContext(nft_info_response);
+  expectCode(createTypeInterface(ctx, nft_info_response));
+});
+it('num_tokens_response', () => {
+  const ctx = new RenderContext(num_tokens_response);
+  expectCode(createTypeInterface(ctx, num_tokens_response));
+});
+it('operators_response', () => {
+  const ctx = new RenderContext(operators_response);
+  expectCode(createTypeInterface(ctx, operators_response));
+});
+it('owner_of_response', () => {
+  const ctx = new RenderContext(owner_of_response);
+  expectCode(createTypeInterface(ctx, owner_of_response));
+});
+it('tokens_response', () => {
+  const ctx = new RenderContext(tokens_response);
+  expectCode(createTypeInterface(ctx, tokens_response));
+});
+it('query classes', () => {
+  const ctx = new RenderContext(query_msg);
+  expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', query_msg));
+});
+it('execute classes', () => {
+  const ctx = new RenderContext(execute_msg);
+  expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', 'SG721QueryClient', execute_msg));
+});
+it('execute classes no extends', () => {
+  const ctx = new RenderContext(execute_msg);
+  expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execute_msg));
+});
+it('execute classes array types', () => {
+  const ctx = new RenderContext(execute_msg_named_groups);
+  expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execute_msg_named_groups));
+});
+it('execute interfaces no extends', () => {
+  const ctx = new RenderContext(execute_msg);
+  expectCode(createExecuteInterface(ctx, 'SG721Instance', null, execute_msg));
+});
+it('query interfaces', () => {
+  const ctx = new RenderContext(query_msg);
+  expectCode(createQueryInterface(ctx, 'SG721ReadOnlyInstance', query_msg));
+});

package/module/client/test/ts-client.vectis.spec.js

@@ -0,0 +1,44 @@
+import cosmos_msg_for__empty from '../../../../../__fixtures__/vectis/govec/cosmos_msg_for__empty.json';
+import execute_msg_for__empty from '../../../../../__fixtures__/vectis/govec/execute_msg_for__empty.json';
+import can_execute_relay_response from '../../../../../__fixtures__/vectis/govec/can_execute_relay_response.json';
+import info_response from '../../../../../__fixtures__/vectis/govec/info_response.json';
+import relay_transaction from '../../../../../__fixtures__/vectis/govec/relay_transaction.json';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
+import { RenderContext } from '../../context';
+import { expectCode } from '../../../test-utils';
+it('cosmos_msg_for__empty', () => {
+  const ctx = new RenderContext(cosmos_msg_for__empty);
+  expectCode(createTypeInterface(ctx, cosmos_msg_for__empty));
+});
+it('execute_msg_for__empty', () => {
+  const ctx = new RenderContext(execute_msg_for__empty);
+  expectCode(createTypeInterface(ctx, execute_msg_for__empty));
+});
+it('can_execute_relay_response', () => {
+  const ctx = new RenderContext(can_execute_relay_response);
+  expectCode(createTypeInterface(ctx, can_execute_relay_response));
+});
+it('info_response', () => {
+  const ctx = new RenderContext(info_response);
+  expectCode(createTypeInterface(ctx, info_response));
+});
+it('relay_transaction', () => {
+  const ctx = new RenderContext(relay_transaction);
+  expectCode(createTypeInterface(ctx, relay_transaction));
+});
+it('query classes', () => {
+  const ctx = new RenderContext(cosmos_msg_for__empty);
+  expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', cosmos_msg_for__empty));
+});
+it('query classes', () => {
+  const ctx = new RenderContext(execute_msg_for__empty);
+  expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', execute_msg_for__empty));
+});
+it('execute classes array types', () => {
+  const ctx = new RenderContext(execute_msg_for__empty);
+  expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execute_msg_for__empty));
+});
+it('execute interfaces no extends', () => {
+  const ctx = new RenderContext(execute_msg_for__empty);
+  expectCode(createExecuteInterface(ctx, 'SG721Instance', null, execute_msg_for__empty));
+});

package/module/context/context.js

@@ -0,0 +1,25 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import deepmerge from "deepmerge"; /// Plugin Types
+
+export const defaultOptions = {
+  reactQuery: {
+    optionalClient: false,
+    v4: false,
+    mutations: false,
+    camelize: true
+  }
+};
+export class RenderContext {
+  constructor(schema, options) {
+    _defineProperty(this, "schema", void 0);
+
+    this.schema = schema;
+    this.options = deepmerge(defaultOptions, options ?? {});
+  }
+
+  refLookup($ref) {
+    const refName = $ref.replace('#/definitions/', '');
+    return this.schema.definitions?.[refName];
+  }
+
+}

package/module/context/index.js

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

package/module/{messages.js → from-partial/from-partial.js}

@@ -1,51 +1,26 @@
 import * as t from '@babel/types';
 import { camel } from 'case';
-import { bindMethod, typedIdentifier, classDeclaration, classProperty, arrowFunctionExpression, getMessageProperties } from './utils';
-import { createTypedObjectParams } from './utils/types';
-import { identifier, tsTypeOperator } from './utils/babel';
+import { bindMethod, typedIdentifier, classDeclaration, classProperty, arrowFunctionExpression, getMessageProperties } from '../utils';
+import { createTypedObjectParams } from '../utils/types';
+import { identifier } from '../utils/babel';
+import { getWasmMethodArgs } from '../client/client';
 
-const createWasmExecMethodPartial = jsonschema => {
+const createWasmExecMethodPartial = (context, jsonschema) => {
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
-  const properties = jsonschema.properties[underscoreName].properties ?? {};
-  const obj = createTypedObjectParams(jsonschema.properties[underscoreName]);
-  const args = Object.keys(properties).map(prop => {
-    return t.objectProperty(t.identifier(prop), t.identifier(camel(prop)), false, prop === camel(prop));
-  });
-  const constantParams = [// t.assignmentPattern(
-  //     identifier(
-  //         'fee',
-  //         t.tsTypeAnnotation(
-  //             t.tsUnionType(
-  //                 [
-  //                     t.tSNumberKeyword(),
-  //                     t.tsTypeReference(
-  //                         t.identifier('StdFee')
-  //                     ),
-  //                     t.tsLiteralType(
-  //                         t.stringLiteral('auto')
-  //                     )
-  //                 ]
-  //             )
-  //         ),
-  //         false
-  //     ),
-  //     t.stringLiteral('auto')
-  // ),
-  // identifier('memo', t.tsTypeAnnotation(
-  //     t.tsStringKeyword()
-  // ), true),
-  identifier('funds', t.tsTypeAnnotation(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
+  const obj = createTypedObjectParams(context, jsonschema.properties[underscoreName]);
+  const args = getWasmMethodArgs(context, jsonschema.properties[underscoreName]);
+  const constantParams = [identifier('funds', t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))), true)];
   return t.classProperty(t.identifier(methodName), arrowFunctionExpression(obj ? [// props
   obj, ...constantParams] : constantParams, t.blockStatement([t.returnStatement(t.objectExpression([t.objectProperty(t.identifier('typeUrl'), t.stringLiteral('/cosmwasm.wasm.v1.MsgExecuteContract')), t.objectProperty(t.identifier('value'), t.callExpression(t.memberExpression(t.identifier('MsgExecuteContract'), t.identifier('fromPartial')), [t.objectExpression([t.objectProperty(t.identifier('sender'), t.memberExpression(t.thisExpression(), t.identifier('sender'))), t.objectProperty(t.identifier('contract'), t.memberExpression(t.thisExpression(), t.identifier('contractAddress'))), t.objectProperty(t.identifier('msg'), t.callExpression(t.identifier('toUtf8'), [t.callExpression(t.memberExpression(t.identifier('JSON'), t.identifier('stringify')), [t.objectExpression([t.objectProperty(t.identifier(underscoreName), t.objectExpression(args))])])])), t.objectProperty(t.identifier('funds'), t.identifier('funds'), false, true)])]))]))]), // return type
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('MsgExecuteContractEncodeObject'))), false));
 };
 
-export const createFromPartialClass = (className, implementsClassName, execMsg) => {
+export const createFromPartialClass = (context, className, implementsClassName, execMsg) => {
   const propertyNames = getMessageProperties(execMsg).map(method => Object.keys(method.properties)?.[0]).filter(Boolean);
   const bindings = propertyNames.map(camel).map(bindMethod);
   const methods = getMessageProperties(execMsg).map(schema => {
-    return createWasmExecMethodPartial(schema);
+    return createWasmExecMethodPartial(context, schema);
   });
   const blockStmt = [];
   [].push.apply(blockStmt, [t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('sender')), t.identifier('sender'))), t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.identifier('contractAddress'))), ...bindings]);
@@ -54,37 +29,21 @@ export const createFromPartialClass = (className, implementsClassName, execMsg)
   classProperty('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword())), // constructor
   t.classMethod('constructor', t.identifier('constructor'), [typedIdentifier('sender', t.tsTypeAnnotation(t.tsStringKeyword())), typedIdentifier('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement(blockStmt)), ...methods], [t.tSExpressionWithTypeArguments(t.identifier(implementsClassName))], null));
 };
-export const createFromPartialInterface = (className, execMsg) => {
+export const createFromPartialInterface = (context, className, execMsg) => {
   const methods = getMessageProperties(execMsg).map(jsonschema => {
     const underscoreName = Object.keys(jsonschema.properties)[0];
     const methodName = camel(underscoreName);
-    return createPropertyFunctionWithObjectParamsForPartial(methodName, 'MsgExecuteContractEncodeObject', jsonschema.properties[underscoreName]);
+    return createPropertyFunctionWithObjectParamsForPartial(context, methodName, 'MsgExecuteContractEncodeObject', jsonschema.properties[underscoreName]);
   });
   const extendsAst = [];
   return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(className), null, extendsAst, t.tSInterfaceBody([// contract address
   t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword())), // contract address
   t.tSPropertySignature(t.identifier('sender'), t.tsTypeAnnotation(t.tsStringKeyword())), ...methods])));
-}; // MARKED AS NOT DRY 
+};
 
-const createPropertyFunctionWithObjectParamsForPartial = (methodName, responseType, jsonschema) => {
-  const obj = createTypedObjectParams(jsonschema);
-  const fixedParams = [// identifier('fee', t.tsTypeAnnotation(
-  //     t.tsUnionType(
-  //         [
-  //             t.tsNumberKeyword(),
-  //             t.tsTypeReference(
-  //                 t.identifier('StdFee')
-  //             ),
-  //             t.tsLiteralType(
-  //                 t.stringLiteral('auto')
-  //             )
-  //         ]
-  //     )
-  // ), true),
-  // identifier('memo', t.tsTypeAnnotation(
-  //     t.tsStringKeyword()
-  // ), true),
-  identifier('funds', t.tsTypeAnnotation(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
+const createPropertyFunctionWithObjectParamsForPartial = (context, methodName, responseType, jsonschema) => {
+  const obj = createTypedObjectParams(context, jsonschema);
+  const fixedParams = [identifier('funds', t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))), true)];
   const func = {
     type: 'TSFunctionType',
     typeAnnotation: t.tsTypeAnnotation(t.tsTypeReference(t.identifier(responseType))),

package/module/from-partial/from-partial.spec.js

@@ -0,0 +1,12 @@
+import execute_msg from '../../../../__fixtures__/basic/execute_msg_for__empty.json';
+import { createFromPartialClass, createFromPartialInterface } from './from-partial';
+import { RenderContext } from '../context';
+import { expectCode } from '../../test-utils';
+it('execute classes', () => {
+  const ctx = new RenderContext(execute_msg);
+  expectCode(createFromPartialClass(ctx, 'SG721MessageComposer', 'SG721Message', execute_msg));
+});
+it('createFromPartialInterface', () => {
+  const ctx = new RenderContext(execute_msg);
+  expectCode(createFromPartialInterface(ctx, 'SG721Message', execute_msg));
+});

package/module/from-partial/index.js

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

package/module/index.js

@@ -1,5 +1,7 @@
 export * from './utils';
-export * from './wasm';
+export * from './client';
+export * from './context';
 export * from './recoil';
-export * from './messages';
-export * from './react-query';
+export * from './from-partial';
+export * from './react-query';
+export * from './types';

package/module/react-query/index.js

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