@vitest/browser 2.0.0-beta.11 → 2.0.0-beta.13

package/dist/client/__vitest_browser__/{orchestrator-DQ4hbmZ_.js → orchestrator-x0A1t8rC.js}

@@ -1,7 +1,9 @@
-import { c as channel, g as getBrowserState, a as client, b as getConfig, r as relative, d as rpcDone } from "./rpc-D6HtJ5Rb.js";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+import { c as channel, g as getBrowserState, a as client, b as globalChannel, d as getConfig, r as relative } from "./client-dLyjuL0K.js";
 import { http } from "/__virtual_vitest__?id=msw%2Fcore%2Fhttp";
 import { setupWorker } from "/__virtual_vitest__?id=msw%2Fbrowser";
-import "/__virtual_vitest__?id=vitest%2Futils";
 function generateHash(str) {
   let hash = 0;
   if (str.length === 0) {
@@ -21,7 +23,7 @@ function createModuleMocker() {
   const mocks = /* @__PURE__ */ new Map();
   const worker = setupWorker(
     http.get(/.+/, async ({ request }) => {
-      const path = removeTimestamp(request.url.slice(location.origin.length));
+      const path = cleanQuery(request.url.slice(location.origin.length));
       if (!mocks.has(path)) {
         return passthrough();
       }
@@ -107,8 +109,9 @@ function getFactoryExports(id) {
   });
 }
 const timestampRegexp = /(\?|&)t=\d{13}/;
-function removeTimestamp(url2) {
-  return url2.replace(timestampRegexp, "");
+const versionRegexp = /(\?|&)v=\w{8}/;
+function cleanQuery(url2) {
+  return url2.replace(timestampRegexp, "").replace(versionRegexp, "");
 }
 function passthrough() {
   return new Response(null, {
@@ -135,46 +138,191 @@ function injectQuery(url2, queryToInject) {
 }
 const url = new URL(location.href);
 const ID_ALL = "__vitest_all__";
-const iframes = /* @__PURE__ */ new Map();
+class IframeOrchestrator {
+  constructor() {
+    __publicField(this, "cancelled", false);
+    __publicField(this, "runningFiles", /* @__PURE__ */ new Set());
+    __publicField(this, "mocker", createModuleMocker());
+    __publicField(this, "iframes", /* @__PURE__ */ new Map());
+  }
+  async init() {
+    const testFiles = getBrowserState().files;
+    debug("test files", testFiles.join(", "));
+    this.runningFiles.clear();
+    testFiles.forEach((file) => this.runningFiles.add(file));
+    channel.addEventListener(
+      "message",
+      (e) => this.onIframeEvent(e)
+    );
+    globalChannel.addEventListener(
+      "message",
+      (e) => this.onGlobalChannelEvent(e)
+    );
+  }
+  async createTesters(testFiles) {
+    this.cancelled = false;
+    this.runningFiles.clear();
+    testFiles.forEach((file) => this.runningFiles.add(file));
+    const config = getConfig();
+    const container = await getContainer(config);
+    if (config.browser.ui) {
+      container.className = "scrolls";
+      container.textContent = "";
+    }
+    const { width, height } = config.browser.viewport;
+    this.iframes.forEach((iframe) => iframe.remove());
+    this.iframes.clear();
+    if (config.isolate === false) {
+      const iframe = this.createIframe(container, ID_ALL);
+      await setIframeViewport(iframe, width, height);
+      return;
+    }
+    for (const file of testFiles) {
+      if (this.cancelled) {
+        done();
+        return;
+      }
+      const iframe = this.createIframe(container, file);
+      await setIframeViewport(iframe, width, height);
+      await new Promise((resolve) => {
+        channel.addEventListener(
+          "message",
+          function handler(e) {
+            if (e.data.type === "done" || e.data.type === "error") {
+              channel.removeEventListener("message", handler);
+              resolve();
+            }
+          }
+        );
+      });
+    }
+  }
+  createIframe(container, file) {
+    if (this.iframes.has(file)) {
+      this.iframes.get(file).remove();
+      this.iframes.delete(file);
+    }
+    const iframe = document.createElement("iframe");
+    iframe.setAttribute("loading", "eager");
+    iframe.setAttribute(
+      "src",
+      `${url.pathname}__vitest_test__/__test__/${getBrowserState().contextId}/${encodeURIComponent(file)}`
+    );
+    iframe.setAttribute("data-vitest", "true");
+    iframe.style.display = "block";
+    iframe.style.border = "none";
+    iframe.style.zIndex = "1";
+    iframe.style.position = "relative";
+    iframe.setAttribute("allowfullscreen", "true");
+    iframe.setAttribute("allow", "clipboard-write;");
+    iframe.setAttribute("name", "vitest-iframe");
+    this.iframes.set(file, iframe);
+    container.appendChild(iframe);
+    return iframe;
+  }
+  async onGlobalChannelEvent(e) {
+    debug("global channel event", JSON.stringify(e.data));
+    switch (e.data.type) {
+      case "cancel": {
+        this.cancelled = true;
+        break;
+      }
+    }
+  }
+  async onIframeEvent(e) {
+    var _a;
+    debug("iframe event", JSON.stringify(e.data));
+    switch (e.data.type) {
+      case "viewport": {
+        const { width, height, id } = e.data;
+        const iframe = this.iframes.get(id);
+        if (!iframe) {
+          const error = new Error(`Cannot find iframe with id ${id}`);
+          channel.postMessage({
+            type: "viewport:fail",
+            id,
+            error: error.message
+          });
+          await client.rpc.onUnhandledError(
+            {
+              name: "Teardown Error",
+              message: error.message
+            },
+            "Teardown Error"
+          );
+          return;
+        }
+        await setIframeViewport(iframe, width, height);
+        channel.postMessage({ type: "viewport:done", id });
+        break;
+      }
+      case "done": {
+        const filenames = e.data.filenames;
+        filenames.forEach((filename) => this.runningFiles.delete(filename));
+        if (!this.runningFiles.size) {
+          const ui = getUiAPI();
+          if (ui && filenames.length > 1) {
+            const id = generateFileId(filenames[filenames.length - 1]);
+            ui.setCurrentFileId(id);
+          }
+          await done();
+        } else {
+          const iframeId = e.data.id;
+          (_a = this.iframes.get(iframeId)) == null ? void 0 : _a.remove();
+          this.iframes.delete(iframeId);
+        }
+        break;
+      }
+      case "error": {
+        const iframeId = e.data.id;
+        this.iframes.delete(iframeId);
+        await client.rpc.onUnhandledError(e.data.error, e.data.errorType);
+        if (iframeId === ID_ALL) {
+          this.runningFiles.clear();
+        } else {
+          this.runningFiles.delete(iframeId);
+        }
+        if (!this.runningFiles.size) {
+          await done();
+        }
+        break;
+      }
+      case "mock:invalidate":
+        this.mocker.invalidate();
+        break;
+      case "unmock":
+        await this.mocker.unmock(e.data);
+        break;
+      case "mock":
+        await this.mocker.mock(e.data);
+        break;
+      case "mock-factory:error":
+      case "mock-factory:response":
+        break;
+      default: {
+        e.data;
+        await client.rpc.onUnhandledError(
+          {
+            name: "Unexpected Event",
+            message: `Unexpected event: ${e.data.type}`
+          },
+          "Unexpected Event"
+        );
+        await done();
+      }
+    }
+  }
+}
+const orchestrator = new IframeOrchestrator();
 let promiseTesters;
 getBrowserState().createTesters = async (files) => {
   await promiseTesters;
-  promiseTesters = createTesters(files).finally(() => {
+  promiseTesters = orchestrator.createTesters(files).finally(() => {
     promiseTesters = void 0;
   });
   await promiseTesters;
 };
-function debug(...args) {
-  const debug2 = getConfig().env.VITEST_BROWSER_DEBUG;
-  if (debug2 && debug2 !== "false") {
-    client.rpc.debug(...args.map(String));
-  }
-}
-function createIframe(container, file) {
-  if (iframes.has(file)) {
-    iframes.get(file).remove();
-    iframes.delete(file);
-  }
-  const iframe = document.createElement("iframe");
-  iframe.setAttribute("loading", "eager");
-  iframe.setAttribute(
-    "src",
-    `${url.pathname}__vitest_test__/__test__/${getBrowserState().contextId}/${encodeURIComponent(file)}`
-  );
-  iframe.setAttribute("data-vitest", "true");
-  iframe.style.display = "block";
-  iframe.style.border = "none";
-  iframe.style.zIndex = "1";
-  iframe.style.position = "relative";
-  iframe.setAttribute("allowfullscreen", "true");
-  iframe.setAttribute("allow", "clipboard-write;");
-  iframe.setAttribute("name", "vitest-iframe");
-  iframes.set(file, iframe);
-  container.appendChild(iframe);
-  return iframe;
-}
 async function done() {
-  await rpcDone();
   await client.rpc.finishBrowserTests(getBrowserState().contextId);
 }
 async function getContainer(config) {
@@ -191,136 +339,13 @@ async function getContainer(config) {
   }
   return document.querySelector("#vitest-tester");
 }
-const runningFiles = /* @__PURE__ */ new Set();
 client.ws.addEventListener("open", async () => {
   const testFiles = getBrowserState().files;
-  debug("test files", testFiles.join(", "));
-  runningFiles.clear();
-  testFiles.forEach((file) => runningFiles.add(file));
-  const mocker = createModuleMocker();
-  channel.addEventListener(
-    "message",
-    async (e) => {
-      var _a;
-      debug("channel event", JSON.stringify(e.data));
-      switch (e.data.type) {
-        case "viewport": {
-          const { width, height, id } = e.data;
-          const iframe = iframes.get(id);
-          if (!iframe) {
-            const error = new Error(`Cannot find iframe with id ${id}`);
-            channel.postMessage({
-              type: "viewport:fail",
-              id,
-              error: error.message
-            });
-            await client.rpc.onUnhandledError(
-              {
-                name: "Teardown Error",
-                message: error.message
-              },
-              "Teardown Error"
-            );
-            return;
-          }
-          await setIframeViewport(iframe, width, height);
-          channel.postMessage({ type: "viewport:done", id });
-          break;
-        }
-        case "done": {
-          const filenames = e.data.filenames;
-          filenames.forEach((filename) => runningFiles.delete(filename));
-          if (!runningFiles.size) {
-            const ui = getUiAPI();
-            if (ui && filenames.length > 1) {
-              const id = generateFileId(filenames[filenames.length - 1]);
-              ui.setCurrentFileId(id);
-            }
-            await done();
-          } else {
-            const iframeId = e.data.id;
-            (_a = iframes.get(iframeId)) == null ? void 0 : _a.remove();
-            iframes.delete(iframeId);
-          }
-          break;
-        }
-        case "error": {
-          const iframeId = e.data.id;
-          iframes.delete(iframeId);
-          await client.rpc.onUnhandledError(e.data.error, e.data.errorType);
-          if (iframeId === ID_ALL) {
-            runningFiles.clear();
-          } else {
-            runningFiles.delete(iframeId);
-          }
-          if (!runningFiles.size) {
-            await done();
-          }
-          break;
-        }
-        case "mock:invalidate":
-          mocker.invalidate();
-          break;
-        case "unmock":
-          await mocker.unmock(e.data);
-          break;
-        case "mock":
-          await mocker.mock(e.data);
-          break;
-        case "mock-factory:error":
-        case "mock-factory:response":
-          break;
-        default: {
-          e.data;
-          await client.rpc.onUnhandledError(
-            {
-              name: "Unexpected Event",
-              message: `Unexpected event: ${e.data.type}`
-            },
-            "Unexpected Event"
-          );
-          await done();
-        }
-      }
-    }
-  );
+  await orchestrator.init();
   if (testFiles.length) {
-    await createTesters(testFiles);
+    await orchestrator.createTesters(testFiles);
   }
 });
-async function createTesters(testFiles) {
-  runningFiles.clear();
-  testFiles.forEach((file) => runningFiles.add(file));
-  const config = getConfig();
-  const container = await getContainer(config);
-  if (config.browser.ui) {
-    container.className = "scrolls";
-    container.textContent = "";
-  }
-  const { width, height } = config.browser.viewport;
-  iframes.forEach((iframe) => iframe.remove());
-  iframes.clear();
-  if (config.isolate === false) {
-    const iframe = createIframe(container, ID_ALL);
-    await setIframeViewport(iframe, width, height);
-  } else {
-    for (const file of testFiles) {
-      const iframe = createIframe(container, file);
-      await setIframeViewport(iframe, width, height);
-      await new Promise((resolve) => {
-        channel.addEventListener(
-          "message",
-          function handler(e) {
-            if (e.data.type === "done" || e.data.type === "error") {
-              channel.removeEventListener("message", handler);
-              resolve();
-            }
-          }
-        );
-      });
-    }
-  }
-}
 function generateFileId(file) {
   const config = getConfig();
   const project = config.name || "";
@@ -336,3 +361,9 @@ async function setIframeViewport(iframe, width, height) {
     iframe.style.height = `${height}px`;
   }
 }
+function debug(...args) {
+  const debug2 = getConfig().env.VITEST_BROWSER_DEBUG;
+  if (debug2 && debug2 !== "false") {
+    client.rpc.debug(...args.map(String));
+  }
+}