reffy 14.7.0 → 14.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reffy",
-  "version": "14.7.0",
+  "version": "14.8.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",
@@ -36,7 +36,7 @@
     "ajv-formats": "2.1.1",
     "commander": "12.0.0",
     "fetch-filecache-for-crawling": "5.1.1",
-    "puppeteer": "22.1.0",
+    "puppeteer": "22.2.0",
     "semver": "^7.3.5",
     "web-specs": "3.3.0",
     "webidl2": "24.4.1"

package/schemas/browserlib/extract-elements.json

@@ -6,10 +6,11 @@
   "items": {
     "type": "object",
     "additionalProperties": false,
-    "required": ["name"],
+    "required": ["name", "href"],
     "properties": {
       "name": { "type": "string" },
       "interface": { "$ref": "../common.json#/$defs/interface" },
+      "href": { "$ref": "../common.json#/$defs/url" },
       "obsolete": { "type": "boolean" }
     }
   }

package/src/browserlib/extract-elements.mjs

@@ -1,3 +1,5 @@
+import getAbsoluteUrl from './get-absolute-url.mjs';
+
 /**
  * Extract the list of markup elements that the spec defines
  *
@@ -43,7 +45,10 @@ export default function (spec) {
       // In most cases, there will be only one element, but some elements are
       // defined together, typically h1-h6 or sub and sup
       return dfns.map(dfn => {
-        const res = { name: getText(dfn) };
+        const res = {
+          name: getText(dfn),
+          href: getAbsoluteUrl(dfn)
+        };
         const dts = [...el.querySelectorAll('dt')];
         dts.forEach(dt => {
           const prop = ({
@@ -143,8 +148,27 @@ export default function (spec) {
       if (!name) {
         throw new Error('Could not extract name from element-summary element');
       }
+      let dfn = el.querySelector('dfn');
+      if (!dfn) {
+        // The SVG 1.1 spec does not use dfns, look for an ID on the parent div
+        // if defined (happens when there are multiple elements defined in the
+        // same section) or at a nearby heading (all other cases).
+        dfn = el.parentElement;
+        if (!dfn.id) {
+          dfn = el.previousElementSibling;
+          while (dfn && !dfn.nodeName.match(/^H\d$/)) {
+            dfn = dfn.previousElementSibling;
+          }
+          if (!dfn) {
+            throw new Error('Could not locate heading associated with element ' + getText(name));
+          }
+        }
+      }
 
-      const res = { name: getText(name).replace(/‘|’/g, '') };
+      const res = {
+        name: getText(name).replace(/‘|’/g, ''),
+        href: getAbsoluteUrl(dfn)
+      };
       const dts = [...el.querySelectorAll('dt')];
       dts.forEach(dt => {
         const prop = ({
@@ -180,7 +204,10 @@ export default function (spec) {
         throw new Error('Could not extract name from definition-table element');
       }
 
-      const res = { name: getText(dfn) };
+      const res = {
+        name: getText(dfn),
+        href: getAbsoluteUrl(dfn)
+      };
       const ths = [...el.querySelectorAll('th')];
       ths.forEach(th => {
         const prop = ({
@@ -212,7 +239,10 @@ export default function (spec) {
   const shortname = (typeof spec === 'string') ? spec : spec.shortname;
   const otherElements = [...document.querySelectorAll('dfn[data-dfn-type="element"]')]
     .map(el => {
-      const elInfo = { "name": el.textContent.trim()};
+      const elInfo = {
+        name: el.textContent.trim(),
+        href: getAbsoluteUrl(el)
+      };
       // All elements defined in MathML Core
       // use the MathMLElement interface
       if (shortname === "mathml-core") {