@unocss/core 0.60.4 → 0.61.2

package/dist/index.d.mts

@@ -58,8 +58,8 @@ declare function escapeRegExp(string: string): string;
 declare function escapeSelector(str: string): string;
 declare const e: typeof escapeSelector;
 
-declare function normalizeCSSEntries(obj: string | CSSEntries | CSSObject): string | CSSEntries;
-declare function normalizeCSSValues(obj: CSSValue | string | (CSSValue | string)[]): (string | CSSEntries)[];
+declare function normalizeCSSEntries(obj: string | CSSEntriesInput | CSSObjectInput): string | CSSEntries;
+declare function normalizeCSSValues(obj: CSSValueInput | string | (CSSValueInput | string)[]): (string | CSSEntries)[];
 declare function clearIdenticalEntries(entry: CSSEntries): CSSEntries;
 declare function entriesToCss(arr?: CSSEntries): string;
 declare function isObject(item: any): item is Record<string, any>;
@@ -79,7 +79,6 @@ declare function isString(s: any): s is string;
 declare const attributifyRE: RegExp;
 declare const cssIdRE: RegExp;
 declare const validateFilterRE: RegExp;
-declare const CONTROL_SHORTCUT_NO_MERGE = "$$shortcut-no-merge";
 declare function isAttributifySelector(selector: string): RegExpMatchArray | null;
 declare function isValidSelector(selector?: string): selector is string;
 declare function normalizeVariant(variant: Variant<any>): VariantObject<any>;
@@ -133,6 +132,7 @@ declare function expandVariantGroup(str: MagicString, separators?: string[], dep
 
 declare function warnOnce(msg: string): void;
 
+declare const symbols: ControlSymbols;
 declare class UnoGenerator<Theme extends object = object> {
     userConfig: UserConfig<Theme>;
     defaults: UserConfigDefaults<Theme>;
@@ -182,39 +182,11 @@ 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 CSSEntries = [string, string | number | undefined][];
-interface CSSColorValue {
-    type: string;
-    components: (string | number)[];
-    alpha: string | number | undefined;
-}
-type RGBAColorValue = [number, number, number, number] | [number, number, number];
-interface ParsedColorValue {
-    /**
-     * Parsed color value.
-     */
-    color?: string;
-    /**
-     * Parsed opacity value.
-     */
-    opacity: string;
-    /**
-     * Color name.
-     */
-    name: string;
-    /**
-     * Color scale, preferably 000 - 999.
-     */
-    no: string;
-    /**
-     * {@link CSSColorValue}
-     */
-    cssColor: CSSColorValue | undefined;
-    /**
-     * Parsed alpha value from opacity
-     */
-    alpha: string | number | undefined;
-}
+type CSSEntry = [string, string | number | undefined];
+type CSSEntries = CSSEntry[];
+type CSSObjectInput = CSSObject | Partial<ControlSymbolsValue>;
+type CSSEntriesInput = (CSSEntry | ControlSymbolsEntry)[];
+type CSSValueInput = CSSObjectInput | CSSEntriesInput | CSSValue;
 type PresetOptions = Record<string, any>;
 interface RuleContext<Theme extends object = object> {
     /**
@@ -230,6 +202,10 @@ interface RuleContext<Theme extends object = object> {
      * UnoCSS generator instance
      */
     generator: UnoGenerator<Theme>;
+    /**
+     * Symbols for special handling
+     */
+    symbols: ControlSymbols;
     /**
      * The theme object
      */
@@ -260,6 +236,38 @@ interface RuleContext<Theme extends object = object> {
      */
     variants?: Variant<Theme>[];
 }
+declare const SymbolShortcutsNoMerge: unique symbol;
+declare const SymbolVariants: unique symbol;
+declare const SymbolParent: unique symbol;
+declare const SymbolSelector: unique symbol;
+interface ControlSymbols {
+    /**
+     * Prevent merging in shortcuts
+     */
+    shortcutsNoMerge: typeof SymbolShortcutsNoMerge;
+    /**
+     * Additional variants applied to this rule
+     */
+    variants: typeof SymbolVariants;
+    /**
+     * Parent selector (`@media`, `@supports`, etc.)
+     */
+    parent: typeof SymbolParent;
+    /**
+     * Selector modifier
+     */
+    selector: typeof SymbolSelector;
+}
+interface ControlSymbolsValue {
+    [SymbolShortcutsNoMerge]: true;
+    [SymbolVariants]: VariantHandler[];
+    [SymbolParent]: string;
+    [SymbolSelector]: (selector: string) => string;
+}
+type ObjectToEntry<T> = {
+    [K in keyof T]: [K, T[K]];
+}[keyof T];
+type ControlSymbolsEntry = ObjectToEntry<ControlSymbolsValue>;
 interface VariantContext<Theme extends object = object> {
     /**
      * Unprocessed selector from user input.
@@ -341,7 +349,7 @@ interface RuleMeta {
 }
 type CSSValue = CSSObject | CSSEntries;
 type CSSValues = CSSValue | CSSValue[];
-type DynamicMatcher<Theme extends object = object> = ((match: RegExpMatchArray, context: Readonly<RuleContext<Theme>>) => Awaitable<CSSValue | string | (CSSValue | string)[] | undefined>);
+type DynamicMatcher<Theme extends object = object> = (match: RegExpMatchArray, context: Readonly<RuleContext<Theme>>) => Awaitable<CSSValueInput | string | (CSSValueInput | string)[] | undefined> | Generator<CSSValueInput | string | undefined> | AsyncGenerator<CSSValueInput | string | undefined>;
 type DynamicRule<Theme extends object = object> = [RegExp, DynamicMatcher<Theme>] | [RegExp, DynamicMatcher<Theme>, RuleMeta];
 type StaticRule = [string, CSSObject | CSSEntries] | [string, CSSObject | CSSEntries, RuleMeta];
 type Rule<Theme extends object = object> = DynamicRule<Theme> | StaticRule;
@@ -412,7 +420,7 @@ interface VariantHandler {
     /**
      * The result rewritten selector for the next round of matching
      */
-    matcher: string;
+    matcher?: string;
     /**
      * Order in which the variant is applied to selector.
      */
@@ -703,6 +711,12 @@ interface UserOnlyOptions<Theme extends object = object> {
      * @default 'build'
      */
     envMode?: 'dev' | 'build';
+    /**
+     * legacy.renderModernChunks need to be consistent with @vitejs/plugin-legacy
+     */
+    legacy?: {
+        renderModernChunks: boolean;
+    };
 }
 /**
  * For unocss-cli config
@@ -1005,4 +1019,4 @@ declare function mergeConfigs<Theme extends object = object>(configs: UserConfig
 declare function definePreset<Options extends object | undefined = undefined, Theme extends object = object>(preset: PresetFactory<Theme, Options>): PresetFactory<Theme, Options>;
 declare function definePreset<Theme extends object = object>(preset: Preset<Theme>): Preset<Theme>;
 
-export { type ArgumentType, type Arrayable, type AutoCompleteExtractor, type AutoCompleteExtractorContext, type AutoCompleteExtractorResult, type AutoCompleteFunction, type AutoCompleteTemplate, type Awaitable, BetterMap, type BlocklistMeta, type BlocklistRule, type BlocklistValue, CONTROL_SHORTCUT_NO_MERGE, type CSSColorValue, type CSSEntries, type CSSObject, type CSSValue, type CSSValues, type CliEntryItem, type CliOptions, type ConfigBase, type ContentOptions, CountableSet, type DeepPartial, type DynamicMatcher, type DynamicRule, type DynamicShortcut, type DynamicShortcutMatcher, type ExtendedTokenInfo, type Extractor, type ExtractorContext, type FilterPattern, type FlatObjectTuple, type GenerateOptions, type GenerateResult, type GeneratorOptions, type HighlightAnnotation, type OutputCssLayersOptions, type ParsedColorValue, type ParsedUtil, type PartialByKeys, type PluginOptions, type Postprocessor, type Preflight, type PreflightContext, type PreparedRule, type Preprocessor, type Preset, type PresetFactory, type PresetOptions, type PresetOrFactory, type RGBAColorValue, type RawUtil, type Replacement, type RequiredByKey, type ResolvedConfig, type RestArgs, type Rule, type RuleContext, type RuleMeta, type SafeListContext, type Shift, type Shortcut, type ShortcutValue, type SourceCodeTransformer, type SourceCodeTransformerEnforce, type SourceMap, type StaticRule, type StaticShortcut, type StaticShortcutMap, type StringifiedUtil, type SuggestResult, type ThemeExtender, type ToArray, TwoKeyMap, UnoGenerator, type UnocssPluginContext, type UserConfig, type UserConfigDefaults, type UserOnlyOptions, type UserShortcuts, type UtilObject, type Variant, type VariantContext, type VariantFunction, type VariantHandler, type VariantHandlerContext, type VariantMatchedResult, type VariantObject, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, cssIdRE, defaultSplitRE, definePreset, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isCountableSet, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, uniqueBy, validateFilterRE, warnOnce, withLayer };
+export { type ArgumentType, type Arrayable, type AutoCompleteExtractor, type AutoCompleteExtractorContext, type AutoCompleteExtractorResult, type AutoCompleteFunction, type AutoCompleteTemplate, type Awaitable, BetterMap, type BlocklistMeta, type BlocklistRule, type BlocklistValue, type CSSEntries, type CSSEntriesInput, type CSSEntry, type CSSObject, type CSSObjectInput, type CSSValue, type CSSValueInput, type CSSValues, type CliEntryItem, type CliOptions, type ConfigBase, type ContentOptions, type ControlSymbols, type ControlSymbolsEntry, type ControlSymbolsValue, CountableSet, type DeepPartial, type DynamicMatcher, type DynamicRule, type DynamicShortcut, type DynamicShortcutMatcher, type ExtendedTokenInfo, type Extractor, type ExtractorContext, type FilterPattern, type FlatObjectTuple, type GenerateOptions, type GenerateResult, type GeneratorOptions, type HighlightAnnotation, type ObjectToEntry, type OutputCssLayersOptions, type ParsedUtil, type PartialByKeys, type PluginOptions, type Postprocessor, type Preflight, type PreflightContext, type PreparedRule, type Preprocessor, type Preset, type PresetFactory, type PresetOptions, type PresetOrFactory, type RawUtil, type Replacement, type RequiredByKey, type ResolvedConfig, type RestArgs, type Rule, type RuleContext, type RuleMeta, type SafeListContext, type Shift, type Shortcut, type ShortcutValue, type SourceCodeTransformer, type SourceCodeTransformerEnforce, type SourceMap, type StaticRule, type StaticShortcut, type StaticShortcutMap, type StringifiedUtil, type SuggestResult, type ThemeExtender, type ToArray, TwoKeyMap, UnoGenerator, type UnocssPluginContext, type UserConfig, type UserConfigDefaults, type UserOnlyOptions, type UserShortcuts, type UtilObject, type Variant, type VariantContext, type VariantFunction, type VariantHandler, type VariantHandlerContext, type VariantMatchedResult, type VariantObject, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, cssIdRE, defaultSplitRE, definePreset, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isCountableSet, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, symbols, toArray, toEscapedSelector, uniq, uniqueBy, validateFilterRE, warnOnce, withLayer };

package/dist/index.d.ts

@@ -58,8 +58,8 @@ declare function escapeRegExp(string: string): string;
 declare function escapeSelector(str: string): string;
 declare const e: typeof escapeSelector;
 
-declare function normalizeCSSEntries(obj: string | CSSEntries | CSSObject): string | CSSEntries;
-declare function normalizeCSSValues(obj: CSSValue | string | (CSSValue | string)[]): (string | CSSEntries)[];
+declare function normalizeCSSEntries(obj: string | CSSEntriesInput | CSSObjectInput): string | CSSEntries;
+declare function normalizeCSSValues(obj: CSSValueInput | string | (CSSValueInput | string)[]): (string | CSSEntries)[];
 declare function clearIdenticalEntries(entry: CSSEntries): CSSEntries;
 declare function entriesToCss(arr?: CSSEntries): string;
 declare function isObject(item: any): item is Record<string, any>;
@@ -79,7 +79,6 @@ declare function isString(s: any): s is string;
 declare const attributifyRE: RegExp;
 declare const cssIdRE: RegExp;
 declare const validateFilterRE: RegExp;
-declare const CONTROL_SHORTCUT_NO_MERGE = "$$shortcut-no-merge";
 declare function isAttributifySelector(selector: string): RegExpMatchArray | null;
 declare function isValidSelector(selector?: string): selector is string;
 declare function normalizeVariant(variant: Variant<any>): VariantObject<any>;
@@ -133,6 +132,7 @@ declare function expandVariantGroup(str: MagicString, separators?: string[], dep
 
 declare function warnOnce(msg: string): void;
 
+declare const symbols: ControlSymbols;
 declare class UnoGenerator<Theme extends object = object> {
     userConfig: UserConfig<Theme>;
     defaults: UserConfigDefaults<Theme>;
@@ -182,39 +182,11 @@ 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 CSSEntries = [string, string | number | undefined][];
-interface CSSColorValue {
-    type: string;
-    components: (string | number)[];
-    alpha: string | number | undefined;
-}
-type RGBAColorValue = [number, number, number, number] | [number, number, number];
-interface ParsedColorValue {
-    /**
-     * Parsed color value.
-     */
-    color?: string;
-    /**
-     * Parsed opacity value.
-     */
-    opacity: string;
-    /**
-     * Color name.
-     */
-    name: string;
-    /**
-     * Color scale, preferably 000 - 999.
-     */
-    no: string;
-    /**
-     * {@link CSSColorValue}
-     */
-    cssColor: CSSColorValue | undefined;
-    /**
-     * Parsed alpha value from opacity
-     */
-    alpha: string | number | undefined;
-}
+type CSSEntry = [string, string | number | undefined];
+type CSSEntries = CSSEntry[];
+type CSSObjectInput = CSSObject | Partial<ControlSymbolsValue>;
+type CSSEntriesInput = (CSSEntry | ControlSymbolsEntry)[];
+type CSSValueInput = CSSObjectInput | CSSEntriesInput | CSSValue;
 type PresetOptions = Record<string, any>;
 interface RuleContext<Theme extends object = object> {
     /**
@@ -230,6 +202,10 @@ interface RuleContext<Theme extends object = object> {
      * UnoCSS generator instance
      */
     generator: UnoGenerator<Theme>;
+    /**
+     * Symbols for special handling
+     */
+    symbols: ControlSymbols;
     /**
      * The theme object
      */
@@ -260,6 +236,38 @@ interface RuleContext<Theme extends object = object> {
      */
     variants?: Variant<Theme>[];
 }
+declare const SymbolShortcutsNoMerge: unique symbol;
+declare const SymbolVariants: unique symbol;
+declare const SymbolParent: unique symbol;
+declare const SymbolSelector: unique symbol;
+interface ControlSymbols {
+    /**
+     * Prevent merging in shortcuts
+     */
+    shortcutsNoMerge: typeof SymbolShortcutsNoMerge;
+    /**
+     * Additional variants applied to this rule
+     */
+    variants: typeof SymbolVariants;
+    /**
+     * Parent selector (`@media`, `@supports`, etc.)
+     */
+    parent: typeof SymbolParent;
+    /**
+     * Selector modifier
+     */
+    selector: typeof SymbolSelector;
+}
+interface ControlSymbolsValue {
+    [SymbolShortcutsNoMerge]: true;
+    [SymbolVariants]: VariantHandler[];
+    [SymbolParent]: string;
+    [SymbolSelector]: (selector: string) => string;
+}
+type ObjectToEntry<T> = {
+    [K in keyof T]: [K, T[K]];
+}[keyof T];
+type ControlSymbolsEntry = ObjectToEntry<ControlSymbolsValue>;
 interface VariantContext<Theme extends object = object> {
     /**
      * Unprocessed selector from user input.
@@ -341,7 +349,7 @@ interface RuleMeta {
 }
 type CSSValue = CSSObject | CSSEntries;
 type CSSValues = CSSValue | CSSValue[];
-type DynamicMatcher<Theme extends object = object> = ((match: RegExpMatchArray, context: Readonly<RuleContext<Theme>>) => Awaitable<CSSValue | string | (CSSValue | string)[] | undefined>);
+type DynamicMatcher<Theme extends object = object> = (match: RegExpMatchArray, context: Readonly<RuleContext<Theme>>) => Awaitable<CSSValueInput | string | (CSSValueInput | string)[] | undefined> | Generator<CSSValueInput | string | undefined> | AsyncGenerator<CSSValueInput | string | undefined>;
 type DynamicRule<Theme extends object = object> = [RegExp, DynamicMatcher<Theme>] | [RegExp, DynamicMatcher<Theme>, RuleMeta];
 type StaticRule = [string, CSSObject | CSSEntries] | [string, CSSObject | CSSEntries, RuleMeta];
 type Rule<Theme extends object = object> = DynamicRule<Theme> | StaticRule;
@@ -412,7 +420,7 @@ interface VariantHandler {
     /**
      * The result rewritten selector for the next round of matching
      */
-    matcher: string;
+    matcher?: string;
     /**
      * Order in which the variant is applied to selector.
      */
@@ -703,6 +711,12 @@ interface UserOnlyOptions<Theme extends object = object> {
      * @default 'build'
      */
     envMode?: 'dev' | 'build';
+    /**
+     * legacy.renderModernChunks need to be consistent with @vitejs/plugin-legacy
+     */
+    legacy?: {
+        renderModernChunks: boolean;
+    };
 }
 /**
  * For unocss-cli config
@@ -1005,4 +1019,4 @@ declare function mergeConfigs<Theme extends object = object>(configs: UserConfig
 declare function definePreset<Options extends object | undefined = undefined, Theme extends object = object>(preset: PresetFactory<Theme, Options>): PresetFactory<Theme, Options>;
 declare function definePreset<Theme extends object = object>(preset: Preset<Theme>): Preset<Theme>;
 
-export { type ArgumentType, type Arrayable, type AutoCompleteExtractor, type AutoCompleteExtractorContext, type AutoCompleteExtractorResult, type AutoCompleteFunction, type AutoCompleteTemplate, type Awaitable, BetterMap, type BlocklistMeta, type BlocklistRule, type BlocklistValue, CONTROL_SHORTCUT_NO_MERGE, type CSSColorValue, type CSSEntries, type CSSObject, type CSSValue, type CSSValues, type CliEntryItem, type CliOptions, type ConfigBase, type ContentOptions, CountableSet, type DeepPartial, type DynamicMatcher, type DynamicRule, type DynamicShortcut, type DynamicShortcutMatcher, type ExtendedTokenInfo, type Extractor, type ExtractorContext, type FilterPattern, type FlatObjectTuple, type GenerateOptions, type GenerateResult, type GeneratorOptions, type HighlightAnnotation, type OutputCssLayersOptions, type ParsedColorValue, type ParsedUtil, type PartialByKeys, type PluginOptions, type Postprocessor, type Preflight, type PreflightContext, type PreparedRule, type Preprocessor, type Preset, type PresetFactory, type PresetOptions, type PresetOrFactory, type RGBAColorValue, type RawUtil, type Replacement, type RequiredByKey, type ResolvedConfig, type RestArgs, type Rule, type RuleContext, type RuleMeta, type SafeListContext, type Shift, type Shortcut, type ShortcutValue, type SourceCodeTransformer, type SourceCodeTransformerEnforce, type SourceMap, type StaticRule, type StaticShortcut, type StaticShortcutMap, type StringifiedUtil, type SuggestResult, type ThemeExtender, type ToArray, TwoKeyMap, UnoGenerator, type UnocssPluginContext, type UserConfig, type UserConfigDefaults, type UserOnlyOptions, type UserShortcuts, type UtilObject, type Variant, type VariantContext, type VariantFunction, type VariantHandler, type VariantHandlerContext, type VariantMatchedResult, type VariantObject, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, cssIdRE, defaultSplitRE, definePreset, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isCountableSet, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, uniqueBy, validateFilterRE, warnOnce, withLayer };
+export { type ArgumentType, type Arrayable, type AutoCompleteExtractor, type AutoCompleteExtractorContext, type AutoCompleteExtractorResult, type AutoCompleteFunction, type AutoCompleteTemplate, type Awaitable, BetterMap, type BlocklistMeta, type BlocklistRule, type BlocklistValue, type CSSEntries, type CSSEntriesInput, type CSSEntry, type CSSObject, type CSSObjectInput, type CSSValue, type CSSValueInput, type CSSValues, type CliEntryItem, type CliOptions, type ConfigBase, type ContentOptions, type ControlSymbols, type ControlSymbolsEntry, type ControlSymbolsValue, CountableSet, type DeepPartial, type DynamicMatcher, type DynamicRule, type DynamicShortcut, type DynamicShortcutMatcher, type ExtendedTokenInfo, type Extractor, type ExtractorContext, type FilterPattern, type FlatObjectTuple, type GenerateOptions, type GenerateResult, type GeneratorOptions, type HighlightAnnotation, type ObjectToEntry, type OutputCssLayersOptions, type ParsedUtil, type PartialByKeys, type PluginOptions, type Postprocessor, type Preflight, type PreflightContext, type PreparedRule, type Preprocessor, type Preset, type PresetFactory, type PresetOptions, type PresetOrFactory, type RawUtil, type Replacement, type RequiredByKey, type ResolvedConfig, type RestArgs, type Rule, type RuleContext, type RuleMeta, type SafeListContext, type Shift, type Shortcut, type ShortcutValue, type SourceCodeTransformer, type SourceCodeTransformerEnforce, type SourceMap, type StaticRule, type StaticShortcut, type StaticShortcutMap, type StringifiedUtil, type SuggestResult, type ThemeExtender, type ToArray, TwoKeyMap, UnoGenerator, type UnocssPluginContext, type UserConfig, type UserConfigDefaults, type UserOnlyOptions, type UserShortcuts, type UtilObject, type Variant, type VariantContext, type VariantFunction, type VariantHandler, type VariantHandlerContext, type VariantMatchedResult, type VariantObject, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, cssIdRE, defaultSplitRE, definePreset, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isCountableSet, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, symbols, toArray, toEscapedSelector, uniq, uniqueBy, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -155,7 +155,6 @@ function isStaticShortcut(sc) {
 const attributifyRE = /^\[(.+?)~?="(.*)"\]$/;
 const cssIdRE = /\.(css|postcss|sass|scss|less|stylus|styl)($|\?)/;
 const validateFilterRE = /[\w\u00A0-\uFFFF%-?]/;
-const CONTROL_SHORTCUT_NO_MERGE = "$$shortcut-no-merge";
 function isAttributifySelector(selector) {
   return selector.match(attributifyRE);
 }
@@ -603,7 +602,7 @@ function definePreset(preset) {
   return preset;
 }
 
-const version = "0.60.4";
+const version = "0.61.2";
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -611,6 +610,12 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
+const symbols = {
+  shortcutsNoMerge: "$$symbol-shortcut-no-merge",
+  variants: "$$symbol-variants",
+  parent: "$$symbol-parent",
+  selector: "$$symbol-selector"
+};
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
     this.userConfig = userConfig;
@@ -664,6 +669,7 @@ class UnoGenerator {
       currentSelector: applied[1],
       theme: this.config.theme,
       generator: this,
+      symbols,
       variantHandlers: applied[2],
       constructCSS: (...args) => this.constructCustomCSS(context, ...args),
       variantMatch: applied
@@ -868,7 +874,7 @@ class UnoGenerator {
             continue;
           handler = { matcher: handler };
         }
-        processed = handler.matcher;
+        processed = handler.matcher ?? processed;
         handlers.unshift(handler);
         variants.add(v);
         applied = true;
@@ -973,18 +979,48 @@ class UnoGenerator {
       const match = unprefixed.match(matcher);
       if (!match)
         continue;
-      const result = await handler(match, context);
+      let result = await handler(match, context);
       if (!result)
         continue;
       if (this.config.details)
         context.rules.push([matcher, handler, meta]);
+      if (typeof result !== "string") {
+        if (Symbol.asyncIterator in result) {
+          const entries2 = [];
+          for await (const r of result) {
+            if (r)
+              entries2.push(r);
+          }
+          result = entries2;
+        } else if (Symbol.iterator in result && !Array.isArray(result)) {
+          result = Array.from(result).filter(notNull);
+        }
+      }
       const entries = normalizeCSSValues(result).filter((i2) => i2.length);
       if (entries.length) {
-        return entries.map((e2) => {
-          if (isString(e2))
-            return [i, e2, meta];
-          else
-            return [i, raw, e2, meta, variantHandlers];
+        return entries.map((css) => {
+          if (isString(css))
+            return [i, css, meta];
+          let variants = variantHandlers;
+          for (const entry of css) {
+            if (entry[0] === symbols.variants) {
+              variants = [
+                ...toArray(entry[1]),
+                ...variants
+              ];
+            } else if (entry[0] === symbols.parent) {
+              variants = [
+                { parent: entry[1] },
+                ...variants
+              ];
+            } else if (entry[0] === symbols.selector) {
+              variants = [
+                { selector: entry[1] },
+                ...variants
+              ];
+            }
+          }
+          return [i, raw, css, meta, variants];
         });
       }
     }
@@ -994,7 +1030,14 @@ class UnoGenerator {
       return;
     if (isRawUtil(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 {
+      selector,
+      entries,
+      parent,
+      layer: variantLayer,
+      sort: variantSort,
+      noMerge
+    } = this.applyVariants(parsed);
     const body = entriesToCss(entries);
     if (!body)
       return;
@@ -1042,8 +1085,13 @@ class UnoGenerator {
         }
       }
     }
-    if (isString(result))
-      result = expandVariantGroup(result.trim()).split(/\s+/g);
+    if (result) {
+      result = toArray(result).map((s) => {
+        if (isString(s))
+          return expandVariantGroup(s.trim()).split(/\s+/g);
+        return s;
+      }).flat();
+    }
     if (!result) {
       const [raw, inputWithoutVariant] = isString(input) ? await this.matchVariants(input) : input;
       if (raw !== inputWithoutVariant) {
@@ -1096,8 +1144,8 @@ class UnoGenerator {
           [e2.filter(([, noMerge]) => !noMerge).map(([entries, , sort]) => [entries, sort]), false]
         ];
         return merges.map(([e3, noMerge]) => [
-          ...stringify(false, noMerge, e3.filter(([entries]) => entries.some((entry) => entry[0] === CONTROL_SHORTCUT_NO_MERGE))),
-          ...stringify(true, noMerge, e3.filter(([entries]) => entries.every((entry) => entry[0] !== CONTROL_SHORTCUT_NO_MERGE)))
+          ...stringify(false, noMerge, e3.filter(([entries]) => entries.some((entry) => entry[0] === symbols.shortcutsNoMerge))),
+          ...stringify(true, noMerge, e3.filter(([entries]) => entries.every((entry) => entry[0] !== symbols.shortcutsNoMerge)))
         ]);
       }).flat(2).filter(Boolean)
     ));
@@ -1136,4 +1184,4 @@ function defaultVariantHandler(input, next) {
   return next(input);
 }
 
-export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, CountableSet, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, cssIdRE, defaultSplitRE, definePreset, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isCountableSet, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, uniqueBy, validateFilterRE, warnOnce, withLayer };
+export { BetterMap, CountableSet, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, cssIdRE, defaultSplitRE, definePreset, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isCountableSet, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, symbols, toArray, toEscapedSelector, uniq, uniqueBy, validateFilterRE, warnOnce, withLayer };

package/package.json

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