@unocss/core 0.22.0 → 0.22.1

package/dist/index.cjs

@@ -388,7 +388,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.22.0";
+const version = "0.22.1";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -513,14 +513,14 @@ class UnoGenerator {
         return layerCache[layer];
       let css = Array.from(sheet).sort((a, b) => (this.parentOrders.get(a[0]) ?? 0) - (this.parentOrders.get(b[0]) ?? 0) || a[0]?.localeCompare(b[0] || "") || 0).map(([parent, items]) => {
         const size = items.length;
-        const sorted = items.filter((i) => (i[4]?.layer || "default") === layer).sort((a, b) => a[0] - b[0] || a[1]?.localeCompare(b[1] || "") || 0).map((a) => [a[1] ? applyScope(a[1], scope) : a[1], a[2]]).map((a) => [a[0] == null ? a[0] : [a[0]], a[1]]);
+        const sorted = items.filter((i) => (i[4]?.layer || "default") === layer).sort((a, b) => a[0] - b[0] || a[1]?.localeCompare(b[1] || "") || 0).map((a) => [a[1] ? applyScope(a[1], scope) : a[1], a[2], !!a[4]?.noMerge]).map((a) => [a[0] == null ? a[0] : [a[0]], a[1], a[2]]);
         if (!sorted.length)
           return void 0;
-        const rules = sorted.reverse().map(([selector, body], idx) => {
+        const rules = sorted.reverse().map(([selector, body, noMerge], idx) => {
           if (selector && this.config.mergeSelectors) {
             for (let i = idx + 1; i < size; i++) {
               const current = sorted[i];
-              if (current && current[0] && current[1] === body) {
+              if (!noMerge && current && current[0] && current[1] === body) {
                 current[0].push(...selector);
                 return null;
               }
@@ -718,11 +718,11 @@ function applyScope(css, scope) {
   else
     return scope ? `${scope} ${css}` : css;
 }
+const attributifyRe = /^\[(.+?)(~?=)"(.*)"\]$/;
 function toEscapedSelector(raw) {
-  if (raw.startsWith("["))
-    return raw.replace(/^\[(.+?)(~?=)"(.*)"\]$/, (_, n, s, i) => `[${e(n)}${s}"${e(i)}"]`);
-  else
-    return `.${e(raw)}`;
+  if (raw.startsWith("[") && attributifyRe.test(raw))
+    return raw.replace(attributifyRe, (_, n, s, i) => `[${e(n)}${s}"${e(i)}"]`);
+  return `.${e(raw)}`;
 }
 
 exports.BetterMap = BetterMap;

package/dist/index.d.ts

@@ -123,6 +123,11 @@ interface RuleMeta {
      * @default 'default'
      */
     layer?: string;
+    /**
+     * Option to not merge this selector even if the body are the same.
+     * @default false
+     */
+    noMerge?: boolean;
     /**
      * Internal rules will only be matched for shortcuts but not the user code.
      * @default false

package/dist/index.mjs

@@ -384,7 +384,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.22.0";
+const version = "0.22.1";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -509,14 +509,14 @@ class UnoGenerator {
         return layerCache[layer];
       let css = Array.from(sheet).sort((a, b) => (this.parentOrders.get(a[0]) ?? 0) - (this.parentOrders.get(b[0]) ?? 0) || a[0]?.localeCompare(b[0] || "") || 0).map(([parent, items]) => {
         const size = items.length;
-        const sorted = items.filter((i) => (i[4]?.layer || "default") === layer).sort((a, b) => a[0] - b[0] || a[1]?.localeCompare(b[1] || "") || 0).map((a) => [a[1] ? applyScope(a[1], scope) : a[1], a[2]]).map((a) => [a[0] == null ? a[0] : [a[0]], a[1]]);
+        const sorted = items.filter((i) => (i[4]?.layer || "default") === layer).sort((a, b) => a[0] - b[0] || a[1]?.localeCompare(b[1] || "") || 0).map((a) => [a[1] ? applyScope(a[1], scope) : a[1], a[2], !!a[4]?.noMerge]).map((a) => [a[0] == null ? a[0] : [a[0]], a[1], a[2]]);
         if (!sorted.length)
           return void 0;
-        const rules = sorted.reverse().map(([selector, body], idx) => {
+        const rules = sorted.reverse().map(([selector, body, noMerge], idx) => {
           if (selector && this.config.mergeSelectors) {
             for (let i = idx + 1; i < size; i++) {
               const current = sorted[i];
-              if (current && current[0] && current[1] === body) {
+              if (!noMerge && current && current[0] && current[1] === body) {
                 current[0].push(...selector);
                 return null;
               }
@@ -714,11 +714,11 @@ function applyScope(css, scope) {
   else
     return scope ? `${scope} ${css}` : css;
 }
+const attributifyRe = /^\[(.+?)(~?=)"(.*)"\]$/;
 function toEscapedSelector(raw) {
-  if (raw.startsWith("["))
-    return raw.replace(/^\[(.+?)(~?=)"(.*)"\]$/, (_, n, s, i) => `[${e(n)}${s}"${e(i)}"]`);
-  else
-    return `.${e(raw)}`;
+  if (raw.startsWith("[") && attributifyRe.test(raw))
+    return raw.replace(attributifyRe, (_, n, s, i) => `[${e(n)}${s}"${e(i)}"]`);
+  return `.${e(raw)}`;
 }
 
 export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, toArray, uniq, validateFilterRE, warnOnce, withLayer };

package/package.json

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