msw 0.21.3 → 0.22.3

package/README.md

@@ -9,12 +9,10 @@
   <a href="https://circleci.com/gh/mswjs/msw" target="_blank">
     <img src="https://img.shields.io/circleci/project/github/mswjs/msw/master.svg" alt="Build status" />
   </a>
-  <a href="https://david-dm.org/mswjs/msw" target="_blank">
-    <img src="https://img.shields.io/david/mswjs/msw.svg" alt="Dependencies status" />
-  </a>
-  <a href="https://david-dm.org/mswjs/msw?type=dev" target="_blank">
-    <img src="https://img.shields.io/david/dev/mswjs/msw.svg" alt="Dev dependencies status" />
+  <a href="https://www.npmjs.com/package/msw" target="_blank">
+    <img src="https://img.shields.io/npm/dw/msw" alt="Download rate" />
   </a>
+  <img alt="Libraries.io dependency status for latest release" src="https://img.shields.io/librariesio/release/npm/msw"/ >
    <a href="https://kcd.im/discord" target="_blank">
     <img src="https://img.shields.io/badge/chat-online-green" alt="Discord server" />
   </a>
@@ -188,10 +186,6 @@ test('handles login exception', () => {
 
 > **Tip:** Did you know that although the API is called `setupServer`, there are no actual servers established? The name is kept for familiarity, and API is designed to resemble operating with an actual server.
 
-## Using the library?
-
-Do you use `msw` at your company? [**Let us know**](https://twitter.com/compose/tweet?text=We%20are%20using%20@ApiMocking%20at%20%3CCOMPANY_NAME%3E%20and%20we%20love%20it!) and get your company's logo featured on [our website](https://mswjs.io) as a token of appreciation.
-
 ## Awards & Mentions
 
 <br />

package/lib/esm/errors-deps.js

@@ -4,18 +4,17 @@ import { j as json } from './fetch-deps.js';
  * Returns a GraphQL body payload.
  */
 const data = (payload) => {
-    return (res) => {
-        res.headers.set('Content-Type', 'application/json');
-        res.body = JSON.stringify({ data: payload });
-        return res;
-    };
+    return json({ data: payload }, { merge: true });
 };
 
 /**
- * Returns a list of GraphQL errors.
+ * Sets a given list of GraphQL errors on the mocked response.
  */
 const errors = (errorsList) => {
-    return json({ errors: errorsList });
+    if (errorsList == null) {
+        return (res) => res;
+    }
+    return json({ errors: errorsList }, { merge: true });
 };
 
 export { data as d, errors as e };

package/lib/esm/fetch-deps.js

@@ -1,4 +1,4 @@
-var codes = {
+var statuses = {
 	"100": "Continue",
 	"101": "Switching Protocols",
 	"102": "Processing",
@@ -64,11 +64,6 @@ var codes = {
 	"511": "Network Authentication Required"
 };
 
-var statuses = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  'default': codes
-});
-
 const status = (statusCode, statusText) => {
     return (res) => {
         res.status = statusCode;
@@ -348,6 +343,48 @@ function set(...args) {
     };
 }
 
+/**
+ * Determines if the given value is an object.
+ */
+function isObject(value) {
+    return value != null && typeof value === 'object' && !Array.isArray(value);
+}
+
+/**
+ * Deeply merges two given objects with the right one
+ * having a priority during property assignment.
+ */
+function mergeRight(left, right) {
+    return Object.entries(right).reduce((result, [key, rightValue]) => {
+        const leftValue = result[key];
+        if (Array.isArray(leftValue) && Array.isArray(rightValue)) {
+            result[key] = leftValue.concat(rightValue);
+            return result;
+        }
+        if (isObject(leftValue) && isObject(rightValue)) {
+            result[key] = mergeRight(leftValue, rightValue);
+            return result;
+        }
+        result[key] = rightValue;
+        return result;
+    }, Object.assign({}, left));
+}
+
+/**
+ * Sets the given value as the JSON body of the response.
+ * @example
+ * res(json({ key: 'value' }))
+ * res(json('Some string'))
+ * res(json([1, '2', false, { ok: true }]))
+ */
+const json = (body, { merge = false } = {}) => {
+    return (res) => {
+        res.headers.set('Content-Type', 'application/json');
+        res.body = merge ? mergeRight(res.body || {}, body) : body;
+        return res;
+    };
+};
+
 /**
  * Returns a boolean indicating if the current process is running in NodeJS environment.
  * @see https://github.com/mswjs/msw/pull/255
@@ -387,21 +424,6 @@ const delay = (durationMs) => {
     };
 };
 
-/**
- * Sets the given value as the JSON body of the response.
- * @example
- * res(json({ key: 'value' }))
- * res(json('Some string'))
- * res(json([1, '2', false, { ok: true }]))
- */
-const json = (body) => {
-    return (res) => {
-        res.headers.set('Content-Type', 'application/json');
-        res.body = JSON.stringify(body);
-        return res;
-    };
-};
-
 const useFetch = isNodeProcess() ? require('node-fetch') : window.fetch;
 const augmentRequestInit = (requestInit) => {
     const headers = new lib.Headers(requestInit.headers);
@@ -433,4 +455,4 @@ const fetch = (input, requestInit = {}) => {
     return useFetch(input.url.href, compliantRequest);
 };
 
-export { set as a, commonjsGlobal as b, createCommonjsModule as c, delay as d, fetch as f, isNodeProcess as i, json as j, lib as l, status as s };
+export { set as a, commonjsGlobal as b, createCommonjsModule as c, delay as d, fetch as f, isNodeProcess as i, json as j, lib as l, mergeRight as m, status as s };

package/lib/esm/{matchRequestUrl-deps.js → getCallFrame-deps.js}

@@ -84,13 +84,13 @@ const pathToRegExp = (path) => {
         .replace(/\?/g, '\\?')
         // Ignore trailing slashes
         .replace(/\/+$/, '')
-        // Replace wildcard with any single character sequence
-        .replace(/\*+/g, '.+')
+        // Replace wildcard with any zero-to-any character sequence
+        .replace(/\*+/g, '.*')
         // Replace parameters with named capturing groups
-        .replace(/:([^\d|^\/][a-zA-Z0-9]*(?=(?:\/|\\.)|$))/g, (_, match) => `(?<${match}>.+?)`)
+        .replace(/:([^\d|^\/][a-zA-Z0-9_]*(?=(?:\/|\\.)|$))/g, (_, paramName) => `(?<${paramName}>[^\/]+?)`)
         // Allow optional trailing slash
         .concat('(\\/|$)');
-    return new RegExp(pattern, 'g');
+    return new RegExp(pattern, 'gi');
 };
 
 /**
@@ -111,6 +111,7 @@ const match = (path, url) => {
 
 var getCleanUrl_1 = createCommonjsModule(function (module, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCleanUrl = void 0;
 /**
  * Removes query parameters and hashes from a given URL.
  */
@@ -119,6 +120,7 @@ function getCleanUrl(url, isAbsolute) {
     return [isAbsolute && url.origin, url.pathname].filter(Boolean).join('');
 }
 exports.getCleanUrl = getCleanUrl;
+
 });
 
 /**
@@ -177,4 +179,29 @@ function matchRequestUrl(url, mask) {
     return match(cleanMask, cleanRequestUrl);
 }
 
-export { prepareRequest as a, prepareResponse as b, getTimestamp as c, getStatusCodeColor as d, getUrlByMask as g, jsonParse as j, matchRequestUrl as m, parseBody as p };
+/**
+ * Return the stack trace frame of a function's invocation.
+ */
+function getCallFrame() {
+    try {
+        const inspectionError = new Error();
+        inspectionError.name = 'Inspection Error';
+        throw inspectionError;
+    }
+    catch (error) {
+        const frames = error.stack.split('\n');
+        // Get the first frame that doesn't reference the library's internal trace.
+        // Assume that frame is the invocation frame.
+        const declarationFrame = frames.slice(1).find((frame) => {
+            return !/(node_modules)?\/lib\/(umd|esm)\//.test(frame);
+        });
+        if (!declarationFrame) {
+            return;
+        }
+        // Extract file reference from the stack frame.
+        const [, declarationPath] = declarationFrame.match(/\((.+?)\)$/) || [];
+        return declarationPath;
+    }
+}
+
+export { getCallFrame as a, prepareRequest as b, prepareResponse as c, getTimestamp as d, getStatusCodeColor as e, getUrlByMask as g, jsonParse as j, matchRequestUrl as m, parseBody as p };