wasm-ast-types 0.8.1 → 0.10.0

package/main/client/client.js

@@ -33,7 +33,7 @@ exports.FIXED_EXECUTE_PARAMS = FIXED_EXECUTE_PARAMS;
 var createWasmQueryMethod = function createWasmQueryMethod(context, jsonschema) {
   var underscoreName = Object.keys(jsonschema.properties)[0];
   var methodName = (0, _case.camel)(underscoreName);
-  var responseType = (0, _case.pascal)("".concat(methodName, "Response"));
+  var responseType = (0, _types2.getResponseType)(context, underscoreName);
   var obj = (0, _types2.createTypedObjectParams)(context, jsonschema.properties[underscoreName]);
   var args = getWasmMethodArgs(context, jsonschema.properties[underscoreName]);
   var actionArg = t.objectProperty(t.identifier(underscoreName), t.objectExpression(args));
@@ -174,7 +174,7 @@ var createQueryInterface = function createQueryInterface(context, className, que
   var methods = (0, _utils.getMessageProperties)(queryMsg).map(function (jsonschema) {
     var underscoreName = Object.keys(jsonschema.properties)[0];
     var methodName = (0, _case.camel)(underscoreName);
-    var responseType = (0, _case.pascal)("".concat(methodName, "Response"));
+    var responseType = (0, _types2.getResponseType)(context, underscoreName);
     return createPropertyFunctionWithObjectParams(context, methodName, responseType, jsonschema.properties[underscoreName]);
   });
   return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(className), null, [], t.tSInterfaceBody([t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword()))].concat((0, _toConsumableArray2["default"])(methods)))));

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

@@ -6,11 +6,9 @@ var _arraysRef = _interopRequireDefault(require("../../../../../__fixtures__/mis
 
 var _client = require("../client");
 
-var _context = require("../../context");
-
 var _testUtils = require("../../../test-utils");
 
-var ctx = new _context.RenderContext(_arraysRef["default"]);
+var ctx = (0, _testUtils.makeContext)(_arraysRef["default"]);
 it('execute_msg_for__empty', function () {
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _arraysRef["default"]));
 });

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

@@ -6,11 +6,9 @@ var _arrays = _interopRequireDefault(require("../../../../../__fixtures__/misc/s
 
 var _client = require("../client");
 
-var _context = require("../../context");
-
 var _testUtils = require("../../../test-utils");
 
-var ctx = new _context.RenderContext(_arrays["default"]);
+var ctx = (0, _testUtils.makeContext)(_arrays["default"]);
 it('execute_msg_for__empty', function () {
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _arrays["default"]));
 });

package/main/client/test/ts-client.cw-named-groups.test.js

@@ -6,11 +6,9 @@ var _execute_msg = _interopRequireDefault(require("../../../../../__fixtures__/d
 
 var _client = require("../client");
 
-var _context = require("../../context");
-
 var _testUtils = require("../../../test-utils");
 
-var ctx = new _context.RenderContext(_execute_msg["default"]);
+var ctx = (0, _testUtils.makeContext)(_execute_msg["default"]);
 it('execute_msg', function () {
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _execute_msg["default"]));
 });

package/main/client/test/ts-client.cw-proposal-single.test.js

@@ -8,23 +8,21 @@ var _query_msg = _interopRequireDefault(require("../../../../../__fixtures__/dao
 
 var _client = require("../client");
 
-var _context = require("../../context");
-
 var _testUtils = require("../../../test-utils");
 
 it('execute_msg_for', function () {
-  var ctx = new _context.RenderContext(_execute_msg["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _execute_msg["default"]));
 });
 it('query classes', function () {
-  var ctx = new _context.RenderContext(_query_msg["default"]);
+  var ctx = (0, _testUtils.makeContext)(_query_msg["default"]);
   (0, _testUtils.expectCode)((0, _client.createQueryClass)(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', _query_msg["default"]));
 });
 it('execute classes array types', function () {
-  var ctx = new _context.RenderContext(_execute_msg["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg["default"]);
   (0, _testUtils.expectCode)((0, _client.createExecuteClass)(ctx, 'SG721Client', 'SG721Instance', null, _execute_msg["default"]));
 });
 it('execute interfaces no extends', function () {
-  var ctx = new _context.RenderContext(_execute_msg["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg["default"]);
   (0, _testUtils.expectCode)((0, _client.createExecuteInterface)(ctx, 'SG721Instance', null, _execute_msg["default"]));
 });

package/main/client/test/ts-client.empty-enums.spec.js

@@ -6,11 +6,9 @@ var _query_msg = _interopRequireDefault(require("../../../../../__fixtures__/dao
 
 var _client = require("../client");
 
-var _context = require("../../context");
-
 var _testUtils = require("../../../test-utils");
 
-var ctx = new _context.RenderContext(_query_msg["default"]);
+var ctx = (0, _testUtils.makeContext)(_query_msg["default"]);
 it('query classes', function () {
   (0, _testUtils.expectCode)((0, _client.createQueryClass)(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', _query_msg["default"]));
 });

package/main/client/test/ts-client.issues.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/55');
+(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/client/test/ts-client.sg721.spec.js

@@ -6,11 +6,9 @@ var _execute_msg_for__empty = _interopRequireDefault(require("../../../../../__f
 
 var _client = require("../client");
 
-var _context = require("../../context");
-
 var _testUtils = require("../../../test-utils");
 
-var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
 it('execute_msg_for__empty', function () {
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _execute_msg_for__empty["default"]));
 });

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

@@ -32,75 +32,73 @@ var _tokens_response = _interopRequireDefault(require("../../../../../__fixtures
 
 var _client = require("../client");
 
-var _context = require("../../context");
-
 var _testUtils = require("../../../test-utils");
 
 it('approval_response', function () {
-  var ctx = new _context.RenderContext(_approval_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_approval_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _approval_response["default"]));
 });
 it('all_nft_info_response', function () {
-  var ctx = new _context.RenderContext(_all_nft_info_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_all_nft_info_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _all_nft_info_response["default"]));
 });
 it('approvals_response', function () {
-  var ctx = new _context.RenderContext(_approvals_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_approvals_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _approvals_response["default"]));
 });
 it('collection_info_response', function () {
-  var ctx = new _context.RenderContext(_collection_info_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_collection_info_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _collection_info_response["default"]));
 });
 it('contract_info_response', function () {
-  var ctx = new _context.RenderContext(_contract_info_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_contract_info_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _contract_info_response["default"]));
 });
 it('instantiate_msg', function () {
-  var ctx = new _context.RenderContext(_instantiate_msg["default"]);
+  var ctx = (0, _testUtils.makeContext)(_instantiate_msg["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _instantiate_msg["default"]));
 });
 it('nft_info_response', function () {
-  var ctx = new _context.RenderContext(_nft_info_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_nft_info_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _nft_info_response["default"]));
 });
 it('num_tokens_response', function () {
-  var ctx = new _context.RenderContext(_num_tokens_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_num_tokens_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _num_tokens_response["default"]));
 });
 it('operators_response', function () {
-  var ctx = new _context.RenderContext(_operators_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_operators_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _operators_response["default"]));
 });
 it('owner_of_response', function () {
-  var ctx = new _context.RenderContext(_owner_of_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_owner_of_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _owner_of_response["default"]));
 });
 it('tokens_response', function () {
-  var ctx = new _context.RenderContext(_tokens_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_tokens_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _tokens_response["default"]));
 });
 it('query classes', function () {
-  var ctx = new _context.RenderContext(_query_msg["default"]);
+  var ctx = (0, _testUtils.makeContext)(_query_msg["default"]);
   (0, _testUtils.expectCode)((0, _client.createQueryClass)(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', _query_msg["default"]));
 });
 it('execute classes', function () {
-  var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _client.createExecuteClass)(ctx, 'SG721Client', 'SG721Instance', 'SG721QueryClient', _execute_msg_for__empty["default"]));
 });
 it('execute classes no extends', function () {
-  var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _client.createExecuteClass)(ctx, 'SG721Client', 'SG721Instance', null, _execute_msg_for__empty["default"]));
 });
 it('execute classes array types', function () {
-  var ctx = new _context.RenderContext(_execute_msg["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg["default"]);
   (0, _testUtils.expectCode)((0, _client.createExecuteClass)(ctx, 'SG721Client', 'SG721Instance', null, _execute_msg["default"]));
 });
 it('execute interfaces no extends', function () {
-  var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _client.createExecuteInterface)(ctx, 'SG721Instance', null, _execute_msg_for__empty["default"]));
 });
 it('query interfaces', function () {
-  var ctx = new _context.RenderContext(_query_msg["default"]);
+  var ctx = (0, _testUtils.makeContext)(_query_msg["default"]);
   (0, _testUtils.expectCode)((0, _client.createQueryInterface)(ctx, 'SG721ReadOnlyInstance', _query_msg["default"]));
 });

package/main/client/test/ts-client.vectis.spec.js

@@ -14,43 +14,41 @@ var _relay_transaction = _interopRequireDefault(require("../../../../../__fixtur
 
 var _client = require("../client");
 
-var _context = require("../../context");
-
 var _testUtils = require("../../../test-utils");
 
 it('cosmos_msg_for__empty', function () {
-  var ctx = new _context.RenderContext(_cosmos_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_cosmos_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _cosmos_msg_for__empty["default"]));
 });
 it('execute_msg_for__empty', function () {
-  var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _execute_msg_for__empty["default"]));
 });
 it('can_execute_relay_response', function () {
-  var ctx = new _context.RenderContext(_can_execute_relay_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_can_execute_relay_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _can_execute_relay_response["default"]));
 });
 it('info_response', function () {
-  var ctx = new _context.RenderContext(_info_response["default"]);
+  var ctx = (0, _testUtils.makeContext)(_info_response["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _info_response["default"]));
 });
 it('relay_transaction', function () {
-  var ctx = new _context.RenderContext(_relay_transaction["default"]);
+  var ctx = (0, _testUtils.makeContext)(_relay_transaction["default"]);
   (0, _testUtils.expectCode)((0, _client.createTypeInterface)(ctx, _relay_transaction["default"]));
 });
 it('query classes', function () {
-  var ctx = new _context.RenderContext(_cosmos_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_cosmos_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _client.createQueryClass)(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', _cosmos_msg_for__empty["default"]));
 });
 it('query classes', function () {
-  var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _client.createQueryClass)(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', _execute_msg_for__empty["default"]));
 });
 it('execute classes array types', function () {
-  var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _client.createExecuteClass)(ctx, 'SG721Client', 'SG721Instance', null, _execute_msg_for__empty["default"]));
 });
 it('execute interfaces no extends', function () {
-  var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _client.createExecuteInterface)(ctx, 'SG721Instance', null, _execute_msg_for__empty["default"]));
 });

package/main/context/context.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.defaultOptions = exports.RenderContext = void 0;
+exports.getDefinitionSchema = exports.defaultOptions = exports.RenderContext = void 0;
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
@@ -17,6 +17,11 @@ var _imports = require("./imports");
 
 var _deepmerge = _interopRequireDefault(require("deepmerge"));
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+;
 var defaultOptions = {
   types: {
     enabled: true,
@@ -36,17 +41,34 @@ var defaultOptions = {
     optionalClient: false,
     version: 'v3',
     mutations: false,
-    camelize: true
+    camelize: true,
+    queryKeys: false
   }
 };
 exports.defaultOptions = defaultOptions;
 
+var getDefinitionSchema = function getDefinitionSchema(schemas) {
+  var aggregateSchema = {
+    definitions: {//
+    }
+  };
+  schemas.forEach(function (schema) {
+    schema.definitions = schema.definitions || {};
+    aggregateSchema.definitions = _objectSpread(_objectSpread({}, aggregateSchema.definitions), schema.definitions);
+  });
+  return aggregateSchema;
+};
+
+exports.getDefinitionSchema = getDefinitionSchema;
+
 var RenderContext = /*#__PURE__*/function () {
-  function RenderContext(schema, options) {
+  function RenderContext(contract, options) {
     (0, _classCallCheck2["default"])(this, RenderContext);
-    (0, _defineProperty2["default"])(this, "schema", void 0);
+    (0, _defineProperty2["default"])(this, "contract", void 0);
     (0, _defineProperty2["default"])(this, "utils", []);
-    this.schema = schema;
+    (0, _defineProperty2["default"])(this, "schema", void 0);
+    this.contract = contract;
+    this.schema = getDefinitionSchema(contract.schemas);
     this.options = (0, _deepmerge["default"])(defaultOptions, options !== null && options !== void 0 ? options : {});
   }
 

package/main/message-composer/message-composer.spec.js

@@ -6,15 +6,13 @@ var _execute_msg_for__empty = _interopRequireDefault(require("../../../../__fixt
 
 var _messageComposer = require("./message-composer");
 
-var _context = require("../context");
-
 var _testUtils = require("../../test-utils");
 
 it('execute classes', function () {
-  var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _messageComposer.createMessageComposerClass)(ctx, 'SG721MessageComposer', 'SG721Message', _execute_msg_for__empty["default"]));
 });
 it('createMessageComposerInterface', function () {
-  var ctx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
   (0, _testUtils.expectCode)((0, _messageComposer.createMessageComposerInterface)(ctx, 'SG721Message', _execute_msg_for__empty["default"]));
 });