qunitx-cli 0.19.0 → 0.19.1

package/dist/cli.js

@@ -93,7 +93,7 @@ async function cleanupBrowserDir(dirPath) {
       }
     }
   }
-  const deadline = Date.now() + 1e3;
+  const deadline = Date.now() + 5e3;
   while (Date.now() < deadline) {
     const removed = await fs.rm(dirPath, { recursive: true, force: true }).then(() => true).catch(() => false);
     if (removed) break;
@@ -908,7 +908,7 @@ function setupWebServer(config, cachedContent) {
   );
   server.wss.on("connection", function connection(socket) {
     socket.on("message", function message(data) {
-      const { event, details, abort } = JSON.parse(data);
+      const { event, details, qunitResult, abort } = JSON.parse(data);
       if (event === "wsOpen") {
         config._phase = "loading";
         config._onWsOpen?.();
@@ -941,6 +941,7 @@ function setupWebServer(config, cachedContent) {
         TAPDisplayTestResult(config.COUNTER, details);
       } else if (event === "done") {
         config._phase = "done";
+        config._lastQUnitResult = qunitResult ?? null;
         if (config.debug && config._groupMode) {
           process.stdout.write(
             `# group done: ${details.passed} passed, ${details.failed} failed (${details.runtime}ms)
@@ -968,7 +969,11 @@ function setupWebServer(config, cachedContent) {
       return;
     }
     config._onTestsJsServed?.();
-    res.writeHead(200, { "Content-Type": "application/javascript", "Cache-Control": "no-store" });
+    res.writeHead(200, {
+      "Content-Type": "application/javascript",
+      "Cache-Control": "no-store",
+      "Content-Length": bytes
+    });
     res.end(cachedContent.allTestCode);
   });
   server.get("/filtered-tests.js", (_req, res) => {
@@ -985,7 +990,11 @@ function setupWebServer(config, cachedContent) {
       return;
     }
     config._onTestsJsServed?.();
-    res.writeHead(200, { "Content-Type": "application/javascript", "Cache-Control": "no-store" });
+    res.writeHead(200, {
+      "Content-Type": "application/javascript",
+      "Cache-Control": "no-store",
+      "Content-Length": bytes
+    });
     res.end(cachedContent.filteredTestCode);
   });
   server.get("/", async (_req, res) => {
@@ -1006,10 +1015,9 @@ function setupWebServer(config, cachedContent) {
       res.end();
       return;
     }
-    const TEST_RUNTIME_TO_INJECT = testRuntimeToInject(config.port, config);
     const htmlContent = escapeAndInjectTestsToHTML(
       mainHTMLWithReplacedAssets,
-      TEST_RUNTIME_TO_INJECT,
+      testRuntimeToInject(config.port, config),
       "./tests.js"
     );
     res.writeHead(200, { "Content-Type": "text/html", "Cache-Control": "no-store" });
@@ -1038,10 +1046,9 @@ function setupWebServer(config, cachedContent) {
       res.end();
       return;
     }
-    const TEST_RUNTIME_TO_INJECT = testRuntimeToInject(config.port, config);
     const htmlContent = escapeAndInjectTestsToHTML(
       mainHTMLWithReplacedAssets,
-      TEST_RUNTIME_TO_INJECT,
+      testRuntimeToInject(config.port, config),
       "./filtered-tests.js"
     );
     res.writeHead(200, { "Content-Type": "text/html", "Cache-Control": "no-store" });
@@ -1055,10 +1062,9 @@ function setupWebServer(config, cachedContent) {
   server.get("/*", async (req, res) => {
     const possibleDynamicHTML = cachedContent.dynamicContentHTMLs[`${config.projectRoot}${req.path}`];
     if (possibleDynamicHTML) {
-      const TEST_RUNTIME_TO_INJECT = testRuntimeToInject(config.port, config);
       const htmlContent = escapeAndInjectTestsToHTML(
         possibleDynamicHTML,
-        TEST_RUNTIME_TO_INJECT,
+        testRuntimeToInject(config.port, config),
         "/tests.js"
       );
       res.writeHead(200, { "Content-Type": "text/html", "Cache-Control": "no-store" });
@@ -1215,11 +1221,6 @@ function testRuntimeToInject(port, config) {
           window.socket.send(JSON.stringify({ event: 'connection' }));
         }
       });
-      window.QUnit.moduleStart((details) => { // NOTE: might be useful in future for hanged module tracking
-        if (window.IS_PLAYWRIGHT) {
-          window.socket.send(JSON.stringify({ event: 'moduleStart', details: details }, getCircularReplacer()));
-        }
-      });
       window.QUnit.on('testStart', (details) => {
         window.QUNIT_RESULT.totalTests++;
         window.QUNIT_RESULT.currentTest = details.fullName.join(' | ');
@@ -1239,7 +1240,7 @@ function testRuntimeToInject(port, config) {
       });
       window.QUnit.done((details) => {
         if (window.IS_PLAYWRIGHT) {
-          window.socket.send(JSON.stringify({ event: 'done', details: details, abort: window.abortQUnit }, getCircularReplacer()));
+          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.
@@ -1537,16 +1538,25 @@ async function setupBrowser(config, cachedContent, existingBrowser = null) {
   await page.addInitScript(() => {
     window.IS_PLAYWRIGHT = true;
   });
-  page.on("console", async (msg) => {
+  config._pendingConsoleHandlers = /* @__PURE__ */ new Set();
+  page.on("console", (msg) => {
     const type = msg.type();
     const alwaysShow = type === "warning" || type === "error";
     if (!alwaysShow && !config.debug) return;
-    try {
-      const values = await Promise.all(msg.args().map((arg) => arg.jsonValue()));
-      console.log(...values);
-    } catch {
-      console.log(msg.text());
-    }
+    const handler = (async () => {
+      try {
+        const values = await Promise.all(
+          msg.args().map(
+            (arg) => arg.jsonValue().catch(() => arg.evaluate((v) => JSON.stringify(v)).then(JSON.parse))
+          )
+        );
+        console.log(...values);
+      } catch {
+        console.log(msg.text());
+      }
+    })();
+    config._pendingConsoleHandlers.add(handler);
+    handler.finally(() => config._pendingConsoleHandlers?.delete(handler));
   });
   page.on("pageerror", (error) => {
     console.error(error.toString());
@@ -1712,7 +1722,7 @@ async function buildTestBundle(config, cachedContent) {
     // Allow test files outside the project root (e.g. /tmp/my-test.ts) to import
     // packages from any node_modules on the ancestor chain of cwd — the same lookup
     // order Node itself uses when resolving require() from process.cwd().
-    nodePaths: ancestorNodeModules(process.cwd()),
+    nodePaths: ANCESTOR_NODE_MODULES,
     bundle: true,
     logLevel: "silent",
     outfile,
@@ -1817,6 +1827,7 @@ async function runTestsInBrowser(config, cachedContent = {}, connections, target
         await runUserModule(`${process.cwd()}/${config.after}`, config.COUNTER, "after");
       }
       if (!config.watch) {
+        await flushConsoleHandlers(config._pendingConsoleHandlers);
         await Promise.all([
           connections.server && connections.server.close(),
           connections.browser && connections.browser.close()
@@ -1856,7 +1867,7 @@ function buildFilteredTests(filteredTests, outputPath, config) {
         contents: filteredTests.map((filePath) => `import "${filePath}";`).join(""),
         resolveDir: process.cwd()
       },
-      nodePaths: ancestorNodeModules(process.cwd()),
+      nodePaths: ANCESTOR_NODE_MODULES,
       bundle: true,
       logLevel: "silent",
       outfile: outputPath,
@@ -1958,7 +1969,7 @@ async function runTestInsideHTMLFile(filePath, { page, server, browser }, config
     clearTimeout(timeoutHandle);
     timeoutHandle = setTimeout(resolveTestRace, startupMs);
     await testRaceResult;
-    QUNIT_RESULT = await page.evaluate(() => window.QUNIT_RESULT);
+    QUNIT_RESULT = config._lastQUnitResult ?? await page.evaluate(() => window.QUNIT_RESULT);
   } catch (error) {
     targetError = error;
     console.log(error);
@@ -1969,6 +1980,7 @@ async function runTestInsideHTMLFile(filePath, { page, server, browser }, config
     config._onTestsJsServed = null;
     config._resetTestTimeout = null;
     config._testRunDone = null;
+    config._lastQUnitResult = null;
   }
   if (!QUNIT_RESULT) {
     if (targetError) console.log(targetError);
@@ -1976,7 +1988,12 @@ async function runTestInsideHTMLFile(filePath, { page, server, browser }, config
     console.log(`# TIMEOUT: ${wsReason}`);
     console.log("BROWSER: runtime error thrown during executing tests");
     console.error("BROWSER: runtime error thrown during executing tests");
-    await failOnNonWatchMode(config.watch, { server, browser }, config._groupMode);
+    await failOnNonWatchMode(
+      config.watch,
+      { server, browser },
+      config._groupMode,
+      config._pendingConsoleHandlers
+    );
   } else if (QUNIT_RESULT.totalTests === 0) {
     return;
   } else if (QUNIT_RESULT.totalTests > QUNIT_RESULT.finishedTests) {
@@ -1986,16 +2003,22 @@ async function runTestInsideHTMLFile(filePath, { page, server, browser }, config
     );
     console.log(`BROWSER: TEST TIMED OUT: ${QUNIT_RESULT.currentTest}`);
     console.error(`BROWSER: TEST TIMED OUT: ${QUNIT_RESULT.currentTest}`);
-    await failOnNonWatchMode(config.watch, { server, browser }, config._groupMode);
+    await failOnNonWatchMode(
+      config.watch,
+      { server, browser },
+      config._groupMode,
+      config._pendingConsoleHandlers
+    );
   } else if (QUNIT_RESULT.failedTests > config.COUNTER.failCount) {
     config.COUNTER.failCount = QUNIT_RESULT.failedTests;
   }
 }
-async function failOnNonWatchMode(watchMode = false, connections = {}, groupMode = false) {
+async function failOnNonWatchMode(watchMode = false, connections = {}, groupMode = false, pendingHandlers) {
   if (!watchMode) {
     if (groupMode) {
       throw new Error("Browser test run failed");
     }
+    await flushConsoleHandlers(pendingHandlers);
     await Promise.all([
       connections.server && connections.server.close(),
       connections.browser && connections.browser.close()
@@ -2004,7 +2027,12 @@ async function failOnNonWatchMode(watchMode = false, connections = {}, groupMode
     process.exit(1);
   }
 }
-var BundleError, ancestorNodeModules;
+async function flushConsoleHandlers(handlers, deadline = Date.now() + 2e3) {
+  if (!handlers || handlers.size === 0 || Date.now() >= deadline) return;
+  await Promise.allSettled([...handlers]);
+  return flushConsoleHandlers(handlers, deadline);
+}
+var BundleError, ancestorNodeModules, ANCESTOR_NODE_MODULES;
 var init_tests_in_browser = __esm({
   "lib/commands/run/tests-in-browser.ts"() {
     init_color();
@@ -2023,6 +2051,7 @@ var init_tests_in_browser = __esm({
     ancestorNodeModules = (dir) => dir.split(path5.sep).map(
       (_, i, parts) => path5.join(parts.slice(0, parts.length - i).join(path5.sep) || path5.sep, "node_modules")
     );
+    ANCESTOR_NODE_MODULES = ancestorNodeModules(process.cwd());
   }
 });
 
@@ -2209,7 +2238,7 @@ var CHANGE_DEDUPE_MS;
 var init_file_watcher = __esm({
   "lib/setup/file-watcher.ts"() {
     init_color();
-    CHANGE_DEDUPE_MS = 30;
+    CHANGE_DEDUPE_MS = 10;
   }
 });
 
@@ -2393,7 +2422,7 @@ async function run(config) {
   } else {
     const allFiles = Object.keys(config.fsTree);
     const groupCount = Math.min(allFiles.length, availableParallelism());
-    const groups = splitIntoGroups(allFiles, groupCount);
+    const groups = await splitIntoGroups(allFiles, groupCount);
     config.COUNTER = {
       testCount: 0,
       failCount: 0,
@@ -2462,6 +2491,7 @@ async function run(config) {
             try {
               await runTestsInBrowser(groupConfig, groupCachedContents[i], connections);
             } finally {
+              await flushConsoleHandlers(groupConfig._pendingConsoleHandlers);
               await Promise.all([
                 connections.server && connections.server.close(),
                 connections.page && // Unref'd: the keepAlive interval above holds the event loop open, so this
@@ -2567,10 +2597,24 @@ async function addCachedContentMainHTML(projectRoot, cachedContent) {
   }
   return cachedContent;
 }
-function splitIntoGroups(files, groupCount) {
-  const groups = Array.from({ length: groupCount }, () => []);
-  files.forEach((file, i) => groups[i % groupCount].push(file));
-  return groups.filter((group) => group.length > 0);
+async function splitIntoGroups(files, groupCount) {
+  const withSizes = await Promise.all(
+    files.map(
+      (f) => fs12.stat(f).then(({ size }) => ({ f, size })).catch(() => ({ f, size: 0 }))
+    )
+  );
+  return withSizes.sort((a, b) => b.size - a.size).reduce(
+    (groups, { f, size }) => {
+      const { idx } = groups.reduce(
+        (min, { total }, i) => total < min.total ? { idx: i, total } : min,
+        { idx: 0, total: groups[0].total }
+      );
+      groups[idx].files.push(f);
+      groups[idx].total += size;
+      return groups;
+    },
+    Array.from({ length: groupCount }, () => ({ files: [], total: 0 }))
+  ).flatMap((g) => g.files.length > 0 ? [g.files] : []);
 }
 function logWatcherAndKeyboardShortcutInfo(config, _server) {
   const prefix = "Watching files...";
@@ -2619,7 +2663,7 @@ init_color();
 var package_default = {
   name: "qunitx-cli",
   type: "module",
-  version: "0.19.0",
+  version: "0.19.1",
   description: "Browser runner for QUnitx: run your qunitx tests in google-chrome",
   author: "Izel Nakri",
   license: "MIT",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "qunitx-cli",
   "type": "module",
-  "version": "0.19.0",
+  "version": "0.19.1",
   "description": "Browser runner for QUnitx: run your qunitx tests in google-chrome",
   "author": "Izel Nakri",
   "license": "MIT",