wasm-ast-types 0.6.0 → 0.7.0

package/main/client/client.js

@@ -43,6 +43,7 @@ var createWasmQueryMethod = function createWasmQueryMethod(context, jsonschema)
 exports.createWasmQueryMethod = createWasmQueryMethod;
 
 var createQueryClass = function createQueryClass(context, className, implementsClassName, queryMsg) {
+  context.addUtil('CosmWasmClient');
   var propertyNames = (0, _utils.getMessageProperties)(queryMsg).map(function (method) {
     var _Object$keys;
 
@@ -85,6 +86,9 @@ var getWasmMethodArgs = function getWasmMethodArgs(context, jsonschema) {
 exports.getWasmMethodArgs = getWasmMethodArgs;
 
 var createWasmExecMethod = function createWasmExecMethod(context, jsonschema) {
+  context.addUtil('ExecuteResult');
+  context.addUtil('StdFee');
+  context.addUtil('Coin');
   var underscoreName = Object.keys(jsonschema.properties)[0];
   var methodName = (0, _case.camel)(underscoreName);
   var obj = (0, _types2.createTypedObjectParams)(context, jsonschema.properties[underscoreName]);
@@ -97,6 +101,7 @@ var createWasmExecMethod = function createWasmExecMethod(context, jsonschema) {
 exports.createWasmExecMethod = createWasmExecMethod;
 
 var createExecuteClass = function createExecuteClass(context, className, implementsClassName, extendsClassName, execMsg) {
+  context.addUtil('SigningCosmWasmClient');
   var propertyNames = (0, _utils.getMessageProperties)(execMsg).map(function (method) {
     var _Object$keys2;
 
@@ -151,6 +156,7 @@ var createPropertyFunctionWithObjectParams = function createPropertyFunctionWith
 exports.createPropertyFunctionWithObjectParams = createPropertyFunctionWithObjectParams;
 
 var createPropertyFunctionWithObjectParamsForExec = function createPropertyFunctionWithObjectParamsForExec(context, methodName, responseType, jsonschema) {
+  context.addUtil('Coin');
   var obj = (0, _types2.createTypedObjectParams)(context, jsonschema);
   var func = {
     type: 'TSFunctionType',

package/main/context/context.js

@@ -13,12 +13,28 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _imports = require("./imports");
+
 var _deepmerge = _interopRequireDefault(require("deepmerge"));
 
 var defaultOptions = {
+  types: {
+    enabled: true,
+    aliasExecuteMsg: false
+  },
+  client: {
+    enabled: true
+  },
+  recoil: {
+    enabled: false
+  },
+  messageComposer: {
+    enabled: false
+  },
   reactQuery: {
+    enabled: false,
     optionalClient: false,
-    v4: false,
+    version: 'v3',
     mutations: false,
     camelize: true
   }
@@ -29,6 +45,7 @@ var RenderContext = /*#__PURE__*/function () {
   function RenderContext(schema, options) {
     (0, _classCallCheck2["default"])(this, RenderContext);
     (0, _defineProperty2["default"])(this, "schema", void 0);
+    (0, _defineProperty2["default"])(this, "utils", []);
     this.schema = schema;
     this.options = (0, _deepmerge["default"])(defaultOptions, options !== null && options !== void 0 ? options : {});
   }
@@ -41,6 +58,16 @@ var RenderContext = /*#__PURE__*/function () {
       var refName = $ref.replace('#/definitions/', '');
       return (_this$schema$definiti = this.schema.definitions) === null || _this$schema$definiti === void 0 ? void 0 : _this$schema$definiti[refName];
     }
+  }, {
+    key: "addUtil",
+    value: function addUtil(util) {
+      this.utils[util] = true;
+    }
+  }, {
+    key: "getImports",
+    value: function getImports() {
+      return (0, _imports.getImportStatements)((0, _imports.convertUtilsToImportList)(this, Object.keys(this.utils)));
+    }
   }]);
   return RenderContext;
 }();

package/main/context/imports.js

@@ -0,0 +1,138 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getImportStatements = exports.convertUtilsToImportList = exports.UTILS = void 0;
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var t = _interopRequireWildcard(require("@babel/types"));
+
+var _utils = require("../utils");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var makeReactQuerySwitch = function makeReactQuerySwitch(varName) {
+  return function (context) {
+    switch (context.options.reactQuery.version) {
+      case 'v4':
+        return {
+          type: 'import',
+          path: '@tanstack/react-query',
+          name: varName
+        };
+
+      case 'v3':
+      default:
+        return {
+          type: 'import',
+          path: 'react-query',
+          name: varName
+        };
+    }
+  };
+};
+
+var UTILS = {
+  MsgExecuteContract: 'cosmjs-types/cosmwasm/wasm/v1/tx',
+  MsgExecuteContractEncodeObject: 'cosmwasm',
+  Coin: '@cosmjs/amino',
+  toUtf8: '@cosmjs/encoding',
+  selectorFamily: 'recoil',
+  StdFee: '@cosmjs/amino',
+  CosmWasmClient: '@cosmjs/cosmwasm-stargate',
+  ExecuteResult: '@cosmjs/cosmwasm-stargate',
+  SigningCosmWasmClient: '@cosmjs/cosmwasm-stargate',
+  // react-query
+  useQuery: makeReactQuerySwitch('useQuery'),
+  UseQueryOptions: makeReactQuerySwitch('UseQueryOptions'),
+  useMutation: makeReactQuerySwitch('useMutation'),
+  UseMutationOptions: makeReactQuerySwitch('UseMutationOptions')
+};
+exports.UTILS = UTILS;
+
+var convertUtilsToImportList = function convertUtilsToImportList(context, utils) {
+  return utils.map(function (util) {
+    if (!UTILS.hasOwnProperty(util)) throw new Error("missing Util! ::[".concat(util, "]"));
+
+    if (typeof UTILS[util] === 'string') {
+      return {
+        type: 'import',
+        path: UTILS[util],
+        name: util
+      };
+    } else if (typeof UTILS[util] === 'function') {
+      return UTILS[util](context);
+    } else {
+      UTILS[util];
+    }
+  });
+};
+
+exports.convertUtilsToImportList = convertUtilsToImportList;
+
+var getImportStatements = function getImportStatements(list) {
+  var imports = list.reduce(function (m, obj) {
+    m[obj.path] = m[obj.path] || [];
+    var exists = m[obj.path].find(function (el) {
+      return el.type === obj.type && el.path === obj.path && el.name === obj.name;
+    }); // TODO some have google.protobuf.Any shows up... figure out the better way to handle this
+
+    if (/\./.test(obj.name)) {
+      obj.name = obj.name.split('.')[obj.name.split('.').length - 1];
+    }
+
+    if (!exists) m[obj.path].push(obj);
+    return m;
+  }, {});
+  return Object.entries(imports).reduce(function (m, _ref) {
+    var _ref2 = (0, _slicedToArray2["default"])(_ref, 2),
+        importPath = _ref2[0],
+        imports = _ref2[1];
+
+    var defaultImports = imports.filter(function (a) {
+      return a.type === 'default';
+    });
+
+    if (defaultImports.length) {
+      if (defaultImports.length > 1) throw new Error('more than one default name NOT allowed.');
+      m.push(t.importDeclaration([t.importDefaultSpecifier(t.identifier(defaultImports[0].name))], t.stringLiteral(defaultImports[0].path)));
+    }
+
+    var namedImports = imports.filter(function (a) {
+      return a.type === 'import' && (!a.importAs || a.name === a.importAs);
+    });
+
+    if (namedImports.length) {
+      m.push((0, _utils.importStmt)(namedImports.map(function (i) {
+        return i.name;
+      }), namedImports[0].path));
+    }
+
+    var aliasNamedImports = imports.filter(function (a) {
+      return a.type === 'import' && a.importAs && a.name !== a.importAs;
+    });
+    aliasNamedImports.forEach(function (imp) {
+      m.push((0, _utils.importAs)(imp.name, imp.importAs, imp.path));
+    });
+    var namespaced = imports.filter(function (a) {
+      return a.type === 'namespace';
+    });
+
+    if (namespaced.length) {
+      if (namespaced.length > 1) throw new Error('more than one namespaced name NOT allowed.');
+      m.push(t.importDeclaration([t.importNamespaceSpecifier(t.identifier(namespaced[0].name))], t.stringLiteral(namespaced[0].path)));
+    }
+
+    return m;
+  }, []);
+};
+
+exports.getImportStatements = getImportStatements;

package/main/context/index.js

@@ -15,4 +15,17 @@ Object.keys(_context).forEach(function (key) {
       return _context[key];
     }
   });
+});
+
+var _imports = require("./imports");
+
+Object.keys(_imports).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _imports[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _imports[key];
+    }
+  });
 });

package/main/index.js

@@ -56,15 +56,15 @@ Object.keys(_recoil).forEach(function (key) {
   });
 });
 
-var _fromPartial = require("./from-partial");
+var _messageComposer = require("./message-composer");
 
-Object.keys(_fromPartial).forEach(function (key) {
+Object.keys(_messageComposer).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _fromPartial[key]) return;
+  if (key in exports && exports[key] === _messageComposer[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _fromPartial[key];
+      return _messageComposer[key];
     }
   });
 });

package/main/{from-partial → message-composer}/index.js

@@ -4,15 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _fromPartial = require("./from-partial");
+var _messageComposer = require("./message-composer");
 
-Object.keys(_fromPartial).forEach(function (key) {
+Object.keys(_messageComposer).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _fromPartial[key]) return;
+  if (key in exports && exports[key] === _messageComposer[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _fromPartial[key];
+      return _messageComposer[key];
     }
   });
 });

package/main/{from-partial/from-partial.js → message-composer/message-composer.js}

@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createFromPartialInterface = exports.createFromPartialClass = void 0;
+exports.createMessageComposerInterface = exports.createMessageComposerClass = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
@@ -27,7 +27,11 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var createWasmExecMethodPartial = function createWasmExecMethodPartial(context, jsonschema) {
+var createWasmExecMethodMessageComposer = function createWasmExecMethodMessageComposer(context, jsonschema) {
+  context.addUtil('Coin');
+  context.addUtil('MsgExecuteContractEncodeObject');
+  context.addUtil('MsgExecuteContract');
+  context.addUtil('toUtf8');
   var underscoreName = Object.keys(jsonschema.properties)[0];
   var methodName = (0, _case.camel)(underscoreName);
   var obj = (0, _types2.createTypedObjectParams)(context, jsonschema.properties[underscoreName]);
@@ -38,7 +42,7 @@ var createWasmExecMethodPartial = function createWasmExecMethodPartial(context,
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('MsgExecuteContractEncodeObject'))), false));
 };
 
-var createFromPartialClass = function createFromPartialClass(context, className, implementsClassName, execMsg) {
+var createMessageComposerClass = function createMessageComposerClass(context, className, implementsClassName, execMsg) {
   var propertyNames = (0, _utils.getMessageProperties)(execMsg).map(function (method) {
     var _Object$keys;
 
@@ -46,7 +50,7 @@ var createFromPartialClass = function createFromPartialClass(context, className,
   }).filter(Boolean);
   var bindings = propertyNames.map(_case.camel).map(_utils.bindMethod);
   var methods = (0, _utils.getMessageProperties)(execMsg).map(function (schema) {
-    return createWasmExecMethodPartial(context, schema);
+    return createWasmExecMethodMessageComposer(context, schema);
   });
   var 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')))].concat((0, _toConsumableArray2["default"])(bindings)));
@@ -56,13 +60,13 @@ var createFromPartialClass = function createFromPartialClass(context, className,
   t.classMethod('constructor', t.identifier('constructor'), [(0, _utils.typedIdentifier)('sender', t.tsTypeAnnotation(t.tsStringKeyword())), (0, _utils.typedIdentifier)('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement(blockStmt))].concat((0, _toConsumableArray2["default"])(methods)), [t.tSExpressionWithTypeArguments(t.identifier(implementsClassName))], null));
 };
 
-exports.createFromPartialClass = createFromPartialClass;
+exports.createMessageComposerClass = createMessageComposerClass;
 
-var createFromPartialInterface = function createFromPartialInterface(context, className, execMsg) {
+var createMessageComposerInterface = function createMessageComposerInterface(context, className, execMsg) {
   var methods = (0, _utils.getMessageProperties)(execMsg).map(function (jsonschema) {
     var underscoreName = Object.keys(jsonschema.properties)[0];
     var methodName = (0, _case.camel)(underscoreName);
-    return createPropertyFunctionWithObjectParamsForPartial(context, methodName, 'MsgExecuteContractEncodeObject', jsonschema.properties[underscoreName]);
+    return createPropertyFunctionWithObjectParamsForMessageComposer(context, methodName, 'MsgExecuteContractEncodeObject', jsonschema.properties[underscoreName]);
   });
   var extendsAst = [];
   return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(className), null, extendsAst, t.tSInterfaceBody([// contract address
@@ -70,9 +74,9 @@ var createFromPartialInterface = function createFromPartialInterface(context, cl
   t.tSPropertySignature(t.identifier('sender'), t.tsTypeAnnotation(t.tsStringKeyword()))].concat((0, _toConsumableArray2["default"])(methods)))));
 };
 
-exports.createFromPartialInterface = createFromPartialInterface;
+exports.createMessageComposerInterface = createMessageComposerInterface;
 
-var createPropertyFunctionWithObjectParamsForPartial = function createPropertyFunctionWithObjectParamsForPartial(context, methodName, responseType, jsonschema) {
+var createPropertyFunctionWithObjectParamsForMessageComposer = function createPropertyFunctionWithObjectParamsForMessageComposer(context, methodName, responseType, jsonschema) {
   var obj = (0, _types2.createTypedObjectParams)(context, jsonschema);
   var fixedParams = [(0, _babel.identifier)('funds', t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))), true)];
   var func = {

package/main/{from-partial/from-partial.spec.js → message-composer/message-composer.spec.js}

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 var _execute_msg_for__empty = _interopRequireDefault(require("../../../../__fixtures__/basic/execute_msg_for__empty.json"));
 
-var _fromPartial = require("./from-partial");
+var _messageComposer = require("./message-composer");
 
 var _context = require("../context");
 
@@ -12,9 +12,9 @@ var _testUtils = require("../../test-utils");
 
 it('execute classes', function () {
   var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
-  (0, _testUtils.expectCode)((0, _fromPartial.createFromPartialClass)(ctx, 'SG721MessageComposer', 'SG721Message', _execute_msg_for__empty["default"]));
+  (0, _testUtils.expectCode)((0, _messageComposer.createMessageComposerClass)(ctx, 'SG721MessageComposer', 'SG721Message', _execute_msg_for__empty["default"]));
 });
-it('createFromPartialInterface', function () {
+it('createMessageComposerInterface', function () {
   var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
-  (0, _testUtils.expectCode)((0, _fromPartial.createFromPartialInterface)(ctx, 'SG721Message', _execute_msg_for__empty["default"]));
+  (0, _testUtils.expectCode)((0, _messageComposer.createMessageComposerInterface)(ctx, 'SG721Message', _execute_msg_for__empty["default"]));
 });

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

@@ -72,6 +72,8 @@ var createReactQueryHook = function createReactQueryHook(_ref2) {
       hookKeyName = _ref2.hookKeyName,
       methodName = _ref2.methodName,
       jsonschema = _ref2.jsonschema;
+  context.addUtil('useQuery');
+  context.addUtil('UseQueryOptions');
   var options = context.options.reactQuery;
   var keys = Object.keys((_jsonschema$propertie = jsonschema.properties) !== null && _jsonschema$propertie !== void 0 ? _jsonschema$propertie : {});
   var args = [];
@@ -159,7 +161,7 @@ var createReactQueryMutationHooks = function createReactQueryMutationHooks(_ref4
 
     var hasMsg = !!((_Object$keys = Object.keys(properties)) !== null && _Object$keys !== void 0 && _Object$keys.length || jsonschema !== null && jsonschema !== void 0 && jsonschema.$ref); // <ExecuteResult, Error, Cw4UpdateMembersMutation>
 
-    var useMutationTypeParameter = generateMutationTypeParameter(mutationHookParamsTypeName, hasMsg);
+    var useMutationTypeParameter = generateMutationTypeParameter(context, mutationHookParamsTypeName);
     return [createReactQueryMutationArgsInterface({
       context: context,
       mutationHookParamsTypeName: mutationHookParamsTypeName,
@@ -183,12 +185,13 @@ var createReactQueryMutationHooks = function createReactQueryMutationHooks(_ref4
 
 exports.createReactQueryMutationHooks = createReactQueryMutationHooks;
 
-function generateMutationTypeParameter(mutationHookParamsTypeName, hasArgs) {
+var generateMutationTypeParameter = function generateMutationTypeParameter(context, mutationHookParamsTypeName) {
+  context.addUtil('ExecuteResult');
   return t.tsTypeParameterInstantiation([// Data
   t.tSTypeReference(t.identifier('ExecuteResult')), // Error
   t.tsTypeReference(t.identifier('Error')), // Variables
   t.tsTypeReference(t.identifier(mutationHookParamsTypeName))]);
-}
+};
 
 /**
  *
@@ -208,6 +211,8 @@ var createReactQueryMutationHook = function createReactQueryMutationHook(_ref5)
       execMethodName = _ref5.execMethodName,
       useMutationTypeParameter = _ref5.useMutationTypeParameter,
       hasMsg = _ref5.hasMsg;
+  context.addUtil('useMutation');
+  context.addUtil('UseMutationOptions');
   var useMutationFunctionArgs = [(0, _babel.shorthandProperty)('client')];
   if (hasMsg) useMutationFunctionArgs.push((0, _babel.shorthandProperty)('msg'));
   useMutationFunctionArgs.push(t.objectProperty(t.identifier('args'), t.assignmentPattern(t.objectPattern(_client.FIXED_EXECUTE_PARAMS.map(function (param) {
@@ -229,8 +234,9 @@ var createReactQueryHookInterface = function createReactQueryHookInterface(_ref6
       jsonschema = _ref6.jsonschema;
   // merge the user options with the defaults
   var options = context.options.reactQuery;
+  context.addUtil('UseQueryOptions');
   var typedUseQueryOptions = t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([(0, _babel.typeRefOrOptionalUnion)(t.identifier(responseType), options.optionalClient), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(responseType)), t.tsArrayType(t.tsParenthesizedType(t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])))]));
-  var body = [(0, _utils.tsPropertySignature)(t.identifier('client'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(QueryClient))), options.optionalClient), (0, _utils.tsPropertySignature)(t.identifier('options'), t.tsTypeAnnotation(options.v4 ? t.tSIntersectionType([(0, _babel.omitTypeReference)(typedUseQueryOptions, "'queryKey' | 'queryFn' | 'initialData'"), t.tSTypeLiteral([t.tsPropertySignature(t.identifier('initialData?'), t.tsTypeAnnotation(t.tsUndefinedKeyword()))])]) : typedUseQueryOptions), true)];
+  var body = [(0, _utils.tsPropertySignature)(t.identifier('client'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(QueryClient))), options.optionalClient), (0, _utils.tsPropertySignature)(t.identifier('options'), t.tsTypeAnnotation(options.version === 'v4' ? t.tSIntersectionType([(0, _babel.omitTypeReference)(typedUseQueryOptions, "'queryKey' | 'queryFn' | 'initialData'"), t.tSTypeLiteral([t.tsPropertySignature(t.identifier('initialData?'), t.tsTypeAnnotation(t.tsUndefinedKeyword()))])]) : typedUseQueryOptions), true)];
   var props = getProps(context, jsonschema);
 
   if (props.length) {

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

@@ -42,7 +42,7 @@ it('createReactQueryHooks', function () {
   (0, _testUtils.expectCode)(t.program((0, _reactQuery.createReactQueryHooks)({
     context: new _context.RenderContext(_query_msg["default"], {
       reactQuery: {
-        v4: true
+        version: 'v4'
       }
     }),
     queryMsg: _query_msg["default"],
@@ -53,7 +53,7 @@ it('createReactQueryHooks', function () {
     context: new _context.RenderContext(_query_msg["default"], {
       reactQuery: {
         optionalClient: true,
-        v4: true
+        version: 'v4'
       }
     }),
     queryMsg: _query_msg["default"],

package/main/recoil/recoil.js

@@ -18,6 +18,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 var createRecoilSelector = function createRecoilSelector(context, keyPrefix, QueryClient, methodName) {
+  context.addUtil('selectorFamily');
   var selectorName = (0, _case.camel)("".concat(methodName, "Selector"));
   var responseType = (0, _case.pascal)("".concat(methodName, "Response"));
   var getterKey = (0, _case.camel)("".concat(keyPrefix).concat((0, _case.pascal)(methodName)));
@@ -66,6 +67,7 @@ var createRecoilQueryClientType = function createRecoilQueryClientType() {
 exports.createRecoilQueryClientType = createRecoilQueryClientType;
 
 var createRecoilQueryClient = function createRecoilQueryClient(context, keyPrefix, QueryClient) {
+  context.addUtil('selectorFamily');
   var getterKey = (0, _case.camel)("".concat(keyPrefix, 'QueryClient'));
   return t.exportNamedDeclaration(t.variableDeclaration('const', [t.variableDeclarator(t.identifier('queryClient'), (0, _utils.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/main/utils/babel.js

@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.typedIdentifier = exports.typeRefOrOptionalUnion = exports.tsTypeOperator = exports.tsPropertySignature = exports.tsObjectPattern = exports.shorthandProperty = exports.recursiveNamespace = exports.propertySignature = exports.promiseTypeAnnotation = exports.pickTypeReference = exports.parameterizedTypeReference = exports.optionalConditionalExpression = exports.omitTypeReference = exports.memberExpressionOrIdentifierSnake = exports.memberExpressionOrIdentifier = exports.importStmt = exports.importAminoMsg = exports.identifier = exports.getMessageProperties = exports.getFieldDimensionality = exports.classProperty = exports.classDeclaration = exports.callExpression = exports.bindMethod = exports.arrowFunctionExpression = exports.arrayTypeNDimensions = exports.FieldTypeAsts = void 0;
+exports.typedIdentifier = exports.typeRefOrOptionalUnion = exports.tsTypeOperator = exports.tsPropertySignature = exports.tsObjectPattern = exports.shorthandProperty = exports.recursiveNamespace = exports.propertySignature = exports.promiseTypeAnnotation = exports.pickTypeReference = exports.parameterizedTypeReference = exports.optionalConditionalExpression = exports.omitTypeReference = exports.memberExpressionOrIdentifierSnake = exports.memberExpressionOrIdentifier = exports.importStmt = exports.importAs = exports.importAminoMsg = exports.identifier = exports.getMessageProperties = exports.getFieldDimensionality = exports.classProperty = exports.classDeclaration = exports.callExpression = exports.bindMethod = exports.arrowFunctionExpression = exports.arrayTypeNDimensions = exports.FieldTypeAsts = void 0;
 
 var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
 
@@ -194,6 +194,12 @@ var importStmt = function importStmt(names, path) {
 
 exports.importStmt = importStmt;
 
+var importAs = function importAs(name, _importAs, importPath) {
+  return t.importDeclaration([t.importSpecifier(t.identifier(_importAs), t.identifier(name))], t.stringLiteral(importPath));
+};
+
+exports.importAs = importAs;
+
 var importAminoMsg = function importAminoMsg() {
   return importStmt(['AminoMsg'], '@cosmjs/amino');
 };

package/main/utils/types.js

@@ -176,7 +176,7 @@ function getPropertySignatureFromProp(context, jsonschema, prop, camelize) {
     if (jsonschema.properties[prop].title) {
       return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(jsonschema.properties[prop].title))));
     } else {
-      throw new Error('createTypedObjectParams() contact maintainer');
+      throw new Error('getPropertySignatureFromProp() contact maintainer');
     }
   }
 

package/module/client/client.js

@@ -15,6 +15,7 @@ export const createWasmQueryMethod = (context, jsonschema) => {
   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 = (context, className, implementsClassName, queryMsg) => {
+  context.addUtil('CosmWasmClient');
   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 => {
@@ -43,6 +44,9 @@ export const getWasmMethodArgs = (context, jsonschema) => {
   return args;
 };
 export const createWasmExecMethod = (context, jsonschema) => {
+  context.addUtil('ExecuteResult');
+  context.addUtil('StdFee');
+  context.addUtil('Coin');
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
   const obj = createTypedObjectParams(context, jsonschema.properties[underscoreName]);
@@ -52,6 +56,7 @@ export const createWasmExecMethod = (context, jsonschema) => {
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tSTypeReference(t.identifier('ExecuteResult'))]))), true));
 };
 export const createExecuteClass = (context, className, implementsClassName, extendsClassName, execMsg) => {
+  context.addUtil('SigningCosmWasmClient');
   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 => {
@@ -93,6 +98,7 @@ export const createPropertyFunctionWithObjectParams = (context, methodName, resp
   return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
 };
 export const createPropertyFunctionWithObjectParamsForExec = (context, methodName, responseType, jsonschema) => {
+  context.addUtil('Coin');
   const obj = createTypedObjectParams(context, jsonschema);
   const func = {
     type: 'TSFunctionType',

package/module/context/context.js

@@ -1,10 +1,25 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import { convertUtilsToImportList, getImportStatements } from "./imports";
 import deepmerge from "deepmerge"; /// Plugin Types
 
 export const defaultOptions = {
+  types: {
+    enabled: true,
+    aliasExecuteMsg: false
+  },
+  client: {
+    enabled: true
+  },
+  recoil: {
+    enabled: false
+  },
+  messageComposer: {
+    enabled: false
+  },
   reactQuery: {
+    enabled: false,
     optionalClient: false,
-    v4: false,
+    version: 'v3',
     mutations: false,
     camelize: true
   }
@@ -13,6 +28,8 @@ export class RenderContext {
   constructor(schema, options) {
     _defineProperty(this, "schema", void 0);
 
+    _defineProperty(this, "utils", []);
+
     this.schema = schema;
     this.options = deepmerge(defaultOptions, options ?? {});
   }
@@ -22,4 +39,12 @@ export class RenderContext {
     return this.schema.definitions?.[refName];
   }
 
+  addUtil(util) {
+    this.utils[util] = true;
+  }
+
+  getImports() {
+    return getImportStatements(convertUtilsToImportList(this, Object.keys(this.utils)));
+  }
+
 }

package/module/context/imports.js

@@ -0,0 +1,97 @@
+import * as t from '@babel/types';
+import { importAs, importStmt } from "../utils";
+
+const makeReactQuerySwitch = varName => {
+  return context => {
+    switch (context.options.reactQuery.version) {
+      case 'v4':
+        return {
+          type: 'import',
+          path: '@tanstack/react-query',
+          name: varName
+        };
+
+      case 'v3':
+      default:
+        return {
+          type: 'import',
+          path: 'react-query',
+          name: varName
+        };
+    }
+  };
+};
+
+export const UTILS = {
+  MsgExecuteContract: 'cosmjs-types/cosmwasm/wasm/v1/tx',
+  MsgExecuteContractEncodeObject: 'cosmwasm',
+  Coin: '@cosmjs/amino',
+  toUtf8: '@cosmjs/encoding',
+  selectorFamily: 'recoil',
+  StdFee: '@cosmjs/amino',
+  CosmWasmClient: '@cosmjs/cosmwasm-stargate',
+  ExecuteResult: '@cosmjs/cosmwasm-stargate',
+  SigningCosmWasmClient: '@cosmjs/cosmwasm-stargate',
+  // react-query
+  useQuery: makeReactQuerySwitch('useQuery'),
+  UseQueryOptions: makeReactQuerySwitch('UseQueryOptions'),
+  useMutation: makeReactQuerySwitch('useMutation'),
+  UseMutationOptions: makeReactQuerySwitch('UseMutationOptions')
+};
+export const convertUtilsToImportList = (context, utils) => {
+  return utils.map(util => {
+    if (!UTILS.hasOwnProperty(util)) throw new Error(`missing Util! ::[${util}]`);
+
+    if (typeof UTILS[util] === 'string') {
+      return {
+        type: 'import',
+        path: UTILS[util],
+        name: util
+      };
+    } else if (typeof UTILS[util] === 'function') {
+      return UTILS[util](context);
+    } else {
+      UTILS[util];
+    }
+  });
+};
+export const getImportStatements = list => {
+  const imports = list.reduce((m, obj) => {
+    m[obj.path] = m[obj.path] || [];
+    const exists = m[obj.path].find(el => el.type === obj.type && el.path === obj.path && el.name === obj.name); // TODO some have google.protobuf.Any shows up... figure out the better way to handle this
+
+    if (/\./.test(obj.name)) {
+      obj.name = obj.name.split('.')[obj.name.split('.').length - 1];
+    }
+
+    if (!exists) m[obj.path].push(obj);
+    return m;
+  }, {});
+  return Object.entries(imports).reduce((m, [importPath, imports]) => {
+    const defaultImports = imports.filter(a => a.type === 'default');
+
+    if (defaultImports.length) {
+      if (defaultImports.length > 1) throw new Error('more than one default name NOT allowed.');
+      m.push(t.importDeclaration([t.importDefaultSpecifier(t.identifier(defaultImports[0].name))], t.stringLiteral(defaultImports[0].path)));
+    }
+
+    const namedImports = imports.filter(a => a.type === 'import' && (!a.importAs || a.name === a.importAs));
+
+    if (namedImports.length) {
+      m.push(importStmt(namedImports.map(i => i.name), namedImports[0].path));
+    }
+
+    const aliasNamedImports = imports.filter(a => a.type === 'import' && a.importAs && a.name !== a.importAs);
+    aliasNamedImports.forEach(imp => {
+      m.push(importAs(imp.name, imp.importAs, imp.path));
+    });
+    const namespaced = imports.filter(a => a.type === 'namespace');
+
+    if (namespaced.length) {
+      if (namespaced.length > 1) throw new Error('more than one namespaced name NOT allowed.');
+      m.push(t.importDeclaration([t.importNamespaceSpecifier(t.identifier(namespaced[0].name))], t.stringLiteral(namespaced[0].path)));
+    }
+
+    return m;
+  }, []);
+};

package/module/context/index.js

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

package/module/index.js

@@ -2,6 +2,6 @@ export * from './utils';
 export * from './client';
 export * from './context';
 export * from './recoil';
-export * from './from-partial';
+export * from './message-composer';
 export * from './react-query';
 export * from './types';

package/module/message-composer/index.js

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

package/module/{from-partial/from-partial.js → message-composer/message-composer.js}

@@ -5,7 +5,11 @@ import { createTypedObjectParams } from '../utils/types';
 import { identifier } from '../utils/babel';
 import { getWasmMethodArgs } from '../client/client';
 
-const createWasmExecMethodPartial = (context, jsonschema) => {
+const createWasmExecMethodMessageComposer = (context, jsonschema) => {
+  context.addUtil('Coin');
+  context.addUtil('MsgExecuteContractEncodeObject');
+  context.addUtil('MsgExecuteContract');
+  context.addUtil('toUtf8');
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
   const obj = createTypedObjectParams(context, jsonschema.properties[underscoreName]);
@@ -16,11 +20,11 @@ const createWasmExecMethodPartial = (context, jsonschema) => {
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('MsgExecuteContractEncodeObject'))), false));
 };
 
-export const createFromPartialClass = (context, className, implementsClassName, execMsg) => {
+export const createMessageComposerClass = (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(context, schema);
+    return createWasmExecMethodMessageComposer(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]);
@@ -29,11 +33,11 @@ export const createFromPartialClass = (context, className, implementsClassName,
   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 = (context, className, execMsg) => {
+export const createMessageComposerInterface = (context, className, execMsg) => {
   const methods = getMessageProperties(execMsg).map(jsonschema => {
     const underscoreName = Object.keys(jsonschema.properties)[0];
     const methodName = camel(underscoreName);
-    return createPropertyFunctionWithObjectParamsForPartial(context, methodName, 'MsgExecuteContractEncodeObject', jsonschema.properties[underscoreName]);
+    return createPropertyFunctionWithObjectParamsForMessageComposer(context, methodName, 'MsgExecuteContractEncodeObject', jsonschema.properties[underscoreName]);
   });
   const extendsAst = [];
   return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(className), null, extendsAst, t.tSInterfaceBody([// contract address
@@ -41,7 +45,7 @@ export const createFromPartialInterface = (context, className, execMsg) => {
   t.tSPropertySignature(t.identifier('sender'), t.tsTypeAnnotation(t.tsStringKeyword())), ...methods])));
 };
 
-const createPropertyFunctionWithObjectParamsForPartial = (context, methodName, responseType, jsonschema) => {
+const createPropertyFunctionWithObjectParamsForMessageComposer = (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 = {

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

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

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

@@ -46,6 +46,8 @@ export const createReactQueryHook = ({
   methodName,
   jsonschema
 }) => {
+  context.addUtil('useQuery');
+  context.addUtil('UseQueryOptions');
   const options = context.options.reactQuery;
   const keys = Object.keys(jsonschema.properties ?? {});
   let args = [];
@@ -126,7 +128,7 @@ export const createReactQueryMutationHooks = ({
 
     const hasMsg = !!(Object.keys(properties)?.length || jsonschema?.$ref); // <ExecuteResult, Error, Cw4UpdateMembersMutation>
 
-    const useMutationTypeParameter = generateMutationTypeParameter(mutationHookParamsTypeName, hasMsg);
+    const useMutationTypeParameter = generateMutationTypeParameter(context, mutationHookParamsTypeName);
     return [createReactQueryMutationArgsInterface({
       context,
       mutationHookParamsTypeName,
@@ -147,12 +149,13 @@ export const createReactQueryMutationHooks = ({
  * Generates the mutation type parameter. If args exist, we use a pick. If not, we just return the params type.
  */
 
-function generateMutationTypeParameter(mutationHookParamsTypeName, hasArgs) {
+const generateMutationTypeParameter = (context, mutationHookParamsTypeName) => {
+  context.addUtil('ExecuteResult');
   return t.tsTypeParameterInstantiation([// Data
   t.tSTypeReference(t.identifier('ExecuteResult')), // Error
   t.tsTypeReference(t.identifier('Error')), // Variables
   t.tsTypeReference(t.identifier(mutationHookParamsTypeName))]);
-}
+};
 
 /**
  *
@@ -173,6 +176,8 @@ export const createReactQueryMutationHook = ({
   useMutationTypeParameter,
   hasMsg
 }) => {
+  context.addUtil('useMutation');
+  context.addUtil('UseMutationOptions');
   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([]))));
@@ -188,8 +193,9 @@ export const createReactQueryHookInterface = ({
 }) => {
   // merge the user options with the defaults
   const options = context.options.reactQuery;
+  context.addUtil('UseQueryOptions');
   const typedUseQueryOptions = t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([typeRefOrOptionalUnion(t.identifier(responseType), options.optionalClient), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(responseType)), t.tsArrayType(t.tsParenthesizedType(t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])))]));
-  const body = [tsPropertySignature(t.identifier('client'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(QueryClient))), options.optionalClient), tsPropertySignature(t.identifier('options'), t.tsTypeAnnotation(options.v4 ? t.tSIntersectionType([omitTypeReference(typedUseQueryOptions, "'queryKey' | 'queryFn' | 'initialData'"), t.tSTypeLiteral([t.tsPropertySignature(t.identifier('initialData?'), t.tsTypeAnnotation(t.tsUndefinedKeyword()))])]) : typedUseQueryOptions), true)];
+  const body = [tsPropertySignature(t.identifier('client'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(QueryClient))), options.optionalClient), tsPropertySignature(t.identifier('options'), t.tsTypeAnnotation(options.version === '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) {

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

@@ -26,7 +26,7 @@ it('createReactQueryHooks', () => {
   expectCode(t.program(createReactQueryHooks({
     context: new RenderContext(query_msg, {
       reactQuery: {
-        v4: true
+        version: 'v4'
       }
     }),
     queryMsg: query_msg,
@@ -37,7 +37,7 @@ it('createReactQueryHooks', () => {
     context: new RenderContext(query_msg, {
       reactQuery: {
         optionalClient: true,
-        v4: true
+        version: 'v4'
       }
     }),
     queryMsg: query_msg,

package/module/recoil/recoil.js

@@ -2,6 +2,7 @@ import * as t from '@babel/types';
 import { camel, pascal } from 'case';
 import { callExpression, getMessageProperties } from '../utils';
 export const createRecoilSelector = (context, keyPrefix, QueryClient, methodName) => {
+  context.addUtil('selectorFamily');
   const selectorName = camel(`${methodName}Selector`);
   const responseType = pascal(`${methodName}Response`);
   const getterKey = camel(`${keyPrefix}${pascal(methodName)}`);
@@ -39,6 +40,7 @@ export const createRecoilQueryClientType = () => ({
   }
 });
 export const createRecoilQueryClient = (context, keyPrefix, QueryClient) => {
+  context.addUtil('selectorFamily');
   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/utils/babel.js

@@ -110,6 +110,9 @@ export const shorthandProperty = prop => {
 export const importStmt = (names, path) => {
   return t.importDeclaration(names.map(name => t.importSpecifier(t.identifier(name), t.identifier(name))), t.stringLiteral(path));
 };
+export const importAs = (name, importAs, importPath) => {
+  return t.importDeclaration([t.importSpecifier(t.identifier(importAs), t.identifier(name))], t.stringLiteral(importPath));
+};
 export const importAminoMsg = () => {
   return importStmt(['AminoMsg'], '@cosmjs/amino');
 };

package/module/utils/types.js

@@ -139,7 +139,7 @@ export function getPropertySignatureFromProp(context, jsonschema, prop, camelize
     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');
+      throw new Error('getPropertySignatureFromProp() contact maintainer');
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/pyramation/cosmwasm-typescript-gen/tree/master/packages/wasm-ast-types#readme",
@@ -86,5 +86,5 @@
     "case": "1.6.3",
     "deepmerge": "4.2.2"
   },
-  "gitHead": "51e6e530adc95d8118606379848080dd9bc3c25a"
+  "gitHead": "09236055739cc020418f89a246d8a954353c7ec3"
 }

package/types/src/context/context.d.ts

@@ -1,12 +1,30 @@
 import { JSONSchema } from "../types";
 export interface ReactQueryOptions {
+    enabled?: boolean;
     optionalClient?: boolean;
-    v4?: boolean;
+    version?: 'v3' | 'v4';
     mutations?: boolean;
     camelize?: boolean;
 }
+export interface TSClientOptions {
+    enabled?: boolean;
+}
+export interface MessageComposerOptions {
+    enabled?: boolean;
+}
+export interface RecoilOptions {
+    enabled?: boolean;
+}
+export interface TSTypesOptions {
+    enabled?: boolean;
+    aliasExecuteMsg?: boolean;
+}
 export interface RenderOptions {
-    reactQuery: ReactQueryOptions;
+    types?: TSTypesOptions;
+    recoil?: RecoilOptions;
+    messageComposer?: MessageComposerOptions;
+    client?: TSClientOptions;
+    reactQuery?: ReactQueryOptions;
 }
 export interface RenderContext {
     schema: JSONSchema;
@@ -15,6 +33,9 @@ export interface RenderContext {
 export declare const defaultOptions: RenderOptions;
 export declare class RenderContext implements RenderContext {
     schema: JSONSchema;
+    utils: string[];
     constructor(schema: JSONSchema, options?: RenderOptions);
     refLookup($ref: string): JSONSchema;
+    addUtil(util: string): void;
+    getImports(): any[];
 }

package/types/src/context/imports.d.ts

@@ -0,0 +1,39 @@
+import { RenderContext } from './context';
+export interface ImportObj {
+    type: 'import' | 'default' | 'namespace';
+    name: string;
+    path: string;
+    importAs?: string;
+}
+export declare const UTILS: {
+    MsgExecuteContract: string;
+    MsgExecuteContractEncodeObject: string;
+    Coin: string;
+    toUtf8: string;
+    StdFee: string;
+    CosmWasmClient: string;
+    ExecuteResult: string;
+    SigningCosmWasmClient: string;
+    useQuery: (context: RenderContext) => {
+        type: string;
+        path: string;
+        name: any;
+    };
+    UseQueryOptions: (context: RenderContext) => {
+        type: string;
+        path: string;
+        name: any;
+    };
+    useMutation: (context: RenderContext) => {
+        type: string;
+        path: string;
+        name: any;
+    };
+    UseMutationOptions: (context: RenderContext) => {
+        type: string;
+        path: string;
+        name: any;
+    };
+};
+export declare const convertUtilsToImportList: (context: RenderContext, utils: string[]) => ImportObj[];
+export declare const getImportStatements: (list: ImportObj[]) => any[];

package/types/src/context/index.d.ts

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

package/types/src/index.d.ts

@@ -2,6 +2,6 @@ export * from './utils';
 export * from './client';
 export * from './context';
 export * from './recoil';
-export * from './from-partial';
+export * from './message-composer';
 export * from './react-query';
 export * from './types';

package/types/src/message-composer/index.d.ts

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

package/types/src/message-composer/message-composer.d.ts

@@ -0,0 +1,5 @@
+import * as t from '@babel/types';
+import { ExecuteMsg } from '../types';
+import { RenderContext } from '../context';
+export declare const createMessageComposerClass: (context: RenderContext, className: string, implementsClassName: string, execMsg: ExecuteMsg) => t.ExportNamedDeclaration;
+export declare const createMessageComposerInterface: (context: RenderContext, className: string, execMsg: ExecuteMsg) => t.ExportNamedDeclaration;

package/types/src/utils/babel.d.ts

@@ -31,6 +31,7 @@ export declare const FieldTypeAsts: {
 };
 export declare const shorthandProperty: (prop: string) => t.ObjectProperty;
 export declare const importStmt: (names: string[], path: string) => t.ImportDeclaration;
+export declare const importAs: (name: string, importAs: string, importPath: string) => t.ImportDeclaration;
 export declare const importAminoMsg: () => t.ImportDeclaration;
 export declare const getFieldDimensionality: (field: Field) => {
     typeName: string;

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

@@ -1,12 +0,0 @@
-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

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

package/types/src/from-partial/from-partial.d.ts

@@ -1,4 +0,0 @@
-import * as t from '@babel/types';
-import { ExecuteMsg } from '../types';
-export declare const createFromPartialClass: (context: RenderContext, className: string, implementsClassName: string, execMsg: ExecuteMsg) => t.ExportNamedDeclaration;
-export declare const createFromPartialInterface: (context: RenderContext, className: string, execMsg: ExecuteMsg) => t.ExportNamedDeclaration;

package/types/src/from-partial/index.d.ts

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