qunitx-cli 0.19.3 → 0.20.0

package/dist/cli.js

@@ -92,12 +92,17 @@ async function cleanupBrowserDir(dirPath) {
   }
   const dirName = dirPath.split("/").pop();
   await killAllReferencingProcesses(dirPath, dirName);
-  const deadline = Date.now() + 5e3;
+  const deadline = Date.now() + CLEANUP_DEADLINE_MS;
   while (Date.now() < deadline) {
-    const removed = await fs.rm(dirPath, { recursive: true, force: true }).then(() => true).catch(() => false);
+    const removed = await fs.rm(dirPath, { recursive: true, force: true }).then(
+      () => fs.access(dirPath).then(
+        () => false,
+        () => true
+      )
+    ).catch(() => false);
     if (removed) return;
     await killAllReferencingProcesses(dirPath, dirName);
-    await new Promise((resolve) => setTimeout(resolve, 50));
+    await new Promise((resolve) => setTimeout(resolve, CLEANUP_RETRY_MS));
   }
   if (!await fs.access(dirPath).then(() => true).catch(() => false))
     return;
@@ -117,8 +122,11 @@ async function cleanupBrowserDir(dirPath) {
     })
   );
 }
+var CLEANUP_DEADLINE_MS, CLEANUP_RETRY_MS;
 var init_cleanup_browser_dir = __esm({
   "lib/utils/cleanup-browser-dir.ts"() {
+    CLEANUP_DEADLINE_MS = 5e3;
+    CLEANUP_RETRY_MS = 50;
   }
 });
 
@@ -472,10 +480,11 @@ function dumpYaml({
   expected,
   message,
   stack,
+  source,
   at
 }) {
   return `name: ${dumpString(name, "")}
-` + yamlLine("actual", actual) + yamlLine("expected", expected) + (message !== null ? yamlLine("message", message) : "") + (stack !== null ? yamlLine("stack", stack) : "") + (at !== null ? yamlLine("at", at) : "");
+` + yamlLine("actual", actual) + yamlLine("expected", expected) + (message !== null ? yamlLine("message", message) : "") + (stack !== null ? yamlLine("stack", stack) : "") + (source !== null ? yamlLine("source", source) : "") + (at !== null ? yamlLine("at", at) : "");
 }
 var NEEDS_QUOTING;
 var init_dump_yaml = __esm({
@@ -498,8 +507,205 @@ var init_indent_string = __esm({
   }
 });
 
+// lib/utils/source-map-decoder.ts
+function readVLQ(s, pos) {
+  let accumulated = 0;
+  let shift = 0;
+  let digit;
+  do {
+    digit = BASE64_LOOKUP[s.charCodeAt(pos++)];
+    accumulated |= (digit & 31) << shift;
+    shift += 5;
+  } while (digit & 32);
+  return [accumulated & 1 ? -(accumulated >>> 1) : accumulated >>> 1, pos];
+}
+function decodeMappings(mappings) {
+  let sourceIndex = 0, sourceLine = 0, sourceCol = 0;
+  return mappings.split(";").map((lineStr) => {
+    const segments = [];
+    let generatedCol = 0;
+    let pos = 0;
+    while (pos < lineStr.length) {
+      if (lineStr[pos] === ",") {
+        pos++;
+        continue;
+      }
+      let delta;
+      [delta, pos] = readVLQ(lineStr, pos);
+      generatedCol += delta;
+      if (pos >= lineStr.length || lineStr[pos] === ",") continue;
+      [delta, pos] = readVLQ(lineStr, pos);
+      sourceIndex += delta;
+      [delta, pos] = readVLQ(lineStr, pos);
+      sourceLine += delta;
+      [delta, pos] = readVLQ(lineStr, pos);
+      sourceCol += delta;
+      if (pos < lineStr.length && lineStr[pos] !== ",") [, pos] = readVLQ(lineStr, pos);
+      segments.push({ generatedCol, sourceIndex, sourceLine, sourceCol });
+    }
+    return segments;
+  });
+}
+function parseSourceMap(json, outDir) {
+  const map = JSON.parse(json);
+  return {
+    segmentsByLine: decodeMappings(map.mappings),
+    sources: map.sources ?? [],
+    sourceRoot: map.sourceRoot ?? "",
+    outDir,
+    sourcesContent: map.sourcesContent ?? []
+  };
+}
+function base64DecodeUtf8(b64) {
+  const binary = atob(b64);
+  return UTF8.decode(Uint8Array.from(binary, (c) => c.charCodeAt(0)));
+}
+function extractInlineSourceMap(bundle, outDir) {
+  if (!bundle) return null;
+  const text = typeof bundle === "string" ? bundle : UTF8.decode(bundle);
+  const match = text.match(
+    /\/\/# sourceMappingURL=data:application\/json;base64,([A-Za-z0-9+/=]+)/
+  );
+  if (!match) return null;
+  try {
+    return parseSourceMap(base64DecodeUtf8(match[1]), outDir);
+  } catch {
+    return null;
+  }
+}
+function normalizePosix(p) {
+  const abs = p.startsWith("/");
+  const parts = p.split("/");
+  const out = [];
+  for (const part of parts) {
+    if (part === "..") out.pop();
+    else if (part !== "" && part !== ".") out.push(part);
+  }
+  return (abs ? "/" : "") + out.join("/");
+}
+function posixResolve(base, relative) {
+  if (relative.startsWith("/")) return normalizePosix(relative);
+  return normalizePosix(base + "/" + relative);
+}
+function toAbsolutePath(raw, outDir, sourceRoot) {
+  if (raw.startsWith("file://")) return raw.slice(7);
+  if (raw.startsWith("/")) return raw;
+  const base = sourceRoot ? normalizePosix(outDir + "/" + sourceRoot) : outDir;
+  return posixResolve(base, raw);
+}
+function lookupPosition(decoder, generatedLine, generatedCol) {
+  const segments = decoder.segmentsByLine[generatedLine - 1];
+  if (!segments?.length) return null;
+  const col0 = generatedCol - 1;
+  let lo = 0, hi = segments.length - 1, best = -1;
+  while (lo <= hi) {
+    const mid = lo + hi >>> 1;
+    if (segments[mid].generatedCol <= col0) {
+      best = mid;
+      lo = mid + 1;
+    } else {
+      hi = mid - 1;
+    }
+  }
+  if (best === -1) return null;
+  const { sourceIndex, sourceLine, sourceCol } = segments[best];
+  const rawSource = decoder.sources[sourceIndex];
+  if (!rawSource) return null;
+  const content = decoder.sourcesContent[sourceIndex];
+  const sourceText = content ? content.split("\n", sourceLine + 1)[sourceLine]?.trim() || null : null;
+  return {
+    absolutePath: toAbsolutePath(rawSource, decoder.outDir, decoder.sourceRoot),
+    line: sourceLine + 1,
+    // 0-based → 1-based
+    col: sourceCol + 1,
+    // 0-based → 1-based
+    sourceText
+  };
+}
+function parseFrameLocation(s) {
+  const colSep = s.lastIndexOf(":");
+  if (colSep < 0) return null;
+  const colStr = s.slice(colSep + 1);
+  if (!/^\d+$/.test(colStr)) return null;
+  const lineSep = s.lastIndexOf(":", colSep - 1);
+  if (lineSep < 0) return null;
+  const lineStr = s.slice(lineSep + 1, colSep);
+  if (!/^\d+$/.test(lineStr)) return null;
+  return { url: s.slice(0, lineSep), line: +lineStr, col: +colStr };
+}
+function isBundleUrl(url) {
+  const normalized = url.startsWith("async ") ? url.slice(6) : url;
+  return /^https?:\/\//.test(normalized) && /\/(tests|filtered-tests)\.js$/.test(normalized);
+}
+function isNodeModulesPath(absolutePath) {
+  return absolutePath.includes("/node_modules/") || absolutePath.includes("\\node_modules\\");
+}
+function makeDisplayPath(absolutePath, projectRoot) {
+  const prefix = projectRoot + "/";
+  return absolutePath.startsWith(prefix) ? absolutePath.slice(prefix.length) : absolutePath;
+}
+function tryResolve(urlLineCol, decoder, projectRoot) {
+  const loc = parseFrameLocation(urlLineCol);
+  if (!loc || !isBundleUrl(loc.url)) return null;
+  const orig = lookupPosition(decoder, loc.line, loc.col);
+  if (!orig) return null;
+  const display = `${makeDisplayPath(orig.absolutePath, projectRoot)}:${orig.line}:${orig.col}`;
+  return {
+    display,
+    userPath: isNodeModulesPath(orig.absolutePath) ? null : display,
+    sourceText: orig.sourceText
+  };
+}
+function resolveFrame(frame, decoder, projectRoot) {
+  const chromeName = frame.match(/^(\s*at\s+)(.*?)\s+\(([^)]+)\)\s*$/);
+  if (chromeName) {
+    const r = tryResolve(chromeName[3], decoder, projectRoot);
+    return r ? {
+      resolved: `${chromeName[1]}${chromeName[2]} (${r.display})`,
+      userPath: r.userPath,
+      sourceText: r.sourceText
+    } : null;
+  }
+  const chromeAnon = frame.match(/^(\s*at\s+(?:async\s+)?)(.+)/);
+  if (chromeAnon) {
+    const r = tryResolve(chromeAnon[2], decoder, projectRoot);
+    return r ? { resolved: `${chromeAnon[1]}${r.display}`, userPath: r.userPath, sourceText: r.sourceText } : null;
+  }
+  const gecko = frame.match(/^([^@]*)@(.+)$/);
+  if (gecko) {
+    const r = tryResolve(gecko[2], decoder, projectRoot);
+    return r ? { resolved: `${gecko[1]}@${r.display}`, userPath: r.userPath, sourceText: r.sourceText } : null;
+  }
+  return null;
+}
+function resolveStack(stack, decoder, projectRoot) {
+  let firstUserFrame = null;
+  let firstUserSourceText = null;
+  const resolvedLines = stack.split("\n").map((frame) => {
+    const result = resolveFrame(frame, decoder, projectRoot);
+    if (!result) return frame;
+    if (!firstUserFrame && result.userPath) {
+      firstUserFrame = result.userPath;
+      firstUserSourceText = result.sourceText;
+    }
+    return result.resolved;
+  });
+  return { resolvedStack: resolvedLines.join("\n"), firstUserFrame, firstUserSourceText };
+}
+var BASE64, BASE64_LOOKUP, UTF8;
+var init_source_map_decoder = __esm({
+  "lib/utils/source-map-decoder.ts"() {
+    BASE64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+    BASE64_LOOKUP = new Uint8Array(128);
+    [...BASE64].forEach((ch, i) => {
+      BASE64_LOOKUP[ch.charCodeAt(0)] = i;
+    });
+    UTF8 = new TextDecoder();
+  }
+});
+
 // lib/tap/display-test-result.ts
-function TAPDisplayTestResult(COUNTER, details) {
+function TAPDisplayTestResult(COUNTER, details, decoder, projectRoot) {
   COUNTER.testCount++;
   if (details.status === "skipped") {
     COUNTER.skipCount++;
@@ -519,6 +725,19 @@ function TAPDisplayTestResult(COUNTER, details) {
       if (!assertion.passed && assertion.todo === false) {
         COUNTER.errorCount = (COUNTER.errorCount ?? 0) + 1;
         process.stdout.write("  ---\n");
+        let stackStr = assertion.stack?.trim() || null;
+        let atStr = extractStackAt(assertion.stack);
+        let sourceText = null;
+        if (decoder && projectRoot && assertion.stack) {
+          const { resolvedStack, firstUserFrame, firstUserSourceText } = resolveStack(
+            assertion.stack,
+            decoder,
+            projectRoot
+          );
+          stackStr = resolvedStack.trim() || null;
+          atStr = firstUserFrame;
+          sourceText = firstUserSourceText;
+        }
         process.stdout.write(
           indentString(
             dumpYaml({
@@ -526,10 +745,9 @@ function TAPDisplayTestResult(COUNTER, details) {
               actual: assertion.actual !== null && typeof assertion.actual === "object" ? JSON.parse(JSON.stringify(assertion.actual, getCircularReplacer())) : assertion.actual,
               expected: assertion.expected !== null && typeof assertion.expected === "object" ? JSON.parse(JSON.stringify(assertion.expected, getCircularReplacer())) : assertion.expected,
               message: assertion.message || null,
-              // Trim leading/trailing whitespace: Chrome stacks start with "    at ..."
-              // (4 spaces per frame) which would otherwise render as "stack:     at ..." in YAML.
-              stack: assertion.stack?.trim() || null,
-              at: extractStackAt(assertion.stack)
+              stack: stackStr,
+              source: sourceText,
+              at: atStr
             }),
             4
           )
@@ -573,6 +791,7 @@ var init_display_test_result = __esm({
   "lib/tap/display-test-result.ts"() {
     init_dump_yaml();
     init_indent_string();
+    init_source_map_decoder();
   }
 });
 
@@ -812,7 +1031,7 @@ var init_http = __esm({
             return true;
           }
           return false;
-        }) || routes["/*"] || null;
+        }) || null;
       }
       #matchPathSegments(path7, url) {
         const pathSegments = path7.split("/");
@@ -902,7 +1121,7 @@ function setupWebServer(config, cachedContent) {
           );
         }
         config._resetTestTimeout?.();
-        TAPDisplayTestResult(config.COUNTER, details);
+        TAPDisplayTestResult(config.COUNTER, details, config._sourceMapDecoder, config.projectRoot);
       } else if (event === "done") {
         config._phase = "done";
         config._lastQUnitResult = qunitResult ?? null;
@@ -919,7 +1138,26 @@ function setupWebServer(config, cachedContent) {
       }
     });
   });
-  server.get("/tests.js", (_req, res) => {
+  server.get("/tests.js", async (_req, res) => {
+    if (cachedContent._activeRebuild) {
+      await cachedContent._activeRebuild.catch(() => {
+      });
+      if (!cachedContent.allTestCode) {
+        config._lastQUnitResult = {
+          totalTests: 0,
+          finishedTests: 0,
+          failedTests: 0,
+          currentTest: null
+        };
+        config._testRunDone?.();
+        config._testRunDone = null;
+        res.writeHead(200, {
+          "Content-Type": "application/javascript",
+          "Cache-Control": "no-store"
+        });
+        return void res.end();
+      }
+    }
     const bytes = cachedContent.allTestCode?.length ?? null;
     config.debug && process.stdout.write(
       `# [HTTPServer] GET /tests.js \u2192 ${bytes !== null ? `${bytes} bytes` : "NOT READY (allTestCode is null)"}
@@ -927,10 +1165,9 @@ function setupWebServer(config, cachedContent) {
     );
     if (bytes === null) {
       res.writeHead(503, { "Content-Type": "application/javascript", "Cache-Control": "no-store" });
-      res.end(
+      return void res.end(
         'console.error("[qunitx] /tests.js requested before bundle was built \u2014 allTestCode is null");'
       );
-      return;
     }
     config._onTestsJsServed?.();
     res.writeHead(200, {
@@ -948,10 +1185,9 @@ function setupWebServer(config, cachedContent) {
     );
     if (bytes === null) {
       res.writeHead(503, { "Content-Type": "application/javascript", "Cache-Control": "no-store" });
-      res.end(
+      return res.end(
         'console.error("[qunitx] /filtered-tests.js requested before bundle was built \u2014 filteredTestCode is null");'
       );
-      return;
     }
     config._onTestsJsServed?.();
     res.writeHead(200, {
@@ -961,18 +1197,28 @@ function setupWebServer(config, cachedContent) {
     });
     res.end(cachedContent.filteredTestCode);
   });
-  server.get("/", (_req, res) => {
+  server.get("/", async (_req, res) => {
+    await cachedContent._activeRebuild?.catch(() => {
+    });
     if (cachedContent._buildError) {
       const htmlContent = buildErrorHTML(cachedContent._buildError);
       res.writeHead(200, HTML_HEADERS);
       res.end(htmlContent);
-      saveHTML(`${config.projectRoot}/${config.output}/index.html`, htmlContent);
-      return;
+      if (cachedContent._activeRebuild) {
+        config._lastQUnitResult = {
+          totalTests: 0,
+          finishedTests: 0,
+          failedTests: 0,
+          currentTest: null
+        };
+        config._testRunDone?.();
+        config._testRunDone = null;
+      }
+      return saveHTML(`${config.projectRoot}/${config.output}/index.html`, htmlContent);
     }
     if (cachedContent._noTestsWarning) {
       res.writeHead(200, HTML_HEADERS);
-      res.end(buildNoTestsHTML(cachedContent._noTestsWarning));
-      return;
+      return res.end(buildNoTestsHTML(cachedContent._noTestsWarning));
     }
     res.writeHead(200, HTML_HEADERS);
     res.end(mainIndexHTML);
@@ -983,13 +1229,11 @@ function setupWebServer(config, cachedContent) {
       const htmlContent = buildErrorHTML(cachedContent._buildError);
       res.writeHead(200, HTML_HEADERS);
       res.end(htmlContent);
-      saveHTML(`${config.projectRoot}/${config.output}/qunitx.html`, htmlContent);
-      return;
+      return saveHTML(`${config.projectRoot}/${config.output}/qunitx.html`, htmlContent);
     }
     if (cachedContent._noTestsWarning) {
       res.writeHead(200, HTML_HEADERS);
-      res.end(buildNoTestsHTML(cachedContent._noTestsWarning));
-      return;
+      return res.end(buildNoTestsHTML(cachedContent._noTestsWarning));
     }
     res.writeHead(200, HTML_HEADERS);
     res.end(mainQunitxHTML);
@@ -1043,11 +1287,6 @@ function replaceAssetPaths(html, htmlPath, projectRoot) {
 function testRuntimeToInject(config, groupId) {
   const groupIdPart = groupId !== void 0 ? `, groupId: ${groupId}` : "";
   return `<script>
-    window.testTimeout = 0;
-    setInterval(() => {
-      window.testTimeout = window.testTimeout + 1000;
-    }, 1000);
-
     (function() {
       // wsOpenStatus: true once the WebSocket 'open' event fires (or immediately for static files).
       // testsLoaded: true once tests.js has executed and dispatched 'qunitx:tests-ready'.
@@ -1073,7 +1312,7 @@ function testRuntimeToInject(config, groupId) {
       if (window.location.protocol === 'file:') return;
 
       let wsRetryCount = 0;
-      const WS_MAX_RETRIES = Math.ceil(${config.timeout} / 10); // retry for the full test timeout window
+      const WS_MAX_RETRIES = Math.ceil(${config.timeout} / ${WS_RETRY_INTERVAL_MS}); // retry for the full test timeout window
 
       function setupWebSocket() {
         try {
@@ -1112,10 +1351,9 @@ function testRuntimeToInject(config, groupId) {
         wsRetryCount++;
         if (wsRetryCount > WS_MAX_RETRIES) {
           console.log('WebSocket connection failed after ' + WS_MAX_RETRIES + ' retries');
-          window.testTimeout = ${config.timeout};
           return;
         }
-        window.setTimeout(setupWebSocket, 10);
+        window.setTimeout(setupWebSocket, ${WS_RETRY_INTERVAL_MS});
       }
 
       setupWebSocket();
@@ -1149,8 +1387,6 @@ function testRuntimeToInject(config, groupId) {
           // "no tests registered" warning (not a failure), so this gives a fast, clean result.
           window.QUNIT_RESULT = { totalTests: 0, finishedTests: 0, failedTests: 0, currentTest: null };
           window.socket.send(JSON.stringify({ event: 'done', details: { passed: 0, failed: 0, runtime: 0 } }));
-        } else {
-          window.testTimeout = ${config.timeout};
         }
         return;
       }
@@ -1165,7 +1401,6 @@ function testRuntimeToInject(config, groupId) {
         window.QUNIT_RESULT.currentTest = details.fullName.join(' | ');
       });
       window.QUnit.on('testEnd', (details) => { // NOTE: https://github.com/qunitjs/qunit/blob/master/src/html-reporter/diff.js
-        window.testTimeout = 0;
         window.QUNIT_RESULT.finishedTests++;
         if (details.status === 'failed') window.QUNIT_RESULT.failedTests++;
         window.QUNIT_RESULT.currentTest = null;
@@ -1182,16 +1417,10 @@ function testRuntimeToInject(config, groupId) {
       window.QUnit.done((details) => {
         if (navigator.webdriver) {
           window.socket.send(JSON.stringify({ event: 'done', details: details, qunitResult: window.QUNIT_RESULT, abort: window.abortQUnit }, getCircularReplacer()));
-          // Do NOT set testTimeout here. The WS 'done' event (testsDone promise) is the
-          // canonical completion signal for Playwright runs. waitForFunction is reserved
-          // for true timeouts (test hangs) where testTimeout increments naturally via setInterval.
-          // Setting testTimeout after done caused a race: under CI load, waitForFunction could
-          // win before Node.js processed the WS done message, dropping all testEnd events.
-        } else {
-          window.testTimeout = ${config.timeout};
         }
       });
 
+      window.QUnit.config.testTimeout = ${config.timeout};
       window.QUnit.start();
     }
   </script>`;
@@ -1292,8 +1521,8 @@ function buildNoTestsHTML(files) {
         var retries = 0;
         function connect() {
           var ws = new WebSocket(\`ws://\${location.hostname}:\${location.port}\`);
-          ws.addEventListener('message', function (e) { if (e.data === 'refresh') location.reload(true); });
-          ws.addEventListener('close', function () { if (retries++ < 120) setTimeout(connect, 1000); });
+          ws.addEventListener('message', function (e) { if (e.data === 'refresh' && !navigator.webdriver) location.reload(true); });
+          ws.addEventListener('close', function () { if (retries++ < ${WATCH_WS_RECONNECT_MAX_RETRIES}) setTimeout(connect, ${WATCH_WS_RECONNECT_INTERVAL_MS}); });
           ws.addEventListener('error', function () { ws.close(); });
         }
         connect();
@@ -1394,8 +1623,8 @@ function buildErrorHTML(buildError) {
         var retries = 0;
         function connect() {
           var ws = new WebSocket(\`ws://\${location.hostname}:\${location.port}\`);
-          ws.addEventListener('message', function (e) { if (e.data === 'refresh') location.reload(true); });
-          ws.addEventListener('close', function () { if (retries++ < 120) setTimeout(connect, 1000); });
+          ws.addEventListener('message', function (e) { if (e.data === 'refresh' && !navigator.webdriver) location.reload(true); });
+          ws.addEventListener('close', function () { if (retries++ < ${WATCH_WS_RECONNECT_MAX_RETRIES}) setTimeout(connect, ${WATCH_WS_RECONNECT_INTERVAL_MS}); });
           ws.addEventListener('error', function () { ws.close(); });
         }
         connect();
@@ -1424,13 +1653,11 @@ function registerGroupRoutes(server, groupConfig, groupCachedContent, groupId) {
   server.get(`/group-${groupId}/`, (_req, res) => {
     if (groupCachedContent._buildError) {
       res.writeHead(200, HTML_HEADERS);
-      res.end(buildErrorHTML(groupCachedContent._buildError));
-      return;
+      return res.end(buildErrorHTML(groupCachedContent._buildError));
     }
     if (groupCachedContent._noTestsWarning) {
       res.writeHead(200, HTML_HEADERS);
-      res.end(buildNoTestsHTML(groupCachedContent._noTestsWarning));
-      return;
+      return res.end(buildNoTestsHTML(groupCachedContent._noTestsWarning));
     }
     res.writeHead(200, HTML_HEADERS);
     res.end(mainGroupHTML);
@@ -1440,10 +1667,9 @@ function registerGroupRoutes(server, groupConfig, groupCachedContent, groupId) {
     const bytes = groupCachedContent.allTestCode?.length ?? null;
     if (bytes === null) {
       res.writeHead(503, { "Content-Type": "application/javascript", "Cache-Control": "no-store" });
-      res.end(
+      return res.end(
         'console.error("[qunitx] /tests.js requested before bundle was built \u2014 allTestCode is null");'
       );
-      return;
     }
     groupConfig._onTestsJsServed?.();
     res.writeHead(200, {
@@ -1495,7 +1721,7 @@ function setupGroupWSHandler(server, groupConfigs) {
           );
         }
         config._resetTestTimeout?.();
-        TAPDisplayTestResult(config.COUNTER, details);
+        TAPDisplayTestResult(config.COUNTER, details, config._sourceMapDecoder, config.projectRoot);
       } else if (event === "done") {
         config._phase = "done";
         config._lastQUnitResult = qunitResult ?? null;
@@ -1544,7 +1770,7 @@ function registerSharedStaticHandler(server, groupConfigs) {
     });
   });
 }
-var fsPromise, HTML_HEADERS, NOT_FOUND_HTML;
+var fsPromise, HTML_HEADERS, WATCH_WS_RECONNECT_INTERVAL_MS, WATCH_WS_RECONNECT_MAX_RETRIES, WS_RETRY_INTERVAL_MS, NOT_FOUND_HTML;
 var init_web_server = __esm({
   "lib/setup/web-server.ts"() {
     init_find_internal_assets_from_html();
@@ -1554,6 +1780,9 @@ var init_web_server = __esm({
     init_http();
     fsPromise = fs8.promises;
     HTML_HEADERS = { "Content-Type": "text/html", "Cache-Control": "no-store" };
+    WATCH_WS_RECONNECT_INTERVAL_MS = 1e3;
+    WATCH_WS_RECONNECT_MAX_RETRIES = 120;
+    WS_RETRY_INTERVAL_MS = 10;
     NOT_FOUND_HTML = `<!DOCTYPE html>
 <html lang="en">
 <head>
@@ -1637,12 +1866,9 @@ async function setupBrowser(config, cachedContent, existingBrowser = null, share
       perfLog(`browser.js: newPage (shared server) took ${Date.now() - setupStart}ms`);
       return [sharedServer, existingBrowser, newPage2];
     }
-    const [newServer, resolvedBrowser] = await Promise.all([
-      setupWebServer(config, cachedContent),
-      Promise.resolve(existingBrowser)
-    ]);
+    const newServer = setupWebServer(config, cachedContent);
     perfLog(`browser.js: setupWebServer took ${Date.now() - setupStart}ms`);
-    const activeBrowser = resolvedBrowser ?? await launchBrowser(config);
+    const activeBrowser = existingBrowser ?? await launchBrowser(config);
     const pageStart = Date.now();
     const isHeadedWatchMode = config.open === true && config.watch;
     const getPage = isHeadedWatchMode ? () => activeBrowser.contexts()[0]?.pages()[0] ?? activeBrowser.newPage() : () => activeBrowser.newPage();
@@ -1836,7 +2062,7 @@ async function buildTestBundle(config, cachedContent) {
   }
   const outfile = `${projectRoot}/${output}/tests.js`;
   await fs9.mkdir(`${projectRoot}/${output}`, { recursive: true });
-  const sourcemap = config.debug ? "inline" : config.watch ? "linked" : false;
+  const sourcemap = "inline";
   const needsDisk = true;
   const buildOptions = {
     stdin: {
@@ -1876,6 +2102,7 @@ async function buildTestBundle(config, cachedContent) {
       )
     ]);
     cachedContent.allTestCode = allTestCode;
+    config._sourceMapDecoder = extractInlineSourceMap(allTestCode, `${projectRoot}/${output}`);
   } catch (error) {
     cachedContent._buildError = {
       type: deriveBuildErrorType(error),
@@ -1907,9 +2134,13 @@ async function runTestsInBrowser(config, cachedContent = {}, connections, target
     const preBuildPromise = cachedContent._preBuildPromise;
     cachedContent._preBuildPromise = null;
     if (!cachedContent.allTestCode) {
-      await (preBuildPromise ?? buildTestBundle(config, cachedContent));
+      if (preBuildPromise) {
+        cachedContent._activeRebuild = preBuildPromise;
+      } else {
+        await buildTestBundle(config, cachedContent);
+      }
     }
-    if (!cachedContent.allTestCode) {
+    if (!cachedContent.allTestCode && !cachedContent._activeRebuild) {
       return connections;
     }
     if (runHasFilter) {
@@ -1919,6 +2150,10 @@ async function runTestsInBrowser(config, cachedContent = {}, connections, target
         outputPath,
         config
       );
+      config._sourceMapDecoder = extractInlineSourceMap(
+        cachedContent.filteredTestCode,
+        `${projectRoot}/${output}`
+      );
     }
     const TIME_COUNTER = timeCounter();
     if (runHasFilter) {
@@ -1930,6 +2165,17 @@ async function runTestsInBrowser(config, cachedContent = {}, connections, target
         )
       );
     }
+    if (cachedContent._activeRebuild) {
+      await cachedContent._activeRebuild.catch(() => {
+      });
+      cachedContent._activeRebuild = null;
+      if (!cachedContent.allTestCode) {
+        config.watch && cachedContent._buildError && console.log(
+          `# esbuild Bundle Error: ${cachedContent._buildError.formatted}`.split("\n").join("\n# ")
+        );
+        return connections;
+      }
+    }
     const TIME_TAKEN = TIME_COUNTER.stop();
     if (!config._groupMode) {
       if (config.COUNTER.testCount === 0 && !cachedContent._buildError) {
@@ -1961,6 +2207,7 @@ async function runTestsInBrowser(config, cachedContent = {}, connections, target
       }
     }
   } catch (error) {
+    cachedContent._activeRebuild = null;
     config.lastFailedTestFiles = config.lastRanTestFiles;
     const exception = new BundleError(error);
     if (!cachedContent._buildError && error.errors?.length) {
@@ -1985,8 +2232,8 @@ async function runTestsInBrowser(config, cachedContent = {}, connections, target
   return connections;
 }
 function buildFilteredTests(filteredTests, outputPath, config) {
-  const sourcemap = config.debug ? "inline" : config.watch ? "linked" : false;
-  const needsDisk = sourcemap === "linked" || Boolean(config.open);
+  const sourcemap = "inline";
+  const needsDisk = Boolean(config.open);
   return buildWithOverlayfsRetry(
     {
       stdin: {
@@ -2060,9 +2307,9 @@ async function runTestInsideHTMLFile(filePath, { page, server, browser }, config
   let wsConnected = false;
   try {
     console.log("#", blue(`QUnitX running: http://localhost:${config.port}${filePath}`));
-    const navMs = config.timeout + 1e4;
-    const startupMs = Math.max(config.timeout * 3, navMs);
-    const testsJsMs = Math.max(config.timeout * 4, navMs);
+    const navMs = config.timeout + NAV_GRACE_MS;
+    const startupMs = Math.max(config.timeout * STARTUP_TIMEOUT_FACTOR, navMs);
+    const testsJsMs = Math.max(config.timeout * TESTS_JS_TIMEOUT_FACTOR, navMs);
     let resolveTestRace;
     const testRaceResult = new Promise((resolve) => {
       resolveTestRace = resolve;
@@ -2080,7 +2327,7 @@ async function runTestInsideHTMLFile(filePath, { page, server, browser }, config
     config._resetTestTimeout = () => {
       wsConnected = true;
       clearTimeout(timeoutHandle);
-      timeoutHandle = setTimeout(resolveTestRace, config.timeout);
+      timeoutHandle = setTimeout(resolveTestRace, config.timeout + TEST_STALL_BUFFER_MS);
     };
     const targetUrl = `http://localhost:${config.port}${filePath}`;
     const navOptions = { timeout: navMs, waitUntil: "commit" };
@@ -2150,7 +2397,7 @@ async function failOnNonWatchMode(watchMode = false, connections = {}, groupMode
     process.exit(1);
   }
 }
-async function flushConsoleHandlers(handlers, deadline = Date.now() + 2e3) {
+async function flushConsoleHandlers(handlers, deadline = Date.now() + CONSOLE_FLUSH_TIMEOUT_MS) {
   if (!handlers || handlers.size === 0 || Date.now() >= deadline) return;
   await Promise.allSettled([...handlers]);
   return flushConsoleHandlers(handlers, deadline);
@@ -2160,7 +2407,7 @@ async function buildAllGroupBundles(groupConfigs, groupCachedContents) {
     cachedContent._buildError = null;
     cachedContent._noTestsWarning = null;
   });
-  const { projectRoot, debug, watch, browser } = groupConfigs[0];
+  const { projectRoot, debug, browser } = groupConfigs[0];
   const activeGroups = groupConfigs.reduce(
     (acc, groupConfig, groupIndex) => {
       const files = Object.keys(groupConfig.fsTree);
@@ -2184,7 +2431,7 @@ async function buildAllGroupBundles(groupConfigs, groupCachedContents) {
       (group) => fs9.mkdir(`${group.config.projectRoot}/${group.config.output}`, { recursive: true })
     )
   );
-  const sourcemap = debug ? "inline" : watch ? "linked" : false;
+  const sourcemap = "inline";
   const groupEntryPlugin = {
     name: "group-entry-loader",
     setup(build) {
@@ -2201,6 +2448,7 @@ async function buildAllGroupBundles(groupConfigs, groupCachedContents) {
       });
     }
   };
+  const esbuildOutdir = path5.join(projectRoot, "tmp");
   const buildOptions = {
     entryPoints: activeGroups.map((_, slotIndex) => ({
       in: `group-entry-${slotIndex}`,
@@ -2212,7 +2460,7 @@ async function buildAllGroupBundles(groupConfigs, groupCachedContents) {
     logLevel: "silent",
     // outdir only labels the paths in outputFiles[].path — nothing is written to disk
     // (write:false). Use projectRoot/tmp as a stable sentinel; mkdir is not required.
-    outdir: path5.join(projectRoot, "tmp"),
+    outdir: esbuildOutdir,
     keepNames: true,
     legalComments: "none",
     target: esbuildTarget(browser),
@@ -2239,7 +2487,13 @@ async function buildAllGroupBundles(groupConfigs, groupCachedContents) {
         const isMap = Boolean(match[2]);
         const { config, cachedContent } = activeGroups[slotIndex];
         const destPath = `${config.projectRoot}/${config.output}/tests.js${isMap ? ".map" : ""}`;
-        if (!isMap) cachedContent.allTestCode = Buffer.from(outputFile.contents);
+        if (!isMap) {
+          cachedContent.allTestCode = Buffer.from(outputFile.contents);
+          config._sourceMapDecoder = extractInlineSourceMap(
+            cachedContent.allTestCode,
+            esbuildOutdir
+          );
+        }
         return fs9.writeFile(destPath, outputFile.contents);
       })
     );
@@ -2258,7 +2512,7 @@ async function buildAllGroupBundles(groupConfigs, groupCachedContents) {
     throw error;
   }
 }
-var BundleError, ancestorNodeModules, ANCESTOR_NODE_MODULES, RETRY_DELAY_MS, MAX_RETRIES, EMPTY_BUNDLE_THRESHOLD, GROUP_OUTPUT_REGEX;
+var BundleError, ancestorNodeModules, ANCESTOR_NODE_MODULES, RETRY_DELAY_MS, MAX_RETRIES, EMPTY_BUNDLE_THRESHOLD, NAV_GRACE_MS, STARTUP_TIMEOUT_FACTOR, TESTS_JS_TIMEOUT_FACTOR, CONSOLE_FLUSH_TIMEOUT_MS, TEST_STALL_BUFFER_MS, GROUP_OUTPUT_REGEX;
 var init_tests_in_browser = __esm({
   "lib/commands/run/tests-in-browser.ts"() {
     init_color();
@@ -2267,6 +2521,7 @@ var init_tests_in_browser = __esm({
     init_run_user_module();
     init_display_final_result();
     init_web_server();
+    init_source_map_decoder();
     BundleError = class extends Error {
       constructor(message) {
         super(message);
@@ -2281,6 +2536,11 @@ var init_tests_in_browser = __esm({
     RETRY_DELAY_MS = 100;
     MAX_RETRIES = 3;
     EMPTY_BUNDLE_THRESHOLD = 500;
+    NAV_GRACE_MS = 1e4;
+    STARTUP_TIMEOUT_FACTOR = 3;
+    TESTS_JS_TIMEOUT_FACTOR = 4;
+    CONSOLE_FLUSH_TIMEOUT_MS = 2e3;
+    TEST_STALL_BUFFER_MS = 5e3;
     GROUP_OUTPUT_REGEX = /group-(\d+)\.js(\.map)?$/;
   }
 });
@@ -2306,7 +2566,7 @@ function setupFileWatchers(testFileLookupPaths, config, onEventFunc, onFinishFun
         }
       }
     };
-    fs10.watchFile(filePath, { interval: 500, persistent: false }, handler);
+    fs10.watchFile(filePath, { interval: SYMLINK_POLL_INTERVAL_MS, persistent: false }, handler);
     symlinkPollers.set(filePath, () => fs10.unwatchFile(filePath, handler));
   }
   function untrackSymlink(filePath) {
@@ -2320,13 +2580,17 @@ function setupFileWatchers(testFileLookupPaths, config, onEventFunc, onFinishFun
       if (!ready || !filename) return;
       const fullPath = filename === path6.basename(watchPath) ? watchPath : path6.join(watchPath, filename);
       if (eventType === "change") {
-        if (!config._building) {
-          const now = Date.now();
-          const last = lastChangeMs[fullPath] ?? 0;
-          if (now - last < CHANGE_DEDUPE_MS) {
-            if (!config._lastBuildEndMs || config._lastBuildEndMs <= last) return;
+        const now = Date.now();
+        const last = lastChangeMs[fullPath] ?? 0;
+        lastChangeMs[fullPath] = now;
+        if (now - last < CHANGE_DEDUPE_MS && (config._building || !config._lastBuildEndMs || config._lastBuildEndMs <= last))
+          return;
+        if (config._lastBuildEndMs) {
+          try {
+            const { mtimeMs } = await stat(fullPath);
+            if (mtimeMs < Math.floor(config._lastBuildEndMs / 1e3) * 1e3) return;
+          } catch {
           }
-          lastChangeMs[fullPath] = now;
         }
         return handleWatchEvent(config, extensions, "change", fullPath, onEventFunc, onFinishFunc);
       }
@@ -2396,7 +2660,7 @@ function setupFileWatchers(testFileLookupPaths, config, onEventFunc, onFinishFun
   };
 }
 async function classifyRenameEvent(fullPath, fsTree) {
-  for (const delay of [0, 50]) {
+  for (const delay of [0, OVERLAYFS_RENAME_RETRY_MS]) {
     if (delay) await new Promise((resolve) => setTimeout(resolve, delay));
     try {
       const statResult = await stat(fullPath);
@@ -2464,11 +2728,13 @@ function colorEvent(event) {
   if (event === "add" || event === "addDir") return green("ADDED:");
   return red("REMOVED:");
 }
-var CHANGE_DEDUPE_MS;
+var CHANGE_DEDUPE_MS, SYMLINK_POLL_INTERVAL_MS, OVERLAYFS_RENAME_RETRY_MS;
 var init_file_watcher = __esm({
   "lib/setup/file-watcher.ts"() {
     init_color();
     CHANGE_DEDUPE_MS = 10;
+    SYMLINK_POLL_INTERVAL_MS = 500;
+    OVERLAYFS_RENAME_RETRY_MS = 50;
   }
 });
 
@@ -2585,7 +2851,11 @@ import fs12 from "node:fs/promises";
 import { normalize } from "node:path";
 import { availableParallelism } from "node:os";
 async function run(config) {
-  const cachedContent = await buildCachedContent(config, config.htmlPaths);
+  const browserPromise = config.watch ? null : launchBrowser(config);
+  const [cachedContent, timings] = await Promise.all([
+    buildCachedContent(config, config.htmlPaths),
+    config.watch ? Promise.resolve(null) : readTimingCache(config.projectRoot)
+  ]);
   if (config.watch) {
     const preBuildPromise = buildTestBundle(config, cachedContent);
     preBuildPromise.catch(() => {
@@ -2595,7 +2865,7 @@ async function run(config) {
       setupBrowser(config, cachedContent),
       writeOutputStaticFiles(config, cachedContent)
     ]);
-    config.expressApp = connections.server;
+    config.webServer = connections.server;
     setupKeyboardEvents(config, cachedContent, connections);
     const isHeadedWatchMode = config.open === true && config.watch;
     if (config.open && !isHeadedWatchMode) {
@@ -2614,7 +2884,10 @@ async function run(config) {
       throw error;
     }
     if (isHeadedWatchMode && (cachedContent._buildError || cachedContent._noTestsWarning)) {
-      await connections.page.goto(`http://localhost:${config.port}/`, { waitUntil: "commit", timeout: 5e3 }).catch(() => {
+      await connections.page.goto(`http://localhost:${config.port}/`, {
+        waitUntil: "commit",
+        timeout: WATCH_NAV_TIMEOUT_MS
+      }).catch(() => {
       });
     }
     if (config.watch) {
@@ -2631,6 +2904,10 @@ async function run(config) {
                 `# Rerun triggered: ${event} \u2192 ${file.replace(`${config.projectRoot}/`, "")}`
               );
             }
+            const rebuildPromise = buildTestBundle(config, cachedContent);
+            rebuildPromise.catch(() => {
+            });
+            cachedContent._preBuildPromise = rebuildPromise;
             return await runTestsInBrowser(config, cachedContent, connections);
           }
           if (config.debug) {
@@ -2643,7 +2920,10 @@ async function run(config) {
         async (_path, _event) => {
           connections.server.publish("refresh");
           if (isHeadedWatchMode && (cachedContent._buildError || cachedContent._noTestsWarning)) {
-            await connections.page.goto(`http://localhost:${config.port}/`, { waitUntil: "commit", timeout: 5e3 }).catch(() => {
+            await connections.page.goto(`http://localhost:${config.port}/`, {
+              waitUntil: "commit",
+              timeout: WATCH_NAV_TIMEOUT_MS
+            }).catch(() => {
             });
           }
         }
@@ -2654,8 +2934,7 @@ async function run(config) {
   } else {
     const allFiles = Object.keys(config.fsTree);
     const groupCount = Math.min(allFiles.length, availableParallelism());
-    const timings = await readTimingCache(config.projectRoot);
-    const { groups, weights } = await splitIntoGroups(allFiles, groupCount, timings);
+    const { groups, weights } = await splitIntoGroups(allFiles, groupCount, timings ?? {});
     config.COUNTER = {
       testCount: 0,
       failCount: 0,
@@ -2687,7 +2966,7 @@ async function run(config) {
 `
     );
     const [browser] = await Promise.all([
-      launchBrowser(config),
+      browserPromise,
       sharedServer ? bindServerToPort(sharedServer, config).then(
         () => groupConfigs.forEach((gc, i) => {
           gc.port = config.port;
@@ -2708,7 +2987,7 @@ async function run(config) {
     const wallTimes = /* @__PURE__ */ new Map();
     const GROUP_TIMEOUT_MS = 3 * 60 * 1e3;
     const keepAlive = setInterval(() => {
-    }, 1e4);
+    }, KEEP_ALIVE_INTERVAL_MS);
     const groupResults = await Promise.allSettled(
       groupConfigs.map((groupConfig, i) => {
         const groupTimeout = new Promise((_, reject) => {
@@ -2734,7 +3013,7 @@ async function run(config) {
             browser,
             sharedServer
           );
-          groupConfig.expressApp = connections.server;
+          groupConfig.webServer = connections.server;
           if (config.before) {
             await runUserModule(`${process.cwd()}/${config.before}`, groupConfig, "before");
           }
@@ -2749,7 +3028,7 @@ async function run(config) {
               Promise.race([
                 connections.page.close(),
                 new Promise((resolve) => {
-                  const pageCloseTimeoutId = setTimeout(resolve, 1e4);
+                  const pageCloseTimeoutId = setTimeout(resolve, PAGE_CLOSE_GRACE_MS);
                   pageCloseTimeoutId.unref();
                 })
               ]).catch(() => {
@@ -2787,11 +3066,10 @@ async function run(config) {
     if (config.after) {
       await runUserModule(`${process.cwd()}/${config.after}`, config.COUNTER, "after");
     }
-    const exitTimer = setTimeout(() => process.exit(exitCode), 5e3);
+    const exitTimer = setTimeout(() => process.exit(exitCode), STDOUT_FLUSH_GRACE_MS);
     exitTimer.unref();
     process.stdout.write("\n", async () => {
       clearTimeout(exitTimer);
-      clearInterval(keepAlive);
       await Promise.all([
         sharedServer?.close().catch(
           (err) => config.debug && process.stderr.write(`# [qunitx] server.close: ${err.message}
@@ -2803,6 +3081,7 @@ async function run(config) {
         )
       ]);
       await shutdownPrelaunch();
+      clearInterval(keepAlive);
       process.exit(exitCode);
     });
   }
@@ -2931,6 +3210,7 @@ function normalizeInternalAssetPathFromHTML(projectRoot, assetPath, htmlPath) {
   const currentDirectory = htmlPath ? htmlPath.split("/").slice(0, -1).join("/") : projectRoot;
   return assetPath.startsWith("./") ? normalize(`${currentDirectory}/${assetPath.slice(2)}`) : normalize(`${currentDirectory}/${assetPath}`);
 }
+var WATCH_NAV_TIMEOUT_MS, PAGE_CLOSE_GRACE_MS, STDOUT_FLUSH_GRACE_MS, KEEP_ALIVE_INTERVAL_MS;
 var init_run = __esm({
   "lib/commands/run.ts"() {
     init_browser();
@@ -2950,6 +3230,10 @@ var init_run = __esm({
     init_display_final_result();
     init_read_template();
     init_html();
+    WATCH_NAV_TIMEOUT_MS = 5e3;
+    PAGE_CLOSE_GRACE_MS = 1e4;
+    STDOUT_FLUSH_GRACE_MS = 5e3;
+    KEEP_ALIVE_INTERVAL_MS = 1e4;
   }
 });
 
@@ -2964,7 +3248,7 @@ init_color();
 var package_default = {
   name: "qunitx-cli",
   type: "module",
-  version: "0.19.3",
+  version: "0.20.0",
   description: "Browser runner for QUnitx: run your qunitx tests in google-chrome",
   author: "Izel Nakri",
   license: "MIT",
@@ -3019,8 +3303,6 @@ var package_default = {
     ws: "^8.20.0"
   },
   devDependencies: {
-    cors: "^2.8.6",
-    express: "^5.2.1",
     "js-yaml": "^4.1.1",
     prettier: "^3.8.2",
     qunitx: "^1.2.7",
@@ -3330,6 +3612,7 @@ function buildGlobFormat(path7) {
 }
 
 // lib/utils/parse-cli-flags.ts
+var FALLBACK_TIMEOUT_MS = 1e4;
 function parseCliFlags(projectRoot) {
   const providedFlags = process.argv.slice(2).reduce(
     (result, arg) => {
@@ -3344,7 +3627,7 @@ function parseCliFlags(projectRoot) {
       } else if (arg.startsWith("--failfast") || arg.startsWith("--failFast")) {
         return Object.assign(result, { failFast: parseBoolean(arg.split("=")[1]) });
       } else if (arg.startsWith("--timeout")) {
-        return Object.assign(result, { timeout: Number(arg.split("=")[1]) || 1e4 });
+        return Object.assign(result, { timeout: Number(arg.split("=")[1]) || FALLBACK_TIMEOUT_MS });
       } else if (arg.startsWith("--output")) {
         return Object.assign(result, { output: arg.split("=")[1] });
       } else if (arg.endsWith(".html")) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "qunitx-cli",
   "type": "module",
-  "version": "0.19.3",
+  "version": "0.20.0",
   "description": "Browser runner for QUnitx: run your qunitx tests in google-chrome",
   "author": "Izel Nakri",
   "license": "MIT",
@@ -56,8 +56,6 @@
     "ws": "^8.20.0"
   },
   "devDependencies": {
-    "cors": "^2.8.6",
-    "express": "^5.2.1",
     "js-yaml": "^4.1.1",
     "prettier": "^3.8.2",
     "qunitx": "^1.2.7",