wasm-ast-types 0.2.0 → 0.2.1

package/main/wasm.js

@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.propertySignature = exports.getPropertyType = exports.createWasmQueryMethod = exports.createWasmExecMethod = exports.createTypedObjectParams = exports.createTypeOrInterface = exports.createTypeInterface = exports.createQueryInterface = exports.createQueryClass = exports.createPropertyFunctionWithObjectParams = exports.createExecuteInterface = exports.createExecuteClass = void 0;
+exports.propertySignature = exports.identifier = exports.getPropertyType = exports.createWasmQueryMethod = exports.createWasmExecMethod = exports.createTypedObjectParams = exports.createTypeOrInterface = exports.createTypeInterface = exports.createQueryInterface = exports.createQueryClass = exports.createPropertyFunctionWithObjectParamsForExec = exports.createPropertyFunctionWithObjectParams = exports.createExecuteInterface = exports.createExecuteClass = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
@@ -48,6 +48,16 @@ var getArrayTypeFromType = function getArrayTypeFromType(type) {
   return t.tsArrayType(getType(type));
 };
 
+var identifier = function identifier(name, typeAnnotation) {
+  var optional = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var type = t.identifier(name);
+  type.typeAnnotation = typeAnnotation;
+  type.optional = optional;
+  return type;
+};
+
+exports.identifier = identifier;
+
 var getType = function getType(type) {
   switch (type) {
     case 'string':
@@ -180,6 +190,12 @@ var createQueryClass = function createQueryClass(className, implementsClassName,
 
 exports.createQueryClass = createQueryClass;
 
+var tsTypeOperator = function tsTypeOperator(typeAnnotation, operator) {
+  var obj = t.tsTypeOperator(typeAnnotation);
+  obj.operator = operator;
+  return obj;
+};
+
 var createWasmExecMethod = function createWasmExecMethod(jsonschema) {
   var _jsonschema$propertie2;
 
@@ -191,7 +207,7 @@ var createWasmExecMethod = function createWasmExecMethod(jsonschema) {
     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)(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
+  obj, t.assignmentPattern(identifier('fee', t.tsTypeAnnotation(t.tsUnionType([t.tSNumberKeyword(), t.tsTypeReference(t.identifier('StdFee'))])), false), t.stringLiteral('auto')), identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), identifier('funds', t.tsTypeAnnotation(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)] : [], 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.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));
 };
 
@@ -229,7 +245,7 @@ var createExecuteInterface = function createExecuteInterface(className, extendsC
   var methods = (0, _utils.getMessageProperties)(execMsg).map(function (jsonschema) {
     var underscoreName = Object.keys(jsonschema.properties)[0];
     var methodName = (0, _case.camel)(underscoreName);
-    return createPropertyFunctionWithObjectParams(methodName, 'ExecuteResult', jsonschema.properties[underscoreName]);
+    return createPropertyFunctionWithObjectParamsForExec(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
@@ -294,6 +310,19 @@ var createPropertyFunctionWithObjectParams = function createPropertyFunctionWith
 
 exports.createPropertyFunctionWithObjectParams = createPropertyFunctionWithObjectParams;
 
+var createPropertyFunctionWithObjectParamsForExec = function createPropertyFunctionWithObjectParamsForExec(methodName, responseType, jsonschema) {
+  var obj = createTypedObjectParams(jsonschema);
+  var fixedParams = [identifier('fee', t.tsTypeAnnotation(t.tsUnionType([t.tsNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), true), identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), identifier('funds', t.tsTypeAnnotation(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
+  var func = {
+    type: 'TSFunctionType',
+    typeAnnotation: (0, _utils.promiseTypeAnnotation)(responseType),
+    parameters: obj ? [obj].concat(fixedParams) : fixedParams
+  };
+  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
+};
+
+exports.createPropertyFunctionWithObjectParamsForExec = createPropertyFunctionWithObjectParamsForExec;
+
 var createQueryInterface = function createQueryInterface(className, queryMsg) {
   var methods = (0, _utils.getMessageProperties)(queryMsg).map(function (jsonschema) {
     var underscoreName = Object.keys(jsonschema.properties)[0];

package/module/wasm.js

@@ -27,6 +27,13 @@ const getArrayTypeFromType = type => {
   return t.tsArrayType(getType(type));
 };
 
+export const identifier = (name, typeAnnotation, optional = false) => {
+  const type = t.identifier(name);
+  type.typeAnnotation = typeAnnotation;
+  type.optional = optional;
+  return type;
+};
+
 const getType = type => {
   switch (type) {
     case 'string':
@@ -138,6 +145,13 @@ export const createQueryClass = (className, implementsClassName, queryMsg) => {
   t.classMethod('constructor', t.identifier('constructor'), [typedIdentifier('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CosmWasmClient')))), typedIdentifier('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement([// client/contract set
   t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('client'))), t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.identifier('contractAddress'))), ...bindings])), ...methods], [t.tSExpressionWithTypeArguments(t.identifier(implementsClassName))]));
 };
+
+const tsTypeOperator = (typeAnnotation, operator) => {
+  const obj = t.tsTypeOperator(typeAnnotation);
+  obj.operator = operator;
+  return obj;
+};
+
 export const createWasmExecMethod = jsonschema => {
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
@@ -147,7 +161,7 @@ export const createWasmExecMethod = jsonschema => {
     return t.objectProperty(t.identifier(prop), t.identifier(camel(prop)), false, prop === camel(prop));
   });
   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
+  obj, t.assignmentPattern(identifier('fee', t.tsTypeAnnotation(t.tsUnionType([t.tSNumberKeyword(), t.tsTypeReference(t.identifier('StdFee'))])), false), t.stringLiteral('auto')), identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), identifier('funds', t.tsTypeAnnotation(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)] : [], t.blockStatement([t.returnStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('execute')), [t.memberExpression(t.thisExpression(), t.identifier('sender')), t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.objectExpression([t.objectProperty(t.identifier(underscoreName), t.objectExpression([...args]))]), t.identifier('fee'), t.identifier('memo'), t.identifier('funds')])))]), // return type
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tSTypeReference(t.identifier('ExecuteResult'))]))), true));
 };
 export const createExecuteClass = (className, implementsClassName, extendsClassName, execMsg) => {
@@ -175,12 +189,52 @@ export const createExecuteInterface = (className, extendsClassName, execMsg) =>
   const methods = getMessageProperties(execMsg).map(jsonschema => {
     const underscoreName = Object.keys(jsonschema.properties)[0];
     const methodName = camel(underscoreName);
-    return createPropertyFunctionWithObjectParams(methodName, 'ExecuteResult', jsonschema.properties[underscoreName]);
+    return createPropertyFunctionWithObjectParamsForExec(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])));
+  t.tSPropertySignature(t.identifier('sender'), t.tsTypeAnnotation(t.tsStringKeyword())), ...methods // // fee
+  // t.tSPropertySignature(
+  //   t.identifier('fee'),
+  //   t.tsTypeAnnotation(
+  //     t.tsUnionType(
+  //       [
+  //         t.tsNumberKeyword(),
+  //         t.tsTypeReference(
+  //           t.identifier('StdFee')
+  //         ),
+  //         t.tsLiteralType(
+  //           t.stringLiteral('auto')
+  //         )
+  //       ]
+  //     )
+  //   )
+  // ),
+  // // memo
+  // propertySignature(
+  //   'memo',
+  //   t.tsTypeAnnotation(
+  //     t.tsStringKeyword()
+  //   ),
+  //   true
+  // ),
+  // // funds
+  // propertySignature(
+  //   'funds',
+  //   t.tsTypeAnnotation(
+  //     tsTypeOperator(
+  //       t.tsArrayType(
+  //         t.tsTypeReference(
+  //           t.identifier('Coin')
+  //         )
+  //       ),
+  //       'readonly'
+  //     )
+  //   ),
+  //   true
+  // )
+  ])));
 };
 export const propertySignature = (name, typeAnnotation, optional = false) => {
   // prop.leadingComments = [{
@@ -224,6 +278,16 @@ export const createPropertyFunctionWithObjectParams = (methodName, responseType,
   };
   return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
 };
+export const createPropertyFunctionWithObjectParamsForExec = (methodName, responseType, jsonschema) => {
+  const obj = createTypedObjectParams(jsonschema);
+  const fixedParams = [identifier('fee', t.tsTypeAnnotation(t.tsUnionType([t.tsNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), true), identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), identifier('funds', t.tsTypeAnnotation(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
+  const func = {
+    type: 'TSFunctionType',
+    typeAnnotation: promiseTypeAnnotation(responseType),
+    parameters: obj ? [obj, ...fixedParams] : fixedParams
+  };
+  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
+};
 export const createQueryInterface = (className, queryMsg) => {
   const methods = getMessageProperties(queryMsg).map(jsonschema => {
     const underscoreName = Object.keys(jsonschema.properties)[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "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",
@@ -85,5 +85,5 @@
     "ast-stringify": "0.1.0",
     "case": "1.6.3"
   },
-  "gitHead": "93a3bca65ba5aec086efeb3ae85950a346ddf0ff"
+  "gitHead": "1ba0a66724ba90b1107aaccb9d075e1c59401a69"
 }