msw 0.27.1 → 0.28.2

package/lib/esm/index.js

@@ -1,7 +1,7 @@
 export { i as context } from './index-deps.js';
-import { c as createCommonjsModule, a as commonjsGlobal, _ as __awaiter, g as getPublicUrlFromRequest, p as parseBody, N as NetworkError } from './RequestHandler-deps.js';
-export { R as RequestHandler, f as compose, b as createResponseComposition, e as defaultContext, d as defaultResponse, m as matchRequestUrl, r as response } from './RequestHandler-deps.js';
-import { H as Headers, h as headersToList, j as jsonParse, i as isNodeProcess } from './fetch-deps.js';
+import { c as createCommonjsModule, a as commonjsGlobal, l as lib$2, j as jsonParse, i as isNodeProcess } from './fetch-deps.js';
+import { _ as __awaiter, g as getPublicUrlFromRequest, p as parseBody, N as NetworkError } from './RequestHandler-deps.js';
+export { R as RequestHandler, b as compose, c as createResponseComposition, a as defaultContext, d as defaultResponse, m as matchRequestUrl, r as response } from './RequestHandler-deps.js';
 import { p as parseGraphQLRequest, G as GraphQLHandler } from './graphql-deps.js';
 export { G as GraphQLHandler, g as graphql, a as graphqlContext } from './graphql-deps.js';
 import { R as RestHandler, i as isStringEqual } from './rest-deps.js';
@@ -438,31 +438,52 @@ function unwrapListeners(arr) {
 
 function once(emitter, name) {
   return new Promise(function (resolve, reject) {
-    function eventListener() {
-      if (errorListener !== undefined) {
+    function errorListener(err) {
+      emitter.removeListener(name, resolver);
+      reject(err);
+    }
+
+    function resolver() {
+      if (typeof emitter.removeListener === 'function') {
         emitter.removeListener('error', errorListener);
       }
       resolve([].slice.call(arguments));
-    }    var errorListener;
-
-    // Adding an error listener is not optional because
-    // if an error is thrown on an event emitter we cannot
-    // guarantee that the actual event we are waiting will
-    // be fired. The result could be a silent way to create
-    // memory or file descriptor leaks, which is something
-    // we should avoid.
+    }
+    eventTargetAgnosticAddListener(emitter, name, resolver, { once: true });
     if (name !== 'error') {
-      errorListener = function errorListener(err) {
-        emitter.removeListener(name, eventListener);
-        reject(err);
-      };
-
-      emitter.once('error', errorListener);
+      addErrorHandlerIfEventEmitter(emitter, errorListener, { once: true });
     }
-
-    emitter.once(name, eventListener);
   });
 }
+
+function addErrorHandlerIfEventEmitter(emitter, handler, flags) {
+  if (typeof emitter.on === 'function') {
+    eventTargetAgnosticAddListener(emitter, 'error', handler, flags);
+  }
+}
+
+function eventTargetAgnosticAddListener(emitter, name, listener, flags) {
+  if (typeof emitter.on === 'function') {
+    if (flags.once) {
+      emitter.once(name, listener);
+    } else {
+      emitter.on(name, listener);
+    }
+  } else if (typeof emitter.addEventListener === 'function') {
+    // EventTarget does not have `error` event semantics like Node
+    // EventEmitters, we do not listen for `error` events here.
+    emitter.addEventListener(name, function wrapListener(arg) {
+      // IE does not have builtin `{ once: true }` support so we
+      // have to do it manually.
+      if (flags.once) {
+        emitter.removeEventListener(name, wrapListener);
+      }
+      listener(arg);
+    });
+  } else {
+    throw new TypeError('The "emitter" argument must be of type EventEmitter. Received type ' + typeof emitter);
+  }
+}
 events.once = once_1;
 
 var StrictEventEmitter_1 = createCommonjsModule(function (module, exports) {
@@ -690,9 +711,17 @@ const getResponse = (request, handlers) => __awaiter(void 0, void 0, void 0, fun
             return acc;
         }
         const result = yield handler.run(request);
-        if (result === null || !result.response || result.handler.shouldSkip) {
+        if (result === null || result.handler.shouldSkip) {
             return null;
         }
+        if (!result.response) {
+            return {
+                request: result.request,
+                handler: result.handler,
+                response: undefined,
+                parsedResult: result.parsedResult,
+            };
+        }
         if (result.response.once) {
             handler.markAsSkipped(true);
         }
@@ -956,7 +985,9 @@ function parseString(setCookieValue, options) {
     value = options.decodeValues ? decodeURIComponent(value) : value; // decode cookie value
   } catch (e) {
     console.error(
-      `set-cookie-parser encountered an error while decoding a cookie with value '${value}'. Set options.decodeValues to false to disable this feature.`,
+      "set-cookie-parser encountered an error while decoding a cookie with value '" +
+        value +
+        "'. Set options.decodeValues to false to disable this feature.",
       e
     );
   }
@@ -1234,8 +1265,14 @@ class CookieStore {
         if (persistedCookies) {
             try {
                 const parsedCookies = JSON.parse(persistedCookies);
-                parsedCookies.forEach(([origin, cookie]) => {
-                    this.store.set(origin, new Map(cookie));
+                parsedCookies.forEach(([origin, cookies]) => {
+                    this.store.set(origin, new Map(cookies.map((_a) => {
+                        var [token, _b] = _a, { expires } = _b, cookie = __rest(_b, ["expires"]);
+                        return [
+                            token,
+                            expires === undefined ? cookie : Object.assign(Object.assign({}, cookie), { expires: new Date(expires) })
+                        ];
+                    })));
                 });
             }
             catch (error) {
@@ -1362,7 +1399,7 @@ function parseWorkerRequest(rawRequest) {
         destination: rawRequest.destination,
         body: pruneGetRequestBody(rawRequest),
         bodyUsed: rawRequest.bodyUsed,
-        headers: new Headers(rawRequest.headers),
+        headers: new lib$2.Headers(rawRequest.headers),
     };
     // Set document cookies on the request.
     setRequestCookies(request);
@@ -1402,7 +1439,7 @@ const createRequestListener = (context, options) => {
                 return channel.send({ type: 'MOCK_NOT_FOUND' });
             }
             readResponseCookies(request, response);
-            const responseWithSerializedHeaders = Object.assign(Object.assign({}, response), { headers: headersToList(response.headers) });
+            const responseWithSerializedHeaders = Object.assign(Object.assign({}, response), { headers: lib$2.headersToList(response.headers) });
             if (!options.quiet) {
                 setTimeout(() => {
                     handler.log(publicRequest, responseWithSerializedHeaders, handler, parsedRequest);
@@ -1450,8 +1487,8 @@ function requestIntegrityCheck(context, serviceWorker) {
         const { payload: actualChecksum } = yield context.events.once('INTEGRITY_CHECK_RESPONSE');
         // Compare the response from the Service Worker and the
         // global variable set by webpack upon build.
-        if (actualChecksum !== "f7d0ed371e596d181f62c6f68c4b7baf") {
-            throw new Error(`Currently active Service Worker (${actualChecksum}) is behind the latest published one (${"f7d0ed371e596d181f62c6f68c4b7baf"}).`);
+        if (actualChecksum !== "82ef9b96d8393b6da34527d1d6e19187") {
+            throw new Error(`Currently active Service Worker (${actualChecksum}) is behind the latest published one (${"82ef9b96d8393b6da34527d1d6e19187"}).`);
         }
         return serviceWorker;
     });

package/lib/esm/index2.js

@@ -1,3 +1,3 @@
-export { d as delay, f as fetch, b as json, a as set, s as status } from './fetch-deps.js';
+export { d as delay, f as fetch, e as json, b as set, s as status } from './fetch-deps.js';
 export { b as body, c as cookie, t as text, x as xml } from './xml-deps.js';
 export { d as data, e as errors } from './errors-deps.js';

package/lib/esm/mockServiceWorker.js

@@ -7,7 +7,7 @@
 /* eslint-disable */
 /* tslint:disable */
 
-const INTEGRITY_CHECKSUM = 'f7d0ed371e596d181f62c6f68c4b7baf'
+const INTEGRITY_CHECKSUM = '82ef9b96d8393b6da34527d1d6e19187'
 const bypassHeaderName = 'x-msw-bypass'
 const activeClientIds = new Set()
 
@@ -114,22 +114,24 @@ async function handleRequest(event, requestId) {
   // Send back the response clone for the "response:*" life-cycle events.
   // Ensure MSW is active and ready to handle the message, otherwise
   // this message will pend indefinitely.
-  if (activeClientIds.has(client.id)) {
-    const clonedResponse = response.clone()
-
-    sendToClient(client, {
-      type: 'RESPONSE',
-      payload: {
-        requestId,
-        type: clonedResponse.type,
-        ok: clonedResponse.ok,
-        status: clonedResponse.status,
-        statusText: clonedResponse.statusText,
-        body: clonedResponse.body === null ? null : await clonedResponse.text(),
-        headers: serializeHeaders(clonedResponse.headers),
-        redirected: clonedResponse.redirected,
-      },
-    })
+  if (client && activeClientIds.has(client.id)) {
+    ;(async function () {
+      const clonedResponse = response.clone()
+      sendToClient(client, {
+        type: 'RESPONSE',
+        payload: {
+          requestId,
+          type: clonedResponse.type,
+          ok: clonedResponse.ok,
+          status: clonedResponse.status,
+          statusText: clonedResponse.statusText,
+          body:
+            clonedResponse.body === null ? null : await clonedResponse.text(),
+          headers: serializeHeaders(clonedResponse.headers),
+          redirected: clonedResponse.redirected,
+        },
+      })
+    })()
   }
 
   return response

package/lib/esm/rest-deps.js

@@ -1,5 +1,5 @@
-import { R as RequestHandler, h as getUrlByMask, m as matchRequestUrl, g as getPublicUrlFromRequest, i as prepareRequest, j as prepareResponse, k as getTimestamp, l as getStatusCodeColor } from './RequestHandler-deps.js';
-import { a as set, s as status, b as json, d as delay, f as fetch } from './fetch-deps.js';
+import { R as RequestHandler, e as getUrlByMask, m as matchRequestUrl, g as getPublicUrlFromRequest, f as prepareRequest, h as prepareResponse, i as getTimestamp, j as getStatusCodeColor } from './RequestHandler-deps.js';
+import { b as set, s as status, e as json, d as delay, f as fetch } from './fetch-deps.js';
 import { c as cookie, b as body, t as text, x as xml } from './xml-deps.js';
 
 /**
@@ -72,7 +72,7 @@ ${queryParams
         return matchRequestUrl(request.url, this.info.mask);
     }
     getPublicRequest(request, parsedResult) {
-        return Object.assign(Object.assign({}, request), { params: parsedResult.params });
+        return Object.assign(Object.assign({}, request), { params: parsedResult.params || {} });
     }
     predicate(request, parsedResult) {
         return (isStringEqual(this.info.method, request.method) && parsedResult.matches);