wasm-ast-types 0.11.3 → 0.13.0

package/main/client/test/ts-client.issue-71.test.js

@@ -0,0 +1,103 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _testUtils = require("../../../test-utils");
+
+var _client = require("../client");
+
+var _jestInCase = _interopRequireDefault(require("jest-in-case"));
+
+var contracts = (0, _testUtils.globContracts)('issues/71');
+(0, _jestInCase["default"])('execute_msg_for__empty', /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(opts) {
+    var ctx;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            ctx = (0, _testUtils.makeContext)(opts.content);
+            (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, opts.content));
+
+          case 2:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+
+  return function (_x) {
+    return _ref.apply(this, arguments);
+  };
+}(), contracts);
+(0, _jestInCase["default"])('query classes', /*#__PURE__*/function () {
+  var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(opts) {
+    var ctx;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            ctx = (0, _testUtils.makeContext)(opts.content);
+            (0, _testUtils.expectCode)((0, _client.createQueryClass)(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', opts.content));
+
+          case 2:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+
+  return function (_x2) {
+    return _ref2.apply(this, arguments);
+  };
+}(), contracts);
+(0, _jestInCase["default"])('execute class', /*#__PURE__*/function () {
+  var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(opts) {
+    var ctx;
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            ctx = (0, _testUtils.makeContext)(opts.content);
+            (0, _testUtils.expectCode)((0, _client.createExecuteClass)(ctx, 'SG721Client', 'SG721Instance', null, opts.content));
+
+          case 2:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  }));
+
+  return function (_x3) {
+    return _ref3.apply(this, arguments);
+  };
+}(), contracts);
+(0, _jestInCase["default"])('execute interface', /*#__PURE__*/function () {
+  var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(opts) {
+    var ctx;
+    return _regenerator["default"].wrap(function _callee4$(_context4) {
+      while (1) {
+        switch (_context4.prev = _context4.next) {
+          case 0:
+            ctx = (0, _testUtils.makeContext)(opts.content);
+            (0, _testUtils.expectCode)((0, _client.createExecuteInterface)(ctx, 'SG721Instance', null, opts.content));
+
+          case 2:
+          case "end":
+            return _context4.stop();
+        }
+      }
+    }, _callee4);
+  }));
+
+  return function (_x4) {
+    return _ref4.apply(this, arguments);
+  };
+}(), contracts);

package/main/context/context.js

@@ -28,7 +28,8 @@ var defaultOptions = {
     aliasExecuteMsg: false
   },
   client: {
-    enabled: true
+    enabled: true,
+    execExtendsQuery: true
   },
   recoil: {
     enabled: false

package/main/utils/types.js

@@ -188,16 +188,29 @@ var getTypeInfo = function getTypeInfo(info) {
     }
 
     if (_nullableType === 'array' && (0, _typeof2["default"])(info.items) === 'object' && !Array.isArray(info.items)) {
-      var _detect = detectType(info.items.type);
+      if (info.items.type) {
+        var _detect = detectType(info.items.type);
 
-      if (_detect.type === 'array') {
-        // wen recursion?
-        type = t.tsArrayType(getArrayTypeFromItems(info.items));
+        if (_detect.type === 'array') {
+          // wen recursion?
+          type = t.tsArrayType(getArrayTypeFromItems(info.items));
+        } else {
+          type = t.tsArrayType(getType(_detect.type));
+        }
+
+        optional = _detect.optional;
+      } else 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 = getArrayTypeFromItems(info.items);
       } else {
-        type = t.tsArrayType(getType(_detect.type));
+        throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
       }
-
-      optional = _detect.optional;
     } else {
       var _detect2 = detectType(_nullableType);
 

package/module/client/test/ts-client.issue-71.test.js

@@ -0,0 +1,21 @@
+import { globContracts, makeContext } from '../../../test-utils';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
+import { expectCode } from '../../../test-utils';
+import cases from 'jest-in-case';
+const contracts = globContracts('issues/71');
+cases('execute_msg_for__empty', async opts => {
+  const ctx = makeContext(opts.content);
+  expectCode(createTypeInterface(ctx, opts.content));
+}, contracts);
+cases('query classes', async opts => {
+  const ctx = makeContext(opts.content);
+  expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', opts.content));
+}, contracts);
+cases('execute class', async opts => {
+  const ctx = makeContext(opts.content);
+  expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, opts.content));
+}, contracts);
+cases('execute interface', async opts => {
+  const ctx = makeContext(opts.content);
+  expectCode(createExecuteInterface(ctx, 'SG721Instance', null, opts.content));
+}, contracts);

package/module/context/context.js

@@ -14,7 +14,8 @@ export const defaultOptions = {
     aliasExecuteMsg: false
   },
   client: {
-    enabled: true
+    enabled: true,
+    execExtendsQuery: true
   },
   recoil: {
     enabled: false

package/module/utils/types.js

@@ -146,16 +146,29 @@ export const getTypeInfo = info => {
     }
 
     if (nullableType === 'array' && typeof info.items === 'object' && !Array.isArray(info.items)) {
-      const detect = detectType(info.items.type);
+      if (info.items.type) {
+        const detect = detectType(info.items.type);
 
-      if (detect.type === 'array') {
-        // wen recursion?
-        type = t.tsArrayType(getArrayTypeFromItems(info.items));
+        if (detect.type === 'array') {
+          // wen recursion?
+          type = t.tsArrayType(getArrayTypeFromItems(info.items));
+        } else {
+          type = t.tsArrayType(getType(detect.type));
+        }
+
+        optional = detect.optional;
+      } else 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 = getArrayTypeFromItems(info.items);
       } else {
-        type = t.tsArrayType(getType(detect.type));
+        throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
       }
-
-      optional = detect.optional;
     } else {
       const detect = detectType(nullableType);
       optional = detect.optional;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.11.3",
+  "version": "0.13.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",
@@ -15,13 +15,15 @@
   "files": [
     "types",
     "main",
+    "src",
     "module"
   ],
   "scripts": {
     "build:main": "cross-env BABEL_ENV=production babel src --out-dir main --delete-dir-on-start --extensions \".tsx,.ts,.js\"",
     "build:module": "cross-env MODULE=true babel src --out-dir module --delete-dir-on-start  --extensions \".tsx,.ts,.js\"",
-    "build": "npm run build:module && npm run build:main",
     "build:ts": "tsc --project ./tsconfig.json",
+    "build": "npm run build:module && npm run build:main",
+    "buidl": "npm run build && npm run build:ts",
     "prepare": "npm run build",
     "lint": "eslint .",
     "format": "eslint . --fix",
@@ -86,5 +88,5 @@
     "case": "1.6.3",
     "deepmerge": "4.2.2"
   },
-  "gitHead": "b7fc988703af9305db47b3259f7e2a95db4665ba"
+  "gitHead": "e46828bd476d30465a35a8021e611938abf89846"
 }