reffy 11.0.3 → 11.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reffy",
-  "version": "11.0.3",
+  "version": "11.0.5",
   "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",
@@ -39,7 +39,7 @@
     "fetch-filecache-for-crawling": "4.1.0",
     "puppeteer": "19.3.0",
     "semver": "^7.3.5",
-    "web-specs": "2.36.0",
+    "web-specs": "2.37.0",
     "webidl2": "24.2.2"
   },
   "devDependencies": {
@@ -48,7 +48,7 @@
     "nock": "13.2.9",
     "respec": "32.4.0",
     "respec-hljs": "2.1.1",
-    "rollup": "3.5.0"
+    "rollup": "3.6.0"
   },
   "scripts": {
     "test": "mocha --recursive tests/"

package/src/browserlib/extract-cssdfn.mjs

@@ -240,21 +240,14 @@ export default function () {
   // <image> again:
   // https://drafts.csswg.org/css-images-4/#typedef-image
   const isAncestorOf = (ancestor, child) => {
-    let seen = [];
-    const checkChild = c => {
-      let res = ancestor === c;
-      if (!res) {
-        res = parents[c]
-          ?.filter(p => !seen.includes(p))
-          ?.find(p => checkChild(ancestor, p));
-      }
-      seen = seen.concat(parents[c]);
-      return res;
-    }
-    return checkChild(child);
+    const checkChild = (c, depth) =>
+      (depth++ < 10) &&
+      (c === ancestor || parents[c]?.find(p => checkChild(p, depth)));
+    return checkChild(child, 0);
   };
-  const isDeepestConstruct = (name, list) =>
-    list.every(p => p === name || !isAncestorOf(name, p));
+  const isDeepestConstruct = (name, list) => {
+    return list.every(p => p === name || !isAncestorOf(name, p));
+  }
 
   // We may now associate values with dfns
   for (const value of values) {
@@ -559,10 +552,11 @@ const getDfnName = dfn => {
   if (dfn.getAttribute('data-lt')) {
     const names = dfn.getAttribute('data-lt').split('|').map(normalize);
     let name = names.find(n =>
-      n.startsWith('<') ||      // Looks like a "type"
-      n.startsWith('@') ||      // Looks like an "at-rule"
-      n.startsWith(':') ||      // Looks like a "descriptor"
-      n.endsWith('()'));        // Looks like a "function"
+      n.startsWith('<') ||            // Looks like a "type"
+      n.startsWith('@') ||            // Looks like an "at-rule"
+      n.startsWith(':') ||            // Looks like a "descriptor"
+      n.endsWith('()')  ||            // Looks like a "function"
+      n === dfn.textContent.trim());  // Looks like the right term
     if (!name) {
       if (names.length > 1) {
         throw new Error(`Found multiple linking texts for dfn without any obvious one: ${names.join(', ')}`);
@@ -646,7 +640,12 @@ const extractTypedDfn = dfn => {
       return;
     }
     let code = dd.querySelector('p > code, pre.prod');
-    if (code) {
+    if (code && !code.closest(informativeSelector)) {
+      // The assumption here is that normative code in the <dd> element that
+      // follows the definition is the production rule for the definition. This
+      // is a rather bold assumption, which should probably be revisited
+      // (unrelated code could appear in the prose and not have anything to do
+      // with the definition's value)
       if (code.textContent.startsWith(`${text} = `) ||
           code.textContent.startsWith(`<${text}> = `)) {
         res = parseProductionRule(code.textContent, { pureSyntax: true });