reffy 11.2.2 → 11.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reffy",
-  "version": "11.2.2",
+  "version": "11.3.0",
   "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",
@@ -33,22 +33,22 @@
   "bin": "./reffy.js",
   "dependencies": {
     "abortcontroller-polyfill": "1.7.5",
-    "ajv": "8.11.2",
+    "ajv": "8.12.0",
     "ajv-formats": "2.1.1",
-    "commander": "9.4.1",
+    "commander": "9.5.0",
     "fetch-filecache-for-crawling": "4.1.0",
-    "puppeteer": "19.4.1",
+    "puppeteer": "19.5.0",
     "semver": "^7.3.5",
-    "web-specs": "2.39.0",
+    "web-specs": "2.41.0",
     "webidl2": "24.2.2"
   },
   "devDependencies": {
     "chai": "4.3.7",
     "mocha": "10.2.0",
     "nock": "13.2.9",
-    "respec": "32.6.0",
+    "respec": "32.6.1",
     "respec-hljs": "2.1.1",
-    "rollup": "3.7.5"
+    "rollup": "3.9.1"
   },
   "scripts": {
     "test": "mocha --recursive tests/"

package/src/browserlib/extract-cssdfn.mjs

@@ -552,11 +552,14 @@ 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 === dfn.textContent.trim());  // Looks like the right term
+      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"
+    if (!name) {
+      // No specific type found in the list, look for the actual term
+      name = names.find(n => n === dfn.textContent.trim());
+    }
     if (!name) {
       if (names.length > 1) {
         throw new Error(`Found multiple linking texts for dfn without any obvious one: ${names.join(', ')}`);

package/src/lib/util.js

@@ -719,7 +719,7 @@ function completeWithAlternativeUrls(spec) {
  * in the given list of specs that passes the given predicate.
  *
  * "Fullest" means "not a delta spec, unless that is the only level that passes
- * the predicate".
+ * the predicate, and not an outdated spec either (before current one)".
  *
  * @function
  * @public
@@ -736,7 +736,8 @@ function isLatestLevelThatPasses(spec, list, predicate) {
         return false;
     }
     if (spec.seriesComposition === 'delta') {
-        while (spec.seriesPrevious) {
+        while (spec.seriesPrevious &&
+               spec.shortname !== spec.series.currentSpecification) {
             spec = list.find(s => s.shortname === spec.seriesPrevious);
             if (!spec) {
                 break;
@@ -747,16 +748,32 @@ function isLatestLevelThatPasses(spec, list, predicate) {
         }
         return true;
     }
-    while (spec.seriesNext) {
-        spec = list.find(s => s.shortname === spec.seriesNext);
-        if (!spec) {
+
+    let next = spec;
+    while (next.seriesNext) {
+        next = list.find(s => s.shortname === next.seriesNext);
+        if (!next) {
             break;
         }
-        if ((spec.seriesComposition === 'full') && predicate(spec)) {
+        if ((next.seriesComposition === 'full') && predicate(next)) {
             return false;
         }
     }
-    return true;
+
+    // Make sure that spec is the current one or is more recent than the
+    // current one.
+    while (spec) {
+        if (spec.shortname === spec.series.currentSpecification) {
+            return true;
+        }
+        if (!spec.seriesPrevious) {
+            return false;
+        }
+        spec = list.find(s => s.shortname === spec.seriesPrevious);
+    }
+
+    // Spec passes predicate but is too old to be considered
+    return false;
 }