wasm-ast-types 0.2.5 → 0.3.1

package/main/utils/types.js

@@ -0,0 +1,252 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getType = exports.getPropertyType = exports.forEmptyNameFix = exports.createTypedObjectParams = 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 _babel = require("./babel");
+
+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 forEmptyNameFix = function forEmptyNameFix(name) {
+  if (name.endsWith('For_Empty')) {
+    return name.replace(/For_Empty$/, '_for_Empty');
+  }
+
+  return name;
+};
+
+exports.forEmptyNameFix = forEmptyNameFix;
+
+var getTypeFromRef = function getTypeFromRef($ref) {
+  switch ($ref) {
+    case '#/definitions/Binary':
+      return t.tsTypeReference(t.identifier('Binary'));
+
+    default:
+      if ($ref !== null && $ref !== void 0 && $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));
+};
+
+var getType = function getType(type) {
+  switch (type) {
+    case 'string':
+      return t.tsStringKeyword();
+
+    case 'boolean':
+      return t.tSBooleanKeyword();
+
+    case 'integer':
+      return t.tsNumberKeyword();
+    // case 'object':
+    // return t.tsObjectKeyword();
+
+    default:
+      throw new Error('contact maintainers [unknown type]: ' + type);
+  }
+};
+
+exports.getType = getType;
+
+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 && _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('[nullableType.type]: case not handled by transpiler. contact maintainers.');
+    }
+
+    if (!(nullableType !== null && nullableType !== void 0 && nullableType.$ref)) {
+      if (nullableType.title) {
+        type = t.tsTypeReference(t.identifier(nullableType.title));
+      } else {
+        throw new Error('[nullableType.title] case not handled by transpiler. contact maintainers.');
+      }
+    } else {
+      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 if (info.items.title) {
+        type = t.tsArrayType(t.tsTypeReference(t.identifier(info.items.title)));
+      } else if (info.items.type) {
+        type = getArrayTypeFromType(info.items.type);
+      } else {
+        throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
+      }
+    } 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('please report this to maintainers (field type): ' + JSON.stringify(info, null, 2));
+    }
+
+    var _info$type = (0, _slicedToArray2["default"])(info.type, 2),
+        _nullableType = _info$type[0],
+        _nullType = _info$type[1];
+
+    if (_nullType !== 'null') {
+      throw new Error('please report this to maintainers (field type): ' + JSON.stringify(info, null, 2));
+    }
+
+    if (_nullableType === 'array') {
+      type = t.tsArrayType(getType(info.items.type));
+    } else {
+      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
+  };
+};
+
+exports.getPropertyType = getPropertyType;
+
+var createTypedObjectParams = function createTypedObjectParams(jsonschema) {
+  var _jsonschema$propertie;
+
+  var camelize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  var keys = Object.keys((_jsonschema$propertie = jsonschema.properties) !== null && _jsonschema$propertie !== void 0 ? _jsonschema$propertie : {});
+  if (!keys.length) return;
+  var typedParams = keys.map(function (prop) {
+    if (jsonschema.properties[prop].type === 'object') {
+      if (jsonschema.properties[prop].title) {
+        return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(forEmptyNameFix(jsonschema.properties[prop].title)))));
+      } else {
+        throw new Error('createTypedObjectParams() contact maintainer');
+      }
+    }
+
+    if (Array.isArray(jsonschema.properties[prop].allOf)) {
+      var _jsonschema$required;
+
+      var isOptional = !((_jsonschema$required = jsonschema.required) !== null && _jsonschema$required !== void 0 && _jsonschema$required.includes(prop));
+      var unionTypes = jsonschema.properties[prop].allOf.map(function (el) {
+        if (el.title) return el.title;
+        return el.type;
+      });
+      var uniqUnionTypes = (0, _toConsumableArray2["default"])(new Set(unionTypes));
+
+      if (uniqUnionTypes.length === 1) {
+        return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(forEmptyNameFix(uniqUnionTypes[0])))), isOptional);
+      } else {
+        return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(uniqUnionTypes.map(function (typ) {
+          return t.tsTypeReference(t.identifier(forEmptyNameFix(typ)));
+        }))), isOptional);
+      }
+    } else if (Array.isArray(jsonschema.properties[prop].oneOf)) {
+      var _jsonschema$required2;
+
+      var oneOf = JSON.stringify(jsonschema.properties[prop].oneOf, null, 2);
+
+      var _isOptional = !((_jsonschema$required2 = jsonschema.required) !== null && _jsonschema$required2 !== void 0 && _jsonschema$required2.includes(prop));
+
+      var _unionTypes = jsonschema.properties[prop].oneOf.map(function (el) {
+        if (el.title) return el.title;
+        return el.type;
+      });
+
+      var _uniqUnionTypes = (0, _toConsumableArray2["default"])(new Set(_unionTypes));
+
+      if (_uniqUnionTypes.length === 1) {
+        return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(forEmptyNameFix(_uniqUnionTypes[0])))), _isOptional);
+      } else {
+        return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(_uniqUnionTypes.map(function (typ) {
+          return t.tsTypeReference(t.identifier(forEmptyNameFix(typ)));
+        }))), _isOptional);
+      }
+    }
+
+    try {
+      getPropertyType(jsonschema, prop);
+    } catch (e) {
+      console.log(e);
+      console.log(jsonschema, prop);
+    }
+
+    var _getPropertyType = getPropertyType(jsonschema, prop),
+        type = _getPropertyType.type,
+        optional = _getPropertyType.optional;
+
+    return (0, _babel.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;
+};
+
+exports.createTypedObjectParams = createTypedObjectParams;

package/main/wasm.js

@@ -7,149 +7,23 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-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;
+exports.createWasmQueryMethod = exports.createWasmExecMethod = 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"));
 
-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));
-};
-
-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':
-      return t.tsStringKeyword();
-
-    case 'boolean':
-      return t.tSBooleanKeyword();
-
-    case 'integer':
-      return t.tsNumberKeyword();
+var _types2 = require("./utils/types");
 
-    default:
-      throw new Error('what is type: ' + type);
-  }
-};
-
-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);
-    }
-  }
+var _babel = require("./utils/babel");
 
-  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
-  };
-};
+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); }
 
-exports.getPropertyType = getPropertyType;
+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 createWasmQueryMethod = function createWasmQueryMethod(jsonschema) {
   var _jsonschema$propertie;
@@ -158,7 +32,7 @@ var createWasmQueryMethod = function createWasmQueryMethod(jsonschema) {
   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 : {};
-  var obj = createTypedObjectParams(jsonschema.properties[underscoreName]);
+  var obj = (0, _types2.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);
   });
@@ -187,23 +61,17 @@ 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;
 
   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 obj = createTypedObjectParams(jsonschema.properties[underscoreName]);
+  var obj = (0, _types2.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)];
+  var constantParams = [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((0, _babel.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));
@@ -253,51 +121,8 @@ var createExecuteInterface = function createExecuteInterface(className, extendsC
 
 exports.createExecuteInterface = createExecuteInterface;
 
-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
-  };
-};
-
-exports.propertySignature = propertySignature;
-
-var createTypedObjectParams = function createTypedObjectParams(jsonschema) {
-  var _jsonschema$propertie3;
-
-  var camelize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-  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 _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;
-};
-
-exports.createTypedObjectParams = createTypedObjectParams;
-
 var createPropertyFunctionWithObjectParams = function createPropertyFunctionWithObjectParams(methodName, responseType, jsonschema) {
-  var obj = createTypedObjectParams(jsonschema);
+  var obj = (0, _types2.createTypedObjectParams)(jsonschema);
   var func = {
     type: 'TSFunctionType',
     typeAnnotation: (0, _utils.promiseTypeAnnotation)(responseType),
@@ -309,8 +134,8 @@ 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 obj = (0, _types2.createTypedObjectParams)(jsonschema);
+  var fixedParams = [(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((0, _babel.tsTypeOperator)(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
   var func = {
     type: 'TSFunctionType',
     typeAnnotation: (0, _utils.promiseTypeAnnotation)(responseType),
@@ -334,18 +159,22 @@ var createQueryInterface = function createQueryInterface(className, queryMsg) {
 exports.createQueryInterface = createQueryInterface;
 
 var createTypeOrInterface = function createTypeOrInterface(Type, jsonschema) {
-  var _jsonschema$propertie4;
+  var _jsonschema$propertie3;
 
   if (jsonschema.type !== 'object') {
-    return t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier(Type), null, getType(jsonschema.type)));
+    if (!jsonschema.type) {
+      return t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier(Type), null, t.tsTypeReference(t.identifier((0, _types2.forEmptyNameFix)(jsonschema.title)))));
+    }
+
+    return t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier(Type), null, (0, _types2.getType)(jsonschema.type)));
   }
 
-  var props = Object.keys((_jsonschema$propertie4 = jsonschema.properties) !== null && _jsonschema$propertie4 !== void 0 ? _jsonschema$propertie4 : {}).map(function (prop) {
-    var _getPropertyType2 = getPropertyType(jsonschema, prop),
-        type = _getPropertyType2.type,
-        optional = _getPropertyType2.optional;
+  var props = Object.keys((_jsonschema$propertie3 = jsonschema.properties) !== null && _jsonschema$propertie3 !== void 0 ? _jsonschema$propertie3 : {}).map(function (prop) {
+    var _getPropertyType = (0, _types2.getPropertyType)(jsonschema, prop),
+        type = _getPropertyType.type,
+        optional = _getPropertyType.optional;
 
-    return propertySignature((0, _case.camel)(prop), t.tsTypeAnnotation(type), optional);
+    return (0, _babel.propertySignature)((0, _case.camel)(prop), t.tsTypeAnnotation(type), optional);
   });
   return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(Type), null, [], t.tsInterfaceBody((0, _toConsumableArray2["default"])(props))));
 };

package/main/wasm.sg721.spec.js

@@ -0,0 +1,30 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _generator = _interopRequireDefault(require("@babel/generator"));
+
+var _execute_msg_for__empty = _interopRequireDefault(require("./../../../__fixtures__/sg721/execute_msg_for__empty.json"));
+
+var _wasm = require("./wasm");
+
+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_msg_for__empty', function () {
+  expectCode((0, _wasm.createTypeInterface)(_execute_msg_for__empty["default"]));
+});
+it('query classes', function () {
+  expectCode((0, _wasm.createQueryClass)('SG721QueryClient', 'SG721ReadOnlyInstance', _execute_msg_for__empty["default"]));
+});
+it('execute classes array types', function () {
+  expectCode((0, _wasm.createExecuteClass)('SG721Client', 'SG721Instance', null, _execute_msg_for__empty["default"]));
+});
+it('execute interfaces no extends', function () {
+  expectCode((0, _wasm.createExecuteInterface)('SG721Instance', null, _execute_msg_for__empty["default"]));
+});

package/main/wasm.spec.js

@@ -4,31 +4,33 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 var _generator = _interopRequireDefault(require("@babel/generator"));
 
-var _query_msg = _interopRequireDefault(require("./__fixtures__/schema/query_msg.json"));
+var _execute_msg = _interopRequireDefault(require("./../../../__fixtures__/cw-named-groups/execute_msg.json"));
 
-var _execute_msg_for__empty = _interopRequireDefault(require("./__fixtures__/schema/execute_msg_for__empty.json"));
+var _query_msg = _interopRequireDefault(require("./../../../__fixtures__/basic/query_msg.json"));
 
-var _approval_response = _interopRequireDefault(require("./__fixtures__/schema/approval_response.json"));
+var _execute_msg_for__empty = _interopRequireDefault(require("./../../../__fixtures__/basic/execute_msg_for__empty.json"));
 
-var _all_nft_info_response = _interopRequireDefault(require("./__fixtures__/schema/all_nft_info_response.json"));
+var _approval_response = _interopRequireDefault(require("./../../../__fixtures__/basic/approval_response.json"));
 
-var _approvals_response = _interopRequireDefault(require("./__fixtures__/schema/approvals_response.json"));
+var _all_nft_info_response = _interopRequireDefault(require("./../../../__fixtures__/basic/all_nft_info_response.json"));
 
-var _collection_info_response = _interopRequireDefault(require("./__fixtures__/schema/collection_info_response.json"));
+var _approvals_response = _interopRequireDefault(require("./../../../__fixtures__/basic/approvals_response.json"));
 
-var _contract_info_response = _interopRequireDefault(require("./__fixtures__/schema/contract_info_response.json"));
+var _collection_info_response = _interopRequireDefault(require("./../../../__fixtures__/basic/collection_info_response.json"));
 
-var _instantiate_msg = _interopRequireDefault(require("./__fixtures__/schema/instantiate_msg.json"));
+var _contract_info_response = _interopRequireDefault(require("./../../../__fixtures__/basic/contract_info_response.json"));
 
-var _nft_info_response = _interopRequireDefault(require("./__fixtures__/schema/nft_info_response.json"));
+var _instantiate_msg = _interopRequireDefault(require("./../../../__fixtures__/basic/instantiate_msg.json"));
 
-var _num_tokens_response = _interopRequireDefault(require("./__fixtures__/schema/num_tokens_response.json"));
+var _nft_info_response = _interopRequireDefault(require("./../../../__fixtures__/basic/nft_info_response.json"));
 
-var _operators_response = _interopRequireDefault(require("./__fixtures__/schema/operators_response.json"));
+var _num_tokens_response = _interopRequireDefault(require("./../../../__fixtures__/basic/num_tokens_response.json"));
 
-var _owner_of_response = _interopRequireDefault(require("./__fixtures__/schema/owner_of_response.json"));
+var _operators_response = _interopRequireDefault(require("./../../../__fixtures__/basic/operators_response.json"));
 
-var _tokens_response = _interopRequireDefault(require("./__fixtures__/schema/tokens_response.json"));
+var _owner_of_response = _interopRequireDefault(require("./../../../__fixtures__/basic/owner_of_response.json"));
+
+var _tokens_response = _interopRequireDefault(require("./../../../__fixtures__/basic/tokens_response.json"));
 
 var _wasm = require("./wasm");
 
@@ -82,6 +84,9 @@ it('execute classes', function () {
 it('execute classes no extends', function () {
   expectCode((0, _wasm.createExecuteClass)('SG721Client', 'SG721Instance', null, _execute_msg_for__empty["default"]));
 });
+it('execute classes array types', function () {
+  expectCode((0, _wasm.createExecuteClass)('SG721Client', 'SG721Instance', null, _execute_msg["default"]));
+});
 it('execute interfaces no extends', function () {
   expectCode((0, _wasm.createExecuteInterface)('SG721Instance', null, _execute_msg_for__empty["default"]));
 });