fetch-mock - npm Package Compare versions

Comparing version 8.0.0 to 8.0.1

cjs/lib/fetch-handler.js

@@ -50,8 +50,12 @@ const responseBuilder = require('./response-builder');
 FetchMock.fetchHandler = function(url, options, request) {
-	({ url, options, request } = requestUtils.normalizeRequest(
+	const normalizedRequest = requestUtils.normalizeRequest(
 		url,
 		options,
 		this.config.Request
-	));
+	);
 
+	({ url, options, request } = normalizedRequest);
+
+	const { signal } = normalizedRequest;
+
 	const route = this.executeRouter(url, options, request);
@@ -66,3 +70,3 @@
 	return new this.config.Promise((res, rej) => {
-		if (options && options.signal) {
+		if (signal) {
 			const abort = () => {
@@ -72,6 +76,6 @@ rej(new AbortError());
 			};
-			if (options.signal.aborted) {
+			if (signal.aborted) {
 				abort();
 			}
-			options.signal.addEventListener('abort', abort);
+			signal.addEventListener('abort', abort);
 		}
@@ -78,0 +82,0 @@

cjs/lib/request-utils.js

@@ -42,11 +42,10 @@ let URL;
 		if (Request.prototype.isPrototypeOf(url)) {
-			const obj = {
+			const derivedOptions = {
+				method: url.method
+			};
+			const normalizedRequestObject = {
 				url: normalizeUrl(url.url),
-				options: Object.assign(
-					{
-						method: url.method
-					},
-					options
-				),
-				request: url
+				options: Object.assign(derivedOptions, options),
+				request: url,
+				signal: (options && options.signal) || url.signal
 			};
@@ -57,5 +56,5 @@
 			if (headers.length) {
-				obj.options.headers = zipObject(headers);
+				normalizedRequestObject.options.headers = zipObject(headers);
 			}
-			return obj;
+			return normalizedRequestObject;
 		} else if (
@@ -68,3 +67,4 @@ typeof url === 'string' ||
 				url: normalizeUrl(url),
-				options: options
+				options: options,
+				signal: options && options.signal
 			};
@@ -71,0 +71,0 @@ } else if (typeof url === 'object') {

es5/lib/fetch-handler.js

@@ -119,7 +119,8 @@ 'use strict';
 
-	var _requestUtils$normali = requestUtils.normalizeRequest(url, options, this.config.Request);
+	var normalizedRequest = requestUtils.normalizeRequest(url, options, this.config.Request);
 
-	url = _requestUtils$normali.url;
-	options = _requestUtils$normali.options;
-	request = _requestUtils$normali.request;
+	url = normalizedRequest.url;
+	options = normalizedRequest.options;
+	request = normalizedRequest.request;
+	var signal = normalizedRequest.signal;
 
@@ -138,3 +139,3 @@
 	return new this.config.Promise(function (res, rej) {
-		if (options && options.signal) {
+		if (signal) {
 			var abort = function abort() {
@@ -144,6 +145,6 @@ rej(new AbortError());
 			};
-			if (options.signal.aborted) {
+			if (signal.aborted) {
 				abort();
 			}
-			options.signal.addEventListener('abort', abort);
+			signal.addEventListener('abort', abort);
 		}
@@ -150,0 +151,0 @@

es5/lib/request-utils.js

@@ -81,8 +81,10 @@ 'use strict';
 		if (Request.prototype.isPrototypeOf(url)) {
-			var obj = {
+			var derivedOptions = {
+				method: url.method
+			};
+			var normalizedRequestObject = {
 				url: normalizeUrl(url.url),
-				options: (0, _assign2.default)({
-					method: url.method
-				}, options),
-				request: url
+				options: (0, _assign2.default)(derivedOptions, options),
+				request: url,
+				signal: options && options.signal || url.signal
 			};
@@ -93,5 +95,5 @@
 			if (headers.length) {
-				obj.options.headers = zipObject(headers);
+				normalizedRequestObject.options.headers = zipObject(headers);
 			}
-			return obj;
+			return normalizedRequestObject;
 		} else if (typeof url === 'string' ||
@@ -102,3 +104,4 @@ // horrible URL object duck-typing
 				url: normalizeUrl(url),
-				options: options
+				options: options,
+				signal: options && options.signal
 			};
@@ -105,0 +108,0 @@ } else if ((typeof url === 'undefined' ? 'undefined' : (0, _typeof3.default)(url)) === 'object') {

package.json

 {
   "name": "fetch-mock",
   "type": "module",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "description": "Mock http requests made using fetch (or isomorphic-fetch)",
@@ -6,0 +6,0 @@ "main": "./cjs/server.js",

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

Total package byte prevSize

2613681

increased by0.08%

Lines of code

74589

increased by0.06%

No dependency changes