wasm-ast-types 0.4.2 → 0.4.3

package/main/utils/types.js

@@ -55,8 +55,16 @@ var getArrayTypeFromRef = function getArrayTypeFromRef($ref) {
   return t.tsArrayType(getTypeFromRef($ref));
 };
 
-var getArrayTypeFromType = function getArrayTypeFromType(type) {
-  return t.tsArrayType(getType(type));
+var getArrayTypeFromItems = function getArrayTypeFromItems(items) {
+  if (items.type === 'array') {
+    if (Array.isArray(items.items)) {
+      return t.tsArrayType(t.tsArrayType(getType(items.items[0].type)));
+    } else {
+      return t.tsArrayType(getArrayTypeFromItems(items.items));
+    }
+  }
+
+  return t.tsArrayType(getType(items.type));
 };
 
 var getType = function getType(type) {
@@ -69,8 +77,6 @@ var getType = function getType(type) {
 
     case 'integer':
       return t.tsNumberKeyword();
-    // case 'object':
-    // return t.tsObjectKeyword();
 
     default:
       throw new Error('contact maintainers [unknown type]: ' + type);
@@ -129,7 +135,7 @@ var getPropertyType = function getPropertyType(schema, prop) {
       } 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);
+        type = getArrayTypeFromItems(info.items);
       } else {
         throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
       }

package/main/wasm.arrays.spec.js

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

package/module/utils/types.js

@@ -34,8 +34,16 @@ const getArrayTypeFromRef = $ref => {
   return t.tsArrayType(getTypeFromRef($ref));
 };
 
-const getArrayTypeFromType = type => {
-  return t.tsArrayType(getType(type));
+const getArrayTypeFromItems = items => {
+  if (items.type === 'array') {
+    if (Array.isArray(items.items)) {
+      return t.tsArrayType(t.tsArrayType(getType(items.items[0].type)));
+    } else {
+      return t.tsArrayType(getArrayTypeFromItems(items.items));
+    }
+  }
+
+  return t.tsArrayType(getType(items.type));
 };
 
 export const getType = type => {
@@ -48,8 +56,6 @@ export const getType = type => {
 
     case 'integer':
       return t.tsNumberKeyword();
-    // case 'object':
-    // return t.tsObjectKeyword();
 
     default:
       throw new Error('contact maintainers [unknown type]: ' + type);
@@ -101,7 +107,7 @@ export const getPropertyType = (schema, prop) => {
       } 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);
+        type = getArrayTypeFromItems(info.items);
       } else {
         throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
       }

package/module/wasm.arrays.spec.js

@@ -0,0 +1,24 @@
+import generate from '@babel/generator';
+import message from './../../../__fixtures__/arrays/schema/schema.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(message));
+});
+it('query classes', () => {
+  expectCode(createQueryClass('SG721QueryClient', 'SG721ReadOnlyInstance', message));
+});
+it('execute classes array types', () => {
+  expectCode(createExecuteClass('SG721Client', 'SG721Instance', null, message));
+});
+it('execute interfaces no extends', () => {
+  expectCode(createExecuteInterface('SG721Instance', null, message));
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "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",
@@ -84,5 +84,5 @@
     "ast-stringify": "0.1.0",
     "case": "1.6.3"
   },
-  "gitHead": "aafba6dadee2e5a14b304f0dd53858e8b509046d"
+  "gitHead": "c5fc4992d9da5f1c9da1f2c34469994dee7801df"
 }