reffy 20.0.0 → 20.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reffy",
-  "version": "20.0.0",
+  "version": "20.0.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",
@@ -35,17 +35,17 @@
   "dependencies": {
     "ajv": "8.17.1",
     "ajv-formats": "3.0.1",
-    "commander": "14.0.1",
+    "commander": "14.0.2",
     "fetch-filecache-for-crawling": "5.1.1",
-    "puppeteer": "24.25.0",
+    "puppeteer": "24.30.0",
     "semver": "^7.3.5",
-    "web-specs": "3.68.0",
+    "web-specs": "3.71.0",
     "webidl2": "24.5.0"
   },
   "devDependencies": {
     "respec": "35.6.0",
     "respec-hljs": "2.1.1",
-    "rollup": "4.52.4",
+    "rollup": "4.53.2",
     "undici": "^7.0.0"
   },
   "overrides": {

package/src/postprocessing/cssmerge.js

@@ -56,6 +56,45 @@ const extractCategories = [
   'values'
 ];
 
+
+/**
+ * Helper function to recursively copy scoped functions and types defined for
+ * another construct to the root level with a `for` key that links back to the
+ * scoping feature.
+ *
+ * Note: for descriptors, the function actually moves the inner descriptors to
+ * the root level.
+ */
+function copyScopedValuesToRootLevel(feature, categorized) {
+  if (feature.values) {
+    const values = feature.values
+      .filter(v => ['function', 'type'].includes(v.type))
+      .map(v => Object.assign({ for: feature.name }, v));
+    categorized.functions.push(
+      ...values.filter(v => v.type === 'function'));
+    categorized.types.push(
+      ...values.filter(v => v.type === 'type'));
+    // A scoped function may have scoped values, let's recurse
+    for (const value of values) {
+      copyScopedValuesToRootLevel(value, categorized);
+    }
+  }
+  if (feature.descriptors) {
+    // Note: at-rule descriptors already have a "for" attribute but
+    // nested at-rules typically don't have "descriptors" themselves
+    // while schema requires the property for consistency
+    const atrules = feature.descriptors
+      .filter(v => v.type === 'at-rule')
+      .map(v => Object.assign({ descriptors: [] }, v));
+    categorized.atrules.push(...atrules);
+    feature.descriptors = feature.descriptors
+      .filter(d => d.type !== 'at-rule');
+    for (const descriptor of feature.descriptors) {
+      copyScopedValuesToRootLevel(descriptor, categorized);
+    }
+  }
+}
+
 export default {
   dependsOn: ['css'],
   input: 'crawl',
@@ -93,25 +132,9 @@ export default {
       categorized.functions.push(...data.values.filter(v => v.type === 'function'));
       categorized.types.push(...data.values.filter(v => v.type === 'type'));
 
-      // Copy scoped functions and types to the root level with a `for` key
-      // to link back to the scoping feature
       for (const category of extractCategories) {
         for (const feature of data[category]) {
-          if (feature.values) {
-            const values = feature.values
-              .map(v => Object.assign({ for: feature.name }, v));
-            categorized.functions.push(
-              ...values.filter(v => v.type === 'function'));
-            categorized.types.push(
-              ...values.filter(v => v.type === 'type'));
-          }
-          if (feature.descriptors) {
-            // Note: at-rule descriptors already have a "for" attribute
-            categorized.atrules.push(
-              ...feature.descriptors.filter(v => v.type === 'at-rule'));
-            feature.descriptors = feature.descriptors
-              .filter(d => d.type !== 'at-rule');
-          }
+          copyScopedValuesToRootLevel(feature, categorized);
         }
       }
     }