reffy 20.0.13 → 20.0.14

package/src/browserlib/extract-headings.mjs

@@ -1,76 +1,76 @@
-import getAbsoluteUrl from './get-absolute-url.mjs';
-
-/**
- * Extract headings data from documents
-*/
-export default function (spec, idToHeading) {
-  // Compute once whether we created a single page version out of multiple pages
-  const singlePage = !document.querySelector('[data-reffy-page]');
-
-  // Headings using the markup convention of the EcmaScript spec
-  const esHeadings = [...document.querySelectorAll('emu-clause[id] > h1')].map(n => {
-    const headingNumber = n.querySelector(".secnum")?.textContent;
-    const headingLevel = headingNumber ? headingNumber.split(".").length : undefined;
-    return {
-      id: n.parentNode.id,
-      href: getAbsoluteUrl(n.parentNode, { singlePage }),
-      title: n.textContent.replace(headingNumber, '').trim(),
-      level: headingLevel,
-      number: headingNumber
-    };
-  });
-
-  // Headings using spans in www.rfc-editor.org RFCs
-  const rfcSelector = 'pre > span:is(.h2,.h3,.h4,.h5,.h6) > a.selflink[id]';
-  const rfcHeadings = [...document.querySelectorAll(rfcSelector)].map(n => {
-    const headingNumber = n.textContent;
-    const headingLevel = headingNumber ? headingNumber.split(".").length : undefined;
-    return {
-      id: n.id,
-      href: getAbsoluteUrl(n, { singlePage }),
-      title: n.parentNode.textContent
-        .replace(headingNumber, '')
-        .replace(/^\s*\./, '')
-        .trim(),
-      level: headingLevel,
-      number: headingNumber.replace(/\s*appendix\s+/i, '')
-    };
-  });
-
-  const headingsSelector = [
-    ':is(h1,h2,h3,h4,h5,h6)[id]',                 // Regular headings
-    ':is(h1,h2,h3,h4,h5,h6):not([id]) > a[name]'  // CSS 2.1 headings
-  ].join(',');
-
-  return esHeadings.concat(rfcHeadings).concat([...document.querySelectorAll(headingsSelector)].map(n => {
-    // Note: In theory, all <hX> heading elements that have an ID are associated
-    // with a heading in idToHeading. One exception to the rule: when the
-    // heading element appears in a <hgroup> element, the mapping is not
-    // properly done (the outline creation algorithm explicitly skips these
-    // headings not to create a mess in the outline). In practice, this only
-    // really happens so far for WHATWG spec titles that (correctly) group the
-    // title and subtitle headings in a <hgroup>.
-    const idAttr = n.id ? 'id' : 'name';
-    const headingEl = n.id ? n : n.parentNode;
-    const href = getAbsoluteUrl(n, { singlePage, attribute: idAttr });
-    const heading = idToHeading[href] || {
-      id: n.getAttribute(idAttr),
-      href,
-      title: n.textContent.trim()
-    };
-    const res = {
-      id: heading.id,
-      href: heading.href,
-      level: parseInt(headingEl.tagName.slice(1), 10),
-      title: heading.title
-    };
-    if (heading.alternateIds?.length) {
-      res.alternateIds = heading.alternateIds;
-    }
-    if (heading.number) {
-      res.number = heading.number;
-    }
-
-    return res;
-  }));
-}
+import getAbsoluteUrl from './get-absolute-url.mjs';
+
+/**
+ * Extract headings data from documents
+*/
+export default function (spec, idToHeading) {
+  // Compute once whether we created a single page version out of multiple pages
+  const singlePage = !document.querySelector('[data-reffy-page]');
+
+  // Headings using the markup convention of the EcmaScript spec
+  const esHeadings = [...document.querySelectorAll('emu-clause[id] > h1')].map(n => {
+    const headingNumber = n.querySelector(".secnum")?.textContent;
+    const headingLevel = headingNumber ? headingNumber.split(".").length : undefined;
+    return {
+      id: n.parentNode.id,
+      href: getAbsoluteUrl(n.parentNode, { singlePage }),
+      title: n.textContent.replace(headingNumber, '').trim(),
+      level: headingLevel,
+      number: headingNumber
+    };
+  });
+
+  // Headings using spans in www.rfc-editor.org RFCs
+  const rfcSelector = 'pre > span:is(.h2,.h3,.h4,.h5,.h6) > a.selflink[id]';
+  const rfcHeadings = [...document.querySelectorAll(rfcSelector)].map(n => {
+    const headingNumber = n.textContent;
+    const headingLevel = headingNumber ? headingNumber.split(".").length : undefined;
+    return {
+      id: n.id,
+      href: getAbsoluteUrl(n, { singlePage }),
+      title: n.parentNode.textContent
+        .replace(headingNumber, '')
+        .replace(/^\s*\./, '')
+        .trim(),
+      level: headingLevel,
+      number: headingNumber.replace(/\s*appendix\s+/i, '')
+    };
+  });
+
+  const headingsSelector = [
+    ':is(h1,h2,h3,h4,h5,h6)[id]',                 // Regular headings
+    ':is(h1,h2,h3,h4,h5,h6):not([id]) > a[name]'  // CSS 2.1 headings
+  ].join(',');
+
+  return esHeadings.concat(rfcHeadings).concat([...document.querySelectorAll(headingsSelector)].map(n => {
+    // Note: In theory, all <hX> heading elements that have an ID are associated
+    // with a heading in idToHeading. One exception to the rule: when the
+    // heading element appears in a <hgroup> element, the mapping is not
+    // properly done (the outline creation algorithm explicitly skips these
+    // headings not to create a mess in the outline). In practice, this only
+    // really happens so far for WHATWG spec titles that (correctly) group the
+    // title and subtitle headings in a <hgroup>.
+    const idAttr = n.id ? 'id' : 'name';
+    const headingEl = n.id ? n : n.parentNode;
+    const href = getAbsoluteUrl(n, { singlePage, attribute: idAttr });
+    const heading = idToHeading[href] || {
+      id: n.getAttribute(idAttr),
+      href,
+      title: n.textContent.trim()
+    };
+    const res = {
+      id: heading.id,
+      href: heading.href,
+      level: parseInt(headingEl.tagName.slice(1), 10),
+      title: heading.title
+    };
+    if (heading.alternateIds?.length) {
+      res.alternateIds = heading.alternateIds;
+    }
+    if (heading.number) {
+      res.number = heading.number;
+    }
+
+    return res;
+  }));
+}

package/src/browserlib/extract-ids.mjs

@@ -1,28 +1,28 @@
-import getAbsoluteUrl from './get-absolute-url.mjs';
-
-/**
- * Extract absolute ids from documents
-*/
-export default function () {
-  // Compute once whether we created a single page version out of multiple pages
-  const singlePage = !document.querySelector('[data-reffy-page]');
-
-  return [...document.querySelectorAll('*[id]')]
-    // Ignore respec- prefixed ids to avoid keeping track of their evolution
-    // They're clearly not meant to be link target in any case
-    .filter(n => !n.id.startsWith('respec-'))
-
-    // Ignore dfn-panel- prefixed ids that ReSpec generates to avoid keeping
-    // track of their evolution. They're clearly not meant to be link target
-    // either.
-    .filter(n => !n.id.startsWith('dfn-panel-'))
-
-    // Convert IDs to absolute URLs (needed to handle multipage specs)
-    .map(n => getAbsoluteUrl(n, { singlePage }))
-
-    // Capture anchors set in <a name> when they're not dup of ids
-    .concat([...document.querySelectorAll('a[name]')]
-      .filter(n => !n.id || n.id !== n.name)
-      .map(n => getAbsoluteUrl(n, { singlePage, attribute: 'name' }))
-    );
-}
+import getAbsoluteUrl from './get-absolute-url.mjs';
+
+/**
+ * Extract absolute ids from documents
+*/
+export default function () {
+  // Compute once whether we created a single page version out of multiple pages
+  const singlePage = !document.querySelector('[data-reffy-page]');
+
+  return [...document.querySelectorAll('*[id]')]
+    // Ignore respec- prefixed ids to avoid keeping track of their evolution
+    // They're clearly not meant to be link target in any case
+    .filter(n => !n.id.startsWith('respec-'))
+
+    // Ignore dfn-panel- prefixed ids that ReSpec generates to avoid keeping
+    // track of their evolution. They're clearly not meant to be link target
+    // either.
+    .filter(n => !n.id.startsWith('dfn-panel-'))
+
+    // Convert IDs to absolute URLs (needed to handle multipage specs)
+    .map(n => getAbsoluteUrl(n, { singlePage }))
+
+    // Capture anchors set in <a name> when they're not dup of ids
+    .concat([...document.querySelectorAll('a[name]')]
+      .filter(n => !n.id || n.id !== n.name)
+      .map(n => getAbsoluteUrl(n, { singlePage, attribute: 'name' }))
+    );
+}

package/src/browserlib/extract-links.mjs

@@ -1,45 +1,45 @@
-function fromLinksToAnchors(links) {
- return Object.keys(links)
-    .sort()
-    // turning sets into arrays
-    .reduce((acc, u) => {
-      acc[u] = {};
-      if (links[u].anchors.size > 0) {
-        acc[u].anchors = [...links[u].anchors];
-      }
-      return acc;
-  }, {});
-}
-
-/**
- * Extract absolute links of the document and their fragments
- * in two set: autolinks (generated by spec authoring tools from webref)
- * and rawlinks (the rest)
-*/
-export default function () {
-  const rawlinks = {};
-  const autolinks = {};
-  document.querySelectorAll('a[href^=http]').forEach(n => {
-    // Ignore links from the "head" section, which either link to
-    // self, the GitHub repo, the implementation report, and other
-    // documents that don't need to appear in the list of references.
-    // Also ignore links in <del> elements that appear when specs
-    // carry their diff (e.g. W3C Recs with candidate corrections).
-    // And then ignore links in aside dfn panels. They only contain internal
-    // links or links that already appear elsewhere in the spec.
-    if (n.closest('.head, del, .dfn-panel')) return;
-    const pageUrl = n.href.split('#')[0];
-    // links generated by authoring tools have data-link-type or data-xref-type set
-    let linkSet = n.dataset.linkType || n.dataset.xrefType ? autolinks : rawlinks;
-    if (!linkSet[pageUrl]) {
-      linkSet[pageUrl] = {anchors: new Set()};
-    }
-    if (n.href.includes('#') && n.href.split('#')[1]) {
-      linkSet[pageUrl].anchors.add(n.href.split('#')[1]);
-    }
-  });
-  return {
-    rawlinks: fromLinksToAnchors(rawlinks),
-    autolinks: fromLinksToAnchors(autolinks)
-  };
-}
+function fromLinksToAnchors(links) {
+ return Object.keys(links)
+    .sort()
+    // turning sets into arrays
+    .reduce((acc, u) => {
+      acc[u] = {};
+      if (links[u].anchors.size > 0) {
+        acc[u].anchors = [...links[u].anchors];
+      }
+      return acc;
+  }, {});
+}
+
+/**
+ * Extract absolute links of the document and their fragments
+ * in two set: autolinks (generated by spec authoring tools from webref)
+ * and rawlinks (the rest)
+*/
+export default function () {
+  const rawlinks = {};
+  const autolinks = {};
+  document.querySelectorAll('a[href^=http]').forEach(n => {
+    // Ignore links from the "head" section, which either link to
+    // self, the GitHub repo, the implementation report, and other
+    // documents that don't need to appear in the list of references.
+    // Also ignore links in <del> elements that appear when specs
+    // carry their diff (e.g. W3C Recs with candidate corrections).
+    // And then ignore links in aside dfn panels. They only contain internal
+    // links or links that already appear elsewhere in the spec.
+    if (n.closest('.head, del, .dfn-panel')) return;
+    const pageUrl = n.href.split('#')[0];
+    // links generated by authoring tools have data-link-type or data-xref-type set
+    let linkSet = n.dataset.linkType || n.dataset.xrefType ? autolinks : rawlinks;
+    if (!linkSet[pageUrl]) {
+      linkSet[pageUrl] = {anchors: new Set()};
+    }
+    if (n.href.includes('#') && n.href.split('#')[1]) {
+      linkSet[pageUrl].anchors.add(n.href.split('#')[1]);
+    }
+  });
+  return {
+    rawlinks: fromLinksToAnchors(rawlinks),
+    autolinks: fromLinksToAnchors(autolinks)
+  };
+}