reffy 7.2.7 → 7.2.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reffy",
-  "version": "7.2.7",
+  "version": "7.2.10",
   "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",
@@ -34,9 +34,9 @@
     "abortcontroller-polyfill": "1.7.3",
     "commander": "9.3.0",
     "fetch-filecache-for-crawling": "4.1.0",
-    "puppeteer": "15.3.2",
+    "puppeteer": "15.4.0",
     "semver": "^7.3.5",
-    "web-specs": "2.16.0",
+    "web-specs": "2.17.0",
     "webidl2": "24.2.2"
   },
   "devDependencies": {

package/src/browserlib/extract-cssdfn.mjs

@@ -225,6 +225,12 @@ const extractValueSpaces = doc => {
     }
   };
 
+  // Regular expression to use to split production rules:
+  // Split on the space that precedes a term immediately before an equal sign
+  // that is not wrapped in quotes (an equal sign wrapped in quotes is part of
+  // actual value syntax)
+  const reSplitRules = /\s(?=[^\s]+?\s*?=[^'])/;
+
   // Extract all dfns with data-dfn-type="type" or data-dfn-type="function"
   // but ignore definitions in <pre> as they do not always use dfns, as in
   // https://drafts.csswg.org/css-values-4/#calc-syntax
@@ -246,7 +252,15 @@ const extractValueSpaces = doc => {
       const text = parent.textContent.trim();
       if (text.match(/\s?=\s/)) {
         // Definition appears in a "prod = foo" text, that's all good
-        parseProductionRule(text, { pureSyntax: true });
+        // ... except in css-easing-2 draft where text also contains another
+        // production rule as a child of the first one:
+        // https://drafts.csswg.org/css-easing-2/#typedef-step-easing-function
+        const prod = text.split(reSplitRules)
+            .find(p => p.trim().startsWith(dfn.textContent.trim()));
+        if (!prod) {
+          throw new Error(`Production rule for ${dfn.textContent.trim()} found has unexpected format`);
+        }
+        parseProductionRule(prod, { pureSyntax: true });
       }
       else if (dfn.textContent.trim().match(/^[a-zA-Z_][a-zA-Z0-9_\-]+\([^\)]+\)$/)) {
         // Definition is "prod(foo bar)", create a "prod() = prod(foo bar)" entry
@@ -323,7 +337,7 @@ const extractValueSpaces = doc => {
     })
     .map(el => el.textContent)
     .map(val => val.replace(/\/\*[^]*?\*\//gm, ''))  // Drop comments
-    .map(val => val.split(/\n(?=[^\n]*\s?=\s)/m))    // Separate definitions
+    .map(val => val.split(reSplitRules))             // Separate definitions
     .flat()
     .filter(text => text.match(/\s?=\s/))
     .map(text => parseProductionRule(text, { pureSyntax: true }));

package/src/browserlib/extract-events.mjs

@@ -41,14 +41,11 @@ export default function (spec) {
   function fromEventElementToTargetInterfaces(eventEl) {
     if (!eventEl) return;
 
-    console.log(`[reffy] ${eventEl.textContent}`);
-
     if (eventEl.dataset?.dfnFor || eventEl.dataset?.linkFor) {
       return (eventEl.dataset.dfnFor || eventEl.dataset.linkFor).split(",").map(t => t.trim());
     } else if (eventEl.getAttribute("href")?.startsWith("#")) {
       const dfn = document.getElementById(eventEl.getAttribute("href").slice(1));
       if (dfn && dfn.dataset?.dfnFor) {
-        console.log(`[reffy] ${eventEl.textContent} dfnFor ${dfn.dataset.dfnFor.split(",").map(t => t.trim())}`);
         return dfn.dataset.dfnFor.split(",").map(t => t.trim());
       }
     } else if (handledEventNames[eventEl.textContent]?.length) {
@@ -56,7 +53,6 @@ export default function (spec) {
       const matchingInterfaces = handledEventNames[eventEl.textContent];
       if (matchingInterfaces.length === 1) {
         // only one such handler, we assume it's a match
-        console.log(`[reffy] ${eventEl.textContent} found ${matchingInterfaces}`);
         return matchingInterfaces;
       } else {
         console.error(`[reffy] Multiple event handler named ${eventEl.textContent}, cannot associate reliably to an interface in ${spec.title}`);
@@ -106,12 +102,12 @@ export default function (spec) {
           if (el.tagName === "DFN" && el.id) {
             event.href = href(el);
           } else if (el.tagName === "A") {
-            if (!el.getAttribute("href").startsWith("https://")) {
-              const url = new URL(el.href);
-                    event.href = href(document.getElementById(url.hash.slice(1)));
-            } else {
-              event.href = el.href;
-            }
+	    if (!el.getAttribute("href").startsWith("https://")) {
+	      const url = new URL(el.href);
+              event.href = href(document.getElementById(url.hash.slice(1)));
+	    } else {
+	      event.href = el.href;
+	    }
           }
           event.src = { format: "summary table", href: href(el.closest('*[id]')) };
           event.type = eventEl.textContent.trim();
@@ -124,9 +120,9 @@ export default function (spec) {
               tr.querySelector(`td:nth-child(${interfaceColumn + 1}) a`)?.textContent ??
               tr.querySelector(`td:nth-child(${interfaceColumn + 1}) code`)?.textContent;
           }
-          if (targetsColumn >= 0 && !event.targets) {
-            event.targets = tr.querySelector(`td:nth-child(${targetsColumn + 1})`)?.textContent?.split(',').map(t => t.trim());
-          }
+	  if (targetsColumn >= 0 && !event.targets) {
+	    event.targets = tr.querySelector(`td:nth-child(${targetsColumn + 1})`)?.textContent?.split(',').map(t => t.trim());
+	  }
           events.push(event);
           eventEl.replaceWith(origEventEl);
         });
@@ -209,8 +205,8 @@ export default function (spec) {
         } else {
           event.type = name;
           // looking at the element following the link
-          // if its content match the name of the event
-          const eventEl = a.nextElementSibling?.textContent?.trim() === event.type ? a.nextElementSibling.querySelector("a,dfn") || a.nextElementSibling : null;
+	  // if its content match the name of the event
+	  const eventEl = a.nextElementSibling?.textContent?.trim() === event.type ? a.nextElementSibling.querySelector("a,dfn") || a.nextElementSibling : null;
           if (eventEl) {
             if (eventEl.tagName === "A" && eventEl.getAttribute("href")) {
               // use the target of the link as our href
@@ -231,7 +227,7 @@ export default function (spec) {
           while ((curEl = curEl.nextElementSibling)) {
             if (curEl.textContent.match(/^([A-Z]+[a-z0-9]*)+Event$/)) {
               iface = curEl.textContent.trim();
-              break;
+	      break;
             }
           }
           if (iface) {
@@ -326,20 +322,20 @@ export default function (spec) {
       // of the section where the definitions are located
       let currentEl = container.parentNode;
       while(currentEl) {
-        if (currentEl.tagName.match(/^H[1-6]$/)) {
-          break;
-        }
-        currentEl = currentEl.previousElementSibling;
+	if (currentEl.tagName.match(/^H[1-6]$/)) {
+	  break;
+	}
+	currentEl = currentEl.previousElementSibling;
       }
       const interfaceEl = currentEl?.querySelector("code");
       if (interfaceEl?.textContent?.match(/^[A-Z][a-z]+Event$/)) {
-        iface = interfaceEl.textContent;
+	iface = interfaceEl.textContent;
       }
     }
     const ev = events.find(e => isSameEvent(event, e));
     if (!ev) {
       if (iface) {
-        event.interface = iface;
+	event.interface = iface;
       }
       event.bubbles = bubbles;
       events.push(event);
@@ -351,7 +347,7 @@ export default function (spec) {
         ev.interface = iface;
       }
       if (!ev.href && event.href) {
-        ev.href = event.href;
+	ev.href = event.href;
       }
       if (bubbles !== undefined) {
         ev.bubbles = bubbles;

package/src/lib/util.js

@@ -605,7 +605,7 @@ async function processSpecification(spec, processFunction, args, options) {
                 window.document.head.querySelector("script[src*='respec']");
 
             function sleep(ms) {
-                return new Promise(resolve => setTimeout(resolve, ms));
+                return new Promise(resolve => setTimeout(resolve, ms, 'slept'));
             }
 
             async function isReady(counter) {
@@ -614,7 +614,10 @@ async function processSpecification(spec, processFunction, args, options) {
                     throw new Error('Respec generation took too long');
                 }
                 if (window.document.respec?.ready) {
-                    await window.document.respec.ready;
+                    const res = await Promise.race([window.document.respec.ready, sleep(60000)]);
+                    if (res === 'slept') {
+                        throw new Error('Respec generation took too long');
+                    }
                 }
                 else if (usesRespec) {
                     await sleep(1000);