reffy 10.1.1 → 10.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reffy",
-  "version": "10.1.1",
+  "version": "10.1.2",
   "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",

package/src/browserlib/extract-cssdfn.mjs

@@ -240,13 +240,27 @@ const extractValueSpaces = doc => {
       .map(s => s.trim().replace(/\s+/g, ' '));
 
     function addValuespace(name, value) {
+      const normalizedValue = normalize(value);
       if (!(name in res)) {
         res[name] = {};
       }
       if (!res[name].value || (pureSyntax && !res[name].pureSyntax)) {
-        res[name].value = normalize(value);
+        res[name].value = normalizedValue;
         res[name].pureSyntax = pureSyntax;
       }
+      else if (res[name].value !== normalizedValue) {
+        // Second definition found. Typically happens for the statement and
+        // block @layer definitions in css-cascade-5. We'll combine the values
+        // as alternative.
+        // Hardcoded exception: re-definitions of rgb() and hsl() are legacy
+        // constructs, stored separately not to pollute `value`.
+        if (name === '<rgb()>' || name === '<hsl()>') {
+          res[name].legacyValue = normalizedValue;
+        }
+        else {
+          res[name].value += ` | ${normalizedValue}`;
+        }
+      }
     }
 
     if (nameAndValue[0].match(/^<.*>$|^.*\(\)$/)) {