From 94e68de7ca9b52d181a0a98b019dd0256694e2f9 Mon Sep 17 00:00:00 2001
From: Francois Daoust <fd@tidoust.net>
Date: Fri, 7 Jul 2023 22:19:21 +0200
Subject: [PATCH] Send ReSpec specs to spec-generator before looking for status

Fixes #944. Note generation of ReSpec specs with JSDOM is still not possible in
practice, due to missing APIs in JSDOM required by ReSpec.

To make sure that the result would work for all WICG specs (in case
browser-specs becomes the source for Specref for WICG specs), I made a built
without retrieving info from Specref for WICG specs. Result looks good, and
would actually fix a couple of outdated titles and incorrect spec statuses.
---
 specs.json         | 21 +++------------------
 src/fetch-info.js  | 15 +++++++++++++--
 test/fetch-info.js |  6 +++---
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/specs.json b/specs.json
index 511e736e..1c3996fa 100644
--- a/specs.json
+++ b/specs.json
@@ -237,18 +237,8 @@
       ]
     }
   },
-  {
-    "url": "https://screen-share.github.io/captured-mouse-events/",
-    "nightly": {
-      "status": "Draft Community Group Report"
-    }
-  },
-  {
-    "url": "https://screen-share.github.io/element-capture/",
-    "nightly": {
-      "status": "Draft Community Group Report"
-    }
-  },
+  "https://screen-share.github.io/captured-mouse-events/",
+  "https://screen-share.github.io/element-capture/",
   {
     "url": "https://sourcemaps.info/spec.html",
     "shortname": "sourcemap",
@@ -402,12 +392,7 @@
   "https://wicg.github.io/datacue/",
   "https://wicg.github.io/deprecation-reporting/",
   "https://wicg.github.io/digital-goods/",
-  {
-    "url": "https://wicg.github.io/direct-sockets/",
-    "nightly": {
-      "status": "Unofficial Proposal Draft"
-    }
-  },
+  "https://wicg.github.io/direct-sockets/",
   "https://wicg.github.io/document-picture-in-picture/",
   "https://wicg.github.io/document-policy/",
   "https://wicg.github.io/element-timing/",
diff --git a/src/fetch-info.js b/src/fetch-info.js
index 18e24847..88f1ad58 100644
--- a/src/fetch-info.js
+++ b/src/fetch-info.js
@@ -261,6 +261,12 @@ async function fetchInfoFromSpecs(specs, options) {
       }
     }
 
+    if (dom.window.document.head.querySelector("script[src*='respec']")) {
+      // Non-generated ReSpec spec, let's get the generated version from
+      // spec-generator
+      dom = await JSDOMFromURL(`https://labs.w3.org/spec-generator/?type=respec&url=${encodeURIComponent(url)}`);
+    }
+
     // Extract first heading when set
     let title = dom.window.document.querySelector("h1");
     if (!title) {
@@ -289,10 +295,15 @@ async function fetchInfoFromSpecs(specs, options) {
         ".head #subtitle",          // WHATWG specs
         ".head #living-standard"    // HTML spec
       ].join(","));
-      const match = subtitle?.textContent.match(/^\s*(.*?)(,| — Last Updated)? \d{1,2} \w+ \d{4}\s*$/);
-      const status = (match ? match[1] : "Editor's Draft")
+      const match = subtitle?.textContent.match(/^\s*(.+?)(,| — Last Updated)?\s+\d{1,2} \w+ \d{4}\s*$/);
+      let status = (match ? match[1] : "Editor's Draft")
         .replace(/’/g, "'")     // Bikeshed generates curly quotes
         .replace(/^W3C /, "");  // Once every full moon, a "W3C " prefix gets added
+      // And once every other full moon, spec has a weird status
+      // (e.g., https://privacycg.github.io/gpc-spec/)
+      if (status === "Proposal" || status === "Unofficial Draft") {
+        status = "Unofficial Proposal Draft";
+      }
       return {
         nightly: { url, status },
         title
diff --git a/test/fetch-info.js b/test/fetch-info.js
index ba8a8b57..d750a0a3 100644
--- a/test/fetch-info.js
+++ b/test/fetch-info.js
@@ -75,15 +75,15 @@ describe("fetch-info module (without W3C API key)", function () {
 
     it("extracts spec info from a Respec spec when needed", async () => {
       const spec = {
-        url: "https://w3c.github.io/respec/examples/tpac_2019.html",
+        url: "https://screen-share.github.io/element-capture/",
         shortname: "respec"
       };
       const info = await fetchInfo([spec]);
       assert.ok(info[spec.shortname]);
       assert.equal(info[spec.shortname].source, "spec");
       assert.equal(info[spec.shortname].nightly.url, spec.url);
-      assert.equal(info[spec.shortname].nightly.status, "Editor's Draft");
-      assert.equal(info[spec.shortname].title, "TPAC 2019 - New Features");
+      assert.equal(info[spec.shortname].nightly.status, "Draft Community Group Report");
+      assert.equal(info[spec.shortname].title, "Element Capture");
     });
 
     it("extracts right title from an ECMAScript proposal spec", async () => {