msw 0.36.1 → 0.36.5

package/lib/umd/mockServiceWorker.js

@@ -2,7 +2,7 @@
 /* tslint:disable */
 
 /**
- * Mock Service Worker (0.36.1).
+ * Mock Service Worker (0.36.5).
  * @see https://github.com/mswjs/msw
  * - Please do NOT modify this file.
  * - Please do NOT serve this file on production.

package/native/lib/index.js

@@ -362,14 +362,6 @@ function tryDecode(str, decode) {
   }
 }
 
-function uuidv4() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-        const r = (Math.random() * 16) | 0;
-        const v = c == 'x' ? r : (r & 0x3) | 0x8;
-        return v.toString(16);
-    });
-}
-
 /**
  * Parses a given value into a JSON.
  * Does not throw an exception on an invalid JSON string.
@@ -985,11 +977,12 @@ function parseMultipartData(data, headers) {
  * Parses a given request/response body based on the "Content-Type" header.
  */
 function parseBody(body, headers) {
+    var _a;
     // Return whatever falsey body value is given.
     if (!body) {
         return body;
     }
-    const contentType = (headers === null || headers === void 0 ? void 0 : headers.get('content-type')) || '';
+    const contentType = ((_a = headers === null || headers === void 0 ? void 0 : headers.get('content-type')) === null || _a === void 0 ? void 0 : _a.toLowerCase()) || '';
     // If the body has a Multipart Content-Type
     // parse it into an object.
     const hasMultipartContent = contentType.startsWith('multipart/form-data');
@@ -1048,10 +1041,8 @@ function setRequestCookies(request) {
  * Converts a given isomorphic request to a `MockedRequest` instance.
  */
 function parseIsomorphicRequest(request) {
-    const requestId = uuidv4();
-    request.headers.set('x-msw-request-id', requestId);
     const mockedRequest = {
-        id: requestId,
+        id: request.id,
         url: request.url,
         method: request.method,
         body: parseBody(request.body, request.headers),
@@ -1234,11 +1225,9 @@ var InvariantError = /** @class */ (function (_super) {
         _this.name = 'Invariant Violation';
         _this.message = format_1.format.apply(void 0, __spreadArray([message], positionals));
         if (_this.stack) {
-            var prevStack = _this.stack;
-            _this.stack = prevStack
-                .split('\n')
-                .slice(STACK_FRAMES_TO_IGNORE)
-                .join('\n');
+            var nextStack = _this.stack.split('\n');
+            nextStack.splice(1, STACK_FRAMES_TO_IGNORE);
+            _this.stack = nextStack.join('\n');
         }
         return _this;
     }
@@ -5387,12 +5376,23 @@ function cleanUrl(path) {
     return path.replace(REDUNDANT_CHARACTERS_EXP, '');
 }
 
+/**
+ * Determines if the given URL string is an absolute URL.
+ */
+function isAbsoluteUrl(url) {
+    return /^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(url);
+}
+
 /**
  * Returns an absolute URL based on the given path.
  */
 function getAbsoluteUrl(path, baseUrl) {
-    // Ignore absolute URLs.
-    if (!path.startsWith('/')) {
+    // already absolute URL
+    if (isAbsoluteUrl(path)) {
+        return path;
+    }
+    // Ignore path with pattern start with *
+    if (path.startsWith('*')) {
         return path;
     }
     // Resolve a relative request URL against a given custom "baseUrl"
@@ -5440,12 +5440,17 @@ function coercePath(path) {
             ? `${parameterName}${wildcard}`
             : `${parameterName}${expression}`;
     })
+        /**
+         * Escape the port so that "path-to-regexp" can match
+         * absolute URLs including port numbers.
+         */
+        .replace(/([^\/])(:)(?=\d+)/, '$1\\$2')
         /**
          * Escape the protocol so that "path-to-regexp" could match
          * absolute URL.
          * @see https://github.com/pillarjs/path-to-regexp/issues/259
          */
-        .replace(/^([^\/]+)(:)(?=\/\/)/g, '$1\\$2'));
+        .replace(/^([^\/]+)(:)(?=\/\/)/, '$1\\$2'));
 }
 /**
  * Returns the result of matching given request URL against a mask.
@@ -5705,7 +5710,6 @@ class RestHandler extends RequestHandler {
         const matchesMethod = this.info.method instanceof RegExp
             ? this.info.method.test(request.method)
             : isStringEqual(this.info.method, request.method);
-        // console.log({ request, matchesMethod, parsedResult })
         return matchesMethod && parsedResult.matches;
     }
     log(request, response) {
@@ -5838,10 +5842,10 @@ function groupHandlersByType(handlers) {
         graphql: [],
     });
 }
-function getScoreForRestHandler() {
+function getRestHandlerScore() {
     return (request, handler) => {
         const { path, method } = handler.info;
-        if (path instanceof RegExp) {
+        if (path instanceof RegExp || method instanceof RegExp) {
             return Infinity;
         }
         const hasSameMethod = isStringEqual(request.method, method);
@@ -5852,12 +5856,15 @@ function getScoreForRestHandler() {
         return score - methodScoreDelta;
     };
 }
-function getScoreForGraphQLHandler(parsedQuery) {
+function getGraphQLHandlerScore(parsedQuery) {
     return (_, handler) => {
         if (typeof parsedQuery.operationName === 'undefined') {
             return Infinity;
         }
         const { operationType, operationName } = handler.info;
+        if (typeof operationName !== 'string') {
+            return Infinity;
+        }
         const hasSameOperationType = parsedQuery.operationType === operationType;
         // Always treat a handler with the same operation type as a more similar one.
         const operationTypeScoreDelta = hasSameOperationType ? TYPE_MATCH_DELTA : 0;
@@ -5867,16 +5874,12 @@ function getScoreForGraphQLHandler(parsedQuery) {
 }
 function getSuggestedHandler(request, handlers, getScore) {
     const suggestedHandlers = handlers
-        .reduce((acc, handler) => {
+        .reduce((suggestions, handler) => {
         const score = getScore(request, handler);
-        return acc.concat([[score, handler]]);
+        return suggestions.concat([[score, handler]]);
     }, [])
-        .sort(([leftScore], [rightScore]) => {
-        return leftScore - rightScore;
-    })
-        .filter(([score]) => {
-        return score <= MAX_MATCH_SCORE;
-    })
+        .sort(([leftScore], [rightScore]) => leftScore - rightScore)
+        .filter(([score]) => score <= MAX_MATCH_SCORE)
         .slice(0, MAX_SUGGESTION_COUNT)
         .map(([, handler]) => handler);
     return suggestedHandlers;
@@ -5906,8 +5909,8 @@ function onUnhandledRequest(request, handlers, strategy = 'warn') {
         ? handlerGroups.graphql
         : handlerGroups.rest;
     const suggestedHandlers = getSuggestedHandler(request, relevantHandlers, parsedGraphQLQuery
-        ? getScoreForGraphQLHandler(parsedGraphQLQuery)
-        : getScoreForRestHandler());
+        ? getGraphQLHandlerScore(parsedGraphQLQuery)
+        : getRestHandlerScore());
     const handlerSuggestion = suggestedHandlers.length > 0
         ? getSuggestedHandlersMessage(suggestedHandlers)
         : '';
@@ -5930,7 +5933,7 @@ Read more: https://mswjs.io/docs/getting-started/mocks\
             // Print a developer-friendly error.
             devUtils.error('Error: %s', message);
             // Throw an exception to halt request processing and not perform the original request.
-            throw new Error('Cannot bypass a request when using the "error" strategy for the "onUnhandledRequest" option.');
+            throw new Error(devUtils.formatMessage('Cannot bypass a request when using the "error" strategy for the "onUnhandledRequest" option.'));
         }
         case 'warn': {
             devUtils.warn('Warning: %s', message);
@@ -6062,15 +6065,14 @@ function createSetupServer(...interceptors$1) {
             },
         });
         interceptor.on('response', (request, response) => {
-            const requestId = request.headers.get('x-msw-request-id');
-            if (!requestId) {
+            if (!request.id) {
                 return;
             }
             if (response.headers.get('x-powered-by') === 'msw') {
-                emitter.emit('response:mocked', response, requestId);
+                emitter.emit('response:mocked', response, request.id);
             }
             else {
-                emitter.emit('response:bypass', response, requestId);
+                emitter.emit('response:bypass', response, request.id);
             }
         });
         return {

package/node/lib/index.js

@@ -2248,14 +2248,6 @@ function tryDecode(str, decode) {
   }
 }
 
-function uuidv4() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-        const r = (Math.random() * 16) | 0;
-        const v = c == 'x' ? r : (r & 0x3) | 0x8;
-        return v.toString(16);
-    });
-}
-
 /**
  * Parses a given value into a JSON.
  * Does not throw an exception on an invalid JSON string.
@@ -2871,11 +2863,12 @@ function parseMultipartData(data, headers) {
  * Parses a given request/response body based on the "Content-Type" header.
  */
 function parseBody(body, headers) {
+    var _a;
     // Return whatever falsey body value is given.
     if (!body) {
         return body;
     }
-    const contentType = (headers === null || headers === void 0 ? void 0 : headers.get('content-type')) || '';
+    const contentType = ((_a = headers === null || headers === void 0 ? void 0 : headers.get('content-type')) === null || _a === void 0 ? void 0 : _a.toLowerCase()) || '';
     // If the body has a Multipart Content-Type
     // parse it into an object.
     const hasMultipartContent = contentType.startsWith('multipart/form-data');
@@ -2934,10 +2927,8 @@ function setRequestCookies(request) {
  * Converts a given isomorphic request to a `MockedRequest` instance.
  */
 function parseIsomorphicRequest(request) {
-    const requestId = uuidv4();
-    request.headers.set('x-msw-request-id', requestId);
     const mockedRequest = {
-        id: requestId,
+        id: request.id,
         url: request.url,
         method: request.method,
         body: parseBody(request.body, request.headers),
@@ -3120,11 +3111,9 @@ var InvariantError = /** @class */ (function (_super) {
         _this.name = 'Invariant Violation';
         _this.message = format_1.format.apply(void 0, __spreadArray([message], positionals));
         if (_this.stack) {
-            var prevStack = _this.stack;
-            _this.stack = prevStack
-                .split('\n')
-                .slice(STACK_FRAMES_TO_IGNORE)
-                .join('\n');
+            var nextStack = _this.stack.split('\n');
+            nextStack.splice(1, STACK_FRAMES_TO_IGNORE);
+            _this.stack = nextStack.join('\n');
         }
         return _this;
     }
@@ -7273,12 +7262,23 @@ function cleanUrl(path) {
     return path.replace(REDUNDANT_CHARACTERS_EXP, '');
 }
 
+/**
+ * Determines if the given URL string is an absolute URL.
+ */
+function isAbsoluteUrl(url) {
+    return /^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(url);
+}
+
 /**
  * Returns an absolute URL based on the given path.
  */
 function getAbsoluteUrl(path, baseUrl) {
-    // Ignore absolute URLs.
-    if (!path.startsWith('/')) {
+    // already absolute URL
+    if (isAbsoluteUrl(path)) {
+        return path;
+    }
+    // Ignore path with pattern start with *
+    if (path.startsWith('*')) {
         return path;
     }
     // Resolve a relative request URL against a given custom "baseUrl"
@@ -7326,12 +7326,17 @@ function coercePath(path) {
             ? `${parameterName}${wildcard}`
             : `${parameterName}${expression}`;
     })
+        /**
+         * Escape the port so that "path-to-regexp" can match
+         * absolute URLs including port numbers.
+         */
+        .replace(/([^\/])(:)(?=\d+)/, '$1\\$2')
         /**
          * Escape the protocol so that "path-to-regexp" could match
          * absolute URL.
          * @see https://github.com/pillarjs/path-to-regexp/issues/259
          */
-        .replace(/^([^\/]+)(:)(?=\/\/)/g, '$1\\$2'));
+        .replace(/^([^\/]+)(:)(?=\/\/)/, '$1\\$2'));
 }
 /**
  * Returns the result of matching given request URL against a mask.
@@ -7591,7 +7596,6 @@ class RestHandler extends RequestHandler {
         const matchesMethod = this.info.method instanceof RegExp
             ? this.info.method.test(request.method)
             : isStringEqual(this.info.method, request.method);
-        // console.log({ request, matchesMethod, parsedResult })
         return matchesMethod && parsedResult.matches;
     }
     log(request, response) {
@@ -7724,10 +7728,10 @@ function groupHandlersByType(handlers) {
         graphql: [],
     });
 }
-function getScoreForRestHandler() {
+function getRestHandlerScore() {
     return (request, handler) => {
         const { path, method } = handler.info;
-        if (path instanceof RegExp) {
+        if (path instanceof RegExp || method instanceof RegExp) {
             return Infinity;
         }
         const hasSameMethod = isStringEqual(request.method, method);
@@ -7738,12 +7742,15 @@ function getScoreForRestHandler() {
         return score - methodScoreDelta;
     };
 }
-function getScoreForGraphQLHandler(parsedQuery) {
+function getGraphQLHandlerScore(parsedQuery) {
     return (_, handler) => {
         if (typeof parsedQuery.operationName === 'undefined') {
             return Infinity;
         }
         const { operationType, operationName } = handler.info;
+        if (typeof operationName !== 'string') {
+            return Infinity;
+        }
         const hasSameOperationType = parsedQuery.operationType === operationType;
         // Always treat a handler with the same operation type as a more similar one.
         const operationTypeScoreDelta = hasSameOperationType ? TYPE_MATCH_DELTA : 0;
@@ -7753,16 +7760,12 @@ function getScoreForGraphQLHandler(parsedQuery) {
 }
 function getSuggestedHandler(request, handlers, getScore) {
     const suggestedHandlers = handlers
-        .reduce((acc, handler) => {
+        .reduce((suggestions, handler) => {
         const score = getScore(request, handler);
-        return acc.concat([[score, handler]]);
+        return suggestions.concat([[score, handler]]);
     }, [])
-        .sort(([leftScore], [rightScore]) => {
-        return leftScore - rightScore;
-    })
-        .filter(([score]) => {
-        return score <= MAX_MATCH_SCORE;
-    })
+        .sort(([leftScore], [rightScore]) => leftScore - rightScore)
+        .filter(([score]) => score <= MAX_MATCH_SCORE)
         .slice(0, MAX_SUGGESTION_COUNT)
         .map(([, handler]) => handler);
     return suggestedHandlers;
@@ -7792,8 +7795,8 @@ function onUnhandledRequest(request, handlers, strategy = 'warn') {
         ? handlerGroups.graphql
         : handlerGroups.rest;
     const suggestedHandlers = getSuggestedHandler(request, relevantHandlers, parsedGraphQLQuery
-        ? getScoreForGraphQLHandler(parsedGraphQLQuery)
-        : getScoreForRestHandler());
+        ? getGraphQLHandlerScore(parsedGraphQLQuery)
+        : getRestHandlerScore());
     const handlerSuggestion = suggestedHandlers.length > 0
         ? getSuggestedHandlersMessage(suggestedHandlers)
         : '';
@@ -7816,7 +7819,7 @@ Read more: https://mswjs.io/docs/getting-started/mocks\
             // Print a developer-friendly error.
             devUtils.error('Error: %s', message);
             // Throw an exception to halt request processing and not perform the original request.
-            throw new Error('Cannot bypass a request when using the "error" strategy for the "onUnhandledRequest" option.');
+            throw new Error(devUtils.formatMessage('Cannot bypass a request when using the "error" strategy for the "onUnhandledRequest" option.'));
         }
         case 'warn': {
             devUtils.warn('Warning: %s', message);
@@ -7948,15 +7951,14 @@ function createSetupServer(...interceptors$1) {
             },
         });
         interceptor.on('response', (request, response) => {
-            const requestId = request.headers.get('x-msw-request-id');
-            if (!requestId) {
+            if (!request.id) {
                 return;
             }
             if (response.headers.get('x-powered-by') === 'msw') {
-                emitter.emit('response:mocked', response, requestId);
+                emitter.emit('response:mocked', response, request.id);
             }
             else {
-                emitter.emit('response:bypass', response, requestId);
+                emitter.emit('response:bypass', response, request.id);
             }
         });
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msw",
-  "version": "0.36.1",
+  "version": "0.36.5",
   "description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
   "main": "lib/umd/index.js",
   "module": "lib/esm/index.js",
@@ -18,9 +18,8 @@
     "test:integration": "jest --config=test/jest.config.js --maxWorkers=3",
     "test:smoke": "config/scripts/smoke.sh",
     "test:ts": "tsc -p test/typings/tsconfig.json",
-    "test:focused": "node node_modules/ts-node/dist/bin.js --project=test/tsconfig.json test/focusedTest.ts",
+    "prepare": "yarn simple-git-hooks init",
     "prepublishOnly": "yarn lint && yarn test:unit && yarn build && yarn test:integration",
-    "prepare": "husky install",
     "postinstall": "node -e \"try{require('./config/scripts/postinstall')}catch(e){}\""
   },
   "lint-staged": {
@@ -88,6 +87,8 @@
   "devDependencies": {
     "@babel/core": "^7.16.0",
     "@babel/preset-env": "^7.16.4",
+    "@commitlint/cli": "^16.0.2",
+    "@commitlint/config-conventional": "^16.0.0",
     "@open-draft/test-server": "^0.2.3",
     "@rollup/plugin-commonjs": "^19.0.0",
     "@rollup/plugin-inject": "^4.0.3",
@@ -104,17 +105,19 @@
     "@typescript-eslint/parser": "^4.28.3",
     "babel-loader": "^8.2.3",
     "babel-minify": "^0.5.1",
+    "commitizen": "^4.2.4",
     "cross-env": "^7.0.3",
     "cross-fetch": "^3.1.4",
+    "cz-conventional-changelog": "3.3.0",
     "eslint": "^7.30.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^3.4.0",
     "fs-extra": "^10.0.0",
     "fs-teardown": "^0.3.0",
-    "husky": "^5.1.1",
     "jest": "26",
     "json-bigint": "^1.0.0",
     "lint-staged": "^11.0.1",
+    "outvariant": "^1.2.1",
     "page-with": "^0.5.0",
     "prettier": "^2.3.2",
     "regenerator-runtime": "^0.13.9",
@@ -122,6 +125,7 @@
     "rollup": "^2.60.2",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-typescript2": "^0.30.0",
+    "simple-git-hooks": "^2.7.0",
     "ts-jest": "26",
     "ts-loader": "^9.2.6",
     "ts-node": "^10.1.0",
@@ -132,5 +136,10 @@
   },
   "resolutions": {
     "chokidar": "3.4.1"
+  },
+  "config": {
+    "commitizen": {
+      "path": "./node_modules/cz-conventional-changelog"
+    }
   }
 }