msw 2.0.14 → 2.1.0

package/lib/browser/index.js

@@ -1,25 +1,8 @@
 "use strict";
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -33,26 +16,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 
 // src/browser/index.ts
 var browser_exports = {};
@@ -67,7 +30,7 @@ var import_outvariant = require("outvariant");
 var import_is_node_process = require("is-node-process");
 
 // src/browser/setupWorker/start/createStartHandler.ts
-var import_until3 = require("@open-draft/until");
+var import_until2 = require("@open-draft/until");
 var import_devUtils6 = require("../core/utils/internal/devUtils.js");
 
 // src/browser/setupWorker/start/utils/getWorkerInstance.ts
@@ -96,9 +59,9 @@ function getWorkerByRegistration(registration, absoluteWorkerUrl, findWorker) {
 }
 
 // src/browser/setupWorker/start/utils/getWorkerInstance.ts
-var getWorkerInstance = (_0, ..._1) => __async(void 0, [_0, ..._1], function* (url, options = {}, findWorker) {
+var getWorkerInstance = async (url, options = {}, findWorker) => {
   const absoluteWorkerUrl = getAbsoluteWorkerUrl(url);
-  const mockRegistrations = yield navigator.serviceWorker.getRegistrations().then(
+  const mockRegistrations = await navigator.serviceWorker.getRegistrations().then(
     (registrations) => registrations.filter(
       (registration) => getWorkerByRegistration(registration, absoluteWorkerUrl, findWorker)
     )
@@ -119,21 +82,21 @@ var getWorkerInstance = (_0, ..._1) => __async(void 0, [_0, ..._1], function* (u
       ];
     });
   }
-  const registrationResult = yield (0, import_until.until)(
-    () => __async(void 0, null, function* () {
-      const registration = yield navigator.serviceWorker.register(url, options);
+  const registrationResult = await (0, import_until.until)(
+    async () => {
+      const registration = await navigator.serviceWorker.register(url, options);
       return [
         // Compare existing worker registration by its worker URL,
         // to prevent irrelevant workers to resolve here (such as Codesandbox worker).
         getWorkerByRegistration(registration, absoluteWorkerUrl, findWorker),
         registration
       ];
-    })
+    }
   );
   if (registrationResult.error) {
     const isWorkerMissing = registrationResult.error.message.includes("(404)");
     if (isWorkerMissing) {
-      const scopeUrl = new URL((options == null ? void 0 : options.scope) || "/", location.href);
+      const scopeUrl = new URL(options?.scope || "/", location.href);
       throw new Error(
         import_devUtils.devUtils.formatMessage(`Failed to register a Service Worker for scope ('${scopeUrl.href}') with script ('${absoluteWorkerUrl}'): Service Worker script does not exist at the given path.
 
@@ -150,7 +113,7 @@ Learn more about creating the Service Worker script: https://mswjs.io/docs/cli/i
     );
   }
   return registrationResult.data;
-});
+};
 
 // src/browser/setupWorker/start/utils/enableMocking.ts
 var import_devUtils3 = require("../core/utils/internal/devUtils.js");
@@ -182,23 +145,20 @@ function printStartMessage(args = {}) {
 }
 
 // src/browser/setupWorker/start/utils/enableMocking.ts
-function enableMocking(context, options) {
-  return __async(this, null, function* () {
-    var _a, _b;
-    context.workerChannel.send("MOCK_ACTIVATE");
-    yield context.events.once("MOCKING_ENABLED");
-    if (context.isMockingEnabled) {
-      import_devUtils3.devUtils.warn(
-        `Found a redundant "worker.start()" call. Note that starting the worker while mocking is already enabled will have no effect. Consider removing this "worker.start()" call.`
-      );
-      return;
-    }
-    context.isMockingEnabled = true;
-    printStartMessage({
-      quiet: options.quiet,
-      workerScope: (_a = context.registration) == null ? void 0 : _a.scope,
-      workerUrl: (_b = context.worker) == null ? void 0 : _b.scriptURL
-    });
+async function enableMocking(context, options) {
+  context.workerChannel.send("MOCK_ACTIVATE");
+  await context.events.once("MOCKING_ENABLED");
+  if (context.isMockingEnabled) {
+    import_devUtils3.devUtils.warn(
+      `Found a redundant "worker.start()" call. Note that starting the worker while mocking is already enabled will have no effect. Consider removing this "worker.start()" call.`
+    );
+    return;
+  }
+  context.isMockingEnabled = true;
+  printStartMessage({
+    quiet: options.quiet,
+    workerScope: context.registration?.scope,
+    workerUrl: context.worker?.scriptURL
   });
 }
 
@@ -223,9 +183,10 @@ function pruneGetRequestBody(request) {
 
 // src/browser/utils/parseWorkerRequest.ts
 function parseWorkerRequest(incomingRequest) {
-  return new Request(incomingRequest.url, __spreadProps(__spreadValues({}, incomingRequest), {
+  return new Request(incomingRequest.url, {
+    ...incomingRequest,
     body: pruneGetRequestBody(incomingRequest)
-  }));
+  });
 }
 
 // src/browser/setupWorker/start/createRequestListener.ts
@@ -233,15 +194,13 @@ var import_handleRequest = require("../core/utils/handleRequest.js");
 var import_devUtils4 = require("../core/utils/internal/devUtils.js");
 var import_toResponseInit = require("../core/utils/toResponseInit.js");
 var createRequestListener = (context, options) => {
-  return (event, message) => __async(void 0, null, function* () {
-    var _b;
+  return async (event, message) => {
     const messageChannel = new WorkerChannel(event.ports[0]);
     const requestId = message.payload.id;
     const request = parseWorkerRequest(message.payload);
     const requestCloneForLogs = request.clone();
     try {
-      let _a;
-      yield (0, import_handleRequest.handleRequest)(
+      await (0, import_handleRequest.handleRequest)(
         request,
         requestId,
         context.requestHandlers,
@@ -251,36 +210,36 @@ var createRequestListener = (context, options) => {
           onPassthroughResponse() {
             messageChannel.postMessage("NOT_FOUND");
           },
-          onMockedResponse(_0, _1) {
-            return __async(this, arguments, function* (response, { handler, parsedResult }) {
-              const responseClone = response.clone();
-              const responseCloneForLogs = response.clone();
-              const responseInit = (0, import_toResponseInit.toResponseInit)(response);
-              if (context.supports.readableStreamTransfer) {
-                const responseStreamOrNull = response.body;
-                messageChannel.postMessage(
-                  "MOCK_RESPONSE",
-                  __spreadProps(__spreadValues({}, responseInit), {
-                    body: responseStreamOrNull
-                  }),
-                  responseStreamOrNull ? [responseStreamOrNull] : void 0
-                );
-              } else {
-                const responseBufferOrNull = response.body === null ? null : yield responseClone.arrayBuffer();
-                messageChannel.postMessage("MOCK_RESPONSE", __spreadProps(__spreadValues({}, responseInit), {
-                  body: responseBufferOrNull
-                }));
-              }
-              if (!options.quiet) {
-                context.emitter.once("response:mocked", () => {
-                  handler.log({
-                    request: requestCloneForLogs,
-                    response: responseCloneForLogs,
-                    parsedResult
-                  });
+          async onMockedResponse(response, { handler, parsedResult }) {
+            const responseClone = response.clone();
+            const responseCloneForLogs = response.clone();
+            const responseInit = (0, import_toResponseInit.toResponseInit)(response);
+            if (context.supports.readableStreamTransfer) {
+              const responseStreamOrNull = response.body;
+              messageChannel.postMessage(
+                "MOCK_RESPONSE",
+                {
+                  ...responseInit,
+                  body: responseStreamOrNull
+                },
+                responseStreamOrNull ? [responseStreamOrNull] : void 0
+              );
+            } else {
+              const responseBufferOrNull = response.body === null ? null : await responseClone.arrayBuffer();
+              messageChannel.postMessage("MOCK_RESPONSE", {
+                ...responseInit,
+                body: responseBufferOrNull
+              });
+            }
+            if (!options.quiet) {
+              context.emitter.once("response:mocked", () => {
+                handler.log({
+                  request: requestCloneForLogs,
+                  response: responseCloneForLogs,
+                  parsedResult
                 });
-              }
-            });
+              });
+            }
           }
         }
       );
@@ -294,7 +253,7 @@ var createRequestListener = (context, options) => {
 This exception has been gracefully handled as a 500 response, however, it's strongly recommended to resolve this error, as it indicates a mistake in your code. If you wish to mock an error response, please see this guide: https://mswjs.io/docs/recipes/mocking-error-responses`,
           request.method,
           request.url,
-          (_b = error.stack) != null ? _b : error
+          error.stack ?? error
         );
         messageChannel.postMessage("MOCK_RESPONSE", {
           status: 500,
@@ -310,50 +269,29 @@ This exception has been gracefully handled as a 500 response, however, it's stro
         });
       }
     }
-  });
+  };
 };
 
 // src/browser/utils/requestIntegrityCheck.ts
-function requestIntegrityCheck(context, serviceWorker) {
-  return __async(this, null, function* () {
-    context.workerChannel.send("INTEGRITY_CHECK_REQUEST");
-    const { payload: actualChecksum } = yield context.events.once(
-      "INTEGRITY_CHECK_RESPONSE"
+async function requestIntegrityCheck(context, serviceWorker) {
+  context.workerChannel.send("INTEGRITY_CHECK_REQUEST");
+  const { payload: actualChecksum } = await context.events.once(
+    "INTEGRITY_CHECK_RESPONSE"
+  );
+  if (actualChecksum !== "223d191a56023cd36aa88c802961b911") {
+    throw new Error(
+      `Currently active Service Worker (${actualChecksum}) is behind the latest published one (${"223d191a56023cd36aa88c802961b911"}).`
     );
-    if (actualChecksum !== "c5f7f8e188b673ea4e677df7ea3c5a39") {
-      throw new Error(
-        `Currently active Service Worker (${actualChecksum}) is behind the latest published one (${"c5f7f8e188b673ea4e677df7ea3c5a39"}).`
-      );
-    }
-    return serviceWorker;
-  });
-}
-
-// src/browser/utils/deferNetworkRequestsUntil.ts
-var import_until2 = require("@open-draft/until");
-function deferNetworkRequestsUntil(predicatePromise) {
-  const originalXhrSend = window.XMLHttpRequest.prototype.send;
-  window.XMLHttpRequest.prototype.send = function(...args) {
-    (0, import_until2.until)(() => predicatePromise).then(() => {
-      window.XMLHttpRequest.prototype.send = originalXhrSend;
-      this.send(...args);
-    });
-  };
-  const originalFetch = window.fetch;
-  window.fetch = (...args) => __async(this, null, function* () {
-    yield (0, import_until2.until)(() => predicatePromise);
-    window.fetch = originalFetch;
-    return window.fetch(...args);
-  });
+  }
+  return serviceWorker;
 }
 
 // src/browser/setupWorker/start/createResponseListener.ts
 var import_interceptors = require("@mswjs/interceptors");
 function createResponseListener(context) {
   return (_, message) => {
-    var _a;
     const { payload: responseJson } = message;
-    if ((_a = responseJson.type) == null ? void 0 : _a.includes("opaque")) {
+    if (responseJson.type?.includes("opaque")) {
       return;
     }
     const response = responseJson.status === 0 ? Response.error() : new Response(
@@ -384,7 +322,7 @@ function createResponseListener(context) {
 // src/browser/setupWorker/start/utils/validateWorkerScope.ts
 var import_devUtils5 = require("../core/utils/internal/devUtils.js");
 function validateWorkerScope(registration, options) {
-  if (!(options == null ? void 0 : options.quiet) && !location.href.startsWith(registration.scope)) {
+  if (!options?.quiet && !location.href.startsWith(registration.scope)) {
     import_devUtils5.devUtils.warn(
       `Cannot intercept requests on this page because it's outside of the worker's scope ("${registration.scope}"). If you wish to mock API requests on this page, you must resolve this scope issue.
 
@@ -397,21 +335,21 @@ function validateWorkerScope(registration, options) {
 // src/browser/setupWorker/start/createStartHandler.ts
 var createStartHandler = (context) => {
   return function start(options, customOptions) {
-    const startWorkerInstance = () => __async(this, null, function* () {
+    const startWorkerInstance = async () => {
       context.events.removeAllListeners();
       context.workerChannel.on(
         "REQUEST",
         createRequestListener(context, options)
       );
       context.workerChannel.on("RESPONSE", createResponseListener(context));
-      const instance = yield getWorkerInstance(
+      const instance = await getWorkerInstance(
         options.serviceWorker.url,
         options.serviceWorker.options,
         options.findWorker
       );
       const [worker, registration] = instance;
       if (!worker) {
-        const missingWorkerMessage = (customOptions == null ? void 0 : customOptions.findWorker) ? import_devUtils6.devUtils.formatMessage(
+        const missingWorkerMessage = customOptions?.findWorker ? import_devUtils6.devUtils.formatMessage(
           `Failed to locate the Service Worker registration using a custom "findWorker" predicate.
 
 Please ensure that the custom predicate properly locates the Service Worker registration at "%s".
@@ -437,7 +375,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
         }
         window.clearInterval(context.keepAliveInterval);
       });
-      const integrityCheckResult = yield (0, import_until3.until)(
+      const integrityCheckResult = await (0, import_until2.until)(
         () => requestIntegrityCheck(context, worker)
       );
       if (integrityCheckResult.error) {
@@ -456,12 +394,12 @@ If this message still persists after updating, please report an issue: https://g
       );
       validateWorkerScope(registration, context.startOptions);
       return registration;
-    });
+    };
     const workerRegistration = startWorkerInstance().then(
-      (registration) => __async(this, null, function* () {
+      async (registration) => {
         const pendingInstance = registration.installing || registration.waiting;
         if (pendingInstance) {
-          yield new Promise((resolve) => {
+          await new Promise((resolve) => {
             pendingInstance.addEventListener("statechange", () => {
               if (pendingInstance.state === "activated") {
                 return resolve();
@@ -469,15 +407,12 @@ If this message still persists after updating, please report an issue: https://g
             });
           });
         }
-        yield enableMocking(context, options).catch((error) => {
-          throw new Error(`Failed to enable mocking: ${error == null ? void 0 : error.message}`);
+        await enableMocking(context, options).catch((error) => {
+          throw new Error(`Failed to enable mocking: ${error?.message}`);
         });
         return registration;
-      })
+      }
     );
-    if (options.waitUntilReady) {
-      deferNetworkRequestsUntil(workerRegistration);
-    }
     return workerRegistration;
   };
 };
@@ -500,7 +435,6 @@ function printStopMessage(args = {}) {
 // src/browser/setupWorker/stop/createStop.ts
 var createStop = (context) => {
   return function stop() {
-    var _a;
     if (!context.isMockingEnabled) {
       import_devUtils8.devUtils.warn(
         'Found a redundant "worker.stop()" call. Note that stopping the worker while mocking already stopped has no effect. Consider removing this "worker.stop()" call.'
@@ -510,7 +444,7 @@ var createStop = (context) => {
     context.workerChannel.send("MOCK_DEACTIVATE");
     context.isMockingEnabled = false;
     window.clearInterval(context.keepAliveInterval);
-    printStopMessage({ quiet: (_a = context.startOptions) == null ? void 0 : _a.quiet });
+    printStopMessage({ quiet: context.startOptions?.quiet });
   };
 };
 
@@ -539,9 +473,9 @@ function createFallbackRequestListener(context, options) {
     name: "fallback",
     interceptors: [new import_fetch.FetchInterceptor(), new import_XMLHttpRequest.XMLHttpRequestInterceptor()]
   });
-  interceptor.on("request", (_0) => __async(this, [_0], function* ({ request, requestId }) {
+  interceptor.on("request", async ({ request, requestId }) => {
     const requestCloneForLogs = request.clone();
-    const response = yield (0, import_handleRequest2.handleRequest)(
+    const response = await (0, import_handleRequest2.handleRequest)(
       request,
       requestId,
       context.requestHandlers,
@@ -564,7 +498,7 @@ function createFallbackRequestListener(context, options) {
     if (response) {
       request.respondWith(response);
     }
-  }));
+  });
   interceptor.on(
     "response",
     ({ response, isMockedResponse, request, requestId }) => {
@@ -584,27 +518,24 @@ function createFallbackRequestListener(context, options) {
 
 // src/browser/setupWorker/start/createFallbackStart.ts
 function createFallbackStart(context) {
-  return function start(options) {
-    return __async(this, null, function* () {
-      context.fallbackInterceptor = createFallbackRequestListener(
-        context,
-        options
-      );
-      printStartMessage({
-        message: "Mocking enabled (fallback mode).",
-        quiet: options.quiet
-      });
-      return void 0;
+  return async function start(options) {
+    context.fallbackInterceptor = createFallbackRequestListener(
+      context,
+      options
+    );
+    printStartMessage({
+      message: "Mocking enabled (fallback mode).",
+      quiet: options.quiet
     });
+    return void 0;
   };
 }
 
 // src/browser/setupWorker/stop/createFallbackStop.ts
 function createFallbackStop(context) {
   return function stop() {
-    var _a, _b;
-    (_a = context.fallbackInterceptor) == null ? void 0 : _a.dispose();
-    printStopMessage({ quiet: (_b = context.startOptions) == null ? void 0 : _b.quiet });
+    context.fallbackInterceptor?.dispose();
+    printStopMessage({ quiet: context.startOptions?.quiet });
   };
 }
 
@@ -629,10 +560,12 @@ function supportsReadableStreamTransfer() {
 
 // src/browser/setupWorker/setupWorker.ts
 var SetupWorkerApi = class extends import_SetupApi.SetupApi {
+  context;
+  startHandler = null;
+  stopHandler = null;
+  listeners;
   constructor(...handlers) {
     super(...handlers);
-    this.startHandler = null;
-    this.stopHandler = null;
     (0, import_outvariant.invariant)(
       !(0, import_is_node_process.isNodeProcess)(),
       import_devUtils9.devUtils.formatMessage(
@@ -668,8 +601,7 @@ var SetupWorkerApi = class extends import_SetupApi.SetupApi {
           });
         },
         send: (type) => {
-          var _a;
-          (_a = this.context.worker) == null ? void 0 : _a.postMessage(type);
+          this.context.worker?.postMessage(type);
         }
       },
       events: {
@@ -734,14 +666,17 @@ var SetupWorkerApi = class extends import_SetupApi.SetupApi {
     this.stopHandler = context.supports.serviceWorkerApi ? createFallbackStop(context) : createStop(context);
     return context;
   }
-  start() {
-    return __async(this, arguments, function* (options = {}) {
-      this.context.startOptions = (0, import_mergeRight2.mergeRight)(
-        DEFAULT_START_OPTIONS,
-        options
+  async start(options = {}) {
+    if (options.waitUntilReady === true) {
+      import_devUtils9.devUtils.warn(
+        'The "waitUntilReady" option has been deprecated. Please remove it from this "worker.start()" call. Follow the recommended Browser integration (https://mswjs.io/docs/integrations/browser) to eliminate any race conditions between the Service Worker registration and any requests made by your application on initial render.'
       );
-      return yield this.startHandler(this.context.startOptions, options);
-    });
+    }
+    this.context.startOptions = (0, import_mergeRight2.mergeRight)(
+      DEFAULT_START_OPTIONS,
+      options
+    );
+    return await this.startHandler(this.context.startOptions, options);
   }
   stop() {
     super.dispose();