respec 35.8.0 → 36.0.0

package/builds/respec-worker.js

@@ -1,32 +1,24 @@
-// ReSpec Worker v1.0.0
-try {
-  importScripts("https://www.w3.org/Tools/respec/respec-highlight");
-} catch (err) {
-  console.error("Network error loading highlighter", err);
+// ReSpec Worker
+// hljs is either inlined by core/worker.js (preferred) or loaded below via
+// importScripts as a fallback when the inline fetch was not possible.
+if (typeof self.hljs === "undefined" && self.RESPEC_HIGHLIGHT_URL) {
+  try {
+    importScripts(self.RESPEC_HIGHLIGHT_URL);
+  } catch (err) {
+    console.error("Network error loading highlighter", err);
+  }
 }
 
-self.addEventListener("message", ({ data: originalData }) => {
-  const data = Object.assign({}, originalData);
-  switch (data.action) {
-    case "highlight-load-lang": {
-      const { langURL, propName, lang } = data;
-      importScripts(langURL);
-      self.hljs.registerLanguage(lang, self[propName]);
-      break;
-    }
-    case "highlight": {
-      const { code } = data;
-      const langs = data.languages.length ? data.languages : undefined;
-      try {
-        const { value, language } = self.hljs.highlightAuto(code, langs);
-        Object.assign(data, { value, language });
-      } catch (err) {
-        console.error("Could not transform some code?", err);
-        // Post back the original code
-        Object.assign(data, { value: code, language: "" });
-      }
-      break;
-    }
+self.addEventListener("message", ({ data }) => {
+  if (data.action !== "highlight") return;
+  const { code } = data;
+  const langs = data.languages?.length ? data.languages : undefined;
+  try {
+    const { value, language } = self.hljs.highlightAuto(code, langs);
+    Object.assign(data, { value, language });
+  } catch (err) {
+    console.error("Could not transform some code?", err);
+    Object.assign(data, { value: code, language: "" });
   }
   self.postMessage(data);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "respec",
-  "version": "35.8.0",
+  "version": "36.0.0",
   "license": "W3C",
   "description": "A technical specification pre-processor.",
   "engines": {
@@ -24,25 +24,27 @@
     "Robin Berjon"
   ],
   "devDependencies": {
-    "@rollup/plugin-alias": "^5.1.1",
-    "@rollup/plugin-commonjs": "^29.0.0",
+    "@eslint/js": "^9.8.0",
+    "@rollup/plugin-commonjs": "^29.0.2",
     "@rollup/plugin-node-resolve": "^16.0.3",
-    "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-terser": "^1.0.0",
     "@types/pluralize": "0.0.33",
     "boxen": "^8.0.1",
+    "cddlparser": "^0.6.0",
     "chokidar": "^5.0.0",
     "clean-css": "^5.3.3",
     "epipebomb": "^1.0.0",
-    "eslint": "^8.57.1",
+    "eslint": "^9.8.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jasmine": "^4.2.2",
     "eslint-plugin-prettier": "^5.5.5",
+    "globals": "^17.5.0",
     "highlight.js": "^11.11.1",
     "hyperhtml": "^2.34.2",
     "idb": "^8.0.3",
-    "jasmine": "^6.0.0",
-    "jasmine-core": "^6.0.1",
+    "jasmine": "^6.2.0",
+    "jasmine-core": "^6.2.0",
     "karma": "^6.4.4",
     "karma-chrome-launcher": "^3.2.0",
     "karma-firefox-launcher": "^2.1.3",
@@ -50,17 +52,19 @@
     "karma-jasmine-html-reporter": "^2.2.0",
     "karma-mocha-reporter": "^2.2.5",
     "karma-safari-launcher": "^1.0.0",
+    "lint-staged": "^16.4.0",
     "loading-indicator": "^2.0.0",
     "pluralize": "^8.0.0",
-    "prettier": "^3.8.1",
+    "prettier": "^3.8.2",
     "prompt": "^1.3.0",
-    "rollup": "^4.57.1",
+    "rollup": "^4.60.1",
     "rollup-plugin-minify-html-literals": "^1.2.6",
-    "serve": "^14.2.5",
-    "serve-handler": "^6.1.6",
+    "serve": "^14.2.6",
+    "serve-handler": "^6.1.7",
+    "simple-git-hooks": "^2.13.1",
     "sniffy-mimetype": "^1.1.1",
-    "typescript": "^5.9.3",
-    "vnu-jar": "^26.2.19",
+    "typescript": "^6.0.3",
+    "vnu-jar": "^26.4.11",
     "webidl2": "^24.5.0"
   },
   "scripts": {
@@ -74,7 +78,7 @@
     "build:dini": "pnpm builder dini",
     "builddeps": "rollup -c js/deps/rollup.config.js --bundleConfigAsCjs && rollup -c worker/rollup.config.js --bundleConfigAsCjs",
     "lint": "tsc -p src/jsconfig.json && eslint .",
-    "prepare": "pnpm builddeps",
+    "prepare": "pnpm builddeps && simple-git-hooks",
     "builder": "node ./tools/builder.cjs",
     "release": "node ./tools/release.cjs",
     "server": "serve",
@@ -88,8 +92,8 @@
   "dependencies": {
     "colors": "1.4.0",
     "finalhandler": "^2.1.1",
-    "marked": "^12.0.2",
-    "puppeteer": "^24.37.5",
+    "marked": "^18.0.0",
+    "puppeteer": "^24.40.0",
     "sade": "^1.8.1",
     "serve-static": "^2.2.1"
   },
@@ -98,14 +102,43 @@
     "tools/respec2html.js",
     "tools/respecDocWriter.js"
   ],
+  "simple-git-hooks": {
+    "pre-commit": "npx lint-staged"
+  },
+  "lint-staged": {
+    "*.js": "eslint --fix",
+    "*.{js,json,md,html,css}": "prettier --write"
+  },
   "prettier": {
     "trailingComma": "es5",
     "arrowParens": "avoid"
   },
   "pnpm": {
     "onlyBuiltDependencies": [
-      "puppeteer"
-    ]
+      "puppeteer",
+      "simple-git-hooks"
+    ],
+    "ignoredBuiltDependencies": [
+      "vnu-jar"
+    ],
+    "overrides": {
+      "flatted": ">=3.4.2",
+      "jasmine>glob": ">=10.5.0",
+      "lodash": ">=4.18.0",
+      "qs": ">=6.14.2",
+      "socket.io-parser": ">=4.2.6",
+      "tmp": ">=0.2.4",
+      "ws": ">=8.17.1",
+      "eslint-plugin-import>minimatch": "^3.1.4",
+      "eslint>minimatch": "^3.1.4",
+      "eslint>brace-expansion": "^1.1.13",
+      "minimatch>brace-expansion": "^1.1.13",
+      "karma>minimatch": "^3.1.4",
+      "jasmine>minimatch": "^9.0.7",
+      "@rollup/pluginutils>picomatch": "^2.3.2",
+      "@rollup/plugin-commonjs>picomatch": "^4.0.4",
+      "anymatch>picomatch": "^2.3.2"
+    }
   },
   "funding": {
     "type": "opencollective",

package/tools/respec2html.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 import { readFile, writeFile } from "fs/promises";
 import colors from "colors";
-import { fileURLToPath } from "url";
 import finalhandler from "finalhandler";
 import http from "http";
 import { marked } from "marked";
@@ -10,28 +9,31 @@ import sade from "sade";
 import serveStatic from "serve-static";
 import { toHTML } from "./respecDocWriter.js";
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const __dirname = import.meta.dirname;
 
 class Renderer extends marked.Renderer {
-  strong(text) {
-    return colors.bold(text);
+  strong(token) {
+    return colors.bold(this.parser.parseInline(token.tokens));
   }
-  em(text) {
-    return colors.italic(text);
+  em(token) {
+    return colors.italic(this.parser.parseInline(token.tokens));
   }
-  codespan(text) {
-    return colors.underline(unescape(text));
+  codespan(token) {
+    return colors.underline(unescape(token.text));
   }
-  paragraph(text) {
-    return unescape(text);
+  paragraph(token) {
+    return unescape(this.parser.parseInline(token.tokens));
   }
-  link(href, _title, text) {
-    return `[${text}](${colors.blue.dim.underline(href)})`;
+  link(token) {
+    const text = this.parser.parseInline(token.tokens);
+    return `[${text}](${colors.blue.dim.underline(token.href)})`;
   }
-  list(body, _orderered) {
+  list(token) {
+    const body = token.items.map(item => this.listitem(item)).join("");
     return `\n${body}`;
   }
-  listitem(text) {
+  listitem(token) {
+    const text = this.parser.parseInline(token.tokens);
     return `* ${text}\n`;
   }
 }
@@ -85,7 +87,7 @@ class Logger {
 
   _formatMarkdown(str) {
     if (typeof str !== "string") return str;
-    return marked(str, { smartypants: true, renderer: new Renderer() });
+    return marked(str, { renderer: new Renderer() });
   }
 
   /** @param {import("./respecDocWriter").ReSpecError} rsError */

package/tools/respecDocWriter.js

@@ -1,13 +1,10 @@
 /**
  * Exports toHTML() method, allowing programmatic control of the spec generator.
  */
-import { fileURLToPath } from "url";
 import path from "path";
 import puppeteer from "puppeteer";
 import { readFile } from "fs/promises";
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
 const noop = () => {};
 
 /**
@@ -142,7 +139,12 @@ async function useLocalReSpec(page, log) {
     const url = new URL(request.url());
     const respecProfileRegex = /\/(respec-[\w-]+)(?:\.js)?$/;
     const profile = url.pathname.match(respecProfileRegex)[1];
-    const localPath = path.join(__dirname, "..", "builds", `${profile}.js`);
+    const localPath = path.join(
+      import.meta.dirname,
+      "..",
+      "builds",
+      `${profile}.js`
+    );
     const relPath = path.relative(process.cwd(), localPath);
     log(`Intercepted ${url} to respond with ${relPath}`);
     await request.respond({
@@ -276,7 +278,7 @@ async function evaluateHTML(version, timer) {
     return new Promise((resolve, reject) => {
       promise.then(resolve, reject);
       const msg = `Timeout: document.respec.ready didn't resolve in ${ms}ms.`;
-      setTimeout(() => reject(msg), ms);
+      setTimeout(() => reject(new Error(msg)), ms);
     });
   }
 }