qunitx-cli 0.19.1 → 0.19.2

package/dist/cli.js

@@ -385,21 +385,6 @@ var init_color = __esm({
   }
 });
 
-// lib/utils/path-exists.ts
-import fs2 from "node:fs/promises";
-async function pathExists(path7) {
-  try {
-    await fs2.access(path7);
-    return true;
-  } catch {
-    return false;
-  }
-}
-var init_path_exists = __esm({
-  "lib/utils/path-exists.ts"() {
-  }
-});
-
 // lib/utils/read-template.ts
 import fs3 from "node:fs/promises";
 import { dirname, join as join2 } from "node:path";
@@ -906,6 +891,7 @@ function setupWebServer(config, cachedContent) {
     cachedContent.mainHTML.filePath,
     config.projectRoot
   );
+  const runtimeScript = testRuntimeToInject(config);
   server.wss.on("connection", function connection(socket) {
     socket.on("message", function message(data) {
       const { event, details, qunitResult, abort } = JSON.parse(data);
@@ -957,7 +943,7 @@ function setupWebServer(config, cachedContent) {
   });
   server.get("/tests.js", (_req, res) => {
     const bytes = cachedContent.allTestCode?.length ?? null;
-    process.stdout.write(
+    config.debug && process.stdout.write(
       `# [HTTPServer] GET /tests.js \u2192 ${bytes !== null ? `${bytes} bytes` : "NOT READY (allTestCode is null)"}
 `
     );
@@ -978,7 +964,7 @@ function setupWebServer(config, cachedContent) {
   });
   server.get("/filtered-tests.js", (_req, res) => {
     const bytes = cachedContent.filteredTestCode?.length ?? null;
-    process.stdout.write(
+    config.debug && process.stdout.write(
       `# [HTTPServer] GET /filtered-tests.js \u2192 ${bytes !== null ? `${bytes} bytes` : "NOT READY (filteredTestCode is null)"}
 `
     );
@@ -1017,7 +1003,7 @@ function setupWebServer(config, cachedContent) {
     }
     const htmlContent = escapeAndInjectTestsToHTML(
       mainHTMLWithReplacedAssets,
-      testRuntimeToInject(config.port, config),
+      runtimeScript,
       "./tests.js"
     );
     res.writeHead(200, { "Content-Type": "text/html", "Cache-Control": "no-store" });
@@ -1048,7 +1034,7 @@ function setupWebServer(config, cachedContent) {
     }
     const htmlContent = escapeAndInjectTestsToHTML(
       mainHTMLWithReplacedAssets,
-      testRuntimeToInject(config.port, config),
+      runtimeScript,
       "./filtered-tests.js"
     );
     res.writeHead(200, { "Content-Type": "text/html", "Cache-Control": "no-store" });
@@ -1064,7 +1050,7 @@ function setupWebServer(config, cachedContent) {
     if (possibleDynamicHTML) {
       const htmlContent = escapeAndInjectTestsToHTML(
         possibleDynamicHTML,
-        testRuntimeToInject(config.port, config),
+        runtimeScript,
         "/tests.js"
       );
       res.writeHead(200, { "Content-Type": "text/html", "Cache-Control": "no-store" });
@@ -1076,21 +1062,26 @@ function setupWebServer(config, cachedContent) {
       );
     }
     const url = req.url;
-    const requestStartedAt = /* @__PURE__ */ new Date();
+    const requestStartedAt = Date.now();
     const filePath = (url.endsWith("/") ? [STATIC_FILES_PATH, url, "index.html"] : [STATIC_FILES_PATH, url]).join("");
-    const statusCode = await pathExists(filePath) ? 200 : 404;
-    res.writeHead(statusCode, {
-      "Content-Type": req.headers.accept?.includes("text/html") ? MIME_TYPES.html : MIME_TYPES[path4.extname(filePath).substring(1).toLowerCase()] || MIME_TYPES.html
+    const contentType = req.headers.accept?.includes("text/html") ? MIME_TYPES.html : MIME_TYPES[path4.extname(filePath).substring(1).toLowerCase()] || MIME_TYPES.html;
+    const stream = fs8.createReadStream(filePath);
+    stream.on("open", () => {
+      res.writeHead(200, { "Content-Type": contentType });
+      stream.pipe(res);
+      config.debug && process.stdout.write(
+        `# [HTTPServer] GET ${url} 200 - ${Date.now() - requestStartedAt}ms
+`
+      );
     });
-    if (statusCode === 404) {
-      res.end();
-    } else {
-      fs8.createReadStream(filePath).pipe(res);
-    }
-    process.stdout.write(
-      `# [HTTPServer] GET ${url} ${statusCode} - ${/* @__PURE__ */ new Date() - requestStartedAt}ms
+    stream.on("error", () => {
+      res.writeHead(404, { "Content-Type": contentType });
+      res.end(contentType === MIME_TYPES.html ? NOT_FOUND_HTML : void 0);
+      config.debug && process.stdout.write(
+        `# [HTTPServer] GET ${url} 404 - ${Date.now() - requestStartedAt}ms
 `
-    );
+      );
+    });
   });
   return server;
 }
@@ -1102,7 +1093,7 @@ function replaceAssetPaths(html, htmlPath, projectRoot) {
     return result.replace(assetPath, normalizedFullAbsolutePath.replace(projectRoot, "."));
   }, html);
 }
-function testRuntimeToInject(port, config) {
+function testRuntimeToInject(config) {
   return `<script>
     window.testTimeout = 0;
     setInterval(() => {
@@ -1138,7 +1129,7 @@ function testRuntimeToInject(port, config) {
 
       function setupWebSocket() {
         try {
-          window.socket = new WebSocket('ws://localhost:${port}');
+          window.socket = new WebSocket(\`ws://localhost:\${location.port}\`);
         } catch (error) {
           console.log(error);
           retryOrFail();
@@ -1150,7 +1141,7 @@ function testRuntimeToInject(port, config) {
           // Notify Node.js that the WS socket is open. This fires immediately (< 1 s) because
           // this runtime script is tiny \u2014 tests.js background compilation hasn't finished yet.
           // Node.js uses this to distinguish "WS never connected" from "WS connected but bundle slow".
-          if (window.IS_PLAYWRIGHT) {
+          if (navigator.webdriver) {
             window.socket.send(JSON.stringify({ event: 'wsOpen' }));
           }
           maybeStart();
@@ -1159,9 +1150,9 @@ function testRuntimeToInject(port, config) {
           retryOrFail();
         });
         window.socket.addEventListener('message', function(messageEvent) {
-          if (!window.IS_PLAYWRIGHT && messageEvent.data === 'refresh') {
+          if (!navigator.webdriver && messageEvent.data === 'refresh') {
             window.location.reload(true);
-          } else if (window.IS_PLAYWRIGHT && messageEvent.data === 'abort') {
+          } else if (navigator.webdriver && messageEvent.data === 'abort') {
             window.abortQUnit = true;
             window.QUnit.config.queue.length = 0;
             window.socket.send(JSON.stringify({ event: 'abort' }));
@@ -1204,7 +1195,7 @@ function testRuntimeToInject(port, config) {
 
       if (!window.QUnit) {
         console.log('QUnit not found after WebSocket connected');
-        if (window.IS_PLAYWRIGHT) {
+        if (navigator.webdriver) {
           // Signal the Playwright runner that the run is complete with 0 tests rather than
           // waiting for the inactivity timeout. The runner treats totalTests === 0 as a
           // "no tests registered" warning (not a failure), so this gives a fast, clean result.
@@ -1217,7 +1208,7 @@ function testRuntimeToInject(port, config) {
       }
 
       window.QUnit.begin(() => { // NOTE: might be useful in future for hanged module tracking
-        if (window.IS_PLAYWRIGHT) {
+        if (navigator.webdriver) {
           window.socket.send(JSON.stringify({ event: 'connection' }));
         }
       });
@@ -1230,8 +1221,10 @@ function testRuntimeToInject(port, config) {
         window.QUNIT_RESULT.finishedTests++;
         if (details.status === 'failed') window.QUNIT_RESULT.failedTests++;
         window.QUNIT_RESULT.currentTest = null;
-        if (window.IS_PLAYWRIGHT) {
-          window.socket.send(JSON.stringify({ event: 'testEnd', details: details, abort: window.abortQUnit }, getCircularReplacer()));
+        if (navigator.webdriver) {
+          const isFailed = details.status === 'failed';
+          const payload = isFailed ? details : { status: details.status, fullName: details.fullName, runtime: details.runtime };
+          window.socket.send(JSON.stringify({ event: 'testEnd', details: payload, abort: window.abortQUnit }, isFailed ? getCircularReplacer() : undefined));
 
           if (${config.failFast} && details.status === 'failed') {
             window.QUnit.config.queue.length = 0;
@@ -1239,7 +1232,7 @@ function testRuntimeToInject(port, config) {
         }
       });
       window.QUnit.done((details) => {
-        if (window.IS_PLAYWRIGHT) {
+        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
@@ -1330,7 +1323,7 @@ function buildNoTestsHTML(files) {
 </head>
 <body>
   <div id="qunit">
-    <h1 id="qunit-header">qunitx</h1>
+    <h1 id="qunit-header"><a href="/" style="color:inherit;text-decoration:none">qunitx</a></h1>
     <h2 id="qunit-banner"></h2>
     <div id="qunit-userAgent">Warning: No Tests Registered</div>
     <ol id="qunit-tests">
@@ -1350,7 +1343,7 @@ function buildNoTestsHTML(files) {
       (function () {
         var retries = 0;
         function connect() {
-          var ws = new WebSocket('ws://' + location.hostname + ':' + location.port);
+          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('error', function () { ws.close(); });
@@ -1432,7 +1425,7 @@ function buildErrorHTML(buildError) {
 </head>
 <body>
   <div id="qunit">
-    <h1 id="qunit-header">qunitx</h1>
+    <h1 id="qunit-header"><a href="/" style="color:inherit;text-decoration:none">qunitx</a></h1>
     <h2 id="qunit-banner"></h2>
     <div id="qunit-userAgent">Build Error: ${buildError.type}</div>
     <ol id="qunit-tests">
@@ -1452,7 +1445,7 @@ function buildErrorHTML(buildError) {
       (function () {
         var retries = 0;
         function connect() {
-          var ws = new WebSocket('ws://' + location.hostname + ':' + location.port);
+          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('error', function () { ws.close(); });
@@ -1464,16 +1457,42 @@ function buildErrorHTML(buildError) {
 </body>
 </html>`;
 }
-var fsPromise;
+var fsPromise, NOT_FOUND_HTML;
 var init_web_server = __esm({
   "lib/setup/web-server.ts"() {
     init_find_internal_assets_from_html();
     init_html();
     init_display_test_result();
     init_color();
-    init_path_exists();
     init_http();
     fsPromise = fs8.promises;
+    NOT_FOUND_HTML = `<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width">
+  <title>404 Not Found \u2014 qunitx</title>
+  <style>
+    *{box-sizing:border-box;margin:0;padding:0}
+    body{font-family:"Helvetica Neue Light","HelveticaNeue-Light","Helvetica Neue",Calibri,Helvetica,Arial,sans-serif}
+    #qunit-header{padding:.5em 0 .5em 1em;color:#C2CCD1;background-color:#0D3349;font-size:1.5em;line-height:1em;font-weight:400;border-radius:5px 5px 0 0}
+    #qunit-banner{height:5px;background-color:#EE5757}
+    #qunit-userAgent{padding:.5em 1em;color:#fff;background-color:#2B81AF;text-shadow:rgba(0,0,0,.5) 2px 2px 1px;font-size:small}
+    #qunit-tests{list-style:none;font-size:smaller}
+    #qunit-tests li{display:list-item;padding:.4em 1em;color:#000;background-color:#EE5757;border-radius:0 0 5px 5px}
+  </style>
+</head>
+<body>
+  <div id="qunit">
+    <h1 id="qunit-header"><a href="/" style="color:inherit;text-decoration:none">qunitx</a></h1>
+    <h2 id="qunit-banner"></h2>
+    <div id="qunit-userAgent">404 Not Found</div>
+    <ol id="qunit-tests">
+      <li id="qunit-testresult"><script>document.getElementById('qunit-testresult').prepend(location.pathname)</script> was not found on this server.</li>
+    </ol>
+  </div>
+</body>
+</html>`;
   }
 });
 
@@ -1535,9 +1554,22 @@ async function setupBrowser(config, cachedContent, existingBrowser = null) {
   const getPage = isHeadedWatchMode ? () => browser.contexts()[0]?.pages()[0] ?? browser.newPage() : () => browser.newPage();
   const [page] = await Promise.all([getPage(), bindServerToPort(server, config)]);
   perfLog(`browser.js: newPage + bindServerToPort took ${Date.now() - pageStart}ms`);
-  await page.addInitScript(() => {
-    window.IS_PLAYWRIGHT = true;
-  });
+  if (config.browser === "firefox") {
+    await page.addInitScript(() => {
+      const preSerialize = (arg) => {
+        if (arg === null || typeof arg !== "object") return arg;
+        try {
+          return JSON.stringify(arg, (_key, v) => v instanceof Date ? v.toISOString() : v);
+        } catch {
+          return String(arg);
+        }
+      };
+      ["log", "warn", "error", "info", "debug"].forEach((method) => {
+        const orig = console[method].bind(console);
+        console[method] = (...args) => orig(...args.map(preSerialize));
+      });
+    });
+  }
   config._pendingConsoleHandlers = /* @__PURE__ */ new Set();
   page.on("console", (msg) => {
     const type = msg.type();
@@ -1545,11 +1577,7 @@ async function setupBrowser(config, cachedContent, existingBrowser = null) {
     if (!alwaysShow && !config.debug) return;
     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))
-          )
-        );
+        const values = await Promise.all(msg.args().map((arg) => arg.jsonValue()));
         console.log(...values);
       } catch {
         console.log(msg.text());
@@ -2346,7 +2374,9 @@ var init_write_output_static_files = __esm({
 // lib/commands/run.ts
 var run_exports = {};
 __export(run_exports, {
+  computeFileTimes: () => computeFileTimes,
   default: () => run,
+  readTimingCache: () => readTimingCache,
   run: () => run
 });
 import fs12 from "node:fs/promises";
@@ -2422,7 +2452,8 @@ async function run(config) {
   } else {
     const allFiles = Object.keys(config.fsTree);
     const groupCount = Math.min(allFiles.length, availableParallelism());
-    const groups = await splitIntoGroups(allFiles, groupCount);
+    const timings = await readTimingCache(config.projectRoot);
+    const { groups, weights } = await splitIntoGroups(allFiles, groupCount, timings);
     config.COUNTER = {
       testCount: 0,
       failCount: 0,
@@ -2461,6 +2492,7 @@ async function run(config) {
       void openOutputInBrowser(config);
     }
     const TIME_COUNTER = timeCounter();
+    const wallTimes = /* @__PURE__ */ new Map();
     const GROUP_TIMEOUT_MS = 3 * 60 * 1e3;
     const keepAlive = setInterval(() => {
     }, 1e3);
@@ -2480,35 +2512,36 @@ async function run(config) {
           }, GROUP_TIMEOUT_MS);
           timeoutId.unref();
         });
-        return Promise.race([
-          (async () => {
-            groupConfig._phase = "connecting";
-            const connections = await setupBrowser(groupConfig, groupCachedContents[i], browser);
-            groupConfig.expressApp = connections.server;
-            if (config.before) {
-              await runUserModule(`${process.cwd()}/${config.before}`, groupConfig, "before");
-            }
-            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
-                // timer still fires if page.close() hangs, without preventing process exit later.
-                Promise.race([
-                  connections.page.close(),
-                  new Promise((resolve) => {
-                    const pageCloseTimeoutId = setTimeout(resolve, 1e4);
-                    pageCloseTimeoutId.unref();
-                  })
-                ]).catch(() => {
+        const startMs = Date.now();
+        const work = (async () => {
+          groupConfig._phase = "connecting";
+          const connections = await setupBrowser(groupConfig, groupCachedContents[i], browser);
+          groupConfig.expressApp = connections.server;
+          if (config.before) {
+            await runUserModule(`${process.cwd()}/${config.before}`, groupConfig, "before");
+          }
+          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
+              // timer still fires if page.close() hangs, without preventing process exit later.
+              Promise.race([
+                connections.page.close(),
+                new Promise((resolve) => {
+                  const pageCloseTimeoutId = setTimeout(resolve, 1e4);
+                  pageCloseTimeoutId.unref();
                 })
-              ]);
-            }
-          })(),
-          groupTimeout
-        ]);
+              ]).catch(() => {
+              })
+            ]);
+          }
+        })();
+        const record = () => wallTimes.set(i, Date.now() - startMs);
+        work.then(record, record);
+        return Promise.race([work, groupTimeout]);
       })
     );
     const exitCode = groupResults.reduce(
@@ -2527,6 +2560,10 @@ async function run(config) {
       );
     }
     TAPDisplayFinalResult(config.COUNTER, TIME_COUNTER.stop());
+    const fileTimes = computeFileTimes(groups, weights, wallTimes);
+    persistTimings(fileTimes, config.projectRoot).catch(() => {
+    });
+    printFileTimings(fileTimes, config.projectRoot);
     if (config.after) {
       await runUserModule(`${process.cwd()}/${config.after}`, config.COUNTER, "after");
     }
@@ -2597,24 +2634,57 @@ async function addCachedContentMainHTML(projectRoot, cachedContent) {
   }
   return cachedContent;
 }
-async function splitIntoGroups(files, groupCount) {
-  const withSizes = await Promise.all(
+async function readTimingCache(projectRoot) {
+  try {
+    const parsed = JSON.parse(await fs12.readFile(`${projectRoot}/tmp/test-timings.json`, "utf8"));
+    return typeof parsed === "object" && parsed !== null && !Array.isArray(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+function computeFileTimes(groups, weights, wallTimes) {
+  const result = /* @__PURE__ */ new Map();
+  groups.forEach((group, i) => {
+    const wallMs = wallTimes.get(i);
+    if (wallMs === void 0) return;
+    const total = group.reduce((sum, f) => sum + (weights.get(f) ?? 0), 0);
+    group.forEach(
+      (f) => result.set(f, total > 0 ? wallMs * ((weights.get(f) ?? 0) / total) : wallMs / group.length)
+    );
+  });
+  return result;
+}
+async function persistTimings(fileTimes, projectRoot) {
+  await fs12.writeFile(
+    `${projectRoot}/tmp/test-timings.json`,
+    JSON.stringify(Object.fromEntries(fileTimes), null, 2)
+  );
+}
+function printFileTimings(fileTimes, projectRoot) {
+  if (fileTimes.size === 0) return;
+  const lines = [...fileTimes.entries()].sort(([, a], [, b]) => b - a).map(([f, ms]) => `#   ${ms.toFixed(0)}ms  ${f.replace(`${projectRoot}/`, "")}`);
+  process.stdout.write(`# File execution times:
+${lines.join("\n")}
+`);
+}
+async function splitIntoGroups(files, groupCount, timings) {
+  const sizes = await Promise.all(
     files.map(
-      (f) => fs12.stat(f).then(({ size }) => ({ f, size })).catch(() => ({ f, size: 0 }))
+      (f) => fs12.stat(f).then((s) => s.size).catch(() => 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] : []);
+  const knownRates = files.map((f, i) => ({ ms: timings[f], size: sizes[i] })).filter(({ ms, size }) => ms > 0 && size > 0);
+  const msPerByte = knownRates.length > 0 ? knownRates.reduce((sum, { ms, size }) => sum + ms / size, 0) / knownRates.length : 1;
+  const weights = new Map(
+    files.map((f, i) => [f, timings[f] > 0 ? timings[f] : sizes[i] * msPerByte])
+  );
+  const buckets = Array.from({ length: groupCount }, () => ({ files: [], total: 0 }));
+  [...files].sort((a, b) => (weights.get(b) ?? 0) - (weights.get(a) ?? 0)).forEach((f) => {
+    const min = buckets.reduce((m, _, i) => buckets[i].total < buckets[m].total ? i : m, 0);
+    buckets[min].files.push(f);
+    buckets[min].total += weights.get(f) ?? 0;
+  });
+  return { groups: buckets.filter((b) => b.files.length > 0).map((b) => b.files), weights };
 }
 function logWatcherAndKeyboardShortcutInfo(config, _server) {
   const prefix = "Watching files...";
@@ -2663,7 +2733,7 @@ init_color();
 var package_default = {
   name: "qunitx-cli",
   type: "module",
-  version: "0.19.1",
+  version: "0.19.2",
   description: "Browser runner for QUnitx: run your qunitx tests in google-chrome",
   author: "Izel Nakri",
   license: "MIT",
@@ -2779,8 +2849,18 @@ import path2 from "node:path";
 // lib/utils/find-project-root.ts
 import process2 from "node:process";
 
+// lib/utils/path-exists.ts
+import fs2 from "node:fs/promises";
+async function pathExists(path7) {
+  try {
+    await fs2.access(path7);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 // lib/utils/search-in-parent-directories.ts
-init_path_exists();
 async function searchInParentDirectories(directory, targetEntry) {
   const resolvedDirectory = directory === "." ? process.cwd() : directory;
   if (await pathExists(`${resolvedDirectory}/${targetEntry}`)) {
@@ -2808,9 +2888,6 @@ async function findProjectRoot() {
   }
 }
 
-// lib/commands/init.ts
-init_path_exists();
-
 // lib/setup/default-project-config-values.ts
 var defaultProjectConfigValues = {
   output: "tmp",
@@ -2877,7 +2954,6 @@ async function writeTSConfigIfNeeded(projectRoot) {
 // lib/commands/generate.ts
 init_color();
 import fs5 from "node:fs/promises";
-init_path_exists();
 init_read_template();
 
 // lib/utils/convert-to-pascal-case.ts

package/package.json

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