wasm-ast-types 0.2.2 → 0.2.5

package/main/index.js

@@ -43,6 +43,19 @@ Object.keys(_recoil).forEach(function (key) {
   });
 });
 
+var _messages = require("./messages");
+
+Object.keys(_messages).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _messages[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _messages[key];
+    }
+  });
+});
+
 var _reactQuery = require("./react-query");
 
 Object.keys(_reactQuery).forEach(function (key) {

package/main/messages.js

@@ -0,0 +1,298 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createFromPartialInterface = exports.createFromPartialClass = void 0;
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var t = _interopRequireWildcard(require("@babel/types"));
+
+var _case = require("case");
+
+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 getTypeFromRef = function getTypeFromRef($ref) {
+  switch ($ref) {
+    case '#/definitions/Binary':
+      return t.tsTypeReference(t.identifier('Binary'));
+
+    default:
+      if ($ref.startsWith('#/definitions/')) {
+        return t.tsTypeReference(t.identifier($ref.replace('#/definitions/', '')));
+      }
+
+      throw new Error('what is $ref: ' + $ref);
+  }
+};
+
+var getArrayTypeFromRef = function getArrayTypeFromRef($ref) {
+  return t.tsArrayType(getTypeFromRef($ref));
+};
+
+var getArrayTypeFromType = function getArrayTypeFromType(type) {
+  return t.tsArrayType(getType(type));
+}; // MARKED AS NOT DRY 
+
+
+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;
+};
+
+var getType = function getType(type) {
+  switch (type) {
+    case 'string':
+      return t.tsStringKeyword();
+
+    case 'boolean':
+      return t.tSBooleanKeyword();
+
+    case 'integer':
+      return t.tsNumberKeyword();
+
+    default:
+      throw new Error('what is type: ' + type);
+  }
+}; // MARKED AS NOT DRY 
+
+
+var getPropertyType = function getPropertyType(schema, prop) {
+  var _schema$properties, _schema$required, _schema$required2;
+
+  var props = (_schema$properties = schema.properties) !== null && _schema$properties !== void 0 ? _schema$properties : {};
+  var info = props[prop];
+  var type = null;
+  var optional = (_schema$required = schema.required) === null || _schema$required === void 0 ? void 0 : _schema$required.includes(prop);
+
+  if (info.allOf && info.allOf.length === 1) {
+    info = info.allOf[0];
+  }
+
+  if (typeof info.$ref === 'string') {
+    type = getTypeFromRef(info.$ref);
+  }
+
+  if (Array.isArray(info.anyOf)) {
+    // assuming 2nd is null, but let's check to ensure
+    if (info.anyOf.length !== 2) {
+      throw new Error('case not handled by transpiler. contact maintainers.');
+    }
+
+    var _info$anyOf = (0, _slicedToArray2["default"])(info.anyOf, 2),
+        nullableType = _info$anyOf[0],
+        nullType = _info$anyOf[1];
+
+    if ((nullType === null || nullType === void 0 ? void 0 : nullType.type) !== 'null') {
+      throw new Error('case not handled by transpiler. contact maintainers.');
+    }
+
+    type = getTypeFromRef(nullableType === null || nullableType === void 0 ? void 0 : nullableType.$ref);
+    optional = true;
+  }
+
+  if (typeof info.type === 'string') {
+    if (info.type === 'array') {
+      if (info.items.$ref) {
+        type = getArrayTypeFromRef(info.items.$ref);
+      } else {
+        type = getArrayTypeFromType(info.items.type);
+      }
+    } else {
+      type = getType(info.type);
+    }
+  }
+
+  if (Array.isArray(info.type)) {
+    // assuming 2nd is null, but let's check to ensure
+    if (info.type.length !== 2) {
+      throw new Error('case not handled by transpiler. contact maintainers.');
+    }
+
+    var _info$type = (0, _slicedToArray2["default"])(info.type, 2),
+        _nullableType = _info$type[0],
+        _nullType = _info$type[1];
+
+    if (_nullType !== 'null') {
+      throw new Error('case not handled by transpiler. contact maintainers.');
+    }
+
+    type = getType(_nullableType);
+    optional = true;
+  }
+
+  if (!type) {
+    throw new Error('cannot find type for ' + JSON.stringify(info));
+  }
+
+  if ((_schema$required2 = schema.required) !== null && _schema$required2 !== void 0 && _schema$required2.includes(prop)) {
+    optional = false;
+  }
+
+  return {
+    type: type,
+    optional: optional
+  };
+};
+
+var tsTypeOperator = function tsTypeOperator(typeAnnotation, operator) {
+  var obj = t.tsTypeOperator(typeAnnotation);
+  obj.operator = operator;
+  return obj;
+}; // MARKED AS NOT DRY 
+
+
+var createWasmExecMethod = function createWasmExecMethod(jsonschema) {
+  var _jsonschema$propertie;
+
+  var underscoreName = Object.keys(jsonschema.properties)[0];
+  var methodName = (0, _case.camel)(underscoreName);
+  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, prop === (0, _case.camel)(prop));
+  });
+  var constantParams = [// t.assignmentPattern(
+  //     identifier(
+  //         'fee',
+  //         t.tsTypeAnnotation(
+  //             t.tsUnionType(
+  //                 [
+  //                     t.tSNumberKeyword(),
+  //                     t.tsTypeReference(
+  //                         t.identifier('StdFee')
+  //                     ),
+  //                     t.tsLiteralType(
+  //                         t.stringLiteral('auto')
+  //                     )
+  //                 ]
+  //             )
+  //         ),
+  //         false
+  //     ),
+  //     t.stringLiteral('auto')
+  // ),
+  // identifier('memo', t.tsTypeAnnotation(
+  //     t.tsStringKeyword()
+  // ), true),
+  identifier('funds', t.tsTypeAnnotation(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
+  return t.classProperty(t.identifier(methodName), (0, _utils.arrowFunctionExpression)(obj ? [// props
+  obj].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), t.objectExpression(args))])])])), t.objectProperty(t.identifier('funds'), t.identifier('funds'), false, true)])]))]))]), // return type
+  t.tsTypeAnnotation(t.tsTypeReference(t.identifier('MsgExecuteContractEncodeObject'))), false));
+};
+
+var createFromPartialClass = function createFromPartialClass(className, implementsClassName, execMsg) {
+  var propertyNames = (0, _utils.getMessageProperties)(execMsg).map(function (method) {
+    var _Object$keys;
+
+    return (_Object$keys = Object.keys(method.properties)) === null || _Object$keys === void 0 ? void 0 : _Object$keys[0];
+  }).filter(Boolean);
+  var bindings = propertyNames.map(_case.camel).map(_utils.bindMethod);
+  var methods = (0, _utils.getMessageProperties)(execMsg).map(function (schema) {
+    return createWasmExecMethod(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)));
+  return t.exportNamedDeclaration((0, _utils.classDeclaration)(className, [// sender
+  (0, _utils.classProperty)('sender', t.tsTypeAnnotation(t.tsStringKeyword())), // contractAddress
+  (0, _utils.classProperty)('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword())), // constructor
+  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;
+
+var createFromPartialInterface = function createFromPartialInterface(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(methodName, 'MsgExecuteContractEncodeObject', jsonschema.properties[underscoreName]);
+  });
+  var extendsAst = [];
+  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(className), null, extendsAst, t.tSInterfaceBody([// contract address
+  t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword())), // contract address
+  t.tSPropertySignature(t.identifier('sender'), t.tsTypeAnnotation(t.tsStringKeyword()))].concat((0, _toConsumableArray2["default"])(methods)))));
+}; // MARKED AS NOT DRY 
+
+
+exports.createFromPartialInterface = createFromPartialInterface;
+
+var propertySignature = function propertySignature(name, typeAnnotation) {
+  var optional = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  // prop.leadingComments = [{
+  //   type: 'Comment',
+  //   value: ' Data on the token itself'
+  // }];
+  // prop.leadingComments = [{
+  //   type: 'CommentBlock',
+  //   value: '* Data on the token itself'
+  // }];
+  return {
+    type: 'TSPropertySignature',
+    key: t.identifier(name),
+    typeAnnotation: typeAnnotation,
+    optional: optional
+  };
+}; // MARKED AS NOT DRY 
+
+
+var createTypedObjectParams = function createTypedObjectParams(jsonschema) {
+  var _jsonschema$propertie2;
+
+  var camelize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  var keys = Object.keys((_jsonschema$propertie2 = jsonschema.properties) !== null && _jsonschema$propertie2 !== void 0 ? _jsonschema$propertie2 : {});
+  if (!keys.length) return;
+  var typedParams = keys.map(function (prop) {
+    var _getPropertyType = getPropertyType(jsonschema, prop),
+        type = _getPropertyType.type,
+        optional = _getPropertyType.optional;
+
+    return propertySignature(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(type), optional);
+  });
+  var params = keys.map(function (prop) {
+    return t.objectProperty(camelize ? t.identifier((0, _case.camel)(prop)) : t.identifier(prop), camelize ? t.identifier((0, _case.camel)(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;
+};
+
+var createPropertyFunctionWithObjectParamsForPartial = function createPropertyFunctionWithObjectParamsForPartial(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: t.tsTypeAnnotation(t.tsTypeReference(t.identifier(responseType))),
+    parameters: obj ? [obj].concat(fixedParams) : fixedParams
+  };
+  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
+};

package/main/messages.spec.js

@@ -0,0 +1,24 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _generator = _interopRequireDefault(require("@babel/generator"));
+
+var _execute_msg_for__empty = _interopRequireDefault(require("./__fixtures__/schema/execute_msg_for__empty.json"));
+
+var _messages = require("./messages");
+
+var expectCode = function expectCode(ast) {
+  expect((0, _generator["default"])(ast).code).toMatchSnapshot();
+};
+
+var printCode = function printCode(ast) {
+  console.log((0, _generator["default"])(ast).code);
+};
+
+it('execute classes', function () {
+  expectCode((0, _messages.createFromPartialClass)('SG721MessageComposer', 'SG721Message', _execute_msg_for__empty["default"]));
+});
+it('createFromPartialInterface', function () {
+  expectCode((0, _messages.createFromPartialInterface)('SG721Message', _execute_msg_for__empty["default"]));
+});

package/main/wasm.js

@@ -28,9 +28,6 @@ var getTypeFromRef = function getTypeFromRef($ref) {
     case '#/definitions/Binary':
       return t.tsTypeReference(t.identifier('Binary'));
 
-    case '#/definitions/Expiration':
-      return t.tsTypeReference(t.identifier('Expiration'));
-
     default:
       if ($ref.startsWith('#/definitions/')) {
         return t.tsTypeReference(t.identifier($ref.replace('#/definitions/', '')));
@@ -206,7 +203,7 @@ var createWasmExecMethod = function createWasmExecMethod(jsonschema) {
   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));
   });
-  var constantParams = [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)];
+  var constantParams = [t.assignmentPattern(identifier('fee', t.tsTypeAnnotation(t.tsUnionType([t.tSNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), false), t.stringLiteral('auto')), identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), identifier('funds', t.tsTypeAnnotation(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
   return t.classProperty(t.identifier(methodName), (0, _utils.arrowFunctionExpression)(obj ? [// props
   obj].concat(constantParams) : constantParams, t.blockStatement([t.returnStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('execute')), [t.memberExpression(t.thisExpression(), t.identifier('sender')), t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.objectExpression([t.objectProperty(t.identifier(underscoreName), t.objectExpression((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));
@@ -329,7 +326,6 @@ var createQueryInterface = function createQueryInterface(className, queryMsg) {
     var underscoreName = Object.keys(jsonschema.properties)[0];
     var methodName = (0, _case.camel)(underscoreName);
     var responseType = (0, _case.pascal)("".concat(methodName, "Response"));
-    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)))));

package/module/index.js

@@ -1,4 +1,5 @@
 export * from './utils';
 export * from './wasm';
 export * from './recoil';
+export * from './messages';
 export * from './react-query';

package/module/messages.js

@@ -0,0 +1,254 @@
+import * as t from '@babel/types';
+import { camel } from 'case';
+import { bindMethod, typedIdentifier, classDeclaration, classProperty, arrowFunctionExpression, getMessageProperties } from './utils';
+
+const getTypeFromRef = $ref => {
+  switch ($ref) {
+    case '#/definitions/Binary':
+      return t.tsTypeReference(t.identifier('Binary'));
+
+    default:
+      if ($ref.startsWith('#/definitions/')) {
+        return t.tsTypeReference(t.identifier($ref.replace('#/definitions/', '')));
+      }
+
+      throw new Error('what is $ref: ' + $ref);
+  }
+};
+
+const getArrayTypeFromRef = $ref => {
+  return t.tsArrayType(getTypeFromRef($ref));
+};
+
+const getArrayTypeFromType = type => {
+  return t.tsArrayType(getType(type));
+}; // MARKED AS NOT DRY 
+
+
+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':
+      return t.tsStringKeyword();
+
+    case 'boolean':
+      return t.tSBooleanKeyword();
+
+    case 'integer':
+      return t.tsNumberKeyword();
+
+    default:
+      throw new Error('what is type: ' + type);
+  }
+}; // MARKED AS NOT DRY 
+
+
+const getPropertyType = (schema, prop) => {
+  const props = schema.properties ?? {};
+  let info = props[prop];
+  let type = null;
+  let optional = schema.required?.includes(prop);
+
+  if (info.allOf && info.allOf.length === 1) {
+    info = info.allOf[0];
+  }
+
+  if (typeof info.$ref === 'string') {
+    type = getTypeFromRef(info.$ref);
+  }
+
+  if (Array.isArray(info.anyOf)) {
+    // assuming 2nd is null, but let's check to ensure
+    if (info.anyOf.length !== 2) {
+      throw new Error('case not handled by transpiler. contact maintainers.');
+    }
+
+    const [nullableType, nullType] = info.anyOf;
+
+    if (nullType?.type !== 'null') {
+      throw new Error('case not handled by transpiler. contact maintainers.');
+    }
+
+    type = getTypeFromRef(nullableType?.$ref);
+    optional = true;
+  }
+
+  if (typeof info.type === 'string') {
+    if (info.type === 'array') {
+      if (info.items.$ref) {
+        type = getArrayTypeFromRef(info.items.$ref);
+      } else {
+        type = getArrayTypeFromType(info.items.type);
+      }
+    } else {
+      type = getType(info.type);
+    }
+  }
+
+  if (Array.isArray(info.type)) {
+    // assuming 2nd is null, but let's check to ensure
+    if (info.type.length !== 2) {
+      throw new Error('case not handled by transpiler. contact maintainers.');
+    }
+
+    const [nullableType, nullType] = info.type;
+
+    if (nullType !== 'null') {
+      throw new Error('case not handled by transpiler. contact maintainers.');
+    }
+
+    type = getType(nullableType);
+    optional = true;
+  }
+
+  if (!type) {
+    throw new Error('cannot find type for ' + JSON.stringify(info));
+  }
+
+  if (schema.required?.includes(prop)) {
+    optional = false;
+  }
+
+  return {
+    type,
+    optional
+  };
+};
+
+const tsTypeOperator = (typeAnnotation, operator) => {
+  const obj = t.tsTypeOperator(typeAnnotation);
+  obj.operator = operator;
+  return obj;
+}; // MARKED AS NOT DRY 
+
+
+const createWasmExecMethod = jsonschema => {
+  const underscoreName = Object.keys(jsonschema.properties)[0];
+  const methodName = camel(underscoreName);
+  const properties = jsonschema.properties[underscoreName].properties ?? {};
+  const obj = createTypedObjectParams(jsonschema.properties[underscoreName]);
+  const args = Object.keys(properties).map(prop => {
+    return t.objectProperty(t.identifier(prop), t.identifier(camel(prop)), false, prop === camel(prop));
+  });
+  const constantParams = [// t.assignmentPattern(
+  //     identifier(
+  //         'fee',
+  //         t.tsTypeAnnotation(
+  //             t.tsUnionType(
+  //                 [
+  //                     t.tSNumberKeyword(),
+  //                     t.tsTypeReference(
+  //                         t.identifier('StdFee')
+  //                     ),
+  //                     t.tsLiteralType(
+  //                         t.stringLiteral('auto')
+  //                     )
+  //                 ]
+  //             )
+  //         ),
+  //         false
+  //     ),
+  //     t.stringLiteral('auto')
+  // ),
+  // identifier('memo', t.tsTypeAnnotation(
+  //     t.tsStringKeyword()
+  // ), true),
+  identifier('funds', t.tsTypeAnnotation(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
+  return t.classProperty(t.identifier(methodName), arrowFunctionExpression(obj ? [// props
+  obj, ...constantParams] : constantParams, t.blockStatement([t.returnStatement(t.objectExpression([t.objectProperty(t.identifier('typeUrl'), t.stringLiteral('/cosmwasm.wasm.v1.MsgExecuteContract')), t.objectProperty(t.identifier('value'), t.callExpression(t.memberExpression(t.identifier('MsgExecuteContract'), t.identifier('fromPartial')), [t.objectExpression([t.objectProperty(t.identifier('sender'), t.memberExpression(t.thisExpression(), t.identifier('sender'))), t.objectProperty(t.identifier('contract'), t.memberExpression(t.thisExpression(), t.identifier('contractAddress'))), t.objectProperty(t.identifier('msg'), t.callExpression(t.identifier('toUtf8'), [t.callExpression(t.memberExpression(t.identifier('JSON'), t.identifier('stringify')), [t.objectExpression([t.objectProperty(t.identifier(underscoreName), t.objectExpression(args))])])])), t.objectProperty(t.identifier('funds'), t.identifier('funds'), false, true)])]))]))]), // return type
+  t.tsTypeAnnotation(t.tsTypeReference(t.identifier('MsgExecuteContractEncodeObject'))), false));
+};
+
+export const createFromPartialClass = (className, implementsClassName, execMsg) => {
+  const propertyNames = getMessageProperties(execMsg).map(method => Object.keys(method.properties)?.[0]).filter(Boolean);
+  const bindings = propertyNames.map(camel).map(bindMethod);
+  const methods = getMessageProperties(execMsg).map(schema => {
+    return createWasmExecMethod(schema);
+  });
+  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]);
+  return t.exportNamedDeclaration(classDeclaration(className, [// sender
+  classProperty('sender', t.tsTypeAnnotation(t.tsStringKeyword())), // contractAddress
+  classProperty('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword())), // constructor
+  t.classMethod('constructor', t.identifier('constructor'), [typedIdentifier('sender', t.tsTypeAnnotation(t.tsStringKeyword())), typedIdentifier('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement(blockStmt)), ...methods], [t.tSExpressionWithTypeArguments(t.identifier(implementsClassName))], null));
+};
+export const createFromPartialInterface = (className, execMsg) => {
+  const methods = getMessageProperties(execMsg).map(jsonschema => {
+    const underscoreName = Object.keys(jsonschema.properties)[0];
+    const methodName = camel(underscoreName);
+    return createPropertyFunctionWithObjectParamsForPartial(methodName, 'MsgExecuteContractEncodeObject', jsonschema.properties[underscoreName]);
+  });
+  const extendsAst = [];
+  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(className), null, extendsAst, t.tSInterfaceBody([// contract address
+  t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword())), // contract address
+  t.tSPropertySignature(t.identifier('sender'), t.tsTypeAnnotation(t.tsStringKeyword())), ...methods])));
+}; // MARKED AS NOT DRY 
+
+const propertySignature = (name, typeAnnotation, optional = false) => {
+  // prop.leadingComments = [{
+  //   type: 'Comment',
+  //   value: ' Data on the token itself'
+  // }];
+  // prop.leadingComments = [{
+  //   type: 'CommentBlock',
+  //   value: '* Data on the token itself'
+  // }];
+  return {
+    type: 'TSPropertySignature',
+    key: t.identifier(name),
+    typeAnnotation,
+    optional
+  };
+}; // MARKED AS NOT DRY 
+
+
+const createTypedObjectParams = (jsonschema, camelize = true) => {
+  const keys = Object.keys(jsonschema.properties ?? {});
+  if (!keys.length) return;
+  const typedParams = keys.map(prop => {
+    const {
+      type,
+      optional
+    } = getPropertyType(jsonschema, prop);
+    return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(type), optional);
+  });
+  const params = keys.map(prop => {
+    return t.objectProperty(camelize ? t.identifier(camel(prop)) : t.identifier(prop), camelize ? t.identifier(camel(prop)) : t.identifier(prop), false, true);
+  });
+  const obj = t.objectPattern([...params]);
+  obj.typeAnnotation = t.tsTypeAnnotation(t.tsTypeLiteral([...typedParams]));
+  return obj;
+};
+
+const createPropertyFunctionWithObjectParamsForPartial = (methodName, responseType, jsonschema) => {
+  const obj = createTypedObjectParams(jsonschema);
+  const fixedParams = [// identifier('fee', t.tsTypeAnnotation(
+  //     t.tsUnionType(
+  //         [
+  //             t.tsNumberKeyword(),
+  //             t.tsTypeReference(
+  //                 t.identifier('StdFee')
+  //             ),
+  //             t.tsLiteralType(
+  //                 t.stringLiteral('auto')
+  //             )
+  //         ]
+  //     )
+  // ), true),
+  // identifier('memo', t.tsTypeAnnotation(
+  //     t.tsStringKeyword()
+  // ), true),
+  identifier('funds', t.tsTypeAnnotation(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
+  const func = {
+    type: 'TSFunctionType',
+    typeAnnotation: t.tsTypeAnnotation(t.tsTypeReference(t.identifier(responseType))),
+    parameters: obj ? [obj, ...fixedParams] : fixedParams
+  };
+  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
+};

package/module/messages.spec.js

@@ -0,0 +1,18 @@
+import generate from '@babel/generator';
+import execute_msg from './__fixtures__/schema/execute_msg_for__empty.json';
+import { createFromPartialClass, createFromPartialInterface } from './messages';
+
+const expectCode = ast => {
+  expect(generate(ast).code).toMatchSnapshot();
+};
+
+const printCode = ast => {
+  console.log(generate(ast).code);
+};
+
+it('execute classes', () => {
+  expectCode(createFromPartialClass('SG721MessageComposer', 'SG721Message', execute_msg));
+});
+it('createFromPartialInterface', () => {
+  expectCode(createFromPartialInterface('SG721Message', execute_msg));
+});

package/module/wasm.js

@@ -7,9 +7,6 @@ const getTypeFromRef = $ref => {
     case '#/definitions/Binary':
       return t.tsTypeReference(t.identifier('Binary'));
 
-    case '#/definitions/Expiration':
-      return t.tsTypeReference(t.identifier('Expiration'));
-
     default:
       if ($ref.startsWith('#/definitions/')) {
         return t.tsTypeReference(t.identifier($ref.replace('#/definitions/', '')));
@@ -160,7 +157,7 @@ export const createWasmExecMethod = jsonschema => {
   const args = Object.keys(properties).map(prop => {
     return t.objectProperty(t.identifier(prop), t.identifier(camel(prop)), false, prop === camel(prop));
   });
-  const constantParams = [t.assignmentPattern(identifier('fee', t.tsTypeAnnotation(t.tsUnionType([t.tSNumberKeyword(), t.tsTypeReference(t.identifier('StdFee'))])), false), t.stringLiteral('auto')), identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), identifier('funds', t.tsTypeAnnotation(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
+  const constantParams = [t.assignmentPattern(identifier('fee', t.tsTypeAnnotation(t.tsUnionType([t.tSNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), false), t.stringLiteral('auto')), identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), identifier('funds', t.tsTypeAnnotation(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
   return t.classProperty(t.identifier(methodName), arrowFunctionExpression(obj ? [// props
   obj, ...constantParams] : constantParams, t.blockStatement([t.returnStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('execute')), [t.memberExpression(t.thisExpression(), t.identifier('sender')), t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.objectExpression([t.objectProperty(t.identifier(underscoreName), t.objectExpression([...args]))]), t.identifier('fee'), t.identifier('memo'), t.identifier('funds')])))]), // return type
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tSTypeReference(t.identifier('ExecuteResult'))]))), true));
@@ -195,47 +192,7 @@ export const createExecuteInterface = (className, extendsClassName, execMsg) =>
   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 // // 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
-  // )
-  ])));
+  t.tSPropertySignature(t.identifier('sender'), t.tsTypeAnnotation(t.tsStringKeyword())), ...methods])));
 };
 export const propertySignature = (name, typeAnnotation, optional = false) => {
   // prop.leadingComments = [{
@@ -294,7 +251,6 @@ export const createQueryInterface = (className, queryMsg) => {
     const underscoreName = Object.keys(jsonschema.properties)[0];
     const methodName = camel(underscoreName);
     const responseType = pascal(`${methodName}Response`);
-    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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.2.2",
+  "version": "0.2.5",
   "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": "c2a825ebda3fd8c1e2080ac9092148403460cc45"
+  "gitHead": "4e067214d530188822eca31ddbeb6eb9ec3ba462"
 }

package/types/index.d.ts

@@ -1,4 +1,5 @@
 export * from './utils';
 export * from './wasm';
 export * from './recoil';
+export * from './messages';
 export * from './react-query';

package/types/messages.d.ts

@@ -1,35 +1,4 @@
 import * as t from '@babel/types';
-import { Mutation } from './types';
-export declare const addMsgMethod: ({ methodName, typeUrl, TypeName, methodToCall }: {
-    methodName: any;
-    typeUrl: any;
-    TypeName: any;
-    methodToCall: any;
-}) => t.ObjectMethod;
-export declare const addFromJSONMethod: ({ methodName, typeUrl, TypeName }: {
-    methodName: any;
-    typeUrl: any;
-    TypeName: any;
-}) => t.ObjectMethod;
-export declare const addFromPartialMethod: ({ methodName, typeUrl, TypeName }: {
-    methodName: any;
-    typeUrl: any;
-    TypeName: any;
-}) => t.ObjectMethod;
-export declare const addToJSONMethod: ({ methodName, typeUrl, TypeName }: {
-    methodName: any;
-    typeUrl: any;
-    TypeName: any;
-}) => t.ObjectMethod;
-export declare const addJsonMethod: ({ methodName, typeUrl, TypeName }: {
-    methodName: any;
-    typeUrl: any;
-    TypeName: any;
-}) => t.ObjectMethod;
-export declare const addEncodedMethod: ({ methodName, typeUrl, TypeName }: {
-    methodName: any;
-    typeUrl: any;
-    TypeName: any;
-}) => t.ObjectMethod;
-export declare const messages: (mutations: Mutation[]) => t.ExportNamedDeclaration;
-export declare const encoded: (mutations: Mutation[]) => t.ExportNamedDeclaration;
+import { ExecuteMsg } from './types';
+export declare const createFromPartialClass: (className: string, implementsClassName: string, execMsg: ExecuteMsg) => t.ExportNamedDeclaration;
+export declare const createFromPartialInterface: (className: string, execMsg: ExecuteMsg) => t.ExportNamedDeclaration;

package/types/utils.d.ts

@@ -1,5 +1,5 @@
 import * as t from '@babel/types';
-import { Field, QueryMsg } from './types';
+import { Field, QueryMsg, ExecuteMsg } from './types';
 import { TSTypeAnnotation, TSExpressionWithTypeArguments } from '@babel/types';
 export declare const getMessageProperties: (msg: QueryMsg | ExecuteMsg) => any;
 export declare const tsPropertySignature: (key: t.Expression, typeAnnotation: t.TSTypeAnnotation, optional: boolean) => t.TSPropertySignature;

package/types/wasm.d.ts

@@ -1,5 +1,6 @@
 import * as t from '@babel/types';
 import { QueryMsg, ExecuteMsg } from './types';
+export declare const identifier: (name: string, typeAnnotation: t.TSTypeAnnotation, optional?: boolean) => t.Identifier;
 export declare const getPropertyType: (schema: any, prop: any) => {
     type: any;
     optional: any;
@@ -17,6 +18,7 @@ export declare const propertySignature: (name: string, typeAnnotation: t.TSTypeA
 };
 export declare const createTypedObjectParams: (jsonschema: any, camelize?: boolean) => t.ObjectPattern;
 export declare const createPropertyFunctionWithObjectParams: (methodName: string, responseType: string, jsonschema: any) => t.TSPropertySignature;
+export declare const createPropertyFunctionWithObjectParamsForExec: (methodName: string, responseType: string, jsonschema: any) => t.TSPropertySignature;
 export declare const createQueryInterface: (className: string, queryMsg: QueryMsg) => t.ExportNamedDeclaration;
 export declare const createTypeOrInterface: (Type: string, jsonschema: any) => t.ExportNamedDeclaration;
 export declare const createTypeInterface: (jsonschema: any) => t.ExportNamedDeclaration;