incorrectly expand nesting rules #38

tbela99 · Jul 5, 2024 · accfe69 · accfe69
1 parent 75cbc4e
commit accfe69
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## V0.5.4
+
+- [x] incorrectly expand css nesting rules
+
 ## V0.5.3
 
 - [x] incorrectly expand css nesting rules

diff --git a/dist/index-umd-web.js b/dist/index-umd-web.js
@@ -7201,11 +7201,17 @@
                     const rule = ast.chi[i];
                     if (!rule.sel.includes('&')) {
                         const selRule = splitRule(rule.sel);
-                        selRule.forEach(arr => combinators.includes(arr[0].charAt(0)) ? arr.unshift(ast.sel) : arr.unshift(ast.sel, ' '));
-                        rule.sel = selRule.reduce((acc, curr) => {
-                            acc.push(curr.join(''));
-                            return acc;
-                        }, []).join(',');
+                        if (selRule.length > 1) {
+                            const r = ':is(' + selRule.map(a => a.join('')).join(',') + ')';
+                            rule.sel = splitRule(ast.sel).reduce((a, b) => a.concat([b.join('') + r]), []).join(',');
+                        }
+                        else {
+                            selRule.forEach(arr => combinators.includes(arr[0].charAt(0)) ? arr.unshift(ast.sel) : arr.unshift(ast.sel, ' '));
+                            rule.sel = selRule.reduce((acc, curr) => {
+                                acc.push(curr.join(''));
+                                return acc;
+                            }, []).join(',');
+                        }
                     }
                     else {
                         rule.sel = replaceCompound(rule.sel, ast.sel);

diff --git a/dist/index.cjs b/dist/index.cjs
@@ -7199,11 +7199,17 @@ function expandRule(node) {
                 const rule = ast.chi[i];
                 if (!rule.sel.includes('&')) {
                     const selRule = splitRule(rule.sel);
-                    selRule.forEach(arr => combinators.includes(arr[0].charAt(0)) ? arr.unshift(ast.sel) : arr.unshift(ast.sel, ' '));
-                    rule.sel = selRule.reduce((acc, curr) => {
-                        acc.push(curr.join(''));
-                        return acc;
-                    }, []).join(',');
+                    if (selRule.length > 1) {
+                        const r = ':is(' + selRule.map(a => a.join('')).join(',') + ')';
+                        rule.sel = splitRule(ast.sel).reduce((a, b) => a.concat([b.join('') + r]), []).join(',');
+                    }
+                    else {
+                        selRule.forEach(arr => combinators.includes(arr[0].charAt(0)) ? arr.unshift(ast.sel) : arr.unshift(ast.sel, ' '));
+                        rule.sel = selRule.reduce((acc, curr) => {
+                            acc.push(curr.join(''));
+                            return acc;
+                        }, []).join(',');
+                    }
                 }
                 else {
                     rule.sel = replaceCompound(rule.sel, ast.sel);

diff --git a/dist/lib/ast/expand.js b/dist/lib/ast/expand.js
@@ -58,11 +58,17 @@ function expandRule(node) {
                 const rule = ast.chi[i];
                 if (!rule.sel.includes('&')) {
                     const selRule = splitRule(rule.sel);
-                    selRule.forEach(arr => combinators.includes(arr[0].charAt(0)) ? arr.unshift(ast.sel) : arr.unshift(ast.sel, ' '));
-                    rule.sel = selRule.reduce((acc, curr) => {
-                        acc.push(curr.join(''));
-                        return acc;
-                    }, []).join(',');
+                    if (selRule.length > 1) {
+                        const r = ':is(' + selRule.map(a => a.join('')).join(',') + ')';
+                        rule.sel = splitRule(ast.sel).reduce((a, b) => a.concat([b.join('') + r]), []).join(',');
+                    }
+                    else {
+                        selRule.forEach(arr => combinators.includes(arr[0].charAt(0)) ? arr.unshift(ast.sel) : arr.unshift(ast.sel, ' '));
+                        rule.sel = selRule.reduce((acc, curr) => {
+                            acc.push(curr.join(''));
+                            return acc;
+                        }, []).join(',');
+                    }
                 }
                 else {
                     rule.sel = replaceCompound(rule.sel, ast.sel);

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tbela99/css-parser",
   "description": "CSS parser for node and the browser",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "exports": {
     ".": "./dist/node/index.js",
     "./umd": "./dist/index-umd-web.js",