msw 0.20.1 → 0.20.5

package/native/index.js

@@ -42,7 +42,6 @@ function __awaiter(thisArg, _arguments, P, generator) {
  */
 
 var parse_1 = parse;
-var serialize_1 = serialize;
 
 /**
  * Module variables.
@@ -50,19 +49,8 @@ var serialize_1 = serialize;
  */
 
 var decode = decodeURIComponent;
-var encode = encodeURIComponent;
 var pairSplitRegExp = /; */;
 
-/**
- * RegExp to match field-content in RFC 7230 sec 3.2
- *
- * field-content = field-vchar [ 1*( SP / HTAB ) field-vchar ]
- * field-vchar   = VCHAR / obs-text
- * obs-text      = %x80-FF
- */
-
-var fieldContentRegExp = /^[\u0009\u0020-\u007e\u0080-\u00ff]+$/;
-
 /**
  * Parse a cookie header.
  *
@@ -111,109 +99,6 @@ function parse(str, options) {
   return obj;
 }
 
-/**
- * Serialize data into a cookie header.
- *
- * Serialize the a name value pair into a cookie string suitable for
- * http headers. An optional options object specified cookie parameters.
- *
- * serialize('foo', 'bar', { httpOnly: true })
- *   => "foo=bar; httpOnly"
- *
- * @param {string} name
- * @param {string} val
- * @param {object} [options]
- * @return {string}
- * @public
- */
-
-function serialize(name, val, options) {
-  var opt = options || {};
-  var enc = opt.encode || encode;
-
-  if (typeof enc !== 'function') {
-    throw new TypeError('option encode is invalid');
-  }
-
-  if (!fieldContentRegExp.test(name)) {
-    throw new TypeError('argument name is invalid');
-  }
-
-  var value = enc(val);
-
-  if (value && !fieldContentRegExp.test(value)) {
-    throw new TypeError('argument val is invalid');
-  }
-
-  var str = name + '=' + value;
-
-  if (null != opt.maxAge) {
-    var maxAge = opt.maxAge - 0;
-
-    if (isNaN(maxAge) || !isFinite(maxAge)) {
-      throw new TypeError('option maxAge is invalid')
-    }
-
-    str += '; Max-Age=' + Math.floor(maxAge);
-  }
-
-  if (opt.domain) {
-    if (!fieldContentRegExp.test(opt.domain)) {
-      throw new TypeError('option domain is invalid');
-    }
-
-    str += '; Domain=' + opt.domain;
-  }
-
-  if (opt.path) {
-    if (!fieldContentRegExp.test(opt.path)) {
-      throw new TypeError('option path is invalid');
-    }
-
-    str += '; Path=' + opt.path;
-  }
-
-  if (opt.expires) {
-    if (typeof opt.expires.toUTCString !== 'function') {
-      throw new TypeError('option expires is invalid');
-    }
-
-    str += '; Expires=' + opt.expires.toUTCString();
-  }
-
-  if (opt.httpOnly) {
-    str += '; HttpOnly';
-  }
-
-  if (opt.secure) {
-    str += '; Secure';
-  }
-
-  if (opt.sameSite) {
-    var sameSite = typeof opt.sameSite === 'string'
-      ? opt.sameSite.toLowerCase() : opt.sameSite;
-
-    switch (sameSite) {
-      case true:
-        str += '; SameSite=Strict';
-        break;
-      case 'lax':
-        str += '; SameSite=Lax';
-        break;
-      case 'strict':
-        str += '; SameSite=Strict';
-        break;
-      case 'none':
-        str += '; SameSite=None';
-        break;
-      default:
-        throw new TypeError('option sameSite is invalid');
-    }
-  }
-
-  return str;
-}
-
 /**
  * Try decoding a string using a decoding function.
  *
@@ -230,11 +115,6 @@ function tryDecode(str, decode) {
   }
 }
 
-var cookie = {
-	parse: parse_1,
-	serialize: serialize_1
-};
-
 function createCommonjsModule(fn, basedir, module) {
 	return module = {
 	  path: basedir,
@@ -487,7 +367,7 @@ exports.flattenHeadersList = flattenHeadersList_1.flattenHeadersList;
 exports.flattenHeadersObject = flattenHeadersObject_1.flattenHeadersObject;
 });
 
-var statuses = {
+var codes = {
 	"100": "Continue",
 	"101": "Switching Protocols",
 	"102": "Processing",
@@ -553,6 +433,11 @@ var statuses = {
 	"511": "Network Authentication Required"
 };
 
+var statuses = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    'default': codes
+});
+
 const status = (statusCode, statusText) => {
     return (res) => {
         res.status = statusCode;
@@ -700,49 +585,72 @@ const response = Object.assign(createResponseComposition(), {
  * Returns a mocked response for a given request using following request handlers.
  */
 const getResponse = (req, handlers) => __awaiter(void 0, void 0, void 0, function* () {
-    const [relevantHandler, parsedRequest] = handlers.reduce((found, requestHandler) => {
-        // Skip any request handlers lookup if a handler is already found,
-        // or the current handler is a one-time handler that's been already used.
-        if ((found && found[0]) || requestHandler.shouldSkip) {
-            return found;
-        }
+    const relevantHandlers = handlers
+        .filter((requestHandler) => {
+        // Skip a handler if it has been already used for a one-time response.
+        return !requestHandler.shouldSkip;
+    })
+        .map((requestHandler) => {
         // Parse the captured request to get additional information.
         // Make the predicate function accept all the necessary information
         // to decide on the interception.
         const parsedRequest = requestHandler.parse
             ? requestHandler.parse(req)
             : null;
-        if (requestHandler.predicate(req, parsedRequest)) {
-            return [requestHandler, parsedRequest];
-        }
-    }, []) || [null, null];
-    if (relevantHandler == null) {
+        return [requestHandler, parsedRequest];
+    })
+        .filter(([requestHandler, parsedRequest]) => {
+        return requestHandler.predicate(req, parsedRequest);
+    });
+    if (relevantHandlers.length == 0) {
+        // Handle a scenario when a request has no relevant request handlers.
+        // In that case it would be bypassed (performed as-is).
         return {
             handler: null,
             response: null,
         };
     }
-    const { getPublicRequest, defineContext, resolver } = relevantHandler;
-    const publicRequest = getPublicRequest
-        ? getPublicRequest(req, parsedRequest)
-        : req;
-    const context = defineContext ? defineContext(publicRequest) : defaultContext;
-    const mockedResponse = yield resolver(publicRequest, response, context);
-    // Handle a scenario when a request handler is present,
-    // but returns no mocked response (i.e. misses a `return res()` statement).
-    if (!mockedResponse) {
+    const { requestHandler, parsedRequest, mockedResponse, publicRequest, } = yield relevantHandlers.reduce((asyncAcc, [requestHandler, parsedRequest]) => __awaiter(void 0, void 0, void 0, function* () {
+        // Now the reduce function is async so we need to await if response was found
+        const acc = yield asyncAcc;
+        // If a first not empty response was found we'll stop evaluating other requests
+        if (acc.requestHandler) {
+            return acc;
+        }
+        const { getPublicRequest, defineContext, resolver } = requestHandler;
+        const publicRequest = getPublicRequest
+            ? getPublicRequest(req, parsedRequest)
+            : req;
+        const context = defineContext
+            ? defineContext(publicRequest)
+            : defaultContext;
+        const mockedResponse = yield resolver(publicRequest, response, context);
+        if (!mockedResponse) {
+            return acc;
+        }
+        if (mockedResponse && mockedResponse.once) {
+            // When responded with a one-time response, match the relevant request handler
+            // as skipped, so it cannot affect the captured requests anymore.
+            requestHandler.shouldSkip = true;
+        }
         return {
-            handler: relevantHandler,
+            requestHandler,
+            parsedRequest,
+            mockedResponse,
+            publicRequest,
+        };
+    }), Promise.resolve({ mockedResponse: null }));
+    // Although reducing a list of relevant request handlers, it's possible
+    // that in the end there will be no handler associted with the request
+    // (i.e. if relevant handlers are fall-through).
+    if (!requestHandler) {
+        return {
+            handler: null,
             response: null,
         };
     }
-    if (mockedResponse.once) {
-        // When responded with a one-time response, match the relevant request handler
-        // as skipped, so it cannot affect the captured requests anymore.
-        relevantHandler.shouldSkip = true;
-    }
     return {
-        handler: relevantHandler,
+        handler: requestHandler,
         response: mockedResponse,
         publicRequest,
         parsedRequest,
@@ -865,7 +773,7 @@ const setupServer = (...requestHandlers) => {
                     // No need to take `credentials` into account, because in NodeJS requests are intercepted
                     // _after_ they happen. Request issuer should have already taken care of sending relevant cookies.
                     // Unlike browser, where interception is on the worker level, _before_ the request happens.
-                    mockedRequest.cookies = cookie.parse(requestCookieString);
+                    mockedRequest.cookies = parse_1(requestCookieString);
                 }
                 if (mockedRequest.headers.get('x-msw-bypass')) {
                     return;

package/node/index.js

@@ -43,7 +43,6 @@ function __awaiter(thisArg, _arguments, P, generator) {
  */
 
 var parse_1 = parse;
-var serialize_1 = serialize;
 
 /**
  * Module variables.
@@ -51,19 +50,8 @@ var serialize_1 = serialize;
  */
 
 var decode = decodeURIComponent;
-var encode = encodeURIComponent;
 var pairSplitRegExp = /; */;
 
-/**
- * RegExp to match field-content in RFC 7230 sec 3.2
- *
- * field-content = field-vchar [ 1*( SP / HTAB ) field-vchar ]
- * field-vchar   = VCHAR / obs-text
- * obs-text      = %x80-FF
- */
-
-var fieldContentRegExp = /^[\u0009\u0020-\u007e\u0080-\u00ff]+$/;
-
 /**
  * Parse a cookie header.
  *
@@ -112,109 +100,6 @@ function parse(str, options) {
   return obj;
 }
 
-/**
- * Serialize data into a cookie header.
- *
- * Serialize the a name value pair into a cookie string suitable for
- * http headers. An optional options object specified cookie parameters.
- *
- * serialize('foo', 'bar', { httpOnly: true })
- *   => "foo=bar; httpOnly"
- *
- * @param {string} name
- * @param {string} val
- * @param {object} [options]
- * @return {string}
- * @public
- */
-
-function serialize(name, val, options) {
-  var opt = options || {};
-  var enc = opt.encode || encode;
-
-  if (typeof enc !== 'function') {
-    throw new TypeError('option encode is invalid');
-  }
-
-  if (!fieldContentRegExp.test(name)) {
-    throw new TypeError('argument name is invalid');
-  }
-
-  var value = enc(val);
-
-  if (value && !fieldContentRegExp.test(value)) {
-    throw new TypeError('argument val is invalid');
-  }
-
-  var str = name + '=' + value;
-
-  if (null != opt.maxAge) {
-    var maxAge = opt.maxAge - 0;
-
-    if (isNaN(maxAge) || !isFinite(maxAge)) {
-      throw new TypeError('option maxAge is invalid')
-    }
-
-    str += '; Max-Age=' + Math.floor(maxAge);
-  }
-
-  if (opt.domain) {
-    if (!fieldContentRegExp.test(opt.domain)) {
-      throw new TypeError('option domain is invalid');
-    }
-
-    str += '; Domain=' + opt.domain;
-  }
-
-  if (opt.path) {
-    if (!fieldContentRegExp.test(opt.path)) {
-      throw new TypeError('option path is invalid');
-    }
-
-    str += '; Path=' + opt.path;
-  }
-
-  if (opt.expires) {
-    if (typeof opt.expires.toUTCString !== 'function') {
-      throw new TypeError('option expires is invalid');
-    }
-
-    str += '; Expires=' + opt.expires.toUTCString();
-  }
-
-  if (opt.httpOnly) {
-    str += '; HttpOnly';
-  }
-
-  if (opt.secure) {
-    str += '; Secure';
-  }
-
-  if (opt.sameSite) {
-    var sameSite = typeof opt.sameSite === 'string'
-      ? opt.sameSite.toLowerCase() : opt.sameSite;
-
-    switch (sameSite) {
-      case true:
-        str += '; SameSite=Strict';
-        break;
-      case 'lax':
-        str += '; SameSite=Lax';
-        break;
-      case 'strict':
-        str += '; SameSite=Strict';
-        break;
-      case 'none':
-        str += '; SameSite=None';
-        break;
-      default:
-        throw new TypeError('option sameSite is invalid');
-    }
-  }
-
-  return str;
-}
-
 /**
  * Try decoding a string using a decoding function.
  *
@@ -231,11 +116,6 @@ function tryDecode(str, decode) {
   }
 }
 
-var cookie = {
-	parse: parse_1,
-	serialize: serialize_1
-};
-
 function createCommonjsModule(fn, basedir, module) {
 	return module = {
 	  path: basedir,
@@ -488,7 +368,7 @@ exports.flattenHeadersList = flattenHeadersList_1.flattenHeadersList;
 exports.flattenHeadersObject = flattenHeadersObject_1.flattenHeadersObject;
 });
 
-var statuses = {
+var codes = {
 	"100": "Continue",
 	"101": "Switching Protocols",
 	"102": "Processing",
@@ -554,6 +434,11 @@ var statuses = {
 	"511": "Network Authentication Required"
 };
 
+var statuses = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    'default': codes
+});
+
 const status = (statusCode, statusText) => {
     return (res) => {
         res.status = statusCode;
@@ -701,49 +586,72 @@ const response = Object.assign(createResponseComposition(), {
  * Returns a mocked response for a given request using following request handlers.
  */
 const getResponse = (req, handlers) => __awaiter(void 0, void 0, void 0, function* () {
-    const [relevantHandler, parsedRequest] = handlers.reduce((found, requestHandler) => {
-        // Skip any request handlers lookup if a handler is already found,
-        // or the current handler is a one-time handler that's been already used.
-        if ((found && found[0]) || requestHandler.shouldSkip) {
-            return found;
-        }
+    const relevantHandlers = handlers
+        .filter((requestHandler) => {
+        // Skip a handler if it has been already used for a one-time response.
+        return !requestHandler.shouldSkip;
+    })
+        .map((requestHandler) => {
         // Parse the captured request to get additional information.
         // Make the predicate function accept all the necessary information
         // to decide on the interception.
         const parsedRequest = requestHandler.parse
             ? requestHandler.parse(req)
             : null;
-        if (requestHandler.predicate(req, parsedRequest)) {
-            return [requestHandler, parsedRequest];
-        }
-    }, []) || [null, null];
-    if (relevantHandler == null) {
+        return [requestHandler, parsedRequest];
+    })
+        .filter(([requestHandler, parsedRequest]) => {
+        return requestHandler.predicate(req, parsedRequest);
+    });
+    if (relevantHandlers.length == 0) {
+        // Handle a scenario when a request has no relevant request handlers.
+        // In that case it would be bypassed (performed as-is).
         return {
             handler: null,
             response: null,
         };
     }
-    const { getPublicRequest, defineContext, resolver } = relevantHandler;
-    const publicRequest = getPublicRequest
-        ? getPublicRequest(req, parsedRequest)
-        : req;
-    const context = defineContext ? defineContext(publicRequest) : defaultContext;
-    const mockedResponse = yield resolver(publicRequest, response, context);
-    // Handle a scenario when a request handler is present,
-    // but returns no mocked response (i.e. misses a `return res()` statement).
-    if (!mockedResponse) {
+    const { requestHandler, parsedRequest, mockedResponse, publicRequest, } = yield relevantHandlers.reduce((asyncAcc, [requestHandler, parsedRequest]) => __awaiter(void 0, void 0, void 0, function* () {
+        // Now the reduce function is async so we need to await if response was found
+        const acc = yield asyncAcc;
+        // If a first not empty response was found we'll stop evaluating other requests
+        if (acc.requestHandler) {
+            return acc;
+        }
+        const { getPublicRequest, defineContext, resolver } = requestHandler;
+        const publicRequest = getPublicRequest
+            ? getPublicRequest(req, parsedRequest)
+            : req;
+        const context = defineContext
+            ? defineContext(publicRequest)
+            : defaultContext;
+        const mockedResponse = yield resolver(publicRequest, response, context);
+        if (!mockedResponse) {
+            return acc;
+        }
+        if (mockedResponse && mockedResponse.once) {
+            // When responded with a one-time response, match the relevant request handler
+            // as skipped, so it cannot affect the captured requests anymore.
+            requestHandler.shouldSkip = true;
+        }
         return {
-            handler: relevantHandler,
+            requestHandler,
+            parsedRequest,
+            mockedResponse,
+            publicRequest,
+        };
+    }), Promise.resolve({ mockedResponse: null }));
+    // Although reducing a list of relevant request handlers, it's possible
+    // that in the end there will be no handler associted with the request
+    // (i.e. if relevant handlers are fall-through).
+    if (!requestHandler) {
+        return {
+            handler: null,
             response: null,
         };
     }
-    if (mockedResponse.once) {
-        // When responded with a one-time response, match the relevant request handler
-        // as skipped, so it cannot affect the captured requests anymore.
-        relevantHandler.shouldSkip = true;
-    }
     return {
-        handler: relevantHandler,
+        handler: requestHandler,
         response: mockedResponse,
         publicRequest,
         parsedRequest,
@@ -866,7 +774,7 @@ const setupServer = (...requestHandlers) => {
                     // No need to take `credentials` into account, because in NodeJS requests are intercepted
                     // _after_ they happen. Request issuer should have already taken care of sending relevant cookies.
                     // Unlike browser, where interception is on the worker level, _before_ the request happens.
-                    mockedRequest.cookies = cookie.parse(requestCookieString);
+                    mockedRequest.cookies = parse_1(requestCookieString);
                 }
                 if (mockedRequest.headers.get('x-msw-bypass')) {
                     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msw",
-  "version": "0.20.1",
+  "version": "0.20.5",
   "description": "Client-side API mocking using Service Workers.",
   "main": "lib/umd/index.js",
   "module": "lib/esm/index.js",
@@ -69,7 +69,7 @@
     "headers-utils": "^1.2.0",
     "node-fetch": "^2.6.0",
     "node-match-path": "^0.4.4",
-    "node-request-interceptor": "^0.3.3",
+    "node-request-interceptor": "^0.3.5",
     "statuses": "^2.0.0",
     "yargs": "^15.4.1"
   },

package/lib/esm/getStatusCodeColor-deps.js

@@ -1,65 +0,0 @@
-import { l as lib } from './fetch-deps.js';
-
-/**
- * Parses a given string into a JSON.
- * Does not throw an exception on an invalid JSON string.
- */
-function jsonParse(str) {
-    try {
-        return JSON.parse(str);
-    }
-    catch (error) {
-        return undefined;
-    }
-}
-
-/**
- * Returns a parsed JSON from a given valid body string,
- * otherwise returns a given body string as-is.
- */
-function getJsonBody(body) {
-    return jsonParse(body) || body;
-}
-
-/**
- * Formats a mocked request for introspection in browser's console.
- */
-function prepareRequest(req) {
-    return Object.assign(Object.assign({}, req), { headers: req.headers.getAllHeaders() });
-}
-
-/**
- * Formats a mocked response for introspection in browser's console.
- */
-function prepareResponse(res) {
-    var _a;
-    const resHeaders = lib.listToHeaders(res.headers);
-    return Object.assign(Object.assign({}, res), { 
-        // Parse a response JSON body for preview in the logs
-        body: ((_a = resHeaders.get('content-type')) === null || _a === void 0 ? void 0 : _a.includes('json')) ? getJsonBody(res.body)
-            : res.body });
-}
-
-function getTimestamp() {
-    const now = new Date();
-    return [now.getHours(), now.getMinutes(), now.getSeconds()]
-        .map(String)
-        .map((chunk) => chunk.slice(0, 2))
-        .map((chunk) => chunk.padStart(2, '0'))
-        .join(':');
-}
-
-/**
- * Returns a HEX color for a given response status code number.
- */
-function getStatusCodeColor(status) {
-    if (status < 300) {
-        return '#69AB32';
-    }
-    if (status < 400) {
-        return '#F0BB4B';
-    }
-    return '#E95F5D';
-}
-
-export { prepareResponse as a, getTimestamp as b, getStatusCodeColor as c, getJsonBody as g, jsonParse as j, prepareRequest as p };