Merge pull request #15 from dontcallmedom/newwebreflinks

Adapt to new link structure in webref
dontcallmedom · Mar 28, 2024 · fec4bea · fec4bea
2 parents 12fd5f0 + a1ab098
commit fec4bea
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 28 deletions.
diff --git a/lib/list-removed-targets.js b/lib/list-removed-targets.js
@@ -36,9 +36,10 @@ async function listRemovedTargets(spec, webrefPath) {
 
   const removedTargets = [];
   for (const url of pages) {
-    const linkingSpecs = webrefCrawl.results.filter(s => s.links && s.links[url]?.anchors);
+    const linkingSpecs = webrefCrawl.results.filter(s => s.links && (s.links.rawlinks[url]?.anchors || s.links.autolinks[url]?.anchors));
     for (const s of linkingSpecs) {
-      const brokenLinks = s.links[url].anchors.filter(a => {
+      const anchors = (s.links.rawlinks[url]?.anchors ?? []).concat(s.links.autolinks[url]?.anchors ?? []);
+      const brokenLinks = anchors.filter(a => {
 	const page = spec.nightly?.pages ? url.replace(baseDirUrl(url), '') : '';
 	return disappearedAnchors.find(d => d === page + "#" + a);
       });

diff --git a/test/webref/ed/links/linking-spec.json b/test/webref/ed/links/linking-spec.json
@@ -4,33 +4,41 @@
     "url": "http://example.com/specs/linking-spec/"
   },
   "links": {
-    "https://example.com/single-page": {
-      "anchors": [
-	"valid1",
-	"valid2"
-      ]
+    "rawlinks": {
+      "https://example.com/single-page": {
+	"anchors": [
+	  "valid2"
+	]
+      },
+      "https://example.com/multi-page/": {
+	"anchors": [
+	  "valid1"
+	]
+      },
+      "https://example.com/multi-page/subpage.html": {
+	"anchors": [
+	  "valid1",
+	  "valid2"
+	]
+      },
+      "https://example.com/multi-page/subpage2.html": {
+	"anchors": [
+	  "valid1",
+	  "valid2"
+	]
+      },
+      "https://example.com/multi-page/subpage3.html": {
+	"anchors": [
+	  "valid1"
+	]
+      }
     },
-    "https://example.com/multi-page/": {
-      "anchors": [
-	"valid1"
-      ]
-    },
-    "https://example.com/multi-page/subpage.html": {
-      "anchors": [
-	"valid1",
-	"valid2"
-      ]
-    },
-    "https://example.com/multi-page/subpage2.html": {
-      "anchors": [
-	"valid1",
-	"valid2"
-      ]
-    },
-    "https://example.com/multi-page/subpage3.html": {
-      "anchors": [
-	"valid1"
-      ]
+    "autolinks": {
+      "https://example.com/single-page": {
+	"anchors": [
+	  "valid1"
+	]
+      }
     }
   }
 }