reffy 6.4.3 → 7.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reffy",
-  "version": "6.4.3",
+  "version": "7.0.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",
@@ -34,18 +34,18 @@
     "abortcontroller-polyfill": "1.7.3",
     "commander": "9.0.0",
     "fetch-filecache-for-crawling": "4.1.0",
-    "puppeteer": "13.3.2",
+    "puppeteer": "13.5.0",
     "semver": "^7.3.5",
-    "web-specs": "1.2.0",
+    "web-specs": "2.0.0",
     "webidl2": "24.2.0"
   },
   "devDependencies": {
     "chai": "4.3.6",
     "mocha": "9.2.1",
     "nock": "13.2.4",
-    "respec": "31.0.3",
+    "respec": "31.0.11",
     "respec-hljs": "2.1.1",
-    "rollup": "2.67.3"
+    "rollup": "2.70.0"
   },
   "scripts": {
     "test": "mocha --recursive tests/"

package/src/browserlib/extract-dfns.mjs

@@ -34,7 +34,7 @@ function normalize(str) {
 }
 
 // Valid types defined in https://tabatkins.github.io/bikeshed/#dfn-types
-// (+ "namespace" and "event" which are not yet in the doc)
+// (+ "namespace", "event" and "permission" which are not yet in the doc)
 function hasValidType(el) {
   const validDfnTypes = [
     // CSS types
@@ -68,6 +68,7 @@ function hasValidType(el) {
     'setlike',
     'extended-attribute',
     'event',
+    'permission',
 
     // Element types
     'element',

package/src/lib/specs-crawler.js

@@ -447,11 +447,20 @@ async function adjustExtractsPerSeries(data, property, settings) {
 
     data.forEach(spec => {
         if (fullLevels.includes(spec)) {
-            // Full level, rename the extract after the series' shortname
-            const pathname = path.resolve(settings.output, spec[property]);
-            spec[property] = `${property}/${spec.series.shortname}${path.extname(spec[property])}`;
-            const newpathname = path.resolve(settings.output, spec[property]);
-            fs.renameSync(pathname, newpathname);
+            // Full level, rename the extract after the series' shortname,
+            // unless we're dealing with a fork spec, in which case, we'll
+            // drop the created extract (not to run into IDL duplication issues)
+            if (spec.seriesComposition === 'fork') {
+                const pathname = path.resolve(settings.output, spec[property]);
+                fs.unlinkSync(pathname);
+                delete spec[property];
+            }
+            else {
+                const pathname = path.resolve(settings.output, spec[property]);
+                spec[property] = `${property}/${spec.series.shortname}${path.extname(spec[property])}`;
+                const newpathname = path.resolve(settings.output, spec[property]);
+                fs.renameSync(pathname, newpathname);
+            }
         }
         else if (deltaLevels.includes(spec)) {
             // Delta level, need to keep the extract as-is