wasm-ast-types 0.8.0 → 0.8.1

package/main/client/test/ts-client.arrays-ref.spec.js

@@ -0,0 +1,25 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _arraysRef = _interopRequireDefault(require("../../../../../__fixtures__/misc/schema/arrays-ref.json"));
+
+var _client = require("../client");
+
+var _context = require("../../context");
+
+var _testUtils = require("../../../test-utils");
+
+var ctx = new _context.RenderContext(_arraysRef["default"]);
+it('execute_msg_for__empty', function () {
+  (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _arraysRef["default"]));
+});
+it('query classes', function () {
+  (0, _testUtils.expectCode)((0, _client.createQueryClass)(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', _arraysRef["default"]));
+});
+it('execute classes array types', function () {
+  (0, _testUtils.expectCode)((0, _client.createExecuteClass)(ctx, 'SG721Client', 'SG721Instance', null, _arraysRef["default"]));
+});
+it('execute interfaces no extends', function () {
+  (0, _testUtils.expectCode)((0, _client.createExecuteInterface)(ctx, 'SG721Instance', null, _arraysRef["default"]));
+});

package/main/utils/types.js

@@ -45,10 +45,22 @@ var getArrayTypeFromRef = function getArrayTypeFromRef($ref) {
   return t.tsArrayType(getTypeFromRef($ref));
 };
 
+var getTypeOrRef = function getTypeOrRef(obj) {
+  if (obj.type) {
+    return getType(obj.type);
+  }
+
+  if (obj.$ref) {
+    return getTypeFromRef(obj.$ref);
+  }
+
+  throw new Error('contact maintainers cannot find type for ' + obj);
+};
+
 var getArrayTypeFromItems = function getArrayTypeFromItems(items) {
   if (items.type === 'array') {
     if (Array.isArray(items.items)) {
-      return t.tsArrayType(t.tsArrayType(getType(items.items[0].type)));
+      return t.tsArrayType(t.tsArrayType(getTypeOrRef(items.items[0])));
     } else {
       return t.tsArrayType(getArrayTypeFromItems(items.items));
     }

package/module/client/test/ts-client.arrays-ref.spec.js

@@ -0,0 +1,17 @@
+import message from '../../../../../__fixtures__/misc/schema/arrays-ref.json';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
+import { RenderContext } from '../../context';
+import { expectCode } from '../../../test-utils';
+const ctx = new RenderContext(message);
+it('execute_msg_for__empty', () => {
+  expectCode(createTypeInterface(ctx, message));
+});
+it('query classes', () => {
+  expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', message));
+});
+it('execute classes array types', () => {
+  expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, message));
+});
+it('execute interfaces no extends', () => {
+  expectCode(createExecuteInterface(ctx, 'SG721Instance', null, message));
+});

package/module/utils/types.js

@@ -18,10 +18,22 @@ const getArrayTypeFromRef = $ref => {
   return t.tsArrayType(getTypeFromRef($ref));
 };
 
+const getTypeOrRef = obj => {
+  if (obj.type) {
+    return getType(obj.type);
+  }
+
+  if (obj.$ref) {
+    return getTypeFromRef(obj.$ref);
+  }
+
+  throw new Error('contact maintainers cannot find type for ' + obj);
+};
+
 const getArrayTypeFromItems = items => {
   if (items.type === 'array') {
     if (Array.isArray(items.items)) {
-      return t.tsArrayType(t.tsArrayType(getType(items.items[0].type)));
+      return t.tsArrayType(t.tsArrayType(getTypeOrRef(items.items[0])));
     } else {
       return t.tsArrayType(getArrayTypeFromItems(items.items));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/pyramation/cosmwasm-typescript-gen/tree/master/packages/wasm-ast-types#readme",
@@ -86,5 +86,5 @@
     "case": "1.6.3",
     "deepmerge": "4.2.2"
   },
-  "gitHead": "93256e4c8579d792ca727ef8f1e9ac47a5231726"
+  "gitHead": "548ad021d449f695ecc4f946a11e2ebe8af53780"
 }