wasm-ast-types 0.20.0 → 0.22.0

package/main/client/client.js

@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getWasmMethodArgs = exports.createWasmQueryMethod = exports.createWasmExecMethod = exports.createTypeOrInterface = exports.createTypeInterface = exports.createQueryInterface = exports.createQueryClass = exports.createPropertyFunctionWithObjectParamsForExec = exports.createPropertyFunctionWithObjectParams = exports.createExecuteInterface = exports.createExecuteClass = exports.FIXED_EXECUTE_PARAMS = exports.CONSTANT_EXEC_PARAMS = void 0;
+exports.getWasmMethodArgs = exports.createWasmQueryMethod = exports.createWasmExecMethod = exports.createTypeOrInterface = exports.createTypeInterface = exports.createQueryInterface = exports.createQueryClass = exports.createPropertyFunctionWithObjectParamsForExec = exports.createPropertyFunctionWithObjectParams = exports.createExecuteInterface = exports.createExecuteClass = exports.CONSTANT_EXEC_PARAMS = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
@@ -25,10 +25,8 @@ 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 CONSTANT_EXEC_PARAMS = [t.assignmentPattern((0, _babel.identifier)('fee', t.tsTypeAnnotation(t.tsUnionType([t.tSNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), false), t.stringLiteral('auto')), (0, _babel.identifier)('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), (0, _babel.identifier)('funds', t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))), true)];
+var CONSTANT_EXEC_PARAMS = [t.assignmentPattern((0, _babel.identifier)('fee', t.tsTypeAnnotation(t.tsUnionType([t.tSNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), false), t.stringLiteral('auto')), (0, _babel.identifier)('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), _utils.OPTIONAL_FUNDS_PARAM];
 exports.CONSTANT_EXEC_PARAMS = CONSTANT_EXEC_PARAMS;
-var FIXED_EXECUTE_PARAMS = [(0, _babel.identifier)('fee', t.tsTypeAnnotation(t.tsUnionType([t.tsNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), true), (0, _babel.identifier)('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), (0, _babel.identifier)('funds', t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))), true)];
-exports.FIXED_EXECUTE_PARAMS = FIXED_EXECUTE_PARAMS;
 
 var createWasmQueryMethod = function createWasmQueryMethod(context, jsonschema) {
   var underscoreName = Object.keys(jsonschema.properties)[0];
@@ -103,7 +101,7 @@ var createWasmExecMethod = function createWasmExecMethod(context, jsonschema) {
 
   var msgActionValue = (param === null || param === void 0 ? void 0 : param.type) === 'Identifier' ? t.identifier(param.name) : t.objectExpression(args);
   return t.classProperty(t.identifier(methodName), (0, _utils.arrowFunctionExpression)(param ? [// props
-  param].concat(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(msgAction, msgActionValue)]), t.identifier('fee'), t.identifier('memo'), t.identifier('funds')])))]), // return type
+  param].concat(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(msgAction, msgActionValue)]), 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));
 };
 
@@ -172,7 +170,7 @@ var createPropertyFunctionWithObjectParamsForExec = function createPropertyFunct
   var func = {
     type: 'TSFunctionType',
     typeAnnotation: (0, _utils.promiseTypeAnnotation)(responseType),
-    parameters: obj ? [obj].concat(FIXED_EXECUTE_PARAMS) : FIXED_EXECUTE_PARAMS
+    parameters: obj ? [obj].concat((0, _toConsumableArray2["default"])(_utils.FIXED_EXECUTE_PARAMS)) : _utils.FIXED_EXECUTE_PARAMS
   };
   return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation( // @ts-ignore:next-line
   func));

package/main/client/test/ts-client.issue-103.test.js

@@ -0,0 +1,48 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _schema = _interopRequireDefault(require("../../../../../__fixtures__/issues/103/schema.json"));
+
+var _client = require("../client");
+
+var _testUtils = require("../../../test-utils");
+
+var queryMessage = _schema["default"].query;
+var executeMessage = _schema["default"].execute;
+var queryCtx = (0, _testUtils.makeContext)(queryMessage);
+var executeCtx = (0, _testUtils.makeContext)(executeMessage);
+describe('query', function () {
+  it('execute_msg_for__empty', function () {
+    (0, _testUtils.expectCode)((0, _client.createTypeInterface)(queryCtx, queryMessage));
+  });
+  it('query classes', function () {
+    (0, _testUtils.expectCode)((0, _client.createQueryClass)(queryCtx, 'QueryClient', 'ReadOnlyInstance', queryMessage));
+  });
+  it('query classes response', function () {
+    (0, _testUtils.expectCode)((0, _client.createTypeInterface)(queryCtx, _schema["default"].query));
+  });
+  it('execute classes array types', function () {
+    (0, _testUtils.expectCode)((0, _client.createExecuteClass)(queryCtx, 'Client', 'Instance', null, queryMessage));
+  });
+  it('execute interfaces no extends', function () {
+    (0, _testUtils.expectCode)((0, _client.createExecuteInterface)(queryCtx, 'SG721Instance', null, queryMessage));
+  });
+});
+describe('execute', function () {
+  it('execute_msg_for__empty', function () {
+    (0, _testUtils.expectCode)((0, _client.createTypeInterface)(executeCtx, executeMessage));
+  });
+  it('query classes', function () {
+    (0, _testUtils.expectCode)((0, _client.createQueryClass)(executeCtx, 'QueryClient', 'ReadOnlyInstance', executeMessage));
+  });
+  it('query classes response', function () {
+    (0, _testUtils.expectCode)((0, _client.createTypeInterface)(executeCtx, _schema["default"].query));
+  });
+  it('execute classes array types', function () {
+    (0, _testUtils.expectCode)((0, _client.createExecuteClass)(executeCtx, 'Client', 'Instance', null, executeMessage));
+  });
+  it('execute interfaces no extends', function () {
+    (0, _testUtils.expectCode)((0, _client.createExecuteInterface)(executeCtx, 'SG721Instance', null, executeMessage));
+  });
+});

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

@@ -19,8 +19,6 @@ var _utils = require("../utils");
 
 var _types2 = require("../utils/types");
 
-var _babel = require("../utils/babel");
-
 var _client = require("../client/client");
 
 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); }
@@ -45,9 +43,9 @@ var createWasmExecMethodMessageComposer = function createWasmExecMethodMessageCo
     actionValue = t.objectExpression(args);
   }
 
-  var constantParams = [(0, _babel.identifier)('funds', t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))), true)];
+  var constantParams = [_utils.OPTIONAL_FUNDS_PARAM];
   return t.classProperty(t.identifier(methodName), (0, _utils.arrowFunctionExpression)(param ? [// props
-  param].concat(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), actionValue)])])])), t.objectProperty(t.identifier('funds'), t.identifier('funds'), false, true)])]))]))]), // return type
+  param].concat(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), actionValue)])])])), t.objectProperty(t.identifier('funds'), t.identifier('_funds'))])]))]))]), // return type
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('MsgExecuteContractEncodeObject'))), false));
 };
 
@@ -87,7 +85,7 @@ exports.createMessageComposerInterface = createMessageComposerInterface;
 
 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 fixedParams = [_utils.OPTIONAL_FUNDS_PARAM];
   var func = {
     type: 'TSFunctionType',
     typeAnnotation: t.tsTypeAnnotation(t.tsTypeReference(t.identifier(responseType))),

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

@@ -21,7 +21,7 @@ var _babel = require("../utils/babel");
 
 var _types2 = require("../utils/types");
 
-var _client = require("../client");
+var _constants = require("../utils/constants");
 
 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); }
 
@@ -218,10 +218,7 @@ var createReactQueryMutationArgsInterface = function createReactQueryMutationArg
   context.addUtil('StdFee');
   context.addUtil('Coin');
   var optionalArgs = t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation( // @ts-ignore:next-line
-  t.tsTypeLiteral(_client.FIXED_EXECUTE_PARAMS.map(function (param) {
-    return (0, _babel.propertySignature)(param.name, // @ts-ignore:next-line
-    param.typeAnnotation, param.optional);
-  }))));
+  t.tsTypeLiteral([(0, _babel.propertySignature)('fee', _constants.OPTIONAL_FEE_PARAM.typeAnnotation, true), (0, _babel.propertySignature)('memo', _constants.OPTIONAL_MEMO_PARAM.typeAnnotation, true), (0, _babel.propertySignature)('funds', _utils.OPTIONAL_FUNDS_PARAM.typeAnnotation, true)])));
   optionalArgs.optional = true;
   body.push(optionalArgs);
   return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(mutationHookParamsTypeName), null, [], t.tsInterfaceBody(body)));
@@ -305,12 +302,8 @@ var createReactQueryMutationHook = function createReactQueryMutationHook(_ref6)
   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) {
-    return (0, _babel.shorthandProperty)(param.name);
-  })), t.objectExpression([]))));
-  return t.exportNamedDeclaration(t.functionDeclaration(t.identifier(mutationHookName), [(0, _utils.identifier)('options', t.tsTypeAnnotation((0, _babel.omitTypeReference)(t.tsTypeReference(t.identifier('UseMutationOptions'), useMutationTypeParameter), 'mutationFn')), true)], t.blockStatement([t.returnStatement((0, _utils.callExpression)(t.identifier('useMutation'), [t.arrowFunctionExpression([t.objectPattern(useMutationFunctionArgs)], t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(execMethodName)), (hasMsg ? [t.identifier('msg')] : []).concat(_client.FIXED_EXECUTE_PARAMS.map(function (param) {
-    return t.identifier(param.name);
-  }))), false // not async
+  useMutationFunctionArgs.push(t.objectProperty(t.identifier('args'), t.assignmentPattern(t.objectPattern([(0, _babel.shorthandProperty)('fee'), (0, _babel.shorthandProperty)('memo'), (0, _babel.shorthandProperty)('funds')]), t.objectExpression([]))));
+  return t.exportNamedDeclaration(t.functionDeclaration(t.identifier(mutationHookName), [(0, _utils.identifier)('options', t.tsTypeAnnotation((0, _babel.omitTypeReference)(t.tsTypeReference(t.identifier('UseMutationOptions'), useMutationTypeParameter), 'mutationFn')), true)], t.blockStatement([t.returnStatement((0, _utils.callExpression)(t.identifier('useMutation'), [t.arrowFunctionExpression([t.objectPattern(useMutationFunctionArgs)], t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(execMethodName)), (hasMsg ? [t.identifier('msg')] : []).concat([t.identifier('fee'), t.identifier('memo'), t.identifier('funds')])), false // not async
   ), t.identifier('options')], useMutationTypeParameter))])));
 };
 

package/main/utils/babel.js

@@ -37,6 +37,7 @@ var propertySignature = function propertySignature(name, typeAnnotation) {
   return {
     type: 'TSPropertySignature',
     key: t.identifier(name),
+    kind: 'get',
     typeAnnotation: typeAnnotation,
     optional: optional
   };

package/main/utils/constants.js

@@ -0,0 +1,25 @@
+"use strict";
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.OPTIONAL_MEMO_PARAM = exports.OPTIONAL_FUNDS_PARAM = exports.OPTIONAL_FEE_PARAM = exports.FIXED_EXECUTE_PARAMS = void 0;
+
+var _babel = require("./babel");
+
+var t = _interopRequireWildcard(require("@babel/types"));
+
+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 OPTIONAL_FUNDS_PARAM = (0, _babel.identifier)('_funds', t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))), true);
+exports.OPTIONAL_FUNDS_PARAM = OPTIONAL_FUNDS_PARAM;
+var OPTIONAL_FEE_PARAM = (0, _babel.identifier)('fee', t.tsTypeAnnotation(t.tsUnionType([t.tsNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), true);
+exports.OPTIONAL_FEE_PARAM = OPTIONAL_FEE_PARAM;
+var OPTIONAL_MEMO_PARAM = (0, _babel.identifier)('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true);
+exports.OPTIONAL_MEMO_PARAM = OPTIONAL_MEMO_PARAM;
+var FIXED_EXECUTE_PARAMS = [OPTIONAL_FEE_PARAM, OPTIONAL_MEMO_PARAM, OPTIONAL_FUNDS_PARAM];
+exports.FIXED_EXECUTE_PARAMS = FIXED_EXECUTE_PARAMS;

package/main/utils/index.js

@@ -3,11 +3,28 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  OPTIONAL_FUNDS_PARAM: true,
+  FIXED_EXECUTE_PARAMS: true
+};
+Object.defineProperty(exports, "FIXED_EXECUTE_PARAMS", {
+  enumerable: true,
+  get: function get() {
+    return _constants.FIXED_EXECUTE_PARAMS;
+  }
+});
+Object.defineProperty(exports, "OPTIONAL_FUNDS_PARAM", {
+  enumerable: true,
+  get: function get() {
+    return _constants.OPTIONAL_FUNDS_PARAM;
+  }
+});
 
 var _babel = require("./babel");
 
 Object.keys(_babel).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _babel[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -21,6 +38,7 @@ var _types = require("./types");
 
 Object.keys(_types).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _types[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -34,6 +52,7 @@ var _ref = require("./ref");
 
 Object.keys(_ref).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _ref[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -41,4 +60,6 @@ Object.keys(_ref).forEach(function (key) {
       return _ref[key];
     }
   });
-});
+});
+
+var _constants = require("./constants");

package/module/client/client.js

@@ -1,10 +1,9 @@
 import * as t from '@babel/types';
 import { camel } from 'case';
-import { arrowFunctionExpression, bindMethod, classDeclaration, classProperty, getMessageProperties, promiseTypeAnnotation, typedIdentifier } from '../utils';
+import { arrowFunctionExpression, bindMethod, classDeclaration, classProperty, FIXED_EXECUTE_PARAMS, getMessageProperties, OPTIONAL_FUNDS_PARAM, promiseTypeAnnotation, typedIdentifier } from '../utils';
 import { createTypedObjectParams, getPropertyType, getResponseType, getType } 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 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), OPTIONAL_FUNDS_PARAM];
 export const createWasmQueryMethod = (context, jsonschema) => {
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
@@ -61,7 +60,7 @@ export const createWasmExecMethod = (context, jsonschema) => {
 
   const msgActionValue = param?.type === 'Identifier' ? t.identifier(param.name) : t.objectExpression(args);
   return t.classProperty(t.identifier(methodName), arrowFunctionExpression(param ? [// props
-  param, ...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(msgAction, msgActionValue)]), t.identifier('fee'), t.identifier('memo'), t.identifier('funds')])))]), // return type
+  param, ...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(msgAction, msgActionValue)]), 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 = (context, className, implementsClassName, extendsClassName, execMsg) => {

package/module/client/test/ts-client.issue-103.test.js

@@ -0,0 +1,41 @@
+import contract from '../../../../../__fixtures__/issues/103/schema.json';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
+import { expectCode, makeContext } from '../../../test-utils';
+const queryMessage = contract.query;
+const executeMessage = contract.execute;
+const queryCtx = makeContext(queryMessage);
+const executeCtx = makeContext(executeMessage);
+describe('query', () => {
+  it('execute_msg_for__empty', () => {
+    expectCode(createTypeInterface(queryCtx, queryMessage));
+  });
+  it('query classes', () => {
+    expectCode(createQueryClass(queryCtx, 'QueryClient', 'ReadOnlyInstance', queryMessage));
+  });
+  it('query classes response', () => {
+    expectCode(createTypeInterface(queryCtx, contract.query));
+  });
+  it('execute classes array types', () => {
+    expectCode(createExecuteClass(queryCtx, 'Client', 'Instance', null, queryMessage));
+  });
+  it('execute interfaces no extends', () => {
+    expectCode(createExecuteInterface(queryCtx, 'SG721Instance', null, queryMessage));
+  });
+});
+describe('execute', () => {
+  it('execute_msg_for__empty', () => {
+    expectCode(createTypeInterface(executeCtx, executeMessage));
+  });
+  it('query classes', () => {
+    expectCode(createQueryClass(executeCtx, 'QueryClient', 'ReadOnlyInstance', executeMessage));
+  });
+  it('query classes response', () => {
+    expectCode(createTypeInterface(executeCtx, contract.query));
+  });
+  it('execute classes array types', () => {
+    expectCode(createExecuteClass(executeCtx, 'Client', 'Instance', null, executeMessage));
+  });
+  it('execute interfaces no extends', () => {
+    expectCode(createExecuteInterface(executeCtx, 'SG721Instance', null, executeMessage));
+  });
+});

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

@@ -1,8 +1,7 @@
 import * as t from '@babel/types';
 import { camel } from 'case';
-import { bindMethod, typedIdentifier, classDeclaration, classProperty, arrowFunctionExpression, getMessageProperties } from '../utils';
+import { arrowFunctionExpression, bindMethod, classDeclaration, classProperty, getMessageProperties, OPTIONAL_FUNDS_PARAM, typedIdentifier } from '../utils';
 import { createTypedObjectParams } from '../utils/types';
-import { identifier } from '../utils/babel';
 import { getWasmMethodArgs } from '../client/client';
 
 const createWasmExecMethodMessageComposer = (context, jsonschema) => {
@@ -23,9 +22,9 @@ const createWasmExecMethodMessageComposer = (context, jsonschema) => {
     actionValue = t.objectExpression(args);
   }
 
-  const constantParams = [identifier('funds', t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))), true)];
+  const constantParams = [OPTIONAL_FUNDS_PARAM];
   return t.classProperty(t.identifier(methodName), arrowFunctionExpression(param ? [// props
-  param, ...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), actionValue)])])])), t.objectProperty(t.identifier('funds'), t.identifier('funds'), false, true)])]))]))]), // return type
+  param, ...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), actionValue)])])])), t.objectProperty(t.identifier('funds'), t.identifier('_funds'))])]))]))]), // return type
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('MsgExecuteContractEncodeObject'))), false));
 };
 
@@ -56,7 +55,7 @@ export const createMessageComposerInterface = (context, className, execMsg) => {
 
 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 fixedParams = [OPTIONAL_FUNDS_PARAM];
   const func = {
     type: 'TSFunctionType',
     typeAnnotation: t.tsTypeAnnotation(t.tsTypeReference(t.identifier(responseType))),

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

@@ -1,9 +1,9 @@
 import * as t from '@babel/types';
 import { camel, pascal } from 'case';
-import { callExpression, createTypedObjectParams, getMessageProperties, identifier, tsObjectPattern, tsPropertySignature } from '../utils';
+import { callExpression, createTypedObjectParams, getMessageProperties, identifier, OPTIONAL_FUNDS_PARAM, tsObjectPattern, tsPropertySignature } from '../utils';
 import { omitTypeReference, optionalConditionalExpression, propertySignature, shorthandProperty } from '../utils/babel';
 import { getPropertyType, getResponseType } from '../utils/types';
-import { FIXED_EXECUTE_PARAMS } from '../client';
+import { OPTIONAL_FEE_PARAM, OPTIONAL_MEMO_PARAM } from '../utils/constants';
 export const createReactQueryHooks = ({
   context,
   queryMsg,
@@ -187,8 +187,7 @@ export const createReactQueryMutationArgsInterface = ({
   context.addUtil('StdFee');
   context.addUtil('Coin');
   const optionalArgs = t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation( // @ts-ignore:next-line
-  t.tsTypeLiteral(FIXED_EXECUTE_PARAMS.map(param => propertySignature(param.name, // @ts-ignore:next-line
-  param.typeAnnotation, param.optional)))));
+  t.tsTypeLiteral([propertySignature('fee', OPTIONAL_FEE_PARAM.typeAnnotation, true), propertySignature('memo', OPTIONAL_MEMO_PARAM.typeAnnotation, true), propertySignature('funds', OPTIONAL_FUNDS_PARAM.typeAnnotation, true)])));
   optionalArgs.optional = true;
   body.push(optionalArgs);
   return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(mutationHookParamsTypeName), null, [], t.tsInterfaceBody(body)));
@@ -266,8 +265,8 @@ export const createReactQueryMutationHook = ({
   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([]))));
-  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
+  useMutationFunctionArgs.push(t.objectProperty(t.identifier('args'), t.assignmentPattern(t.objectPattern([shorthandProperty('fee'), shorthandProperty('memo'), shorthandProperty('funds')]), 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([t.identifier('fee'), t.identifier('memo'), t.identifier('funds')])), false // not async
   ), t.identifier('options')], useMutationTypeParameter))])));
 };
 

package/module/utils/babel.js

@@ -6,6 +6,7 @@ export const propertySignature = (name, typeAnnotation, optional = false) => {
   return {
     type: 'TSPropertySignature',
     key: t.identifier(name),
+    kind: 'get',
     typeAnnotation,
     optional
   };

package/module/utils/constants.js

@@ -0,0 +1,6 @@
+import { identifier } from './babel';
+import * as t from '@babel/types';
+export const OPTIONAL_FUNDS_PARAM = identifier('_funds', t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))), true);
+export const OPTIONAL_FEE_PARAM = identifier('fee', t.tsTypeAnnotation(t.tsUnionType([t.tsNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), true);
+export const OPTIONAL_MEMO_PARAM = identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true);
+export const FIXED_EXECUTE_PARAMS = [OPTIONAL_FEE_PARAM, OPTIONAL_MEMO_PARAM, OPTIONAL_FUNDS_PARAM];

package/module/utils/index.js

@@ -1,3 +1,5 @@
 export * from './babel';
 export * from './types';
-export * from './ref';
+export * from './ref';
+export { OPTIONAL_FUNDS_PARAM } from './constants';
+export { FIXED_EXECUTE_PARAMS } from './constants';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.20.0",
+  "version": "0.22.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",
@@ -88,5 +88,5 @@
     "case": "1.6.3",
     "deepmerge": "4.2.2"
   },
-  "gitHead": "d2edba320c63e2db5fe2db0bfb1f4cd5e44f2188"
+  "gitHead": "45ac1ece2da95df09f949d692c95c66de0205408"
 }