@unocss/transformer-directives 0.26.1 → 0.26.2

package/dist/index.cjs

@@ -306,21 +306,26 @@ async function transformDirectives(css, uno, filename) {
         return;
       const parentSelector = cssTree.generate(node.prelude);
       for (const i of utils) {
-        const [, selector, body, parent] = i;
+        const [, _selector, body, parent] = i;
+        const selector = _selector?.replace(core.regexScopePlaceholder, " ") || _selector;
         if (parent) {
           const newNodeCss = `${parent}{${parentSelector}{${body}}}`;
           const insertNodeAst = cssTree.parse(newNodeCss);
           list.insertList(insertNodeAst.children, item);
         } else if (selector && selector !== ".\\-") {
-          const pseudoClassSelectors = cssTree.parse(selector, {
+          const selectorAST = cssTree.parse(selector, {
             context: "selector"
-          }).children.filter((i2) => i2.type === "PseudoClassSelector");
-          const parentSelectorAst = cssTree.clone(node.prelude);
-          parentSelectorAst.children.forEach((i2) => {
-            if (i2.type === "Selector")
-              i2.children.appendList(pseudoClassSelectors.copy());
           });
-          const newNodeCss = `${cssTree.generate(parentSelectorAst)}{${body}}`;
+          const prelude = cssTree.clone(node.prelude);
+          prelude.children.forEach((child) => {
+            const parentSelectorAst = cssTree.clone(selectorAST);
+            parentSelectorAst.children.forEach((i2) => {
+              if (i2.type === "ClassSelector" && i2.name === "\\-")
+                Object.assign(i2, cssTree.clone(child));
+            });
+            Object.assign(child, parentSelectorAst);
+          });
+          const newNodeCss = `${cssTree.generate(prelude)}{${body}}`;
           const insertNodeAst = cssTree.parse(newNodeCss);
           list.insertList(insertNodeAst.children, item);
         } else {

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { expandVariantGroup, notNull } from '@unocss/core';
+import { expandVariantGroup, notNull, regexScopePlaceholder } from '@unocss/core';
 import { parse, walk, generate, clone, List } from 'css-tree';
 import require$$0 from 'path';
 import 'crypto';
@@ -298,21 +298,26 @@ async function transformDirectives(css, uno, filename) {
         return;
       const parentSelector = generate(node.prelude);
       for (const i of utils) {
-        const [, selector, body, parent] = i;
+        const [, _selector, body, parent] = i;
+        const selector = _selector?.replace(regexScopePlaceholder, " ") || _selector;
         if (parent) {
           const newNodeCss = `${parent}{${parentSelector}{${body}}}`;
           const insertNodeAst = parse(newNodeCss);
           list.insertList(insertNodeAst.children, item);
         } else if (selector && selector !== ".\\-") {
-          const pseudoClassSelectors = parse(selector, {
+          const selectorAST = parse(selector, {
             context: "selector"
-          }).children.filter((i2) => i2.type === "PseudoClassSelector");
-          const parentSelectorAst = clone(node.prelude);
-          parentSelectorAst.children.forEach((i2) => {
-            if (i2.type === "Selector")
-              i2.children.appendList(pseudoClassSelectors.copy());
           });
-          const newNodeCss = `${generate(parentSelectorAst)}{${body}}`;
+          const prelude = clone(node.prelude);
+          prelude.children.forEach((child) => {
+            const parentSelectorAst = clone(selectorAST);
+            parentSelectorAst.children.forEach((i2) => {
+              if (i2.type === "ClassSelector" && i2.name === "\\-")
+                Object.assign(i2, clone(child));
+            });
+            Object.assign(child, parentSelectorAst);
+          });
+          const newNodeCss = `${generate(prelude)}{${body}}`;
           const insertNodeAst = parse(newNodeCss);
           list.insertList(insertNodeAst.children, item);
         } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/transformer-directives",
-  "version": "0.26.1",
+  "version": "0.26.2",
   "description": "UnoCSS transformer for `@apply` directive",
   "keywords": [
     "unocss",
@@ -31,13 +31,13 @@
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "peerDependencies": {
-    "@unocss/core": "0.26.1"
+    "@unocss/core": "0.26.2"
   },
   "dependencies": {
     "css-tree": "^2.0.4"
   },
   "devDependencies": {
-    "@unocss/core": "0.26.1"
+    "@unocss/core": "0.26.2"
   },
   "scripts": {
     "build": "unbuild",