wasm-ast-types 0.11.0 → 0.11.1

package/main/client/test/ts-client.account-nfts.spec.js

@@ -0,0 +1,24 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _accountNft = _interopRequireDefault(require("../../../../../__fixtures__/idl-version/accounts-nft/account-nft.json"));
+
+var _client = require("../client");
+
+var _testUtils = require("../../../test-utils");
+
+var message = _accountNft["default"].query;
+var ctx = (0, _testUtils.makeContext)(message);
+it('execute_msg_for__empty', function () {
+  (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, message));
+});
+it('query classes', function () {
+  (0, _testUtils.expectCode)((0, _client.createQueryClass)(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', message));
+});
+it('execute classes array types', function () {
+  (0, _testUtils.expectCode)((0, _client.createExecuteClass)(ctx, 'SG721Client', 'SG721Instance', null, message));
+});
+it('execute interfaces no extends', function () {
+  (0, _testUtils.expectCode)((0, _client.createExecuteInterface)(ctx, 'SG721Instance', null, message));
+});

package/main/utils/types.js

@@ -70,6 +70,12 @@ var getTypeOrRef = function getTypeOrRef(obj) {
 };
 
 var getArrayTypeFromItems = function getArrayTypeFromItems(items) {
+  // passing in [{"type":"string"}]
+  if (Array.isArray(items)) {
+    return t.tsArrayType(t.tsArrayType(getTypeOrRef(items[0])));
+  } // passing in {"items": [{"type":"string"}]}
+
+
   var detect = detectType(items.type);
 
   if (detect.type === 'array') {
@@ -193,7 +199,15 @@ var getTypeInfo = function getTypeInfo(info) {
 
       optional = _detect.optional;
     } else {
-      type = getType(_nullableType);
+      var _detect2 = detectType(_nullableType);
+
+      optional = _detect2.optional;
+
+      if (_detect2.type === 'array') {
+        type = getArrayTypeFromItems(info.items);
+      } else {
+        type = getType(_detect2.type);
+      }
     }
 
     optional = true;
@@ -322,7 +336,7 @@ function getPropertySignatureFromProp(context, jsonschema, prop, camelize) {
     getPropertyType(context, jsonschema, prop);
   } catch (e) {
     console.log(e);
-    console.log(jsonschema, prop);
+    console.log(JSON.stringify(jsonschema, null, 2), prop);
   }
 
   var _getPropertyType = getPropertyType(context, jsonschema, prop),

package/module/client/test/ts-client.account-nfts.spec.js

@@ -0,0 +1,17 @@
+import contract from '../../../../../__fixtures__/idl-version/accounts-nft/account-nft.json';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
+import { expectCode, makeContext } from '../../../test-utils';
+const message = contract.query;
+const ctx = makeContext(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

@@ -37,6 +37,12 @@ const getTypeOrRef = obj => {
 };
 
 const getArrayTypeFromItems = items => {
+  // passing in [{"type":"string"}]
+  if (Array.isArray(items)) {
+    return t.tsArrayType(t.tsArrayType(getTypeOrRef(items[0])));
+  } // passing in {"items": [{"type":"string"}]}
+
+
   const detect = detectType(items.type);
 
   if (detect.type === 'array') {
@@ -151,7 +157,14 @@ export const getTypeInfo = info => {
 
       optional = detect.optional;
     } else {
-      type = getType(nullableType);
+      const detect = detectType(nullableType);
+      optional = detect.optional;
+
+      if (detect.type === 'array') {
+        type = getArrayTypeFromItems(info.items);
+      } else {
+        type = getType(detect.type);
+      }
     }
 
     optional = true;
@@ -259,7 +272,7 @@ export function getPropertySignatureFromProp(context, jsonschema, prop, camelize
     getPropertyType(context, jsonschema, prop);
   } catch (e) {
     console.log(e);
-    console.log(jsonschema, prop);
+    console.log(JSON.stringify(jsonschema, null, 2), prop);
   }
 
   const {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.11.0",
+  "version": "0.11.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": "d7f8c715f76edac8c5c2762e58fe8c73351d2af5"
+  "gitHead": "4d6287ab9d17ea8cef91b183c00e9bae6e8529e1"
 }