mappersmith - npm Package Compare versions

Comparing version 2.25.1 to 2.26.0

gateway.js

@@ -14,3 +14,3 @@ "use strict";
 
-var _timeoutError = _interopRequireDefault(require("./gateway/timeout-error"));
+var _timeoutError = require("./gateway/timeout-error");
 
@@ -69,3 +69,3 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
   dispatchClientError: function dispatchClientError(message, error) {
-    if (_timeoutError.default.isTimeoutError(error) && this.options().enableHTTP408OnTimeouts) {
+    if ((0, _timeoutError.isTimeoutError)(error) && this.options().enableHTTP408OnTimeouts) {
       this.failCallback(new _response.default(this.request, 408, message, {}, [error]));
@@ -72,0 +72,0 @@ } else {

gateway/fetch.js

@@ -16,3 +16,3 @@ "use strict";
 
-var _timeoutError = _interopRequireDefault(require("./timeout-error"));
+var _timeoutError = require("./timeout-error");
 
@@ -85,3 +85,3 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
         canceled = true;
-        var error = new _timeoutError.default("Timeout (".concat(timeout, "ms)"));
+        var error = (0, _timeoutError.createTimeoutError)("Timeout (".concat(timeout, "ms)"));
 
@@ -88,0 +88,0 @@ _this.dispatchClientError(error.message, error);

gateway/http.js

@@ -20,3 +20,3 @@ "use strict";
 
-var _timeoutError = _interopRequireDefault(require("./timeout-error"));
+var _timeoutError = require("./timeout-error");
 
@@ -95,3 +95,3 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
         httpRequest.abort();
-        var error = new _timeoutError.default("Timeout (".concat(timeout, "ms)"));
+        var error = (0, _timeoutError.createTimeoutError)("Timeout (".concat(timeout, "ms)"));
 
@@ -98,0 +98,0 @@ _this.dispatchClientError(error.message, error);

gateway/timeout-error.js

@@ -6,56 +6,16 @@ "use strict";
 });
-exports.default = void 0;
+exports.createTimeoutError = exports.isTimeoutError = void 0;
 
-function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+var isTimeoutError = function isTimeoutError(e) {
+  return e && e.name === 'TimeoutError';
+};
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+exports.isTimeoutError = isTimeoutError;
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+var createTimeoutError = function createTimeoutError(message) {
+  var error = new Error(message);
+  error.name = 'TimeoutError';
+  return error;
+};
 
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _wrapNativeSuper(Class) { var _cache = typeof Map === "function" ? new Map() : undefined; _wrapNativeSuper = function _wrapNativeSuper(Class) { if (Class === null || !_isNativeFunction(Class)) return Class; if (typeof Class !== "function") { throw new TypeError("Super expression must either be null or a function"); } if (typeof _cache !== "undefined") { if (_cache.has(Class)) return _cache.get(Class); _cache.set(Class, Wrapper); } function Wrapper() { return _construct(Class, arguments, _getPrototypeOf(this).constructor); } Wrapper.prototype = Object.create(Class.prototype, { constructor: { value: Wrapper, enumerable: false, writable: true, configurable: true } }); return _setPrototypeOf(Wrapper, Class); }; return _wrapNativeSuper(Class); }
-
-function isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
-
-function _construct(Parent, args, Class) { if (isNativeReflectConstruct()) { _construct = Reflect.construct; } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); }
-
-function _isNativeFunction(fn) { return Function.toString.call(fn).indexOf("[native code]") !== -1; }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
-var TimeoutError =
-/*#__PURE__*/
-function (_Error) {
-  _inherits(TimeoutError, _Error);
-
-  _createClass(TimeoutError, null, [{
-    key: "isTimeoutError",
-    value: function isTimeoutError(e) {
-      return e && e.name === 'TimeoutError';
-    }
-  }]);
-
-  function TimeoutError(message) {
-    var _this;
-
-    _classCallCheck(this, TimeoutError);
-
-    _this = _possibleConstructorReturn(this, _getPrototypeOf(TimeoutError).call(this));
-    _this.message = message;
-    _this.name = 'TimeoutError';
-    return _this;
-  }
-
-  return TimeoutError;
-}(_wrapNativeSuper(Error));
-
-exports.default = TimeoutError;
+exports.createTimeoutError = createTimeoutError;

gateway/xhr.js

@@ -14,3 +14,3 @@ "use strict";
 
-var _timeoutError = _interopRequireDefault(require("./timeout-error"));
+var _timeoutError = require("./timeout-error");
 
@@ -71,3 +71,3 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
         clearTimeout(_this.timer);
-        var error = new _timeoutError.default("Timeout (".concat(timeout, "ms)"));
+        var error = (0, _timeoutError.createTimeoutError)("Timeout (".concat(timeout, "ms)"));
 
@@ -79,3 +79,3 @@ _this.dispatchClientError(error.message, error);
         _this.canceled = true;
-        var error = new _timeoutError.default("Timeout (".concat(timeout, "ms)"));
+        var error = (0, _timeoutError.createTimeoutError)("Timeout (".concat(timeout, "ms)"));
 
@@ -82,0 +82,0 @@ _this.dispatchClientError(error.message, error);

mappersmith.js

@@ -16,3 +16,3 @@ "use strict";
 /* global VERSION */
-var version = "2.25.1";
+var version = "2.26.0";
 exports.version = version;
@@ -19,0 +19,0 @@ var configs = {

mocks/mock-resource.js

@@ -8,2 +8,4 @@ "use strict";
 
+var _mappersmith = require("../mappersmith");
+
 var _mockRequest = _interopRequireDefault(require("./mock-request"));
@@ -39,2 +41,3 @@
   this.mockRequest = null;
+  this.asyncFinalRequest = null;
 }
@@ -102,2 +105,14 @@
   /**
+   * @return {Promise<MockAssert>}
+   */
+  assertObjectAsync: function assertObjectAsync() {
+    var _this = this;
+
+    return this.createAsyncRequest().then(function (finalRequest) {
+      _this.asyncFinalRequest = finalRequest;
+      return _this.toMockRequest().assertObject();
+    });
+  },
+
+  /**
    * @return {MockAssert}
@@ -113,5 +128,5 @@ */
   toMockRequest: function toMockRequest() {
-    var _this = this;
+    var _this2 = this;
 
-    var finalRequest = this.createRequest();
+    var finalRequest = this.asyncFinalRequest ? this.asyncFinalRequest : this.createRequest();
     var assertObject = this.mockRequest ? this.mockRequest.assertObject() : new _mockAssert.default([]);
@@ -128,3 +143,3 @@ var responseStatus = this.responseStatusHandler ? this.responseStatusHandler(finalRequest, assertObject) : this.responseStatus;
       var urlMatcher = function urlMatcher(requestUrl, requestParams) {
-        var expandedParams = _this.expandParams(params, requestParams);
+        var expandedParams = _this2.expandParams(params, requestParams);
 
@@ -186,2 +201,20 @@ var testRequest = finalRequest.enhance({
     }, initialRequest);
+  },
+
+  /**
+   * @private
+   */
+  createAsyncRequest: function createAsyncRequest() {
+    var methodDescriptor = this.manifest.createMethodDescriptor(this.resourceName, this.methodName);
+    var initialRequest = new _request.default(methodDescriptor, this.requestParams);
+    var middleware = this.manifest.createMiddleware({
+      resourceName: this.resourceName,
+      resourceMethod: this.methodName,
+      mockRequest: true
+    });
+    return middleware.reduce(function (requestPromise, middleware) {
+      return requestPromise.then(function (request) {
+        return middleware.request(request);
+      });
+    }, _mappersmith.configs.Promise.resolve(initialRequest));
   }
@@ -188,0 +221,0 @@ };

package.json

 {
   "name": "mappersmith",
-  "version": "2.25.1",
+  "version": "2.26.0",
   "description": "It is a lightweight rest client for node.js and the browser",
@@ -5,0 +5,0 @@ "author": "Tulio Ornelas <[e-mail]>",

README.md

@@ -782,2 +782,3 @@ [![npm version](https://badge.fury.io/js/mappersmith.svg)](http://badge.fury.io/js/mappersmith)
 * `assertObject()`
+* `assertObjectAsync()`
 
@@ -866,2 +867,16 @@ Example using __jasmine__:
 
+If you have a middleware with an async request phase use `assertObjectAsync` to await for the middleware execution, example:
+
+```javascript
+const mock = await mockClient(client)
+  .resource('User')
+  .method('all')
+  .response({ allUsers: [{id: 1}] })
+  .assertObjectAsync()
+
+console.log(mock.mostRecentCall())
+console.log(mock.callsCount())
+console.log(mock.calls())
+```
+
 `response` and `status` can accept functions to generate response body or status. This can be useful when you want to return different responses for the same request being made several times.
@@ -868,0 +883,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Number of lines in readme file

1125

increased by1.35%

Worsened metrics

Total package byte prevSize

122751

decreased by-2.03%

Lines of code

2355

decreased by-0.08%

No dependency changes