msw 0.36.5 → 0.38.1

package/lib/esm/index.js

@@ -1022,56 +1022,71 @@ ${handlers.map((handler) => `  • ${handler.info.header}`).join('\n')}`;
     return `Did you mean to request "${handlers[0].info.header}" instead?`;
 }
 function onUnhandledRequest(request, handlers, strategy = 'warn') {
-    if (typeof strategy === 'function') {
-        strategy(request);
-        return;
-    }
-    /**
-     * @note Ignore exceptions during GraphQL request parsing because at this point
-     * we cannot assume the unhandled request is a valid GraphQL request.
-     * If the GraphQL parsing fails, just don't treat it as a GraphQL request.
-     */
     const parsedGraphQLQuery = tryCatch(() => parseGraphQLRequest(request));
-    const handlerGroups = groupHandlersByType(handlers);
-    const relevantHandlers = parsedGraphQLQuery
-        ? handlerGroups.graphql
-        : handlerGroups.rest;
-    const suggestedHandlers = getSuggestedHandler(request, relevantHandlers, parsedGraphQLQuery
-        ? getGraphQLHandlerScore(parsedGraphQLQuery)
-        : getRestHandlerScore());
-    const handlerSuggestion = suggestedHandlers.length > 0
-        ? getSuggestedHandlersMessage(suggestedHandlers)
-        : '';
-    const publicUrl = getPublicUrlFromRequest(request);
-    const requestHeader = parsedGraphQLQuery
-        ? `${parsedGraphQLQuery.operationType} ${parsedGraphQLQuery.operationName} (${request.method} ${publicUrl})`
-        : `${request.method} ${publicUrl}`;
-    const messageTemplate = [
-        `captured a request without a matching request handler:`,
-        `  \u2022 ${requestHeader}`,
-        handlerSuggestion,
-        `\
+    function generateHandlerSuggestion() {
+        /**
+         * @note Ignore exceptions during GraphQL request parsing because at this point
+         * we cannot assume the unhandled request is a valid GraphQL request.
+         * If the GraphQL parsing fails, just don't treat it as a GraphQL request.
+         */
+        const handlerGroups = groupHandlersByType(handlers);
+        const relevantHandlers = parsedGraphQLQuery
+            ? handlerGroups.graphql
+            : handlerGroups.rest;
+        const suggestedHandlers = getSuggestedHandler(request, relevantHandlers, parsedGraphQLQuery
+            ? getGraphQLHandlerScore(parsedGraphQLQuery)
+            : getRestHandlerScore());
+        return suggestedHandlers.length > 0
+            ? getSuggestedHandlersMessage(suggestedHandlers)
+            : '';
+    }
+    function generateUnhandledRequestMessage() {
+        const publicUrl = getPublicUrlFromRequest(request);
+        const requestHeader = parsedGraphQLQuery
+            ? `${parsedGraphQLQuery.operationType} ${parsedGraphQLQuery.operationName} (${request.method} ${publicUrl})`
+            : `${request.method} ${publicUrl}`;
+        const handlerSuggestion = generateHandlerSuggestion();
+        const messageTemplate = [
+            `captured a request without a matching request handler:`,
+            `  \u2022 ${requestHeader}`,
+            handlerSuggestion,
+            `\
 If you still wish to intercept this unhandled request, please create a request handler for it.
 Read more: https://mswjs.io/docs/getting-started/mocks\
 `,
-    ].filter(Boolean);
-    const message = messageTemplate.join('\n\n');
-    switch (strategy) {
-        case 'error': {
-            // 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(devUtils.formatMessage('Cannot bypass a request when using the "error" strategy for the "onUnhandledRequest" option.'));
-        }
-        case 'warn': {
-            devUtils.warn('Warning: %s', message);
-            break;
+        ].filter(Boolean);
+        return messageTemplate.join('\n\n');
+    }
+    function applyStrategy(strategy) {
+        // Generate handler suggestions only when applying the strategy.
+        // This saves bandwidth for scenarios when developers opt-out
+        // from the default unhandled request handling strategy.
+        const message = generateUnhandledRequestMessage();
+        switch (strategy) {
+            case 'error': {
+                // 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(devUtils.formatMessage('Cannot bypass a request when using the "error" strategy for the "onUnhandledRequest" option.'));
+            }
+            case 'warn': {
+                devUtils.warn('Warning: %s', message);
+                break;
+            }
+            case 'bypass':
+                break;
+            default:
+                throw new Error(devUtils.formatMessage('Failed to react to an unhandled request: unknown strategy "%s". Please provide one of the supported strategies ("bypass", "warn", "error") or a custom callback function as the value of the "onUnhandledRequest" option.', strategy));
         }
-        case 'bypass':
-            break;
-        default:
-            throw new Error(devUtils.formatMessage('Failed to react to an unhandled request: unknown strategy "%s". Please provide one of the supported strategies ("bypass", "warn", "error") or a custom callback function as the value of the "onUnhandledRequest" option.', strategy));
     }
+    if (typeof strategy === 'function') {
+        strategy(request, {
+            warning: applyStrategy.bind(null, 'warn'),
+            error: applyStrategy.bind(null, 'error'),
+        });
+        return;
+    }
+    applyStrategy(strategy);
 }
 
 function readResponseCookies(request, response) {
@@ -1084,7 +1099,7 @@ function handleRequest(request, handlers, options, emitter, handleRequestOptions
     return __awaiter(this, void 0, void 0, function* () {
         emitter.emit('request:start', request);
         // Perform bypassed requests (i.e. issued via "ctx.fetch") as-is.
-        if (request.headers.get('x-msw-bypass')) {
+        if (request.headers.get('x-msw-bypass') === 'true') {
             emitter.emit('request:end', request);
             (_a = handleRequestOptions === null || handleRequestOptions === void 0 ? void 0 : handleRequestOptions.onBypassResponse) === null || _a === void 0 ? void 0 : _a.call(handleRequestOptions, request);
             return;

package/lib/esm/mockServiceWorker.js

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