msw 0.33.1 → 0.35.0

package/lib/esm/RequestHandler-deps.js

@@ -41,6 +41,65 @@ var lib = {};
 
 var invariant$1 = {};
 
+var format$1 = {};
+
+Object.defineProperty(format$1, "__esModule", { value: true });
+format$1.format = void 0;
+var POSITIONALS_EXP = /(%?)(%([sdjo]))/g;
+function serializePositional(positional, flag) {
+    switch (flag) {
+        // Strings.
+        case 's':
+            return positional;
+        // Digits.
+        case 'd':
+        case 'i':
+            return Number(positional);
+        // JSON.
+        case 'j':
+            return JSON.stringify(positional);
+        // Objects.
+        case 'o': {
+            // Preserve stings to prevent extra quotes around them.
+            if (typeof positional === 'string') {
+                return positional;
+            }
+            var json = JSON.stringify(positional);
+            // If the positional isn't serializable, return it as-is.
+            if (json === '{}' || json === '[]' || /^\[object .+?\]$/.test(json)) {
+                return positional;
+            }
+            return json;
+        }
+    }
+}
+function format(message) {
+    var positionals = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        positionals[_i - 1] = arguments[_i];
+    }
+    if (positionals.length === 0) {
+        return message;
+    }
+    var positionalIndex = 0;
+    var formattedMessage = message.replace(POSITIONALS_EXP, function (match, isEscaped, _, flag) {
+        var positional = positionals[positionalIndex];
+        var value = serializePositional(positional, flag);
+        if (!isEscaped) {
+            positionalIndex++;
+            return value;
+        }
+        return match;
+    });
+    // Append unresolved positionals to string as-is.
+    if (positionalIndex < positionals.length) {
+        formattedMessage += " " + positionals.slice(positionalIndex).join(' ');
+    }
+    formattedMessage = formattedMessage.replace(/%{2,2}/g, '%');
+    return formattedMessage;
+}
+format$1.format = format;
+
 var __extends = (commonjsGlobal && commonjsGlobal.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -62,21 +121,9 @@ var __spreadArray = (commonjsGlobal && commonjsGlobal.__spreadArray) || function
     return to;
 };
 Object.defineProperty(invariant$1, "__esModule", { value: true });
-invariant$1.invariant = invariant$1.InvariantError = invariant$1.interpolate = void 0;
+invariant$1.invariant = invariant$1.InvariantError = void 0;
+var format_1 = format$1;
 var STACK_FRAMES_TO_IGNORE = 2;
-function interpolate(message) {
-    var positionals = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        positionals[_i - 1] = arguments[_i];
-    }
-    var index = 0;
-    return message.replace(/%[s|d|o]/g, function (match) {
-        var _a;
-        var value = (_a = positionals[index++]) !== null && _a !== void 0 ? _a : match;
-        return typeof value === 'object' ? JSON.stringify(value) : value;
-    });
-}
-invariant$1.interpolate = interpolate;
 var InvariantError = /** @class */ (function (_super) {
     __extends(InvariantError, _super);
     function InvariantError(message) {
@@ -86,7 +133,7 @@ var InvariantError = /** @class */ (function (_super) {
         }
         var _this = _super.call(this, message) || this;
         _this.name = 'Invariant Violation';
-        _this.message = interpolate.apply(void 0, __spreadArray([message], positionals));
+        _this.message = format_1.format.apply(void 0, __spreadArray([message], positionals));
         if (_this.stack) {
             var prevStack = _this.stack;
             _this.stack = prevStack
@@ -123,6 +170,7 @@ var __exportStar = (commonjsGlobal && commonjsGlobal.__exportStar) || function(m
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(invariant$1, exports);
+__exportStar(format$1, exports);
 }(lib));
 
 const LIBRARY_PREFIX = '[MSW]';
@@ -130,7 +178,7 @@ const LIBRARY_PREFIX = '[MSW]';
  * Formats a given message by appending the library's prefix string.
  */
 function formatMessage(message, ...positionals) {
-    const interpolatedMessage = lib.interpolate(message, ...positionals);
+    const interpolatedMessage = lib.format(message, ...positionals);
     return `${LIBRARY_PREFIX} ${interpolatedMessage}`;
 }
 /**
@@ -265,17 +313,23 @@ const getPublicUrlFromRequest = (request) => {
         : new URL(request.url.pathname, `${request.url.protocol}//${request.url.host}`).href;
 };
 
+var StatusCodeColor;
+(function (StatusCodeColor) {
+    StatusCodeColor["Success"] = "#69AB32";
+    StatusCodeColor["Warning"] = "#F0BB4B";
+    StatusCodeColor["Danger"] = "#E95F5D";
+})(StatusCodeColor || (StatusCodeColor = {}));
 /**
  * Returns a HEX color for a given response status code number.
  */
 function getStatusCodeColor(status) {
     if (status < 300) {
-        return '#69AB32';
+        return StatusCodeColor.Success;
     }
     if (status < 400) {
-        return '#F0BB4B';
+        return StatusCodeColor.Warning;
     }
-    return '#E95F5D';
+    return StatusCodeColor.Danger;
 }
 
 /**
@@ -381,7 +435,10 @@ function getAbsoluteUrl(path, baseUrl) {
     // Resolve a relative request URL against a given custom "baseUrl"
     // or the current location (in the case of browser/browser-like environments).
     const origin = baseUrl || (typeof location !== 'undefined' && location.origin);
-    return origin ? new URL(path, origin).href : path;
+    return origin
+        ? // Encode and decode the path to preserve escaped characters.
+            decodeURI(new URL(encodeURI(path), origin).href)
+        : path;
 }
 
 /**
@@ -576,4 +633,4 @@ class RequestHandler {
     }
 }
 
-export { NetworkError as N, RequestHandler as R, __awaiter as _, getCleanUrl$1 as a, defaultResponse as b, createResponseComposition as c, devUtils as d, defaultContext as e, compose as f, getPublicUrlFromRequest as g, cleanUrl as h, getSearchParams as i, prepareRequest as j, prepareResponse as k, lib as l, matchRequestUrl as m, getTimestamp as n, getStatusCodeColor as o, parseBody as p, __rest as q, response as r };
+export { NetworkError as N, RequestHandler as R, __awaiter as _, getCleanUrl$1 as a, defaultResponse as b, createResponseComposition as c, devUtils as d, defaultContext as e, compose as f, getPublicUrlFromRequest as g, cleanUrl as h, getSearchParams as i, prepareRequest as j, prepareResponse as k, lib as l, matchRequestUrl as m, getStatusCodeColor as n, getTimestamp as o, parseBody as p, __rest as q, response as r };

package/lib/esm/graphql-deps.js

@@ -1,6 +1,6 @@
 import { j as jsonParse, b as set, s as status, e as delay, f as fetch, d as cookie } from './fetch-deps.js';
 import { d as data, e as errors } from './errors-deps.js';
-import { g as getPublicUrlFromRequest, d as devUtils, q as __rest, R as RequestHandler, m as matchRequestUrl, j as prepareRequest, k as prepareResponse, n as getTimestamp, o as getStatusCodeColor } from './RequestHandler-deps.js';
+import { g as getPublicUrlFromRequest, d as devUtils, q as __rest, R as RequestHandler, m as matchRequestUrl, j as prepareRequest, k as prepareResponse, n as getStatusCodeColor, o as getTimestamp } from './RequestHandler-deps.js';
 
 function _typeof$3(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof$3 = function _typeof(obj) { return typeof obj; }; } else { _typeof$3 = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof$3(obj); }
 
@@ -3124,17 +3124,20 @@ function getTokenKindDesc(kind) {
   return isPunctuatorTokenKind(kind) ? "\"".concat(kind, "\"") : kind;
 }
 
-function parseQuery(query) {
+function parseDocumentNode(node) {
     var _a;
+    const operationDef = node.definitions.find((def) => {
+        return def.kind === 'OperationDefinition';
+    });
+    return {
+        operationType: operationDef === null || operationDef === void 0 ? void 0 : operationDef.operation,
+        operationName: (_a = operationDef === null || operationDef === void 0 ? void 0 : operationDef.name) === null || _a === void 0 ? void 0 : _a.value,
+    };
+}
+function parseQuery(query) {
     try {
         const ast = parse(query);
-        const operationDef = ast.definitions.find((def) => {
-            return def.kind === 'OperationDefinition';
-        });
-        return {
-            operationType: operationDef === null || operationDef === void 0 ? void 0 : operationDef.operation,
-            operationName: (_a = operationDef === null || operationDef === void 0 ? void 0 : operationDef.name) === null || _a === void 0 ? void 0 : _a.value,
-        };
+        return parseDocumentNode(ast);
     }
     catch (error) {
         return error;
@@ -3214,7 +3217,7 @@ function parseGraphQLRequest(request) {
     const parsedResult = parseQuery(query);
     if (parsedResult instanceof Error) {
         const requestPublicUrl = getPublicUrlFromRequest(request);
-        throw new Error(devUtils.formatMessage('Failed to intercept a GraphQL request to "%s %s": cannot parse query. See the error message from the parser below.\n\n%o', request.method, requestPublicUrl, parsedResult.message));
+        throw new Error(devUtils.formatMessage('Failed to intercept a GraphQL request to "%s %s": cannot parse query. See the error message from the parser below.\n\n%s', request.method, requestPublicUrl, parsedResult.message));
     }
     return {
         operationType: parsedResult.operationType,
@@ -3242,16 +3245,33 @@ const graphqlContext = {
     errors,
     cookie,
 };
+function isDocumentNode(value) {
+    if (value == null) {
+        return false;
+    }
+    return typeof value === 'object' && 'kind' in value && 'definitions' in value;
+}
 class GraphQLHandler extends RequestHandler {
     constructor(operationType, operationName, endpoint, resolver) {
+        let resolvedOperationName = operationName;
+        if (isDocumentNode(operationName)) {
+            const parsedNode = parseDocumentNode(operationName);
+            if (parsedNode.operationType !== operationType) {
+                throw new Error(`Failed to create a GraphQL handler: provided a DocumentNode with a mismatched operation type (expected "${operationType}", but got "${parsedNode.operationType}").`);
+            }
+            if (!parsedNode.operationName) {
+                throw new Error(`Failed to create a GraphQL handler: provided a DocumentNode with no operation name.`);
+            }
+            resolvedOperationName = parsedNode.operationName;
+        }
         const header = operationType === 'all'
             ? `${operationType} (origin: ${endpoint.toString()})`
-            : `${operationType} ${operationName} (origin: ${endpoint.toString()})`;
+            : `${operationType} ${resolvedOperationName} (origin: ${endpoint.toString()})`;
         super({
             info: {
                 header,
                 operationType,
-                operationName,
+                operationName: resolvedOperationName,
             },
             ctx: graphqlContext,
             resolver,
@@ -3290,7 +3310,8 @@ Consider naming this operation or using "graphql.operation" request handler to i
     log(request, response, handler, parsedRequest) {
         const loggedRequest = prepareRequest(request);
         const loggedResponse = prepareResponse(response);
-        console.groupCollapsed(devUtils.formatMessage('%s %s (%c%s%c)'), getTimestamp(), `${parsedRequest === null || parsedRequest === void 0 ? void 0 : parsedRequest.operationType} ${parsedRequest === null || parsedRequest === void 0 ? void 0 : parsedRequest.operationName}`, `color:${getStatusCodeColor(response.status)} %s`, response.status, response.statusText, 'color:inherit');
+        const statusColor = getStatusCodeColor(response.status);
+        console.groupCollapsed(devUtils.formatMessage('%s %s (%c%s%c)'), getTimestamp(), `${parsedRequest === null || parsedRequest === void 0 ? void 0 : parsedRequest.operationType} ${parsedRequest === null || parsedRequest === void 0 ? void 0 : parsedRequest.operationName}`, `color:${statusColor}`, `${response.status} ${response.statusText}`, 'color:inherit');
         console.log('Request:', loggedRequest);
         console.log('Handler:', this);
         console.log('Response:', loggedResponse);