reffy 12.1.5 → 13.0.1

package/README.md

@@ -10,7 +10,7 @@ The code features a generic crawler that can fetch Web specifications and genera
 
 ### Pre-requisites
 
-To install Reffy, you need [Node.js](https://nodejs.org/en/) 14 or greater.
+To install Reffy, you need [Node.js](https://nodejs.org/en/) 18 or greater (the crawler itself may still run with earlier versions of Node.js, but version 18 is needed to run tests).
 
 ### Installation
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reffy",
-  "version": "12.1.5",
+  "version": "13.0.1",
   "description": "W3C/WHATWG spec dependencies exploration companion. Features a short set of tools to study spec references as well as WebIDL term definitions and references found in W3C specifications.",
   "repository": {
     "type": "git",
@@ -27,7 +27,7 @@
   ],
   "license": "MIT",
   "engines": {
-    "node": ">=14.18"
+    "node": ">=18"
   },
   "main": "index.js",
   "bin": "./reffy.js",
@@ -37,18 +37,18 @@
     "ajv-formats": "2.1.1",
     "commander": "10.0.1",
     "fetch-filecache-for-crawling": "4.1.0",
-    "puppeteer": "19.9.1",
+    "puppeteer": "20.1.2",
     "semver": "^7.3.5",
-    "web-specs": "2.56.0",
+    "web-specs": "2.57.0",
     "webidl2": "24.2.2"
   },
   "devDependencies": {
     "chai": "4.3.7",
     "mocha": "10.2.0",
-    "nock": "13.3.0",
-    "respec": "32.8.0",
+    "nock": "13.3.1",
+    "respec": "34.1.1",
     "respec-hljs": "2.1.1",
-    "rollup": "3.20.4"
+    "rollup": "3.21.5"
   },
   "scripts": {
     "test": "mocha --recursive tests/"

package/src/browserlib/extract-events.mjs

@@ -160,24 +160,40 @@ export default function (spec) {
   [...document.querySelectorAll("a")]
     .filter(a => !a.closest(informativeSelector) && isFiringLink(a))
     .forEach(a => {
-      const container = a.parentNode;
-      // There can be multiple "fire an event" links in a container
-      // limiting our text parsing to content in between two such links
-      // (or the end of the container if there is only one such link)
+      // Clone and drop possible annotations to avoid extracting asides.
+      // (note the need to temporarily add the cloned node to the document
+      // so that ranges can be used)
+      const apos = [...a.parentNode.children].findIndex(c => c === a);
+      const container = a.parentNode.cloneNode(true);
+      const aclone = container.children[apos];
+
+      const annotations = container.querySelectorAll("aside, .mdn-anno");
+      annotations.forEach(n => n.remove());
+      document.body.appendChild(container);
+
+
+      // There can be multiple "fire an event" links in a container,
+      // limiting our text parsing to content in between two such links,
+      // or to the first time aside appears (no whitespaces in Bikeshed
+      // so code would extract the beginning of the annotation otherwise),
+      // or the end of the container if neither of the above occurs.
       const range = document.createRange();
       range.selectNode(container);
-      range.setStart(a, 0);
+      range.setStart(aclone, 0);
 
-      let nextFiringLink, curEl = a;
+      let nextFiringEl, curEl = aclone;
       while ((curEl = curEl.nextElementSibling)) {
         if (curEl.tagName === "A" && isFiringLink(curEl)) {
-          nextFiringLink = curEl;
+          nextFiringEl = curEl;
+          break;
         }
       }
-      if (nextFiringLink) {
-        range.setEndBefore(nextFiringLink);
+
+      if (nextFiringEl) {
+        range.setEndBefore(nextFiringEl);
       }
       const parsedText = range.toString();
+      document.body.removeChild(container);
       let phrasing;
       let m = parsedText.match(/fir(e|ing)\s+a(n|\s+pointer)\s+event\s+named\s+"?(?<eventName>[a-z]+)/i);
       if (m) {
@@ -225,8 +241,8 @@ export default function (spec) {
           }
         }
         if (!event.interface) {
-          let curEl = a, iface;
-          while ((curEl = curEl.nextElementSibling)) {
+          let curEl = aclone, iface;
+          while ((curEl = curEl.nextElementSibling) && curEl !== nextFiringEl) {
             if (curEl.textContent.match(/^([A-Z]+[a-z0-9]*)+Event$/)) {
               iface = curEl.textContent.trim();
               break;