wasm-ast-types 0.2.6 → 0.3.0

package/main/messages.js

@@ -31,7 +31,7 @@ var createWasmExecMethodPartial = function createWasmExecMethodPartial(jsonschem
   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 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));
   });
@@ -99,29 +99,8 @@ var createFromPartialInterface = function createFromPartialInterface(className,
 
 exports.createFromPartialInterface = createFromPartialInterface;
 
-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 = (0, _types2.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;
-};
-
 var createPropertyFunctionWithObjectParamsForPartial = function createPropertyFunctionWithObjectParamsForPartial(methodName, responseType, jsonschema) {
-  var obj = createTypedObjectParams(jsonschema);
+  var obj = (0, _types2.createTypedObjectParams)(jsonschema);
   var fixedParams = [// identifier('fee', t.tsTypeAnnotation(
   //     t.tsUnionType(
   //         [

package/main/react-query.spec.js

@@ -34,6 +34,6 @@ var printCode = function printCode(ast) {
 
 
 it('createReactQueryHooks', function () {
-  printCode(t.program((0, _reactQuery.createReactQueryHooks)(_query_msg["default"], 'Sg721', 'Sg721QueryClient')));
+  expectCode(t.program((0, _reactQuery.createReactQueryHooks)(_query_msg["default"], 'Sg721', 'Sg721QueryClient')));
   expectCode(t.program((0, _reactQuery.createReactQueryHooks)(_query_msg["default"], 'Sg721', 'Sg721QueryClient')));
 });

package/main/utils/types.js

@@ -7,23 +7,39 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getType = exports.getPropertyType = void 0;
+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.startsWith('#/definitions/')) {
+      if ($ref !== null && $ref !== void 0 && $ref.startsWith('#/definitions/')) {
         return t.tsTypeReference(t.identifier($ref.replace('#/definitions/', '')));
       }
 
@@ -49,6 +65,8 @@ var getType = function getType(type) {
 
     case 'integer':
       return t.tsNumberKeyword();
+    // case 'object':
+    // return t.tsObjectKeyword();
 
     default:
       throw new Error('contact maintainers [unknown type]: ' + type);
@@ -63,7 +81,7 @@ var getPropertyType = function getPropertyType(schema, prop) {
   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);
+  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];
@@ -84,10 +102,19 @@ var getPropertyType = function getPropertyType(schema, prop) {
         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.');
+      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);
     }
 
-    type = getTypeFromRef(nullableType === null || nullableType === void 0 ? void 0 : nullableType.$ref);
     optional = true;
   }
 
@@ -95,8 +122,12 @@ var getPropertyType = function getPropertyType(schema, prop) {
     if (info.type === 'array') {
       if (info.items.$ref) {
         type = getArrayTypeFromRef(info.items.$ref);
-      } else {
+      } 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);
@@ -140,4 +171,62 @@ var getPropertyType = function getPropertyType(schema, prop) {
   };
 };
 
-exports.getPropertyType = getPropertyType;
+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 allOf = JSON.stringify(jsonschema.properties[prop].allOf, null, 2);
+      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);
+      }
+    }
+
+    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,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-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"));
 
@@ -32,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);
   });
@@ -67,7 +67,7 @@ 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 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));
   });
@@ -121,31 +121,8 @@ var createExecuteInterface = function createExecuteInterface(className, extendsC
 
 exports.createExecuteInterface = createExecuteInterface;
 
-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 = (0, _types2.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;
-
 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),
@@ -157,7 +134,7 @@ var createPropertyFunctionWithObjectParams = function createPropertyFunctionWith
 exports.createPropertyFunctionWithObjectParams = createPropertyFunctionWithObjectParams;
 
 var createPropertyFunctionWithObjectParamsForExec = function createPropertyFunctionWithObjectParamsForExec(methodName, responseType, jsonschema) {
-  var obj = createTypedObjectParams(jsonschema);
+  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',
@@ -182,16 +159,20 @@ 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') {
+    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 = (0, _types2.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 (0, _babel.propertySignature)((0, _case.camel)(prop), t.tsTypeAnnotation(type), optional);
   });

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.vectis.spec.js

@@ -0,0 +1,38 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _generator = _interopRequireDefault(require("@babel/generator"));
+
+var _cosmos_msg_for__empty = _interopRequireDefault(require("./../../../__fixtures__/vectis/cosmos_msg_for__empty.json"));
+
+var _execute_msg_for__empty = _interopRequireDefault(require("./../../../__fixtures__/vectis/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('cosmos_msg_for__empty', function () {
+  expectCode((0, _wasm.createTypeInterface)(_cosmos_msg_for__empty["default"]));
+});
+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', _cosmos_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/module/messages.js

@@ -1,8 +1,8 @@
 import * as t from '@babel/types';
 import { camel } from 'case';
 import { bindMethod, typedIdentifier, classDeclaration, classProperty, arrowFunctionExpression, getMessageProperties } from './utils';
-import { getPropertyType } from './utils/types';
-import { identifier, tsTypeOperator, propertySignature } from './utils/babel';
+import { createTypedObjectParams } from './utils/types';
+import { identifier, tsTypeOperator } from './utils/babel';
 
 const createWasmExecMethodPartial = jsonschema => {
   const underscoreName = Object.keys(jsonschema.properties)[0];
@@ -66,24 +66,6 @@ export const createFromPartialInterface = (className, execMsg) => {
   t.tSPropertySignature(t.identifier('sender'), t.tsTypeAnnotation(t.tsStringKeyword())), ...methods])));
 }; // 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(

package/module/react-query.spec.js

@@ -21,6 +21,6 @@ const printCode = ast => {
 
 
 it('createReactQueryHooks', () => {
-  printCode(t.program(createReactQueryHooks(query_msg, 'Sg721', 'Sg721QueryClient')));
+  expectCode(t.program(createReactQueryHooks(query_msg, 'Sg721', 'Sg721QueryClient')));
   expectCode(t.program(createReactQueryHooks(query_msg, 'Sg721', 'Sg721QueryClient')));
 });

package/module/utils/types.js

@@ -1,4 +1,13 @@
 import * as t from '@babel/types';
+import { camel } from 'case';
+import { propertySignature } from './babel';
+export const forEmptyNameFix = name => {
+  if (name.endsWith('For_Empty')) {
+    return name.replace(/For_Empty$/, '_for_Empty');
+  }
+
+  return name;
+};
 
 const getTypeFromRef = $ref => {
   switch ($ref) {
@@ -6,7 +15,7 @@ const getTypeFromRef = $ref => {
       return t.tsTypeReference(t.identifier('Binary'));
 
     default:
-      if ($ref.startsWith('#/definitions/')) {
+      if ($ref?.startsWith('#/definitions/')) {
         return t.tsTypeReference(t.identifier($ref.replace('#/definitions/', '')));
       }
 
@@ -32,6 +41,8 @@ export const getType = type => {
 
     case 'integer':
       return t.tsNumberKeyword();
+    // case 'object':
+    // return t.tsObjectKeyword();
 
     default:
       throw new Error('contact maintainers [unknown type]: ' + type);
@@ -41,7 +52,7 @@ export const getPropertyType = (schema, prop) => {
   const props = schema.properties ?? {};
   let info = props[prop];
   let type = null;
-  let optional = schema.required?.includes(prop);
+  let optional = !schema.required?.includes(prop);
 
   if (info.allOf && info.allOf.length === 1) {
     info = info.allOf[0];
@@ -60,10 +71,19 @@ export const getPropertyType = (schema, prop) => {
     const [nullableType, nullType] = info.anyOf;
 
     if (nullType?.type !== 'null') {
-      throw new Error('case not handled by transpiler. contact maintainers.');
+      throw new Error('[nullableType.type]: case not handled by transpiler. contact maintainers.');
+    }
+
+    if (!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?.$ref);
     }
 
-    type = getTypeFromRef(nullableType?.$ref);
     optional = true;
   }
 
@@ -71,8 +91,12 @@ export const getPropertyType = (schema, prop) => {
     if (info.type === 'array') {
       if (info.items.$ref) {
         type = getArrayTypeFromRef(info.items.$ref);
-      } else {
+      } 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);
@@ -112,4 +136,52 @@ export const getPropertyType = (schema, prop) => {
     type,
     optional
   };
+};
+export const createTypedObjectParams = (jsonschema, camelize = true) => {
+  const keys = Object.keys(jsonschema.properties ?? {});
+  if (!keys.length) return;
+  const typedParams = keys.map(prop => {
+    if (jsonschema.properties[prop].type === 'object') {
+      if (jsonschema.properties[prop].title) {
+        return propertySignature(camelize ? 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)) {
+      const allOf = JSON.stringify(jsonschema.properties[prop].allOf, null, 2);
+      const isOptional = !jsonschema.required?.includes(prop);
+      const unionTypes = jsonschema.properties[prop].allOf.map(el => {
+        if (el.title) return el.title;
+        return el.type;
+      });
+      const uniqUnionTypes = [...new Set(unionTypes)];
+
+      if (uniqUnionTypes.length === 1) {
+        return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(forEmptyNameFix(uniqUnionTypes[0])))), isOptional);
+      } else {
+        return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(uniqUnionTypes.map(typ => t.tsTypeReference(t.identifier(forEmptyNameFix(typ)))))), isOptional);
+      }
+    }
+
+    try {
+      getPropertyType(jsonschema, prop);
+    } catch (e) {
+      console.log(e);
+      console.log(jsonschema, 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;
 };

package/module/wasm.js

@@ -1,7 +1,7 @@
 import * as t from '@babel/types';
 import { camel, pascal } from 'case';
 import { bindMethod, typedIdentifier, promiseTypeAnnotation, classDeclaration, classProperty, arrowFunctionExpression, getMessageProperties } from './utils';
-import { getPropertyType, getType } from './utils/types';
+import { getPropertyType, getType, createTypedObjectParams, forEmptyNameFix } from './utils/types';
 import { identifier, tsTypeOperator, propertySignature } from './utils/babel';
 export const createWasmQueryMethod = jsonschema => {
   const underscoreName = Object.keys(jsonschema.properties)[0];
@@ -72,23 +72,6 @@ export const createExecuteInterface = (className, extendsClassName, execMsg) =>
   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, 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;
-};
 export const createPropertyFunctionWithObjectParams = (methodName, responseType, jsonschema) => {
   const obj = createTypedObjectParams(jsonschema);
   const func = {
@@ -119,6 +102,10 @@ export const createQueryInterface = (className, queryMsg) => {
 };
 export const createTypeOrInterface = (Type, jsonschema) => {
   if (jsonschema.type !== 'object') {
+    if (!jsonschema.type) {
+      return t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier(Type), null, t.tsTypeReference(t.identifier(forEmptyNameFix(jsonschema.title)))));
+    }
+
     return t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier(Type), null, getType(jsonschema.type)));
   }
 

package/module/wasm.sg721.spec.js

@@ -0,0 +1,24 @@
+import generate from '@babel/generator';
+import execute_msg_for__empty from './../../../__fixtures__/sg721/execute_msg_for__empty.json';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from './wasm';
+
+const expectCode = ast => {
+  expect(generate(ast).code).toMatchSnapshot();
+};
+
+const printCode = ast => {
+  console.log(generate(ast).code);
+};
+
+it('execute_msg_for__empty', () => {
+  expectCode(createTypeInterface(execute_msg_for__empty));
+});
+it('query classes', () => {
+  expectCode(createQueryClass('SG721QueryClient', 'SG721ReadOnlyInstance', execute_msg_for__empty));
+});
+it('execute classes array types', () => {
+  expectCode(createExecuteClass('SG721Client', 'SG721Instance', null, execute_msg_for__empty));
+});
+it('execute interfaces no extends', () => {
+  expectCode(createExecuteInterface('SG721Instance', null, execute_msg_for__empty));
+});

package/module/wasm.vectis.spec.js

@@ -0,0 +1,31 @@
+import generate from '@babel/generator';
+import cosmos_msg_for__empty from './../../../__fixtures__/vectis/cosmos_msg_for__empty.json';
+import execute_msg_for__empty from './../../../__fixtures__/vectis/execute_msg_for__empty.json';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from './wasm';
+
+const expectCode = ast => {
+  expect(generate(ast).code).toMatchSnapshot();
+};
+
+const printCode = ast => {
+  console.log(generate(ast).code);
+};
+
+it('cosmos_msg_for__empty', () => {
+  expectCode(createTypeInterface(cosmos_msg_for__empty));
+});
+it('execute_msg_for__empty', () => {
+  expectCode(createTypeInterface(execute_msg_for__empty));
+});
+it('query classes', () => {
+  expectCode(createQueryClass('SG721QueryClient', 'SG721ReadOnlyInstance', cosmos_msg_for__empty));
+});
+it('query classes', () => {
+  expectCode(createQueryClass('SG721QueryClient', 'SG721ReadOnlyInstance', execute_msg_for__empty));
+});
+it('execute classes array types', () => {
+  expectCode(createExecuteClass('SG721Client', 'SG721Instance', null, execute_msg_for__empty));
+});
+it('execute interfaces no extends', () => {
+  expectCode(createExecuteInterface('SG721Instance', null, execute_msg_for__empty));
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.2.6",
+  "version": "0.3.0",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/pyramation/cosmwasm-typescript-gen/tree/master/packages/wasm-ast-types#readme",
@@ -85,5 +85,5 @@
     "ast-stringify": "0.1.0",
     "case": "1.6.3"
   },
-  "gitHead": "9a94ff9a623b4f4d9f8c1f742b15b43eb525295f"
+  "gitHead": "0e1c21c1c495002883f9511bb1dd693c468af0a6"
 }