@unocss/core 0.45.9 → 0.45.14

package/dist/index.cjs

@@ -45,10 +45,6 @@ function toArray(value = []) {
 function uniq(value) {
   return Array.from(new Set(value));
 }
-function mergeSet(target, append) {
-  append.forEach((i) => target.add(i));
-  return target;
-}
 function isString(s) {
   return typeof s === "string";
 }
@@ -138,7 +134,7 @@ function isStaticShortcut(sc) {
 
 const attributifyRE = /^\[(.+?)~?="(.*)"\]$/;
 const cssIdRE = /\.(css|postcss|sass|scss|less|stylus|styl)$/;
-const validateFilterRE = /(?!\d|-{2}|-\d)[a-zA-Z0-9\u00A0-\uFFFF-_:%-?]/;
+const validateFilterRE = /[\w\u00A0-\uFFFF-_:%-?]/;
 const CONTROL_SHORTCUT_NO_MERGE = "$$shortcut-no-merge";
 function isAttributifySelector(selector) {
   return selector.match(attributifyRE);
@@ -224,7 +220,7 @@ function withLayer(layer, rules) {
 }
 
 const regexClassGroup = /((?:[!\w+:_/-]|\[&?>?:?.*\])+?)([:-])\(((?:[~!\w\s:/\\,%#.$-]|\[.*?\])*?)\)/gm;
-function expandVariantGroup(str, seperators = ["-", ":"]) {
+function expandVariantGroup(str, seperators = ["-", ":"], depth = 5) {
   regexClassGroup.lastIndex = 0;
   let hasChanged = false;
   let content = str.toString();
@@ -239,11 +235,13 @@ function expandVariantGroup(str, seperators = ["-", ":"]) {
       }
     );
     hasChanged = content !== before;
-  } while (hasChanged);
-  if (typeof str === "string")
+    depth -= 1;
+  } while (hasChanged && depth);
+  if (typeof str === "string") {
     return content;
-  else
-    return str.overwrite(0, str.length(), content);
+  } else {
+    return str.length() ? str.overwrite(0, str.length(), content) : str;
+  }
 }
 
 const warned = /* @__PURE__ */ new Set();
@@ -323,7 +321,7 @@ function createNanoEvents() {
 const LAYER_DEFAULT = "default";
 const LAYER_PREFLIGHTS = "preflights";
 const LAYER_SHORTCUTS = "shortcuts";
-const DEAFULT_LAYERS = {
+const DEFAULT_LAYERS = {
   [LAYER_PREFLIGHTS]: -100,
   [LAYER_SHORTCUTS]: -10,
   [LAYER_DEFAULT]: 0
@@ -362,7 +360,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     ...rawPresets.filter((p) => !p.enforce),
     ...rawPresets.filter((p) => p.enforce === "post")
   ];
-  const layers = Object.assign(DEAFULT_LAYERS, ...rawPresets.map((i) => i.layers), userConfig.layers);
+  const layers = Object.assign(DEFAULT_LAYERS, ...rawPresets.map((i) => i.layers), userConfig.layers);
   function mergePresets(key) {
     return uniq([
       ...sortedPresets.flatMap((p) => toArray(p[key] || [])),
@@ -417,7 +415,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.45.9";
+const version = "0.45.14";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -581,12 +579,12 @@ 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 || LAYER_DEFAULT) === layer).sort((a, b) => a[0] - b[0] || (a[4]?.sort || 0) - (b[4]?.sort || 0) || a[1]?.localeCompare(b[1] || "") || a[2]?.localeCompare(b[2] || "") || 0).map(([, selector, body, , meta]) => {
+        const sorted = items.filter((i) => (i[4]?.layer || LAYER_DEFAULT) === layer).sort((a, b) => a[0] - b[0] || (a[4]?.sort || 0) - (b[4]?.sort || 0) || a[1]?.localeCompare(b[1] || "") || a[2]?.localeCompare(b[2] || "") || 0).map(([, selector, body, , meta, , variantNoMerge]) => {
           const scopedSelector = selector ? applyScope(selector, scope) : selector;
           return [
             [[scopedSelector ?? "", meta?.sort ?? 0]],
             body,
-            !!meta?.noMerge
+            !!(variantNoMerge ?? meta?.noMerge)
           ];
         });
         if (!sorted.length)
@@ -699,7 +697,8 @@ class UnoGenerator {
       entries: variantContextResult.entries,
       parent,
       layer: variantContextResult.layer,
-      sort: variantContextResult.sort
+      sort: variantContextResult.sort,
+      noMerge: variantContextResult.noMerge
     };
     for (const p of this.config.postprocess)
       p(obj);
@@ -768,8 +767,8 @@ class UnoGenerator {
     if (!parsed)
       return;
     if (isRawUtil(parsed))
-      return [parsed[0], void 0, parsed[1], void 0, parsed[2], this.config.details ? context : void 0];
-    const { selector, entries, parent, layer: variantLayer, sort: variantSort } = this.applyVariants(parsed);
+      return [parsed[0], void 0, parsed[1], void 0, parsed[2], this.config.details ? context : void 0, void 0];
+    const { selector, entries, parent, layer: variantLayer, sort: variantSort, noMerge } = this.applyVariants(parsed);
     const body = entriesToCss(entries);
     if (!body)
       return;
@@ -779,7 +778,7 @@ class UnoGenerator {
       layer: variantLayer ?? metaLayer,
       sort: variantSort ?? metaSort
     };
-    return [parsed[0], selector, body, parent, ruleMeta, this.config.details ? context : void 0];
+    return [parsed[0], selector, body, parent, ruleMeta, this.config.details ? context : void 0, noMerge];
   }
   expandShortcut(input, context, depth = 5) {
     if (depth === 0)
@@ -839,12 +838,12 @@ class UnoGenerator {
     const rawStringfieldUtil = [];
     for (const item of parsed) {
       if (isRawUtil(item)) {
-        rawStringfieldUtil.push([item[0], void 0, item[1], void 0, item[2], context]);
+        rawStringfieldUtil.push([item[0], void 0, item[1], void 0, item[2], context, void 0]);
         continue;
       }
-      const { selector, entries, parent: parent2, sort } = this.applyVariants(item, [...item[4], ...parentVariants], raw);
+      const { selector, entries, parent: parent2, sort, noMerge } = this.applyVariants(item, [...item[4], ...parentVariants], raw);
       const mapItem = selectorMap.getFallback(selector, parent2, [[], item[0]]);
-      mapItem[0].push([entries, !!item[3]?.noMerge, sort ?? 0]);
+      mapItem[0].push([entries, !!(noMerge ?? item[3]?.noMerge), sort ?? 0]);
     }
     return rawStringfieldUtil.concat(selectorMap.map(([e2, index], selector, joinedParents) => {
       const stringify = (flatten, noMerge, entrySortPair) => {
@@ -853,7 +852,7 @@ class UnoGenerator {
         return (flatten ? [entriesList.flat(1)] : entriesList).map((entries) => {
           const body = entriesToCss(entries);
           if (body)
-            return [index, selector, body, joinedParents, { ...meta, noMerge, sort: maxSort }, context];
+            return [index, selector, body, joinedParents, { ...meta, noMerge, sort: maxSort }, context, void 0];
           return void 0;
         });
       };
@@ -926,7 +925,6 @@ exports.isStaticShortcut = isStaticShortcut;
 exports.isString = isString;
 exports.isValidSelector = isValidSelector;
 exports.mergeDeep = mergeDeep;
-exports.mergeSet = mergeSet;
 exports.movePseudoElementsEnd = movePseudoElementsEnd;
 exports.noop = noop;
 exports.normalizeCSSEntries = normalizeCSSEntries;

package/dist/index.d.ts

@@ -102,7 +102,6 @@ declare function isStaticShortcut(sc: Shortcut): sc is StaticShortcut;
 
 declare function toArray<T>(value?: T | T[]): T[];
 declare function uniq<T>(value: T[]): T[];
-declare function mergeSet<T>(target: Set<T>, append: Set<T>): Set<T>;
 declare function isString(s: any): s is string;
 
 declare const attributifyRE: RegExp;
@@ -133,8 +132,8 @@ declare class BetterMap<K, V> extends Map<K, V> {
 declare function withLayer<T>(layer: string, rules: Rule<T>[]): Rule<T>[];
 
 declare const regexClassGroup: RegExp;
-declare function expandVariantGroup(str: string, seperators?: ('-' | ':')[]): string;
-declare function expandVariantGroup(str: MagicString, seperators?: ('-' | ':')[]): MagicString;
+declare function expandVariantGroup(str: string, seperators?: string[], depth?: number): string;
+declare function expandVariantGroup(str: MagicString, seperators?: string[], depth?: number): MagicString;
 
 declare function warnOnce(msg: string): void;
 
@@ -356,6 +355,11 @@ interface VariantHandlerContext {
      * Order in which the variant is sorted within single rule.
      */
     sort?: number;
+    /**
+     * Option to not merge the resulting entries even if the body are the same.
+     * @default false
+     */
+    noMerge?: boolean;
 }
 interface VariantHandler {
     /**
@@ -725,7 +729,8 @@ declare type StringifiedUtil = readonly [
     body: string,
     parent: string | undefined,
     meta: RuleMeta | undefined,
-    context: RuleContext | undefined
+    context: RuleContext | undefined,
+    noMerge: boolean | undefined
 ];
 declare type PreparedRule = readonly [
     selector: [string, number][],
@@ -738,6 +743,7 @@ interface UtilObject {
     parent: string | undefined;
     layer: string | undefined;
     sort: number | undefined;
+    noMerge: boolean | undefined;
 }
 interface GenerateOptions {
     /**
@@ -769,4 +775,4 @@ declare const extractorSplit: Extractor;
 
 declare const extractorSvelte: Extractor;
 
-export { ArgumentType, Arrayable, AutoCompleteExtractor, AutoCompleteExtractorContext, AutoCompleteExtractorResult, AutoCompleteFunction, AutoCompleteTemplate, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSColorValue, CSSEntries, CSSObject, CSSValue, CSSValues, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, PreparedRule, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, ShortcutValue, SourceCodeTransformer, SourceCodeTransformerEnforce, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, mergeDeep, mergeSet, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };
+export { ArgumentType, Arrayable, AutoCompleteExtractor, AutoCompleteExtractorContext, AutoCompleteExtractorResult, AutoCompleteFunction, AutoCompleteTemplate, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSColorValue, CSSEntries, CSSObject, CSSValue, CSSValues, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, PreparedRule, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, ShortcutValue, SourceCodeTransformer, SourceCodeTransformerEnforce, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, mergeDeep, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -41,10 +41,6 @@ function toArray(value = []) {
 function uniq(value) {
   return Array.from(new Set(value));
 }
-function mergeSet(target, append) {
-  append.forEach((i) => target.add(i));
-  return target;
-}
 function isString(s) {
   return typeof s === "string";
 }
@@ -134,7 +130,7 @@ function isStaticShortcut(sc) {
 
 const attributifyRE = /^\[(.+?)~?="(.*)"\]$/;
 const cssIdRE = /\.(css|postcss|sass|scss|less|stylus|styl)$/;
-const validateFilterRE = /(?!\d|-{2}|-\d)[a-zA-Z0-9\u00A0-\uFFFF-_:%-?]/;
+const validateFilterRE = /[\w\u00A0-\uFFFF-_:%-?]/;
 const CONTROL_SHORTCUT_NO_MERGE = "$$shortcut-no-merge";
 function isAttributifySelector(selector) {
   return selector.match(attributifyRE);
@@ -220,7 +216,7 @@ function withLayer(layer, rules) {
 }
 
 const regexClassGroup = /((?:[!\w+:_/-]|\[&?>?:?.*\])+?)([:-])\(((?:[~!\w\s:/\\,%#.$-]|\[.*?\])*?)\)/gm;
-function expandVariantGroup(str, seperators = ["-", ":"]) {
+function expandVariantGroup(str, seperators = ["-", ":"], depth = 5) {
   regexClassGroup.lastIndex = 0;
   let hasChanged = false;
   let content = str.toString();
@@ -235,11 +231,13 @@ function expandVariantGroup(str, seperators = ["-", ":"]) {
       }
     );
     hasChanged = content !== before;
-  } while (hasChanged);
-  if (typeof str === "string")
+    depth -= 1;
+  } while (hasChanged && depth);
+  if (typeof str === "string") {
     return content;
-  else
-    return str.overwrite(0, str.length(), content);
+  } else {
+    return str.length() ? str.overwrite(0, str.length(), content) : str;
+  }
 }
 
 const warned = /* @__PURE__ */ new Set();
@@ -319,7 +317,7 @@ function createNanoEvents() {
 const LAYER_DEFAULT = "default";
 const LAYER_PREFLIGHTS = "preflights";
 const LAYER_SHORTCUTS = "shortcuts";
-const DEAFULT_LAYERS = {
+const DEFAULT_LAYERS = {
   [LAYER_PREFLIGHTS]: -100,
   [LAYER_SHORTCUTS]: -10,
   [LAYER_DEFAULT]: 0
@@ -358,7 +356,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     ...rawPresets.filter((p) => !p.enforce),
     ...rawPresets.filter((p) => p.enforce === "post")
   ];
-  const layers = Object.assign(DEAFULT_LAYERS, ...rawPresets.map((i) => i.layers), userConfig.layers);
+  const layers = Object.assign(DEFAULT_LAYERS, ...rawPresets.map((i) => i.layers), userConfig.layers);
   function mergePresets(key) {
     return uniq([
       ...sortedPresets.flatMap((p) => toArray(p[key] || [])),
@@ -413,7 +411,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.45.9";
+const version = "0.45.14";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -577,12 +575,12 @@ 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 || LAYER_DEFAULT) === layer).sort((a, b) => a[0] - b[0] || (a[4]?.sort || 0) - (b[4]?.sort || 0) || a[1]?.localeCompare(b[1] || "") || a[2]?.localeCompare(b[2] || "") || 0).map(([, selector, body, , meta]) => {
+        const sorted = items.filter((i) => (i[4]?.layer || LAYER_DEFAULT) === layer).sort((a, b) => a[0] - b[0] || (a[4]?.sort || 0) - (b[4]?.sort || 0) || a[1]?.localeCompare(b[1] || "") || a[2]?.localeCompare(b[2] || "") || 0).map(([, selector, body, , meta, , variantNoMerge]) => {
           const scopedSelector = selector ? applyScope(selector, scope) : selector;
           return [
             [[scopedSelector ?? "", meta?.sort ?? 0]],
             body,
-            !!meta?.noMerge
+            !!(variantNoMerge ?? meta?.noMerge)
           ];
         });
         if (!sorted.length)
@@ -695,7 +693,8 @@ class UnoGenerator {
       entries: variantContextResult.entries,
       parent,
       layer: variantContextResult.layer,
-      sort: variantContextResult.sort
+      sort: variantContextResult.sort,
+      noMerge: variantContextResult.noMerge
     };
     for (const p of this.config.postprocess)
       p(obj);
@@ -764,8 +763,8 @@ class UnoGenerator {
     if (!parsed)
       return;
     if (isRawUtil(parsed))
-      return [parsed[0], void 0, parsed[1], void 0, parsed[2], this.config.details ? context : void 0];
-    const { selector, entries, parent, layer: variantLayer, sort: variantSort } = this.applyVariants(parsed);
+      return [parsed[0], void 0, parsed[1], void 0, parsed[2], this.config.details ? context : void 0, void 0];
+    const { selector, entries, parent, layer: variantLayer, sort: variantSort, noMerge } = this.applyVariants(parsed);
     const body = entriesToCss(entries);
     if (!body)
       return;
@@ -775,7 +774,7 @@ class UnoGenerator {
       layer: variantLayer ?? metaLayer,
       sort: variantSort ?? metaSort
     };
-    return [parsed[0], selector, body, parent, ruleMeta, this.config.details ? context : void 0];
+    return [parsed[0], selector, body, parent, ruleMeta, this.config.details ? context : void 0, noMerge];
   }
   expandShortcut(input, context, depth = 5) {
     if (depth === 0)
@@ -835,12 +834,12 @@ class UnoGenerator {
     const rawStringfieldUtil = [];
     for (const item of parsed) {
       if (isRawUtil(item)) {
-        rawStringfieldUtil.push([item[0], void 0, item[1], void 0, item[2], context]);
+        rawStringfieldUtil.push([item[0], void 0, item[1], void 0, item[2], context, void 0]);
         continue;
       }
-      const { selector, entries, parent: parent2, sort } = this.applyVariants(item, [...item[4], ...parentVariants], raw);
+      const { selector, entries, parent: parent2, sort, noMerge } = this.applyVariants(item, [...item[4], ...parentVariants], raw);
       const mapItem = selectorMap.getFallback(selector, parent2, [[], item[0]]);
-      mapItem[0].push([entries, !!item[3]?.noMerge, sort ?? 0]);
+      mapItem[0].push([entries, !!(noMerge ?? item[3]?.noMerge), sort ?? 0]);
     }
     return rawStringfieldUtil.concat(selectorMap.map(([e2, index], selector, joinedParents) => {
       const stringify = (flatten, noMerge, entrySortPair) => {
@@ -849,7 +848,7 @@ class UnoGenerator {
         return (flatten ? [entriesList.flat(1)] : entriesList).map((entries) => {
           const body = entriesToCss(entries);
           if (body)
-            return [index, selector, body, joinedParents, { ...meta, noMerge, sort: maxSort }, context];
+            return [index, selector, body, joinedParents, { ...meta, noMerge, sort: maxSort }, context, void 0];
           return void 0;
         });
       };
@@ -896,4 +895,4 @@ function defaultVariantHandler(input, next) {
   return next(input);
 }
 
-export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, mergeDeep, mergeSet, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };
+export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, mergeDeep, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.45.9",
+  "version": "0.45.14",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",