respec 37.3.1 → 37.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "respec",
-  "version": "37.3.1",
+  "version": "37.3.3",
   "license": "W3C",
   "description": "A technical specification pre-processor.",
   "engines": {
@@ -38,17 +38,16 @@
     "eslint-plugin-import-x": "^4.17.1",
     "eslint-plugin-jasmine": "^4.2.2",
     "eslint-plugin-prettier": "^5.5.6",
-    "globals": "^17.9.0",
-    "highlight.js": "^11.11.2",
+    "globals": "^17.11.0",
+    "highlight.js": "^11.12.0",
     "hyperhtml": "^2.34.2",
     "idb": "^8.0.3",
-    "jasmine": "^6.3.0",
-    "jasmine-core": "^6.3.0",
+    "jasmine": "^7.0.0",
+    "jasmine-core": "^7.0.1",
     "karma": "^6.4.4",
     "karma-chrome-launcher": "^3.2.0",
     "karma-firefox-launcher": "^2.1.3",
     "karma-jasmine": "^5.1.0",
-    "karma-jasmine-html-reporter": "^2.2.0",
     "karma-mocha-reporter": "^2.2.5",
     "karma-safari-launcher": "^1.0.0",
     "lint-staged": "^17.3.0",
@@ -63,7 +62,7 @@
     "simple-git-hooks": "^2.13.1",
     "sniffy-mimetype": "^1.1.1",
     "typescript": "^7.0.2",
-    "vnu-jar": "^26.8.6",
+    "vnu-jar": "^26.8.15",
     "webidl2": "^24.5.0"
   },
   "scripts": {
@@ -89,10 +88,9 @@
     "test:integration": "karma start ./tests/spec/karma.conf.cjs --single-run"
   },
   "dependencies": {
-    "colors": "1.4.0",
     "finalhandler": "^2.1.1",
     "marked": "^18.0.9",
-    "puppeteer": "^25.5.0",
+    "puppeteer": "^25.8.0",
     "sade": "^1.8.1",
     "serve-static": "^2.2.1"
   },
@@ -121,13 +119,13 @@
       "vnu-jar"
     ],
     "overrides": {
-      "fast-uri": "^3.1.4",
+      "fast-uri": "^3.1.5",
       "flatted": ">=3.4.2",
       "follow-redirects": ">=1.16.0",
       "jasmine>glob": ">=10.5.0",
       "lodash": ">=4.18.0",
       "qs": ">=6.14.2",
-      "socket.io-parser": ">=4.2.6",
+      "socket.io-parser": ">=4.2.7",
       "tmp": ">=0.2.4",
       "ws": ">=8.17.1",
       "@rollup/pluginutils>picomatch": "^2.3.2",

package/tools/respec2html.js

@@ -1,32 +1,32 @@
 #!/usr/bin/env node
 import { readFile, writeFile } from "fs/promises";
-import colors from "colors";
 import finalhandler from "finalhandler";
 import http from "http";
 import { marked } from "marked";
 import path from "path";
 import sade from "sade";
 import serveStatic from "serve-static";
+import { styleText } from "node:util";
 import { toHTML } from "./respecDocWriter.js";
 
 const __dirname = import.meta.dirname;
 
 class Renderer extends marked.Renderer {
   strong(token) {
-    return colors.bold(this.parser.parseInline(token.tokens));
+    return styleText("bold", this.parser.parseInline(token.tokens));
   }
   em(token) {
-    return colors.italic(this.parser.parseInline(token.tokens));
+    return styleText("italic", this.parser.parseInline(token.tokens));
   }
   codespan(token) {
-    return colors.underline(unescape(token.text));
+    return styleText("underline", unescape(token.text));
   }
   paragraph(token) {
     return unescape(this.parser.parseInline(token.tokens));
   }
   link(token) {
     const text = this.parser.parseInline(token.tokens);
-    return `[${text}](${colors.blue.dim.underline(token.href)})`;
+    return `[${text}](${styleText(["blue", "dim", "underline"], token.href)})`;
   }
   list(token) {
     const body = token.items.map(item => this.listitem(item)).join("");
@@ -50,8 +50,8 @@ class Logger {
    */
   info(message, timeRemaining) {
     if (!this.verbose) return;
-    const header = colors.dim.bgWhite.black.bold("[INFO]");
-    const time = colors.dim(`[Timeout: ${timeRemaining}ms]`);
+    const header = styleText(["dim", "bgWhite", "black", "bold"], "[INFO]");
+    const time = styleText("dim", `[Timeout: ${timeRemaining}ms]`);
     console.error(header, time, message);
   }
 
@@ -60,8 +60,8 @@ class Logger {
    * @param {RsError} rsError
    */
   error(rsError) {
-    const header = colors.bgRed.white.bold("[ERROR]");
-    const message = colors.red(this._formatMarkdown(rsError.message));
+    const header = styleText(["bgRed", "white", "bold"], "[ERROR]");
+    const message = styleText("red", this._formatMarkdown(rsError.message));
     console.error(header, message);
     if (rsError.plugin) {
       this._printDetails(rsError);
@@ -70,8 +70,8 @@ class Logger {
 
   /** @param {RsError} rsError */
   warn(rsError) {
-    const header = colors.bgYellow.black.bold("[WARNING]");
-    const message = colors.yellow(this._formatMarkdown(rsError.message));
+    const header = styleText(["bgYellow", "black", "bold"], "[WARNING]");
+    const message = styleText("yellow", this._formatMarkdown(rsError.message));
     console.error(header, message);
     if (rsError.plugin) {
       this._printDetails(rsError);
@@ -80,14 +80,14 @@ class Logger {
 
   /** @param {Error | string} error */
   fatal(error) {
-    const header = colors.bgRed.white.bold("[FATAL]");
-    const message = colors.red(error.stack || error);
+    const header = styleText(["bgRed", "white", "bold"], "[FATAL]");
+    const message = styleText("red", error.stack || error);
     console.error(header, message);
     // Errors thrown by respecDocWriter keep the original in `cause`, so the
     // underlying stack is only reachable by walking the chain.
     let cause = error instanceof Error ? error.cause : undefined;
     for (let depth = 0; cause instanceof Error && depth < 5; depth++) {
-      console.error(colors.red(`Caused by: ${cause.stack}`));
+      console.error(styleText("red", `Caused by: ${cause.stack}`));
       cause = cause.cause;
     }
   }
@@ -105,7 +105,11 @@ class Logger {
       const longestTitle = shouldPrintStacktrace ? "Stacktrace" : "Plugin";
       const padWidth = longestTitle.length + 1;
       const paddedTitle = `${title}:`.padStart(padWidth);
-      console.error(" ", colors.bold(paddedTitle), this._formatMarkdown(value));
+      console.error(
+        " ",
+        styleText("bold", paddedTitle),
+        this._formatMarkdown(value)
+      );
     };
     print("Count", rsError.elements && String(rsError.elements.length));
     print("Plugin", rsError.plugin);
@@ -113,7 +117,7 @@ class Logger {
     if (shouldPrintStacktrace) {
       let stacktrace = `${rsError.stack}`;
       if (rsError.cause) {
-        stacktrace += `\n    ${colors.bold("Caused by:")} ${rsError.cause.stack.split("\n").join("\n   ")}`;
+        stacktrace += `\n    ${styleText("bold", "Caused by:")} ${rsError.cause.stack.split("\n").join("\n   ")}`;
       }
       print("Stacktrace", stacktrace);
     }
@@ -173,18 +177,20 @@ class StaticServer {
 
 const cli = sade("respec [source] [destination]", true)
   .describe("Converts a ReSpec source file to HTML and writes to destination.")
-  .example(`input.html output.html ${colors.dim("# Output to a file.")}`)
+  .example(`input.html output.html ${styleText("dim", "# Output to a file.")}`)
   .example(
-    `http://example.com/spec.html stdout ${colors.dim("# Output to stdout.")}`
+    `http://example.com/spec.html stdout ${styleText("dim", "# Output to stdout.")}`
   )
   .example(
-    `http://example.com/spec.html output.html -e -w ${colors.dim(
+    `http://example.com/spec.html output.html -e -w ${styleText(
+      "dim",
       "# Halt on errors or warning."
     )}`
   )
   .example("--src http://example.com/spec.html --out spec.html")
   .example(
-    `--localhost index.html out.html ${colors.dim(
+    `--localhost index.html out.html ${styleText(
+      "dim",
       "# Generate file using a local web server."
     )}`
   );

package/tools/respecDocWriter.js

@@ -7,6 +7,13 @@ import { readFile } from "fs/promises";
 
 const noop = () => {};
 
+/**
+ * Time allowed for the browser process to start, separate from processing.
+ * Cold CI runners regularly need longer than puppeteer's 30s default,
+ * which surfaced as "Timed out ... waiting for the WS endpoint URL".
+ */
+const LAUNCH_TIMEOUT = 120000;
+
 /**
  * Fetches a ReSpec "src" URL, and writes the processed static HTML to an "out" path.
  * @param {string} src A URL or filepath that is the ReSpec source.
@@ -41,7 +48,11 @@ export async function toHTML(src, options = {}) {
   }
 
   const log = msg => options.onProgress(msg, timer.remaining);
-  const timer = createTimer(timeout);
+  /**
+   * Starts once the browser is up, so a slow launch does not eat the caller's
+   * processing budget. `timeout` documents time before *processing* times out.
+   */
+  let timer = createTimer(timeout);
 
   /** @type {RsError[]} */
   const errors = [];
@@ -65,7 +76,10 @@ export async function toHTML(src, options = {}) {
     args,
     devtools,
     headless: true,
+    timeout: LAUNCH_TIMEOUT,
   });
+  // Charge only document processing against the caller's timeout.
+  timer = createTimer(timeout);
 
   try {
     const page = await browser.newPage();