@unocss/core 66.1.0-beta.8 → 66.1.0

package/dist/index.d.mts

@@ -210,7 +210,12 @@ type FlatObjectTuple<T> = {
 type PartialByKeys<T, K extends keyof T = keyof T> = FlatObjectTuple<Partial<Pick<T, Extract<keyof T, K>>> & Omit<T, K>>;
 type RequiredByKey<T, K extends keyof T = keyof T> = FlatObjectTuple<Required<Pick<T, Extract<keyof T, K>>> & Omit<T, K>>;
 type CSSObject = Record<string, string | number | undefined>;
-type CSSEntry = [string, string | number | undefined];
+/**
+ * [property, value, operators?]
+ *
+ * - operators: Used to perform specific operations on value or property.
+ */
+type CSSEntry = [string, string | number | undefined, Arrayable<string>?];
 type CSSEntries = CSSEntry[];
 type CSSObjectInput = CSSObject | Partial<ControlSymbolsValue>;
 type CSSEntriesInput = (CSSEntry | ControlSymbolsEntry)[];
@@ -265,6 +270,7 @@ interface RuleContext<Theme extends object = object> {
     variants?: Variant<Theme>[];
 }
 declare const SymbolShortcutsNoMerge: unique symbol;
+declare const SymbolNoMerge: unique symbol;
 declare const SymbolVariants: unique symbol;
 declare const SymbolParent: unique symbol;
 declare const SymbolSelector: unique symbol;
@@ -275,6 +281,10 @@ interface ControlSymbols {
      * Prevent merging in shortcuts
      */
     shortcutsNoMerge: typeof SymbolShortcutsNoMerge;
+    /**
+     * Prevent merging in rules
+     */
+    noMerge: typeof SymbolNoMerge;
     /**
      * Additional variants applied to this rule
      */
@@ -298,7 +308,8 @@ interface ControlSymbols {
 }
 interface ControlSymbolsValue {
     [SymbolShortcutsNoMerge]: true;
-    [SymbolVariants]: VariantHandler[];
+    [SymbolNoMerge]: true;
+    [SymbolVariants]: VariantHandler[] | ((handlers: VariantHandler[]) => VariantHandler[]);
     [SymbolParent]: string;
     [SymbolSelector]: (selector: string) => string;
     [SymbolLayer]: string;

package/dist/index.d.ts

@@ -210,7 +210,12 @@ type FlatObjectTuple<T> = {
 type PartialByKeys<T, K extends keyof T = keyof T> = FlatObjectTuple<Partial<Pick<T, Extract<keyof T, K>>> & Omit<T, K>>;
 type RequiredByKey<T, K extends keyof T = keyof T> = FlatObjectTuple<Required<Pick<T, Extract<keyof T, K>>> & Omit<T, K>>;
 type CSSObject = Record<string, string | number | undefined>;
-type CSSEntry = [string, string | number | undefined];
+/**
+ * [property, value, operators?]
+ *
+ * - operators: Used to perform specific operations on value or property.
+ */
+type CSSEntry = [string, string | number | undefined, Arrayable<string>?];
 type CSSEntries = CSSEntry[];
 type CSSObjectInput = CSSObject | Partial<ControlSymbolsValue>;
 type CSSEntriesInput = (CSSEntry | ControlSymbolsEntry)[];
@@ -265,6 +270,7 @@ interface RuleContext<Theme extends object = object> {
     variants?: Variant<Theme>[];
 }
 declare const SymbolShortcutsNoMerge: unique symbol;
+declare const SymbolNoMerge: unique symbol;
 declare const SymbolVariants: unique symbol;
 declare const SymbolParent: unique symbol;
 declare const SymbolSelector: unique symbol;
@@ -275,6 +281,10 @@ interface ControlSymbols {
      * Prevent merging in shortcuts
      */
     shortcutsNoMerge: typeof SymbolShortcutsNoMerge;
+    /**
+     * Prevent merging in rules
+     */
+    noMerge: typeof SymbolNoMerge;
     /**
      * Additional variants applied to this rule
      */
@@ -298,7 +308,8 @@ interface ControlSymbols {
 }
 interface ControlSymbolsValue {
     [SymbolShortcutsNoMerge]: true;
-    [SymbolVariants]: VariantHandler[];
+    [SymbolNoMerge]: true;
+    [SymbolVariants]: VariantHandler[] | ((handlers: VariantHandler[]) => VariantHandler[]);
     [SymbolParent]: string;
     [SymbolSelector]: (selector: string) => string;
     [SymbolLayer]: string;

package/dist/index.mjs

@@ -657,10 +657,11 @@ function definePreset(preset) {
   return preset;
 }
 
-const version = "66.1.0-beta.8";
+const version = "66.1.0";
 
 const symbols = {
   shortcutsNoMerge: "$$symbol-shortcut-no-merge",
+  noMerge: "$$symbol-no-merge",
   variants: "$$symbol-variants",
   parent: "$$symbol-parent",
   selector: "$$symbol-selector",
@@ -874,7 +875,7 @@ class UnoGeneratorInternal {
         });
         if (!sorted.length)
           return void 0;
-        const rules = sorted.reverse().map(([selectorSortPair, body, noMerge], idx) => {
+        const ruleLines = sorted.reverse().map(([selectorSortPair, body, noMerge], idx) => {
           if (!noMerge && this.config.mergeSelectors) {
             for (let i = idx + 1; i < size; i++) {
               const current = sorted[i];
@@ -887,7 +888,8 @@ class UnoGeneratorInternal {
           }
           const selectors = selectorSortPair ? uniq(selectorSortPair.sort((a, b) => a[1] - b[1] || a[0]?.localeCompare(b[0] || "") || 0).map((pair) => pair[0]).filter(Boolean)) : [];
           return selectors.length ? `${selectors.join(`,${nl}`)}{${body}}` : body;
-        }).filter(Boolean).reverse().join(nl);
+        }).filter(Boolean);
+        const rules = Array.from(new Set(ruleLines)).reverse().join(nl);
         if (!parent)
           return rules;
         const parents = parent.split(" $$ ");
@@ -995,10 +997,11 @@ class UnoGeneratorInternal {
       (previous, v) => (input) => {
         const entries = v.body?.(input.entries) || input.entries;
         const parents = Array.isArray(v.parent) ? v.parent : [v.parent, void 0];
+        const selector = v.selector?.(input.selector, entries);
         return (v.handle ?? defaultVariantHandler)({
           ...input,
           entries,
-          selector: v.selector?.(input.selector, entries) || input.selector,
+          selector: selector || input.selector,
           parent: parents[0] || input.parent,
           parentOrder: parents[1] || input.parentOrder,
           layer: v.layer || input.layer,
@@ -1116,10 +1119,14 @@ class UnoGeneratorInternal {
             let entryMeta = meta;
             for (const entry of css) {
               if (entry[0] === symbols.variants) {
-                variants = [
-                  ...toArray(entry[1]),
-                  ...variants
-                ];
+                if (typeof entry[1] === "function") {
+                  variants = entry[1](variants) || variants;
+                } else {
+                  variants = [
+                    ...toArray(entry[1]),
+                    ...variants
+                  ];
+                }
               } else if (entry[0] === symbols.parent) {
                 variants = [
                   { parent: entry[1] },
@@ -1140,6 +1147,11 @@ class UnoGeneratorInternal {
                   ...entryMeta,
                   sort: entry[1]
                 };
+              } else if (entry[0] === symbols.noMerge) {
+                entryMeta = {
+                  ...entryMeta,
+                  noMerge: entry[1]
+                };
               }
             }
             return [index, raw, css, entryMeta, variants];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/core",
   "type": "module",
-  "version": "66.1.0-beta.8",
+  "version": "66.1.0",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -38,7 +38,7 @@
   ],
   "devDependencies": {
     "magic-string": "^0.30.17",
-    "unconfig": "^7.3.1"
+    "unconfig": "^7.3.2"
   },
   "scripts": {
     "build": "unbuild",