reffy 19.1.4 → 19.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reffy",
-  "version": "19.1.4",
+  "version": "19.1.6",
   "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",
@@ -39,13 +39,13 @@
     "fetch-filecache-for-crawling": "5.1.1",
     "puppeteer": "24.15.0",
     "semver": "^7.3.5",
-    "web-specs": "3.58.0",
+    "web-specs": "3.59.0",
     "webidl2": "24.5.0"
   },
   "devDependencies": {
     "respec": "35.4.3",
     "respec-hljs": "2.1.1",
-    "rollup": "4.45.1",
+    "rollup": "4.46.1",
     "undici": "^7.0.0"
   },
   "overrides": {

package/schemas/postprocessing/css.json

@@ -9,6 +9,13 @@
         "type": "string"
       },
       "minItems": 1
+    },
+
+    "extended": {
+      "type": "array",
+      "items": {
+        "$ref": "../common.json#/$defs/url"
+      }
     }
   },
 
@@ -25,6 +32,7 @@
         "properties": {
           "name": { "type": "string", "pattern": "^@" },
           "href": { "$ref": "../common.json#/$defs/url" },
+          "extended": { "$ref": "#/$defs/extended" },
           "syntax": { "$ref": "../common.json#/$defs/cssValue" },
           "prose": { "type": "string" },
           "descriptors": {
@@ -48,13 +56,13 @@
       "type": "array",
       "items": {
         "type": "object",
-        "required": ["name", "type"],
+        "required": ["name"],
         "additionalProperties": false,
         "properties": {
           "name": { "type": "string", "pattern": "^.*()$" },
           "for": { "$ref": "#/$defs/scopes" },
           "href": { "$ref": "../common.json#/$defs/url" },
-          "type": { "type": "string", "enum": ["function"] },
+          "extended": { "$ref": "#/$defs/extended" },
           "prose": { "type": "string" },
           "syntax": { "$ref": "../common.json#/$defs/cssValue" }
         }
@@ -69,6 +77,7 @@
         "properties": {
           "name": { "$ref": "../common.json#/$defs/cssPropertyName" },
           "href": { "$ref": "../common.json#/$defs/url" },
+          "extended": { "$ref": "#/$defs/extended" },
           "syntax": { "$ref": "../common.json#/$defs/cssValue" },
           "legacyAliasOf": { "$ref": "../common.json#/$defs/cssPropertyName" },
           "styleDeclaration": {
@@ -88,6 +97,7 @@
         "properties": {
           "name": { "$ref": "../common.json#/$defs/cssPropertyName" },
           "href": { "$ref": "../common.json#/$defs/url" },
+          "extended": { "$ref": "#/$defs/extended" },
           "prose": { "type": "string" },
           "syntax": { "$ref": "../common.json#/$defs/cssValue" }
         }
@@ -97,13 +107,13 @@
       "type": "array",
       "items": {
         "type": "object",
-        "required": ["name", "type"],
+        "required": ["name"],
         "additionalProperties": false,
         "properties": {
           "name": { "type": "string", "pattern": "^[a-zA-Z0-9-\\+\\(\\)\\[\\]\\{\\}]+$" },
           "for": { "$ref": "#/$defs/scopes" },
           "href": { "$ref": "../common.json#/$defs/url" },
-          "type": { "type": "string", "enum": ["type"] },
+          "extended": { "$ref": "#/$defs/extended" },
           "prose": { "type": "string" },
           "syntax": { "$ref": "../common.json#/$defs/cssValue" }
         }

package/src/postprocessing/cssmerge.js

@@ -111,8 +111,9 @@ export default {
 
     // The job is "almost" done but we now need to de-duplicate entries.
     // Duplicated entries exist when:
-    // - A property is defined in one spec and extended in other specs. We'll
-    // consolidate the entries (and syntaxes) to get back to a single entry.
+    // - A property, function or type is defined in one spec and extended in
+    // other specs. We'll consolidate the entries (and syntaxes) to get back to
+    // a single entry.
     // - An at-rule is defined in one spec. Additional descriptors are defined
     // in other specs. We'll consolidate the entries similarly.
     // - A descriptor is defined in one level of a spec series, and re-defined
@@ -179,13 +180,22 @@ export default {
       // Identify the base definition for each feature, using the definition
       // (that has some known syntax) in the most recent level. Move that base
       // definition to the beginning of the array and get rid of other base
-      // definitions.
-      // (Note: the code chooses one definition if duplicates of base
-      // definitions in unrelated specs still exist)
+      // definitions. Notes:
+      // - For properties, an extension is an entry with a `newValues` key.
+      // - For functions and types, an extension is an entry without an `href`
+      // key (the spec that extends the base type does not contain any `<dfn>`)
+      // - The code chooses one definition if duplicates of base definitions in
+      // unrelated specs still exist.
       for (const [name, dfns] of Object.entries(featureDfns)) {
-        let actualDfns = dfns.filter(dfn => dfn.syntax);
+        let actualDfns = dfns.filter(dfn => dfn.href && dfn.syntax);
         if (actualDfns.length === 0) {
-          actualDfns = dfns.filter(dfn => !dfn.newValues);
+          actualDfns = dfns.filter(dfn => dfn.href && !dfn.newValues);
+        }
+        if (actualDfns.length === 0) {
+          // No base definition, not a real type, let's discard it
+          // (problem should be captured through tests on individual extracts)
+          delete featureDfns[name];
+          continue;
         }
         const best = actualDfns.reduce((dfn1, dfn2) => {
           if (dfn1.spec.series.shortname !== dfn2.spec.series.shortname) {
@@ -199,6 +209,7 @@ export default {
             return dfn1;
           }
         });
+        best.extended = [];
         featureDfns[name] = [best].concat(
           dfns.filter(dfn => !actualDfns.includes(dfn))
         );
@@ -239,6 +250,18 @@ export default {
               continue;
             }
             baseDfn.syntax += ' | ' + dfn.newValues;
+            baseDfn.extended.push(dfn.href);
+          }
+          else if (dfn.syntax) {
+            // Extensions of functions and types are *re-definitions* in
+            // practice, new syntax overrides the base one. There should be
+            // only one such extension in unrelated specs, the code assumes
+            // that some sort of curation already took place, and picks up
+            // a winner randomly.
+            // Note: we don't have any `href` info for functions/types
+            // extensions, so we'll just use the URL of the crawled spec.
+            baseDfn.syntax = dfn.syntax;
+            baseDfn.extended = [dfn.spec.crawled ?? dfn.spec.url];
           }
           if (baseDfn.descriptors && dfn.descriptors?.length > 0) {
             baseDfn.descriptors.push(...dfn.descriptors.filter(desc =>