@unocss/core 0.13.1 → 0.14.3

package/dist/{index.js → index.cjs}

@@ -1,44 +1,7 @@
-var __defProp = Object.defineProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __export = (target, all) => {
-  __markAsModule(target);
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
+'use strict';
 
-// src/index.ts
-__export(exports, {
-  BetterMap: () => BetterMap,
-  TwoKeyMap: () => TwoKeyMap,
-  UnoGenerator: () => UnoGenerator,
-  attributifyRE: () => attributifyRE,
-  createGenerator: () => createGenerator,
-  e: () => e,
-  entriesToCss: () => entriesToCss,
-  escapeRegExp: () => escapeRegExp,
-  escapeSelector: () => escapeSelector,
-  expandVariantGroup: () => expandVariantGroup,
-  extractorSplit: () => extractorSplit,
-  hasScopePlaceholder: () => hasScopePlaceholder,
-  hex2rgba: () => hex2rgba,
-  isAttributifySelector: () => isAttributifySelector,
-  isObject: () => isObject,
-  isRawUtil: () => isRawUtil,
-  isStaticRule: () => isStaticRule,
-  isStaticShortcut: () => isStaticShortcut,
-  isValidSelector: () => isValidSelector,
-  mergeDeep: () => mergeDeep,
-  mergeSet: () => mergeSet,
-  normalizeVariant: () => normalizeVariant,
-  regexClassGroup: () => regexClassGroup,
-  toArray: () => toArray,
-  uniq: () => uniq,
-  validateFilterRE: () => validateFilterRE,
-  warnOnce: () => warnOnce,
-  withLayer: () => withLayer
-});
+Object.defineProperty(exports, '__esModule', { value: true });
 
-// src/utils/escape.ts
 function escapeRegExp(string) {
   return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -74,13 +37,36 @@ function escapeSelector(str) {
   }
   return result;
 }
-var e = escapeSelector;
+const e = escapeSelector;
 
-// src/utils/object.ts
+function normalizeCSSEntries(obj) {
+  return (!Array.isArray(obj) ? Object.entries(obj) : obj).filter((i) => i[1] != null);
+}
+function normalizeCSSValues(obj) {
+  if (Array.isArray(obj)) {
+    if (obj.find((i) => !Array.isArray(i) || Array.isArray(i[0])))
+      return obj.map((i) => normalizeCSSEntries(i));
+    else
+      return [obj];
+  } else {
+    return [normalizeCSSEntries(obj)];
+  }
+}
+function clearIdenticalEntries(entry) {
+  return entry.filter(([k, v], idx) => {
+    if (k.startsWith("$$"))
+      return false;
+    for (let i = idx - 1; i >= 0; i--) {
+      if (entry[i][0] === k && entry[i][1] === v)
+        return false;
+    }
+    return true;
+  });
+}
 function entriesToCss(arr) {
   if (arr == null)
     return "";
-  return arr.map(([key, value]) => value != null ? `${key}:${value};` : void 0).filter(Boolean).join("");
+  return clearIdenticalEntries(arr).map(([key, value]) => value != null ? `${key}:${value};` : void 0).filter(Boolean).join("");
 }
 function isObject(item) {
   return item && typeof item === "object" && !Array.isArray(item);
@@ -114,7 +100,6 @@ function isStaticShortcut(sc) {
   return typeof sc[0] === "string";
 }
 
-// src/utils/basic.ts
 function toArray(value = []) {
   return Array.isArray(value) ? value : [value];
 }
@@ -126,8 +111,7 @@ function mergeSet(target, append) {
   return target;
 }
 
-// src/utils/colors.ts
-var hexRE = /^#?([\da-f]+)$/i;
+const hexRE = /^#?([\da-f]+)$/i;
 function hex2rgba(hex = "") {
   const [, body] = hex.match(hexRE) || [];
   if (!body)
@@ -149,9 +133,8 @@ function hex2rgba(hex = "") {
   }
 }
 
-// src/utils/helpers.ts
-var attributifyRE = /^\[(.+?)~?="(.*)"\]$/;
-var validateFilterRE = /[a-z?]/;
+const attributifyRE = /^\[(.+?)~?="(.*)"\]$/;
+const validateFilterRE = /(?!\d|-{2}|-\d)[a-zA-Z0-9\u00A0-\uFFFF-_:%-?]/;
 function isAttributifySelector(selector) {
   return selector.match(attributifyRE);
 }
@@ -164,9 +147,11 @@ function normalizeVariant(variant) {
 function isRawUtil(util) {
   return util.length === 3;
 }
+function notNull(value) {
+  return value != null;
+}
 
-// src/utils/map.ts
-var TwoKeyMap = class {
+class TwoKeyMap {
   constructor() {
     this._map = new Map();
   }
@@ -195,12 +180,10 @@ var TwoKeyMap = class {
     return this;
   }
   has(key1, key2) {
-    var _a;
-    return (_a = this._map.get(key1)) == null ? void 0 : _a.has(key2);
+    return this._map.get(key1)?.has(key2);
   }
   delete(key1, key2) {
-    var _a;
-    return ((_a = this._map.get(key1)) == null ? void 0 : _a.delete(key2)) || false;
+    return this._map.get(key1)?.delete(key2) || false;
   }
   deleteTop(key1) {
     return this._map.delete(key1);
@@ -210,8 +193,8 @@ var TwoKeyMap = class {
       return fn(v, k1, k2);
     }));
   }
-};
-var BetterMap = class extends Map {
+}
+class BetterMap extends Map {
   map(mapFn) {
     const result = [];
     this.forEach((v, k) => {
@@ -219,9 +202,8 @@ var BetterMap = class extends Map {
     });
     return result;
   }
-};
+}
 
-// src/utils/layer.ts
 function withLayer(layer, rules) {
   rules.forEach((r) => {
     if (!r[2])
@@ -232,8 +214,7 @@ function withLayer(layer, rules) {
   return rules;
 }
 
-// src/utils/variantGroup.ts
-var regexClassGroup = /([!\w+:_/-]+?)([:-])\(((?:[!\w\s:/\\,%#.$-]|\[.*?\])*?)\)/gm;
+const regexClassGroup = /([!\w+:_/-]+?)([:-])\(((?:[!\w\s:/\\,%#.$-]|\[.*?\])*?)\)/gm;
 function expandVariantGroup(str) {
   const replaces = [];
   let match;
@@ -251,8 +232,7 @@ function expandVariantGroup(str) {
   return result;
 }
 
-// src/utils/warn.ts
-var warned = new Set();
+const warned = new Set();
 function warnOnce(msg) {
   if (warned.has(msg))
     return;
@@ -260,8 +240,7 @@ function warnOnce(msg) {
   warned.add(msg);
 }
 
-// src/extractors/split.ts
-var extractorSplit = {
+const extractorSplit = {
   name: "split",
   order: 0,
   extract({ code }) {
@@ -269,7 +248,6 @@ var extractorSplit = {
   }
 };
 
-// src/config.ts
 function resolveShortcuts(shortcuts) {
   return toArray(shortcuts).flatMap((s) => {
     if (Array.isArray(s))
@@ -277,7 +255,7 @@ function resolveShortcuts(shortcuts) {
     return Object.entries(s);
   });
 }
-var defaultLayers = {
+const defaultLayers = {
   shortcuts: -1,
   default: 0
 };
@@ -335,11 +313,9 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-// package.json
-var version = "0.13.1";
+const version = "0.14.3";
 
-// src/generator/index.ts
-var UnoGenerator = class {
+class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
     this.userConfig = userConfig;
     this.defaults = defaults;
@@ -370,7 +346,7 @@ var UnoGenerator = class {
     };
     for (const extractor of this.config.extractors) {
       const result = await extractor.extract(context);
-      result == null ? void 0 : result.forEach((t) => set.add(t));
+      result?.forEach((t) => set.add(t));
     }
     return set;
   }
@@ -389,7 +365,6 @@ var UnoGenerator = class {
     const matched = new Set();
     const sheet = new Map();
     const hit = (raw, payload) => {
-      var _a;
       this._cache.set(raw, payload);
       matched.add(raw);
       for (const item of payload) {
@@ -397,7 +372,7 @@ var UnoGenerator = class {
         if (!sheet.has(parent))
           sheet.set(parent, []);
         sheet.get(parent).push(item);
-        if ((_a = item[4]) == null ? void 0 : _a.layer)
+        if (item[4]?.layer)
           layerSet.add(item[4].layer);
       }
     };
@@ -433,12 +408,12 @@ var UnoGenerator = class {
       const expanded = this.expandShortcut(applied[1], context);
       if (expanded) {
         const utils = await this.stringifyShortcuts(applied, context, expanded[0], expanded[1]);
-        if (utils == null ? void 0 : utils.length)
+        if (utils?.length)
           return hit(raw, utils);
       } else {
-        const util = this.stringifyUtil(await this.parseUtil(applied, context));
-        if (util)
-          return hit(raw, [util]);
+        const utils = (await this.parseUtil(applied, context))?.map((i) => this.stringifyUtil(i)).filter(notNull);
+        if (utils?.length)
+          return hit(raw, utils);
       }
       this._cache.set(raw, null);
     }));
@@ -449,36 +424,27 @@ var UnoGenerator = class {
       });
     }
     const layerCache = {};
-    const layers = this.config.sortLayers(Array.from(layerSet).sort((a, b) => {
-      var _a, _b;
-      return ((_a = this.config.layers[a]) != null ? _a : 0) - ((_b = this.config.layers[b]) != null ? _b : 0) || a.localeCompare(b);
-    }));
+    const layers = this.config.sortLayers(Array.from(layerSet).sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b)));
     const getLayer = (layer) => {
       if (layerCache[layer])
         return layerCache[layer];
       let css = Array.from(sheet).sort((a, b) => (this.parentOrders.get(a[0]) || 0) - (this.parentOrders.get(b[0]) || 0)).map(([parent, items]) => {
         const size = items.length;
-        const sorted = items.filter((i) => {
-          var _a;
-          return (((_a = i[4]) == null ? void 0 : _a.layer) || "default") === layer;
-        }).sort((a, b) => {
-          var _a;
-          return a[0] - b[0] || ((_a = a[1]) == null ? void 0 : _a.localeCompare(b[1] || "")) || 0;
-        }).map((a) => [a[1] ? applyScope(a[1], scope) : a[1], a[2]]);
+        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]]);
         if (!sorted.length)
           return void 0;
-        const rules = sorted.map(([selector, body], idx) => {
+        const rules = sorted.reverse().map(([selector, body], idx) => {
           if (selector && this.config.mergeSelectors) {
-            for (let i = size - 1; i > idx; i--) {
+            for (let i = idx + 1; i < size; i++) {
               const current = sorted[i];
               if (current && current[0] && current[1] === body) {
-                current[0] = `${selector},${current[0]}`;
+                current[0] = `${current[0]},${selector}`;
                 return null;
               }
             }
           }
           return selector ? `${selector}{${body}}` : body;
-        }).filter(Boolean).join(nl);
+        }).filter(Boolean).reverse().join(nl);
         return parent ? `${parent}{${nl}${rules}${nl}}` : rules;
       }).filter(Boolean).join(nl);
       if (preflights) {
@@ -490,7 +456,7 @@ var UnoGenerator = class {
       return layerCache[layer] = !minify && css ? `/* layer: ${layer} */${nl}${css}` : css;
     };
     const getLayers = (includes = layers, excludes) => {
-      return includes.filter((i) => !(excludes == null ? void 0 : excludes.includes(i))).map((i) => getLayer(i) || "").filter(Boolean).join(nl);
+      return includes.filter((i) => !excludes?.includes(i)).map((i) => getLayer(i) || "").filter(Boolean).join(nl);
     };
     return {
       get css() {
@@ -535,20 +501,15 @@ var UnoGenerator = class {
     return [raw, processed, handlers];
   }
   applyVariants(parsed, variantHandlers = parsed[4], raw = parsed[1]) {
+    const entries = variantHandlers.reduce((p, v) => v.body?.(p) || p, parsed[2]);
     return [
-      variantHandlers.reduce((p, v) => {
-        var _a;
-        return ((_a = v.selector) == null ? void 0 : _a.call(v, p)) || p;
-      }, toEscapedSelector(raw)),
-      variantHandlers.reduce((p, v) => {
-        var _a;
-        return ((_a = v.body) == null ? void 0 : _a.call(v, p)) || p;
-      }, parsed[2]),
+      variantHandlers.reduce((p, v) => v.selector?.(p, entries) || p, toEscapedSelector(raw)),
+      entries,
       variantHandlers.reduce((p, v) => Array.isArray(v.parent) ? v.parent[0] : v.parent || p, void 0)
     ];
   }
   constructCustomCSS(context, body, overrideSelector) {
-    body = normalizeEntries(body);
+    body = normalizeCSSEntries(body);
     const [selector, entries, mediaQuery] = this.applyVariants([0, overrideSelector || context.rawSelector, body, void 0, context.variantHandlers]);
     const cssBody = `${selector}{${entriesToCss(entries)}}`;
     if (mediaQuery)
@@ -556,12 +517,11 @@ var UnoGenerator = class {
     return cssBody;
   }
   async parseUtil(input, context, internal = false) {
-    var _a, _b;
     const [raw, processed, variantHandlers] = typeof input === "string" ? this.matchVariants(input) : input;
     const staticMatch = this.config.rulesStaticMap[processed];
     if (staticMatch) {
-      if (staticMatch[1] && (internal || !((_a = staticMatch[2]) == null ? void 0 : _a.internal)))
-        return [staticMatch[0], raw, normalizeEntries(staticMatch[1]), staticMatch[2], variantHandlers];
+      if (staticMatch[1] && (internal || !staticMatch[2]?.internal))
+        return [[staticMatch[0], raw, normalizeCSSEntries(staticMatch[1]), staticMatch[2], variantHandlers]];
     }
     context.variantHandlers = variantHandlers;
     const { rulesDynamic, rulesSize } = this.config;
@@ -569,7 +529,7 @@ var UnoGenerator = class {
       const rule = rulesDynamic[i];
       if (!rule)
         continue;
-      if (((_b = rule[2]) == null ? void 0 : _b.internal) && !internal)
+      if (rule[2]?.internal && !internal)
         continue;
       const [matcher, handler, meta] = rule;
       const match = processed.match(matcher);
@@ -579,10 +539,10 @@ var UnoGenerator = class {
       if (!result)
         continue;
       if (typeof result === "string")
-        return [i, result, meta];
-      const entries = normalizeEntries(result).filter((i2) => i2[1] != null);
+        return [[i, result, meta]];
+      const entries = normalizeCSSValues(result).filter((i2) => i2.length);
       if (entries.length)
-        return [i, raw, entries, meta, variantHandlers];
+        return entries.map((e2) => [i, raw, e2, meta, variantHandlers]);
     }
   }
   stringifyUtil(parsed) {
@@ -623,10 +583,7 @@ var UnoGenerator = class {
     if (!result)
       return;
     return [
-      result.flatMap((r) => {
-        var _a;
-        return ((_a = this.expandShortcut(r, context, depth - 1)) == null ? void 0 : _a[0]) || [r];
-      }),
+      result.flatMap((r) => this.expandShortcut(r, context, depth - 1)?.[0] || [r]),
       meta
     ];
   }
@@ -636,8 +593,8 @@ var UnoGenerator = class {
       const result = await this.parseUtil(i, context, true);
       if (!result)
         warnOnce(`unmatched utility "${i}" in shortcut "${parent[1]}"`);
-      return result;
-    }))).filter(Boolean).sort((a, b) => a[0] - b[0]);
+      return result || [];
+    }))).flat(1).filter(Boolean).sort((a, b) => a[0] - b[0]);
     const [raw, , parentVariants] = parent;
     for (const item of parsed) {
       if (isRawUtil(item))
@@ -658,12 +615,12 @@ var UnoGenerator = class {
   isBlocked(raw) {
     return !raw || this.config.blocklist.some((e2) => typeof e2 === "string" ? e2 === raw : e2.test(raw));
   }
-};
+}
 function createGenerator(config, defaults) {
   return new UnoGenerator(config, defaults);
 }
-var reScopePlaceholder = / \$\$ /;
-var hasScopePlaceholder = (css) => css.match(reScopePlaceholder);
+const reScopePlaceholder = / \$\$ /;
+const hasScopePlaceholder = (css) => css.match(reScopePlaceholder);
 function applyScope(css, scope) {
   if (hasScopePlaceholder(css))
     return css.replace(reScopePlaceholder, scope ? ` ${scope} ` : " ");
@@ -676,37 +633,36 @@ function toEscapedSelector(raw) {
   else
     return `.${e(raw)}`;
 }
-function normalizeEntries(obj) {
-  return !Array.isArray(obj) ? Object.entries(obj) : obj;
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BetterMap,
-  TwoKeyMap,
-  UnoGenerator,
-  attributifyRE,
-  createGenerator,
-  e,
-  entriesToCss,
-  escapeRegExp,
-  escapeSelector,
-  expandVariantGroup,
-  extractorSplit,
-  hasScopePlaceholder,
-  hex2rgba,
-  isAttributifySelector,
-  isObject,
-  isRawUtil,
-  isStaticRule,
-  isStaticShortcut,
-  isValidSelector,
-  mergeDeep,
-  mergeSet,
-  normalizeVariant,
-  regexClassGroup,
-  toArray,
-  uniq,
-  validateFilterRE,
-  warnOnce,
-  withLayer
-});
+
+exports.BetterMap = BetterMap;
+exports.TwoKeyMap = TwoKeyMap;
+exports.UnoGenerator = UnoGenerator;
+exports.attributifyRE = attributifyRE;
+exports.clearIdenticalEntries = clearIdenticalEntries;
+exports.createGenerator = createGenerator;
+exports.e = e;
+exports.entriesToCss = entriesToCss;
+exports.escapeRegExp = escapeRegExp;
+exports.escapeSelector = escapeSelector;
+exports.expandVariantGroup = expandVariantGroup;
+exports.extractorSplit = extractorSplit;
+exports.hasScopePlaceholder = hasScopePlaceholder;
+exports.hex2rgba = hex2rgba;
+exports.isAttributifySelector = isAttributifySelector;
+exports.isObject = isObject;
+exports.isRawUtil = isRawUtil;
+exports.isStaticRule = isStaticRule;
+exports.isStaticShortcut = isStaticShortcut;
+exports.isValidSelector = isValidSelector;
+exports.mergeDeep = mergeDeep;
+exports.mergeSet = mergeSet;
+exports.normalizeCSSEntries = normalizeCSSEntries;
+exports.normalizeCSSValues = normalizeCSSValues;
+exports.normalizeVariant = normalizeVariant;
+exports.notNull = notNull;
+exports.regexClassGroup = regexClassGroup;
+exports.toArray = toArray;
+exports.uniq = uniq;
+exports.validateFilterRE = validateFilterRE;
+exports.warnOnce = warnOnce;
+exports.withLayer = withLayer;

package/dist/index.d.ts

@@ -13,7 +13,7 @@ declare class UnoGenerator {
     matchVariants(raw: string, current?: string): VariantMatchedResult;
     applyVariants(parsed: ParsedUtil, variantHandlers?: VariantHandler[], raw?: string): readonly [string, CSSEntries, string | undefined];
     constructCustomCSS(context: Readonly<RuleContext>, body: CSSObject | CSSEntries, overrideSelector?: string): string;
-    parseUtil(input: string | VariantMatchedResult, context: RuleContext, internal?: boolean): Promise<ParsedUtil | RawUtil | undefined>;
+    parseUtil(input: string | VariantMatchedResult, context: RuleContext, internal?: boolean): Promise<ParsedUtil[] | RawUtil[] | undefined>;
     stringifyUtil(parsed?: ParsedUtil | RawUtil): StringifiedUtil | undefined;
     expandShortcut(processed: string, context: RuleContext, depth?: number): [string[], RuleMeta | undefined] | undefined;
     stringifyShortcuts(parent: VariantMatchedResult, context: RuleContext, expanded: string[], meta?: RuleMeta): Promise<StringifiedUtil[] | undefined>;
@@ -86,7 +86,8 @@ interface RuleMeta {
      */
     internal?: boolean;
 }
-declare type DynamicMatcher<Theme extends {} = {}> = ((match: string[], context: Readonly<RuleContext<Theme>>) => Awaitable<CSSObject | CSSEntries | string | undefined>);
+declare type CSSValues = CSSObject | CSSEntries | (CSSObject | CSSEntries)[];
+declare type DynamicMatcher<Theme extends {} = {}> = ((match: string[], context: Readonly<RuleContext<Theme>>) => Awaitable<CSSValues | string | undefined>);
 declare type DynamicRule<Theme extends {} = {}> = [RegExp, DynamicMatcher<Theme>] | [RegExp, DynamicMatcher<Theme>, RuleMeta];
 declare type StaticRule = [string, CSSObject | CSSEntries] | [string, CSSObject | CSSEntries, RuleMeta];
 declare type Rule<Theme extends {} = {}> = DynamicRule<Theme> | StaticRule;
@@ -110,7 +111,7 @@ interface VariantHandler {
     /**
      * Rewrite the output selector. Often be used to append pesudo classes or parents.
      */
-    selector?: (input: string) => string | undefined;
+    selector?: (input: string, body: CSSEntries) => string | undefined;
     /**
      * Rewrite the output css body. The input come in [key,value][] pairs.
      */
@@ -326,6 +327,9 @@ declare function escapeRegExp(string: string): string;
 declare function escapeSelector(str: string): string;
 declare const e: typeof escapeSelector;
 
+declare function normalizeCSSEntries(obj: CSSEntries | CSSObject): CSSEntries;
+declare function normalizeCSSValues(obj: CSSValues): CSSEntries[];
+declare function clearIdenticalEntries(entry: CSSEntries): CSSEntries;
 declare function entriesToCss(arr?: CSSEntries): string;
 declare function isObject(item: any): item is Record<string, any>;
 declare function mergeDeep<T>(original: T, patch: DeepPartial<T>): T;
@@ -344,6 +348,7 @@ declare function isAttributifySelector(selector: string): RegExpMatchArray | nul
 declare function isValidSelector(selector?: string): selector is string;
 declare function normalizeVariant(variant: Variant): VariantObject;
 declare function isRawUtil(util: ParsedUtil | RawUtil | StringifiedUtil): util is RawUtil;
+declare function notNull<T>(value: T | null | undefined): value is T;
 
 declare class TwoKeyMap<K1, K2, V> {
     _map: Map<K1, Map<K2, V>>;
@@ -368,4 +373,4 @@ declare function warnOnce(msg: string): void;
 
 declare const extractorSplit: Extractor;
 
-export { ArgumentType, Awaitable, BetterMap, BlocklistRule, CSSEntries, CSSObject, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedUtil, PartialByKeys, PluginOptions, Preflight, Preset, RawUtil, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, TwoKeyMap, UnoGenerator, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, Variant, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, createGenerator, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeVariant, regexClassGroup, toArray, uniq, validateFilterRE, warnOnce, withLayer };
+export { ArgumentType, Awaitable, BetterMap, BlocklistRule, CSSEntries, CSSObject, CSSValues, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedUtil, PartialByKeys, PluginOptions, Preflight, Preset, RawUtil, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, TwoKeyMap, UnoGenerator, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, Variant, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, createGenerator, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, toArray, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -1,4 +1,3 @@
-// src/utils/escape.ts
 function escapeRegExp(string) {
   return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -34,13 +33,36 @@ function escapeSelector(str) {
   }
   return result;
 }
-var e = escapeSelector;
+const e = escapeSelector;
 
-// src/utils/object.ts
+function normalizeCSSEntries(obj) {
+  return (!Array.isArray(obj) ? Object.entries(obj) : obj).filter((i) => i[1] != null);
+}
+function normalizeCSSValues(obj) {
+  if (Array.isArray(obj)) {
+    if (obj.find((i) => !Array.isArray(i) || Array.isArray(i[0])))
+      return obj.map((i) => normalizeCSSEntries(i));
+    else
+      return [obj];
+  } else {
+    return [normalizeCSSEntries(obj)];
+  }
+}
+function clearIdenticalEntries(entry) {
+  return entry.filter(([k, v], idx) => {
+    if (k.startsWith("$$"))
+      return false;
+    for (let i = idx - 1; i >= 0; i--) {
+      if (entry[i][0] === k && entry[i][1] === v)
+        return false;
+    }
+    return true;
+  });
+}
 function entriesToCss(arr) {
   if (arr == null)
     return "";
-  return arr.map(([key, value]) => value != null ? `${key}:${value};` : void 0).filter(Boolean).join("");
+  return clearIdenticalEntries(arr).map(([key, value]) => value != null ? `${key}:${value};` : void 0).filter(Boolean).join("");
 }
 function isObject(item) {
   return item && typeof item === "object" && !Array.isArray(item);
@@ -74,7 +96,6 @@ function isStaticShortcut(sc) {
   return typeof sc[0] === "string";
 }
 
-// src/utils/basic.ts
 function toArray(value = []) {
   return Array.isArray(value) ? value : [value];
 }
@@ -86,8 +107,7 @@ function mergeSet(target, append) {
   return target;
 }
 
-// src/utils/colors.ts
-var hexRE = /^#?([\da-f]+)$/i;
+const hexRE = /^#?([\da-f]+)$/i;
 function hex2rgba(hex = "") {
   const [, body] = hex.match(hexRE) || [];
   if (!body)
@@ -109,9 +129,8 @@ function hex2rgba(hex = "") {
   }
 }
 
-// src/utils/helpers.ts
-var attributifyRE = /^\[(.+?)~?="(.*)"\]$/;
-var validateFilterRE = /[a-z?]/;
+const attributifyRE = /^\[(.+?)~?="(.*)"\]$/;
+const validateFilterRE = /(?!\d|-{2}|-\d)[a-zA-Z0-9\u00A0-\uFFFF-_:%-?]/;
 function isAttributifySelector(selector) {
   return selector.match(attributifyRE);
 }
@@ -124,9 +143,11 @@ function normalizeVariant(variant) {
 function isRawUtil(util) {
   return util.length === 3;
 }
+function notNull(value) {
+  return value != null;
+}
 
-// src/utils/map.ts
-var TwoKeyMap = class {
+class TwoKeyMap {
   constructor() {
     this._map = new Map();
   }
@@ -155,12 +176,10 @@ var TwoKeyMap = class {
     return this;
   }
   has(key1, key2) {
-    var _a;
-    return (_a = this._map.get(key1)) == null ? void 0 : _a.has(key2);
+    return this._map.get(key1)?.has(key2);
   }
   delete(key1, key2) {
-    var _a;
-    return ((_a = this._map.get(key1)) == null ? void 0 : _a.delete(key2)) || false;
+    return this._map.get(key1)?.delete(key2) || false;
   }
   deleteTop(key1) {
     return this._map.delete(key1);
@@ -170,8 +189,8 @@ var TwoKeyMap = class {
       return fn(v, k1, k2);
     }));
   }
-};
-var BetterMap = class extends Map {
+}
+class BetterMap extends Map {
   map(mapFn) {
     const result = [];
     this.forEach((v, k) => {
@@ -179,9 +198,8 @@ var BetterMap = class extends Map {
     });
     return result;
   }
-};
+}
 
-// src/utils/layer.ts
 function withLayer(layer, rules) {
   rules.forEach((r) => {
     if (!r[2])
@@ -192,8 +210,7 @@ function withLayer(layer, rules) {
   return rules;
 }
 
-// src/utils/variantGroup.ts
-var regexClassGroup = /([!\w+:_/-]+?)([:-])\(((?:[!\w\s:/\\,%#.$-]|\[.*?\])*?)\)/gm;
+const regexClassGroup = /([!\w+:_/-]+?)([:-])\(((?:[!\w\s:/\\,%#.$-]|\[.*?\])*?)\)/gm;
 function expandVariantGroup(str) {
   const replaces = [];
   let match;
@@ -211,8 +228,7 @@ function expandVariantGroup(str) {
   return result;
 }
 
-// src/utils/warn.ts
-var warned = new Set();
+const warned = new Set();
 function warnOnce(msg) {
   if (warned.has(msg))
     return;
@@ -220,8 +236,7 @@ function warnOnce(msg) {
   warned.add(msg);
 }
 
-// src/extractors/split.ts
-var extractorSplit = {
+const extractorSplit = {
   name: "split",
   order: 0,
   extract({ code }) {
@@ -229,7 +244,6 @@ var extractorSplit = {
   }
 };
 
-// src/config.ts
 function resolveShortcuts(shortcuts) {
   return toArray(shortcuts).flatMap((s) => {
     if (Array.isArray(s))
@@ -237,7 +251,7 @@ function resolveShortcuts(shortcuts) {
     return Object.entries(s);
   });
 }
-var defaultLayers = {
+const defaultLayers = {
   shortcuts: -1,
   default: 0
 };
@@ -295,11 +309,9 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-// package.json
-var version = "0.13.1";
+const version = "0.14.3";
 
-// src/generator/index.ts
-var UnoGenerator = class {
+class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
     this.userConfig = userConfig;
     this.defaults = defaults;
@@ -330,7 +342,7 @@ var UnoGenerator = class {
     };
     for (const extractor of this.config.extractors) {
       const result = await extractor.extract(context);
-      result == null ? void 0 : result.forEach((t) => set.add(t));
+      result?.forEach((t) => set.add(t));
     }
     return set;
   }
@@ -349,7 +361,6 @@ var UnoGenerator = class {
     const matched = new Set();
     const sheet = new Map();
     const hit = (raw, payload) => {
-      var _a;
       this._cache.set(raw, payload);
       matched.add(raw);
       for (const item of payload) {
@@ -357,7 +368,7 @@ var UnoGenerator = class {
         if (!sheet.has(parent))
           sheet.set(parent, []);
         sheet.get(parent).push(item);
-        if ((_a = item[4]) == null ? void 0 : _a.layer)
+        if (item[4]?.layer)
           layerSet.add(item[4].layer);
       }
     };
@@ -393,12 +404,12 @@ var UnoGenerator = class {
       const expanded = this.expandShortcut(applied[1], context);
       if (expanded) {
         const utils = await this.stringifyShortcuts(applied, context, expanded[0], expanded[1]);
-        if (utils == null ? void 0 : utils.length)
+        if (utils?.length)
           return hit(raw, utils);
       } else {
-        const util = this.stringifyUtil(await this.parseUtil(applied, context));
-        if (util)
-          return hit(raw, [util]);
+        const utils = (await this.parseUtil(applied, context))?.map((i) => this.stringifyUtil(i)).filter(notNull);
+        if (utils?.length)
+          return hit(raw, utils);
       }
       this._cache.set(raw, null);
     }));
@@ -409,36 +420,27 @@ var UnoGenerator = class {
       });
     }
     const layerCache = {};
-    const layers = this.config.sortLayers(Array.from(layerSet).sort((a, b) => {
-      var _a, _b;
-      return ((_a = this.config.layers[a]) != null ? _a : 0) - ((_b = this.config.layers[b]) != null ? _b : 0) || a.localeCompare(b);
-    }));
+    const layers = this.config.sortLayers(Array.from(layerSet).sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b)));
     const getLayer = (layer) => {
       if (layerCache[layer])
         return layerCache[layer];
       let css = Array.from(sheet).sort((a, b) => (this.parentOrders.get(a[0]) || 0) - (this.parentOrders.get(b[0]) || 0)).map(([parent, items]) => {
         const size = items.length;
-        const sorted = items.filter((i) => {
-          var _a;
-          return (((_a = i[4]) == null ? void 0 : _a.layer) || "default") === layer;
-        }).sort((a, b) => {
-          var _a;
-          return a[0] - b[0] || ((_a = a[1]) == null ? void 0 : _a.localeCompare(b[1] || "")) || 0;
-        }).map((a) => [a[1] ? applyScope(a[1], scope) : a[1], a[2]]);
+        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]]);
         if (!sorted.length)
           return void 0;
-        const rules = sorted.map(([selector, body], idx) => {
+        const rules = sorted.reverse().map(([selector, body], idx) => {
           if (selector && this.config.mergeSelectors) {
-            for (let i = size - 1; i > idx; i--) {
+            for (let i = idx + 1; i < size; i++) {
               const current = sorted[i];
               if (current && current[0] && current[1] === body) {
-                current[0] = `${selector},${current[0]}`;
+                current[0] = `${current[0]},${selector}`;
                 return null;
               }
             }
           }
           return selector ? `${selector}{${body}}` : body;
-        }).filter(Boolean).join(nl);
+        }).filter(Boolean).reverse().join(nl);
         return parent ? `${parent}{${nl}${rules}${nl}}` : rules;
       }).filter(Boolean).join(nl);
       if (preflights) {
@@ -450,7 +452,7 @@ var UnoGenerator = class {
       return layerCache[layer] = !minify && css ? `/* layer: ${layer} */${nl}${css}` : css;
     };
     const getLayers = (includes = layers, excludes) => {
-      return includes.filter((i) => !(excludes == null ? void 0 : excludes.includes(i))).map((i) => getLayer(i) || "").filter(Boolean).join(nl);
+      return includes.filter((i) => !excludes?.includes(i)).map((i) => getLayer(i) || "").filter(Boolean).join(nl);
     };
     return {
       get css() {
@@ -495,20 +497,15 @@ var UnoGenerator = class {
     return [raw, processed, handlers];
   }
   applyVariants(parsed, variantHandlers = parsed[4], raw = parsed[1]) {
+    const entries = variantHandlers.reduce((p, v) => v.body?.(p) || p, parsed[2]);
     return [
-      variantHandlers.reduce((p, v) => {
-        var _a;
-        return ((_a = v.selector) == null ? void 0 : _a.call(v, p)) || p;
-      }, toEscapedSelector(raw)),
-      variantHandlers.reduce((p, v) => {
-        var _a;
-        return ((_a = v.body) == null ? void 0 : _a.call(v, p)) || p;
-      }, parsed[2]),
+      variantHandlers.reduce((p, v) => v.selector?.(p, entries) || p, toEscapedSelector(raw)),
+      entries,
       variantHandlers.reduce((p, v) => Array.isArray(v.parent) ? v.parent[0] : v.parent || p, void 0)
     ];
   }
   constructCustomCSS(context, body, overrideSelector) {
-    body = normalizeEntries(body);
+    body = normalizeCSSEntries(body);
     const [selector, entries, mediaQuery] = this.applyVariants([0, overrideSelector || context.rawSelector, body, void 0, context.variantHandlers]);
     const cssBody = `${selector}{${entriesToCss(entries)}}`;
     if (mediaQuery)
@@ -516,12 +513,11 @@ var UnoGenerator = class {
     return cssBody;
   }
   async parseUtil(input, context, internal = false) {
-    var _a, _b;
     const [raw, processed, variantHandlers] = typeof input === "string" ? this.matchVariants(input) : input;
     const staticMatch = this.config.rulesStaticMap[processed];
     if (staticMatch) {
-      if (staticMatch[1] && (internal || !((_a = staticMatch[2]) == null ? void 0 : _a.internal)))
-        return [staticMatch[0], raw, normalizeEntries(staticMatch[1]), staticMatch[2], variantHandlers];
+      if (staticMatch[1] && (internal || !staticMatch[2]?.internal))
+        return [[staticMatch[0], raw, normalizeCSSEntries(staticMatch[1]), staticMatch[2], variantHandlers]];
     }
     context.variantHandlers = variantHandlers;
     const { rulesDynamic, rulesSize } = this.config;
@@ -529,7 +525,7 @@ var UnoGenerator = class {
       const rule = rulesDynamic[i];
       if (!rule)
         continue;
-      if (((_b = rule[2]) == null ? void 0 : _b.internal) && !internal)
+      if (rule[2]?.internal && !internal)
         continue;
       const [matcher, handler, meta] = rule;
       const match = processed.match(matcher);
@@ -539,10 +535,10 @@ var UnoGenerator = class {
       if (!result)
         continue;
       if (typeof result === "string")
-        return [i, result, meta];
-      const entries = normalizeEntries(result).filter((i2) => i2[1] != null);
+        return [[i, result, meta]];
+      const entries = normalizeCSSValues(result).filter((i2) => i2.length);
       if (entries.length)
-        return [i, raw, entries, meta, variantHandlers];
+        return entries.map((e2) => [i, raw, e2, meta, variantHandlers]);
     }
   }
   stringifyUtil(parsed) {
@@ -583,10 +579,7 @@ var UnoGenerator = class {
     if (!result)
       return;
     return [
-      result.flatMap((r) => {
-        var _a;
-        return ((_a = this.expandShortcut(r, context, depth - 1)) == null ? void 0 : _a[0]) || [r];
-      }),
+      result.flatMap((r) => this.expandShortcut(r, context, depth - 1)?.[0] || [r]),
       meta
     ];
   }
@@ -596,8 +589,8 @@ var UnoGenerator = class {
       const result = await this.parseUtil(i, context, true);
       if (!result)
         warnOnce(`unmatched utility "${i}" in shortcut "${parent[1]}"`);
-      return result;
-    }))).filter(Boolean).sort((a, b) => a[0] - b[0]);
+      return result || [];
+    }))).flat(1).filter(Boolean).sort((a, b) => a[0] - b[0]);
     const [raw, , parentVariants] = parent;
     for (const item of parsed) {
       if (isRawUtil(item))
@@ -618,12 +611,12 @@ var UnoGenerator = class {
   isBlocked(raw) {
     return !raw || this.config.blocklist.some((e2) => typeof e2 === "string" ? e2 === raw : e2.test(raw));
   }
-};
+}
 function createGenerator(config, defaults) {
   return new UnoGenerator(config, defaults);
 }
-var reScopePlaceholder = / \$\$ /;
-var hasScopePlaceholder = (css) => css.match(reScopePlaceholder);
+const reScopePlaceholder = / \$\$ /;
+const hasScopePlaceholder = (css) => css.match(reScopePlaceholder);
 function applyScope(css, scope) {
   if (hasScopePlaceholder(css))
     return css.replace(reScopePlaceholder, scope ? ` ${scope} ` : " ");
@@ -636,36 +629,5 @@ function toEscapedSelector(raw) {
   else
     return `.${e(raw)}`;
 }
-function normalizeEntries(obj) {
-  return !Array.isArray(obj) ? Object.entries(obj) : obj;
-}
-export {
-  BetterMap,
-  TwoKeyMap,
-  UnoGenerator,
-  attributifyRE,
-  createGenerator,
-  e,
-  entriesToCss,
-  escapeRegExp,
-  escapeSelector,
-  expandVariantGroup,
-  extractorSplit,
-  hasScopePlaceholder,
-  hex2rgba,
-  isAttributifySelector,
-  isObject,
-  isRawUtil,
-  isStaticRule,
-  isStaticShortcut,
-  isValidSelector,
-  mergeDeep,
-  mergeSet,
-  normalizeVariant,
-  regexClassGroup,
-  toArray,
-  uniq,
-  validateFilterRE,
-  warnOnce,
-  withLayer
-};
+
+export { BetterMap, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, createGenerator, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, 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.13.1",
+  "version": "0.14.3",
   "description": "The instant on-demand Atomic CSS engine.",
   "keywords": [
     "unocss",
@@ -25,19 +25,19 @@
   "sideEffects": false,
   "exports": {
     ".": {
-      "require": "./dist/index.js",
+      "require": "./dist/index.cjs",
       "import": "./dist/index.mjs",
       "types": "./dist/index.d.ts"
     }
   },
-  "main": "dist/index.js",
+  "main": "dist/index.cjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "tsup",
-    "dev": "tsup --watch src"
+    "build": "unbuild",
+    "stub": "unbuild --stub"
   }
 }