wasm-ast-types 0.0.6 → 0.0.9

package/main/index.js

@@ -4,19 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _types = require("./types");
-
-Object.keys(_types).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _types[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _types[key];
-    }
-  });
-});
-
 var _utils = require("./utils");
 
 Object.keys(_utils).forEach(function (key) {

package/main/utils.spec.js

@@ -103,4 +103,10 @@ it('mutation classes', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PUR
       }
     }
   }, _callee4);
-})));
+})));
+it('object parms', function () {
+  var obj = t.objectPattern([t.objectProperty(t.identifier('includeExpired'), t.identifier('includeExpired'), false, true), t.objectProperty(t.identifier('tokenId'), t.identifier('tokenId'), false, true)]);
+  obj.typeAnnotation = t.tsTypeAnnotation(t.tsTypeLiteral([t.tsPropertySignature(t.identifier('includeExpired'), t.tsTypeAnnotation(t.tsBooleanKeyword())), t.tsPropertySignature(t.identifier('tokenId'), t.tsTypeAnnotation(t.tsStringKeyword()))]));
+  expectCode(t.program([t.expressionStatement(t.assignmentExpression('=', t.identifier('ownerOf'), (0, _utils.arrowFunctionExpression)([obj], t.blockStatement([// body
+  ], []), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier('OwnerOfResponse'))]))))))]));
+});

package/main/wasm.js

@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.propertySignature = exports.createWasmQueryMethod = exports.createWasmExecMethod = exports.createTypeOrInterface = exports.createTypeInterface = exports.createQueryInterface = exports.createQueryClass = exports.createExecuteInterface = exports.createExecuteClass = void 0;
+exports.propertySignature = exports.createWasmQueryMethod = exports.createWasmExecMethod = exports.createTypedObjectParams = exports.createTypeOrInterface = exports.createTypeInterface = exports.createQueryInterface = exports.createQueryClass = exports.createPropertyFunctionWithObjectParams = exports.createExecuteInterface = exports.createExecuteClass = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
@@ -152,16 +152,13 @@ var createWasmQueryMethod = function createWasmQueryMethod(jsonschema) {
   var underscoreName = Object.keys(jsonschema.properties)[0];
   var methodName = (0, _case.camel)(underscoreName);
   var responseType = (0, _case.pascal)("".concat(methodName, "Response"));
-  var properties = (_jsonschema$propertie = jsonschema.properties[underscoreName].properties) !== null && _jsonschema$propertie !== void 0 ? _jsonschema$propertie : {}; // console.log({ jsonschema, methodName, underscoreName, properties });
-
-  var params = Object.keys(properties).map(function (prop) {
-    return getProperty(jsonschema.properties[underscoreName], prop);
-  });
+  var properties = (_jsonschema$propertie = jsonschema.properties[underscoreName].properties) !== null && _jsonschema$propertie !== void 0 ? _jsonschema$propertie : {};
+  var obj = createTypedObjectParams(jsonschema.properties[underscoreName]);
   var args = Object.keys(properties).map(function (prop) {
     return t.objectProperty(t.identifier(prop), t.identifier((0, _case.camel)(prop)), false, true);
   });
   var actionArg = t.objectProperty(t.identifier(underscoreName), t.objectExpression(args));
-  return t.classProperty(t.identifier(methodName), (0, _utils.arrowFunctionExpression)(params, 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));
+  return t.classProperty(t.identifier(methodName), (0, _utils.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));
 };
 
 exports.createWasmQueryMethod = createWasmQueryMethod;
@@ -191,13 +188,12 @@ var createWasmExecMethod = function createWasmExecMethod(jsonschema) {
   var underscoreName = Object.keys(jsonschema.properties)[0];
   var methodName = (0, _case.camel)(underscoreName);
   var properties = (_jsonschema$propertie2 = jsonschema.properties[underscoreName].properties) !== null && _jsonschema$propertie2 !== void 0 ? _jsonschema$propertie2 : {};
-  var params = Object.keys(properties).map(function (prop) {
-    return getProperty(jsonschema.properties[underscoreName], prop);
-  });
+  var obj = createTypedObjectParams(jsonschema.properties[underscoreName]);
   var args = Object.keys(properties).map(function (prop) {
     return t.objectProperty(t.identifier(prop), t.identifier((0, _case.camel)(prop)), false, prop === (0, _case.camel)(prop));
   });
-  return t.classProperty(t.identifier(methodName), (0, _utils.arrowFunctionExpression)((0, _toConsumableArray2["default"])(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((0, _toConsumableArray2["default"])(args)))]), t.stringLiteral('auto')])))]), // return type
+  return t.classProperty(t.identifier(methodName), (0, _utils.arrowFunctionExpression)(obj ? [// props
+  obj] : [], 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((0, _toConsumableArray2["default"])(args)))]), t.stringLiteral('auto')])))]), // return type
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tSTypeReference(t.identifier('ExecuteResult'))]))), true));
 };
 
@@ -221,7 +217,7 @@ var createExecuteClass = function createExecuteClass(className, implementsClassN
   }
 
   [].push.apply(blockStmt, [// 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')))].concat((0, _toConsumableArray2["default"])(bindings)));
+  t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('client'))), 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)));
   return t.exportNamedDeclaration((0, _utils.classDeclaration)(className, [// client
   (0, _utils.classProperty)('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient')))), // sender
   (0, _utils.classProperty)('sender', t.tsTypeAnnotation(t.tsStringKeyword())), // contractAddress
@@ -233,15 +229,9 @@ exports.createExecuteClass = createExecuteClass;
 
 var createExecuteInterface = function createExecuteInterface(className, extendsClassName, execMsg) {
   var methods = execMsg.oneOf.map(function (jsonschema) {
-    var _jsonschema$propertie3;
-
     var underscoreName = Object.keys(jsonschema.properties)[0];
     var methodName = (0, _case.camel)(underscoreName);
-    var properties = (_jsonschema$propertie3 = jsonschema.properties[underscoreName].properties) !== null && _jsonschema$propertie3 !== void 0 ? _jsonschema$propertie3 : {};
-    var params = Object.keys(properties).map(function (prop) {
-      return getProperty(jsonschema.properties[underscoreName], prop);
-    });
-    return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(t.tsFunctionType(null, (0, _toConsumableArray2["default"])(params), (0, _utils.promiseTypeAnnotation)('ExecuteResult'))));
+    return createPropertyFunctionWithObjectParams(methodName, 'ExecuteResult', jsonschema.properties[underscoreName]);
   });
   var extendsAst = extendsClassName ? [t.tSExpressionWithTypeArguments(t.identifier(extendsClassName))] : [];
   return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(className), null, extendsAst, t.tSInterfaceBody([// contract address
@@ -251,18 +241,47 @@ var createExecuteInterface = function createExecuteInterface(className, extendsC
 
 exports.createExecuteInterface = createExecuteInterface;
 
+var createTypedObjectParams = function createTypedObjectParams(jsonschema) {
+  var _jsonschema$propertie3;
+
+  var keys = Object.keys((_jsonschema$propertie3 = jsonschema.properties) !== null && _jsonschema$propertie3 !== void 0 ? _jsonschema$propertie3 : {});
+  if (!keys.length) return;
+  var typedParams = keys.map(function (prop) {
+    var _getPropertyType2 = getPropertyType(jsonschema, prop),
+        type = _getPropertyType2.type,
+        optional = _getPropertyType2.optional;
+
+    return t.tsPropertySignature(t.identifier(prop), t.tsTypeAnnotation(type));
+  });
+  var params = keys.map(function (prop) {
+    return t.objectProperty(t.identifier(prop), t.identifier(prop), false, true);
+  });
+  var obj = t.objectPattern((0, _toConsumableArray2["default"])(params));
+  obj.typeAnnotation = t.tsTypeAnnotation(t.tsTypeLiteral((0, _toConsumableArray2["default"])(typedParams)));
+  return obj;
+};
+
+exports.createTypedObjectParams = createTypedObjectParams;
+
+var createPropertyFunctionWithObjectParams = function createPropertyFunctionWithObjectParams(methodName, responseType, jsonschema) {
+  var obj = createTypedObjectParams(jsonschema);
+  var func = {
+    type: 'TSFunctionType',
+    typeAnnotation: (0, _utils.promiseTypeAnnotation)(responseType),
+    parameters: obj ? [obj] : []
+  };
+  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
+};
+
+exports.createPropertyFunctionWithObjectParams = createPropertyFunctionWithObjectParams;
+
 var createQueryInterface = function createQueryInterface(className, queryMsg) {
   var methods = queryMsg.oneOf.map(function (jsonschema) {
-    var _jsonschema$propertie4;
-
     var underscoreName = Object.keys(jsonschema.properties)[0];
     var methodName = (0, _case.camel)(underscoreName);
     var responseType = (0, _case.pascal)("".concat(methodName, "Response"));
-    var properties = (_jsonschema$propertie4 = jsonschema.properties[underscoreName].properties) !== null && _jsonschema$propertie4 !== void 0 ? _jsonschema$propertie4 : {};
-    var params = Object.keys(properties).map(function (prop) {
-      return getProperty(jsonschema.properties[underscoreName], prop);
-    });
-    return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(t.tsFunctionType(null, (0, _toConsumableArray2["default"])(params), (0, _utils.promiseTypeAnnotation)(responseType))));
+    var obj = createTypedObjectParams(jsonschema.properties[underscoreName]);
+    return createPropertyFunctionWithObjectParams(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()))].concat((0, _toConsumableArray2["default"])(methods)))));
 };
@@ -286,16 +305,16 @@ var propertySignature = function propertySignature(name, typeAnnotation) {
 exports.propertySignature = propertySignature;
 
 var createTypeOrInterface = function createTypeOrInterface(Type, jsonschema) {
-  var _jsonschema$propertie5;
+  var _jsonschema$propertie4;
 
   if (jsonschema.type !== 'object') {
     return t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier(Type), null, getType(jsonschema.type)));
   }
 
-  var props = Object.keys((_jsonschema$propertie5 = jsonschema.properties) !== null && _jsonschema$propertie5 !== void 0 ? _jsonschema$propertie5 : {}).map(function (prop) {
-    var _getPropertyType2 = getPropertyType(jsonschema, prop),
-        type = _getPropertyType2.type,
-        optional = _getPropertyType2.optional;
+  var props = Object.keys((_jsonschema$propertie4 = jsonschema.properties) !== null && _jsonschema$propertie4 !== void 0 ? _jsonschema$propertie4 : {}).map(function (prop) {
+    var _getPropertyType3 = getPropertyType(jsonschema, prop),
+        type = _getPropertyType3.type,
+        optional = _getPropertyType3.optional;
 
     return propertySignature((0, _case.camel)(prop), t.tsTypeAnnotation(type), optional);
   });

package/main/wasm.spec.js

@@ -77,7 +77,7 @@ it('query classes', function () {
   expectCode((0, _wasm.createQueryClass)('SG721QueryClient', 'SG721ReadOnlyInstance', _query_msg["default"]));
 });
 it('execute classes', function () {
-  expectCode((0, _wasm.createExecuteClass)('SG721Client', 'SG721Instance', 'SG721QueryClient', _execute_msg_for__empty["default"]));
+  printCode((0, _wasm.createExecuteClass)('SG721Client', 'SG721Instance', 'SG721QueryClient', _execute_msg_for__empty["default"]));
 });
 it('execute classes no extends', function () {
   expectCode((0, _wasm.createExecuteClass)('SG721Client', 'SG721Instance', null, _execute_msg_for__empty["default"]));

package/module/index.js

@@ -1,3 +1,2 @@
-export * from './types';
 export * from './utils';
 export * from './wasm';

package/module/utils.spec.js

@@ -44,4 +44,10 @@ it('mutation classes', async () => {
   t.classProperty(t.identifier('mint'), arrowFunctionExpression([// props
   typedIdentifier('sender', t.tsTypeAnnotation(t.tsStringKeyword())), typedIdentifier('tokenId', t.tsTypeAnnotation(t.tsStringKeyword())), typedIdentifier('owner', t.tsTypeAnnotation(t.tsStringKeyword())), typedIdentifier('token_uri', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement([t.returnStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('execute')), [t.identifier('sender'), t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.objectExpression([t.objectProperty(t.identifier('mint'), t.objectExpression([t.objectProperty(t.identifier('token_id'), t.identifier('tokenId')), t.objectProperty(t.identifier('owner'), t.identifier('owner')), t.objectProperty(t.identifier('token_uri'), t.identifier('token_uri')), t.objectProperty(t.identifier('expression'), t.objectExpression([]))]))]), t.stringLiteral('auto')])))]), // return type
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tSTypeReference(t.identifier('ExecuteResult'))]))), true))], [t.tSExpressionWithTypeArguments(t.identifier('SG721ReadOnlyInstance'))], t.identifier('SG721QueryClient')))]));
+});
+it('object parms', () => {
+  const obj = t.objectPattern([t.objectProperty(t.identifier('includeExpired'), t.identifier('includeExpired'), false, true), t.objectProperty(t.identifier('tokenId'), t.identifier('tokenId'), false, true)]);
+  obj.typeAnnotation = t.tsTypeAnnotation(t.tsTypeLiteral([t.tsPropertySignature(t.identifier('includeExpired'), t.tsTypeAnnotation(t.tsBooleanKeyword())), t.tsPropertySignature(t.identifier('tokenId'), t.tsTypeAnnotation(t.tsStringKeyword()))]));
+  expectCode(t.program([t.expressionStatement(t.assignmentExpression('=', t.identifier('ownerOf'), arrowFunctionExpression([obj], t.blockStatement([// body
+  ], []), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier('OwnerOfResponse'))]))))))]));
 });

package/module/wasm.js

@@ -123,16 +123,13 @@ export const createWasmQueryMethod = jsonschema => {
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
   const responseType = pascal(`${methodName}Response`);
-  const properties = jsonschema.properties[underscoreName].properties ?? {}; // console.log({ jsonschema, methodName, underscoreName, properties });
-
-  const params = Object.keys(properties).map(prop => {
-    return getProperty(jsonschema.properties[underscoreName], prop);
-  });
+  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 actionArg = t.objectProperty(t.identifier(underscoreName), t.objectExpression(args));
-  return t.classProperty(t.identifier(methodName), arrowFunctionExpression(params, 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));
+  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) => {
   const propertyNames = queryMsg.oneOf.map(method => Object.keys(method.properties)?.[0]).filter(Boolean);
@@ -150,14 +147,12 @@ export const createWasmExecMethod = jsonschema => {
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
   const properties = jsonschema.properties[underscoreName].properties ?? {};
-  const params = Object.keys(properties).map(prop => {
-    return getProperty(jsonschema.properties[underscoreName], prop);
-  });
+  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));
   });
-  return t.classProperty(t.identifier(methodName), arrowFunctionExpression([// props
-  ...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.stringLiteral('auto')])))]), // return type
+  return t.classProperty(t.identifier(methodName), arrowFunctionExpression(obj ? [// props
+  obj] : [], 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.stringLiteral('auto')])))]), // return type
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tSTypeReference(t.identifier('ExecuteResult'))]))), true));
 };
 export const createExecuteClass = (className, implementsClassName, extendsClassName, execMsg) => {
@@ -174,7 +169,7 @@ export const createExecuteClass = (className, implementsClassName, extendsClassN
   }
 
   [].push.apply(blockStmt, [// 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]);
+  t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('client'))), 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]);
   return t.exportNamedDeclaration(classDeclaration(className, [// client
   classProperty('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient')))), // sender
   classProperty('sender', t.tsTypeAnnotation(t.tsStringKeyword())), // contractAddress
@@ -185,27 +180,46 @@ export const createExecuteInterface = (className, extendsClassName, execMsg) =>
   const methods = execMsg.oneOf.map(jsonschema => {
     const underscoreName = Object.keys(jsonschema.properties)[0];
     const methodName = camel(underscoreName);
-    const properties = jsonschema.properties[underscoreName].properties ?? {};
-    const params = Object.keys(properties).map(prop => {
-      return getProperty(jsonschema.properties[underscoreName], prop);
-    });
-    return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(t.tsFunctionType(null, [...params], promiseTypeAnnotation('ExecuteResult'))));
+    return createPropertyFunctionWithObjectParams(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 createTypedObjectParams = jsonschema => {
+  const keys = Object.keys(jsonschema.properties ?? {});
+  if (!keys.length) return;
+  const typedParams = keys.map(prop => {
+    const {
+      type,
+      optional
+    } = getPropertyType(jsonschema, prop);
+    return t.tsPropertySignature(t.identifier(prop), t.tsTypeAnnotation(type));
+  });
+  const params = keys.map(prop => {
+    return t.objectProperty(t.identifier(prop), t.identifier(prop), false, true);
+  });
+  const obj = t.objectPattern([...params]);
+  obj.typeAnnotation = t.tsTypeAnnotation(t.tsTypeLiteral([...typedParams]));
+  return obj;
+};
+export const createPropertyFunctionWithObjectParams = (methodName, responseType, jsonschema) => {
+  const obj = createTypedObjectParams(jsonschema);
+  const func = {
+    type: 'TSFunctionType',
+    typeAnnotation: promiseTypeAnnotation(responseType),
+    parameters: obj ? [obj] : []
+  };
+  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
+};
 export const createQueryInterface = (className, queryMsg) => {
   const methods = queryMsg.oneOf.map(jsonschema => {
     const underscoreName = Object.keys(jsonschema.properties)[0];
     const methodName = camel(underscoreName);
     const responseType = pascal(`${methodName}Response`);
-    const properties = jsonschema.properties[underscoreName].properties ?? {};
-    const params = Object.keys(properties).map(prop => {
-      return getProperty(jsonschema.properties[underscoreName], prop);
-    });
-    return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(t.tsFunctionType(null, [...params], promiseTypeAnnotation(responseType))));
+    const obj = createTypedObjectParams(jsonschema.properties[underscoreName]);
+    return createPropertyFunctionWithObjectParams(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])));
 };

package/module/wasm.spec.js

@@ -59,7 +59,7 @@ it('query classes', () => {
   expectCode(createQueryClass('SG721QueryClient', 'SG721ReadOnlyInstance', query_msg));
 });
 it('execute classes', () => {
-  expectCode(createExecuteClass('SG721Client', 'SG721Instance', 'SG721QueryClient', execute_msg));
+  printCode(createExecuteClass('SG721Client', 'SG721Instance', 'SG721QueryClient', execute_msg));
 });
 it('execute classes no extends', () => {
   expectCode(createExecuteClass('SG721Client', 'SG721Instance', null, execute_msg));

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.0.6",
+  "version": "0.0.9",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
-  "homepage": "https://github.com/pyramation/cosmscript/tree/master/packages/wasm-ast-types#readme",
+  "homepage": "https://github.com/pyramation/cosmwasm-typescript-gen/tree/master/packages/wasm-ast-types#readme",
   "license": "SEE LICENSE IN LICENSE",
   "main": "main/index.js",
   "module": "module/index.js",
@@ -42,11 +42,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/pyramation/cosmscript/tree/master/packages/wasm-ast-types"
+    "url": "https://github.com/pyramation/cosmwasm-typescript-gen/tree/master/packages/wasm-ast-types"
   },
   "keywords": [],
   "bugs": {
-    "url": "https://github.com/pyramation/cosmscript/tree/master/packages/wasm-ast-types/issues"
+    "url": "https://github.com/pyramation/cosmwasm-typescript-gen/tree/master/packages/wasm-ast-types/issues"
   },
   "devDependencies": {
     "@babel/cli": "7.17.6",
@@ -85,5 +85,5 @@
     "ast-stringify": "0.1.0",
     "case": "1.6.3"
   },
-  "gitHead": "bedb5d4d98b2779746909450960862ce4b7aa7f4"
+  "gitHead": "1d8886f8c415d2123010166ee491f88935c8ec1b"
 }

package/main/types.js

@@ -1,4 +0,0 @@
-"use strict";
-
-;
-;

package/module/types.js

@@ -1,3 +0,0 @@
-;
-;
-export {};