@unocss/core 0.22.2 → 0.22.6

package/dist/index.cjs

@@ -388,7 +388,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.22.2";
+const version = "0.22.6";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -517,10 +517,10 @@ class UnoGenerator {
         if (!sorted.length)
           return void 0;
         const rules = sorted.reverse().map(([selector, body, noMerge], idx) => {
-          if (selector && this.config.mergeSelectors) {
+          if (!noMerge && selector && this.config.mergeSelectors) {
             for (let i = idx + 1; i < size; i++) {
               const current = sorted[i];
-              if (!noMerge && current && current[0] && current[1] === body) {
+              if (current && !current[2] && current[0] && current[1] === body) {
                 current[0].push(...selector);
                 return null;
               }
@@ -690,18 +690,25 @@ class UnoGenerator {
         continue;
       const { selector, entries, parent: parent2 } = this.applyVariants(item, [...item[4], ...parentVariants], raw);
       const mapItem = selectorMap.getFallback(selector, parent2, [[], item[0]]);
-      mapItem[0].push(entries);
+      mapItem[0].push([entries, !!item[3]?.noMerge]);
     }
     return selectorMap.map(([e2, index], selector, mediaQuery) => {
-      const split = e2.filter((entries) => entries.some((entry) => entry[0] === CONTROL_SHORTCUT_NO_MERGE));
-      const rest = e2.filter((entries) => entries.every((entry) => entry[0] !== CONTROL_SHORTCUT_NO_MERGE));
-      return [...split, rest.flat(1)].map((entries) => {
+      const stringify = (noMerge) => (entries) => {
         const body = entriesToCss(entries);
         if (body)
-          return [index, selector, body, mediaQuery, meta];
+          return [index, selector, body, mediaQuery, { ...meta, noMerge }];
         return void 0;
+      };
+      const merges = [
+        [e2.filter(([, noMerge]) => noMerge).map(([entries]) => entries), true],
+        [e2.filter(([, noMerge]) => !noMerge).map(([entries]) => entries), false]
+      ];
+      return merges.map(([e3, noMerge]) => {
+        const splits = e3.filter((entries) => entries.some((entry) => entry[0] === CONTROL_SHORTCUT_NO_MERGE));
+        const rests = e3.filter((entries) => entries.every((entry) => entry[0] !== CONTROL_SHORTCUT_NO_MERGE));
+        return [...splits.map(stringify(noMerge)), ...[rests.flat(1)].map(stringify(noMerge))];
       });
-    }).flat(1).filter(Boolean);
+    }).flat(2).filter(Boolean);
   }
   isBlocked(raw) {
     return !raw || this.config.blocklist.some((e2) => typeof e2 === "string" ? e2 === raw : e2.test(raw));
@@ -720,7 +727,7 @@ function applyScope(css, scope) {
 }
 const attributifyRe = /^\[(.+?)(~?=)"(.*)"\]$/;
 function toEscapedSelector(raw) {
-  if (raw.startsWith("[") && attributifyRe.test(raw))
+  if (attributifyRe.test(raw))
     return raw.replace(attributifyRe, (_, n, s, i) => `[${e(n)}${s}"${e(i)}"]`);
   return `.${e(raw)}`;
 }

package/dist/index.mjs

@@ -384,7 +384,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.22.2";
+const version = "0.22.6";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -513,10 +513,10 @@ class UnoGenerator {
         if (!sorted.length)
           return void 0;
         const rules = sorted.reverse().map(([selector, body, noMerge], idx) => {
-          if (selector && this.config.mergeSelectors) {
+          if (!noMerge && selector && this.config.mergeSelectors) {
             for (let i = idx + 1; i < size; i++) {
               const current = sorted[i];
-              if (!noMerge && current && current[0] && current[1] === body) {
+              if (current && !current[2] && current[0] && current[1] === body) {
                 current[0].push(...selector);
                 return null;
               }
@@ -686,18 +686,25 @@ class UnoGenerator {
         continue;
       const { selector, entries, parent: parent2 } = this.applyVariants(item, [...item[4], ...parentVariants], raw);
       const mapItem = selectorMap.getFallback(selector, parent2, [[], item[0]]);
-      mapItem[0].push(entries);
+      mapItem[0].push([entries, !!item[3]?.noMerge]);
     }
     return selectorMap.map(([e2, index], selector, mediaQuery) => {
-      const split = e2.filter((entries) => entries.some((entry) => entry[0] === CONTROL_SHORTCUT_NO_MERGE));
-      const rest = e2.filter((entries) => entries.every((entry) => entry[0] !== CONTROL_SHORTCUT_NO_MERGE));
-      return [...split, rest.flat(1)].map((entries) => {
+      const stringify = (noMerge) => (entries) => {
         const body = entriesToCss(entries);
         if (body)
-          return [index, selector, body, mediaQuery, meta];
+          return [index, selector, body, mediaQuery, { ...meta, noMerge }];
         return void 0;
+      };
+      const merges = [
+        [e2.filter(([, noMerge]) => noMerge).map(([entries]) => entries), true],
+        [e2.filter(([, noMerge]) => !noMerge).map(([entries]) => entries), false]
+      ];
+      return merges.map(([e3, noMerge]) => {
+        const splits = e3.filter((entries) => entries.some((entry) => entry[0] === CONTROL_SHORTCUT_NO_MERGE));
+        const rests = e3.filter((entries) => entries.every((entry) => entry[0] !== CONTROL_SHORTCUT_NO_MERGE));
+        return [...splits.map(stringify(noMerge)), ...[rests.flat(1)].map(stringify(noMerge))];
       });
-    }).flat(1).filter(Boolean);
+    }).flat(2).filter(Boolean);
   }
   isBlocked(raw) {
     return !raw || this.config.blocklist.some((e2) => typeof e2 === "string" ? e2 === raw : e2.test(raw));
@@ -716,7 +723,7 @@ function applyScope(css, scope) {
 }
 const attributifyRe = /^\[(.+?)(~?=)"(.*)"\]$/;
 function toEscapedSelector(raw) {
-  if (raw.startsWith("[") && attributifyRe.test(raw))
+  if (attributifyRe.test(raw))
     return raw.replace(attributifyRe, (_, n, s, i) => `[${e(n)}${s}"${e(i)}"]`);
   return `.${e(raw)}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.22.2",
+  "version": "0.22.6",
   "description": "The instant on-demand Atomic CSS engine.",
   "keywords": [
     "unocss",