@unocss/core 0.62.3 → 0.63.0

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { LoadConfigResult } from 'unconfig';
 import MagicString from 'magic-string';
+import { LoadConfigResult } from 'unconfig';
 
 type EventsMap = Record<string, any>;
 interface DefaultEvents extends EventsMap {
@@ -51,6 +51,22 @@ declare class Emitter<Events extends EventsMap = DefaultEvents> {
     emit<K extends keyof Events>(this: this, event: K, ...args: Parameters<Events[K]>): void;
 }
 
+declare function toArray<T>(value?: T | T[]): T[];
+declare function uniq<T>(value: T[]): T[];
+declare function uniqueBy<T>(array: readonly T[], equalFn: (a: T, b: T) => boolean): T[];
+declare function isString(s: any): s is string;
+
+declare class CountableSet<K> extends Set<K> {
+    _map: Map<K, number>;
+    constructor(values?: Iterable<K>);
+    add(key: K): this;
+    delete(key: K): boolean;
+    clear(): void;
+    getCount(key: K): number;
+    setCount(key: K, count: number): this;
+}
+declare function isCountableSet<T = string>(value: any): value is CountableSet<T>;
+
 declare function escapeRegExp(string: string): string;
 /**
  * CSS Selector Escape
@@ -58,24 +74,6 @@ declare function escapeRegExp(string: string): string;
 declare function escapeSelector(str: string): string;
 declare const e: typeof escapeSelector;
 
-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>;
-/**
- * Deep merge two objects
- */
-declare function mergeDeep<T>(original: T, patch: DeepPartial<T>, mergeArray?: boolean): T;
-declare function clone<T>(val: T): T;
-declare function isStaticRule(rule: Rule<any>): rule is StaticRule;
-declare function isStaticShortcut(sc: Shortcut<any>): sc is StaticShortcut;
-
-declare function toArray<T>(value?: T | T[]): T[];
-declare function uniq<T>(value: T[]): T[];
-declare function uniqueBy<T>(array: readonly T[], equalFn: (a: T, b: T) => boolean): T[];
-declare function isString(s: any): s is string;
-
 declare const attributifyRE: RegExp;
 declare const cssIdRE: RegExp;
 declare const validateFilterRE: RegExp;
@@ -86,6 +84,8 @@ declare function isRawUtil(util: ParsedUtil | RawUtil | StringifiedUtil): util i
 declare function notNull<T>(value: T | null | undefined): value is T;
 declare function noop(): void;
 
+declare function withLayer<T extends object>(layer: string, rules: Rule<T>[]): Rule<T>[];
+
 declare class TwoKeyMap<K1, K2, V> {
     _map: Map<K1, Map<K2, V>>;
     get(key1: K1, key2: K2): V | undefined;
@@ -102,18 +102,18 @@ declare class BetterMap<K, V> extends Map<K, V> {
     flatMap<R extends readonly unknown[]>(mapFn: (value: V, key: K) => R): R[number][];
 }
 
-declare class CountableSet<K> extends Set<K> {
-    _map: Map<K, number>;
-    constructor(values?: Iterable<K>);
-    add(key: K): this;
-    delete(key: K): boolean;
-    clear(): void;
-    getCount(key: K): number;
-    setCount(key: K, count: number): this;
-}
-declare function isCountableSet<T = string>(value: any): value is CountableSet<T>;
-
-declare function withLayer<T extends object>(layer: string, rules: Rule<T>[]): Rule<T>[];
+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>;
+/**
+ * Deep merge two objects
+ */
+declare function mergeDeep<T>(original: T, patch: DeepPartial<T>, mergeArray?: boolean): T;
+declare function clone<T>(val: T): T;
+declare function isStaticRule(rule: Rule<any>): rule is StaticRule;
+declare function isStaticShortcut(sc: Shortcut<any>): sc is StaticShortcut;
 
 declare function makeRegexClassGroup(separators?: string[]): RegExp;
 interface VariantGroup {
@@ -240,6 +240,7 @@ declare const SymbolShortcutsNoMerge: unique symbol;
 declare const SymbolVariants: unique symbol;
 declare const SymbolParent: unique symbol;
 declare const SymbolSelector: unique symbol;
+declare const SymbolLayer: unique symbol;
 interface ControlSymbols {
     /**
      * Prevent merging in shortcuts
@@ -257,12 +258,17 @@ interface ControlSymbols {
      * Selector modifier
      */
     selector: typeof SymbolSelector;
+    /**
+     * Layer modifier
+     */
+    layer: typeof SymbolLayer;
 }
 interface ControlSymbolsValue {
     [SymbolShortcutsNoMerge]: true;
     [SymbolVariants]: VariantHandler[];
     [SymbolParent]: string;
     [SymbolSelector]: (selector: string) => string;
+    [SymbolLayer]: string;
 }
 type ObjectToEntry<T> = {
     [K in keyof T]: [K, T[K]];
@@ -350,13 +356,13 @@ interface RuleMeta {
 type CSSValue = CSSObject | CSSEntries;
 type CSSValues = CSSValue | CSSValue[];
 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 DynamicRule<Theme extends object = object> = [RegExp, DynamicMatcher<Theme>, RuleMeta?];
+type StaticRule = [string, CSSObject | CSSEntries, RuleMeta?];
 type Rule<Theme extends object = object> = DynamicRule<Theme> | StaticRule;
 type DynamicShortcutMatcher<Theme extends object = object> = ((match: RegExpMatchArray, context: Readonly<RuleContext<Theme>>) => (string | ShortcutValue[] | undefined));
-type StaticShortcut = [string, string | ShortcutValue[]] | [string, string | ShortcutValue[], RuleMeta];
+type StaticShortcut = [string, string | ShortcutValue[], RuleMeta?];
 type StaticShortcutMap = Record<string, string | ShortcutValue[]>;
-type DynamicShortcut<Theme extends object = object> = [RegExp, DynamicShortcutMatcher<Theme>] | [RegExp, DynamicShortcutMatcher<Theme>, RuleMeta];
+type DynamicShortcut<Theme extends object = object> = [RegExp, DynamicShortcutMatcher<Theme>, RuleMeta?];
 type UserShortcuts<Theme extends object = object> = StaticShortcutMap | (StaticShortcut | DynamicShortcut<Theme> | StaticShortcutMap)[];
 type Shortcut<Theme extends object = object> = StaticShortcut | DynamicShortcut<Theme>;
 type ShortcutValue = string | CSSValue;
@@ -686,6 +692,10 @@ interface Preset<Theme extends object = object> extends ConfigBase<Theme> {
      * Apply layer to all utilities and shortcuts
      */
     layer?: string;
+    /**
+     * Custom API endpoint for cross-preset communication
+     */
+    api?: any;
 }
 type PresetFactory<Theme extends object = object, PresetOptions extends object | undefined = undefined> = (options?: PresetOptions) => Preset<Theme>;
 type PresetOrFactory<Theme extends object = object> = Preset<Theme> | PresetFactory<Theme, any>;
@@ -918,6 +928,7 @@ interface GenerateResult<T = Set<string>> {
     layers: string[];
     getLayer: (name?: string) => string | undefined;
     getLayers: (includes?: string[], excludes?: string[]) => string;
+    setLayer: (layer: string, callback: (content: string) => Promise<string>) => Promise<string>;
     matched: T;
 }
 type VariantMatchedResult<Theme extends object = object> = readonly [
@@ -1007,10 +1018,6 @@ interface GenerateOptions<T extends boolean> {
     extendedInfo?: T;
 }
 
-declare const defaultSplitRE: RegExp;
-declare const splitWithVariantGroupRE: RegExp;
-declare const extractorSplit: Extractor;
-
 declare function resolveShortcuts<Theme extends object = object>(shortcuts: UserShortcuts<Theme>): Shortcut<Theme>[];
 /**
  * Resolve a single preset, nested presets are ignored
@@ -1028,4 +1035,8 @@ 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>;
 
+declare const defaultSplitRE: RegExp;
+declare const splitWithVariantGroupRE: RegExp;
+declare const extractorSplit: Extractor;
+
 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

@@ -1,5 +1,5 @@
-import { LoadConfigResult } from 'unconfig';
 import MagicString from 'magic-string';
+import { LoadConfigResult } from 'unconfig';
 
 type EventsMap = Record<string, any>;
 interface DefaultEvents extends EventsMap {
@@ -51,6 +51,22 @@ declare class Emitter<Events extends EventsMap = DefaultEvents> {
     emit<K extends keyof Events>(this: this, event: K, ...args: Parameters<Events[K]>): void;
 }
 
+declare function toArray<T>(value?: T | T[]): T[];
+declare function uniq<T>(value: T[]): T[];
+declare function uniqueBy<T>(array: readonly T[], equalFn: (a: T, b: T) => boolean): T[];
+declare function isString(s: any): s is string;
+
+declare class CountableSet<K> extends Set<K> {
+    _map: Map<K, number>;
+    constructor(values?: Iterable<K>);
+    add(key: K): this;
+    delete(key: K): boolean;
+    clear(): void;
+    getCount(key: K): number;
+    setCount(key: K, count: number): this;
+}
+declare function isCountableSet<T = string>(value: any): value is CountableSet<T>;
+
 declare function escapeRegExp(string: string): string;
 /**
  * CSS Selector Escape
@@ -58,24 +74,6 @@ declare function escapeRegExp(string: string): string;
 declare function escapeSelector(str: string): string;
 declare const e: typeof escapeSelector;
 
-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>;
-/**
- * Deep merge two objects
- */
-declare function mergeDeep<T>(original: T, patch: DeepPartial<T>, mergeArray?: boolean): T;
-declare function clone<T>(val: T): T;
-declare function isStaticRule(rule: Rule<any>): rule is StaticRule;
-declare function isStaticShortcut(sc: Shortcut<any>): sc is StaticShortcut;
-
-declare function toArray<T>(value?: T | T[]): T[];
-declare function uniq<T>(value: T[]): T[];
-declare function uniqueBy<T>(array: readonly T[], equalFn: (a: T, b: T) => boolean): T[];
-declare function isString(s: any): s is string;
-
 declare const attributifyRE: RegExp;
 declare const cssIdRE: RegExp;
 declare const validateFilterRE: RegExp;
@@ -86,6 +84,8 @@ declare function isRawUtil(util: ParsedUtil | RawUtil | StringifiedUtil): util i
 declare function notNull<T>(value: T | null | undefined): value is T;
 declare function noop(): void;
 
+declare function withLayer<T extends object>(layer: string, rules: Rule<T>[]): Rule<T>[];
+
 declare class TwoKeyMap<K1, K2, V> {
     _map: Map<K1, Map<K2, V>>;
     get(key1: K1, key2: K2): V | undefined;
@@ -102,18 +102,18 @@ declare class BetterMap<K, V> extends Map<K, V> {
     flatMap<R extends readonly unknown[]>(mapFn: (value: V, key: K) => R): R[number][];
 }
 
-declare class CountableSet<K> extends Set<K> {
-    _map: Map<K, number>;
-    constructor(values?: Iterable<K>);
-    add(key: K): this;
-    delete(key: K): boolean;
-    clear(): void;
-    getCount(key: K): number;
-    setCount(key: K, count: number): this;
-}
-declare function isCountableSet<T = string>(value: any): value is CountableSet<T>;
-
-declare function withLayer<T extends object>(layer: string, rules: Rule<T>[]): Rule<T>[];
+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>;
+/**
+ * Deep merge two objects
+ */
+declare function mergeDeep<T>(original: T, patch: DeepPartial<T>, mergeArray?: boolean): T;
+declare function clone<T>(val: T): T;
+declare function isStaticRule(rule: Rule<any>): rule is StaticRule;
+declare function isStaticShortcut(sc: Shortcut<any>): sc is StaticShortcut;
 
 declare function makeRegexClassGroup(separators?: string[]): RegExp;
 interface VariantGroup {
@@ -240,6 +240,7 @@ declare const SymbolShortcutsNoMerge: unique symbol;
 declare const SymbolVariants: unique symbol;
 declare const SymbolParent: unique symbol;
 declare const SymbolSelector: unique symbol;
+declare const SymbolLayer: unique symbol;
 interface ControlSymbols {
     /**
      * Prevent merging in shortcuts
@@ -257,12 +258,17 @@ interface ControlSymbols {
      * Selector modifier
      */
     selector: typeof SymbolSelector;
+    /**
+     * Layer modifier
+     */
+    layer: typeof SymbolLayer;
 }
 interface ControlSymbolsValue {
     [SymbolShortcutsNoMerge]: true;
     [SymbolVariants]: VariantHandler[];
     [SymbolParent]: string;
     [SymbolSelector]: (selector: string) => string;
+    [SymbolLayer]: string;
 }
 type ObjectToEntry<T> = {
     [K in keyof T]: [K, T[K]];
@@ -350,13 +356,13 @@ interface RuleMeta {
 type CSSValue = CSSObject | CSSEntries;
 type CSSValues = CSSValue | CSSValue[];
 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 DynamicRule<Theme extends object = object> = [RegExp, DynamicMatcher<Theme>, RuleMeta?];
+type StaticRule = [string, CSSObject | CSSEntries, RuleMeta?];
 type Rule<Theme extends object = object> = DynamicRule<Theme> | StaticRule;
 type DynamicShortcutMatcher<Theme extends object = object> = ((match: RegExpMatchArray, context: Readonly<RuleContext<Theme>>) => (string | ShortcutValue[] | undefined));
-type StaticShortcut = [string, string | ShortcutValue[]] | [string, string | ShortcutValue[], RuleMeta];
+type StaticShortcut = [string, string | ShortcutValue[], RuleMeta?];
 type StaticShortcutMap = Record<string, string | ShortcutValue[]>;
-type DynamicShortcut<Theme extends object = object> = [RegExp, DynamicShortcutMatcher<Theme>] | [RegExp, DynamicShortcutMatcher<Theme>, RuleMeta];
+type DynamicShortcut<Theme extends object = object> = [RegExp, DynamicShortcutMatcher<Theme>, RuleMeta?];
 type UserShortcuts<Theme extends object = object> = StaticShortcutMap | (StaticShortcut | DynamicShortcut<Theme> | StaticShortcutMap)[];
 type Shortcut<Theme extends object = object> = StaticShortcut | DynamicShortcut<Theme>;
 type ShortcutValue = string | CSSValue;
@@ -686,6 +692,10 @@ interface Preset<Theme extends object = object> extends ConfigBase<Theme> {
      * Apply layer to all utilities and shortcuts
      */
     layer?: string;
+    /**
+     * Custom API endpoint for cross-preset communication
+     */
+    api?: any;
 }
 type PresetFactory<Theme extends object = object, PresetOptions extends object | undefined = undefined> = (options?: PresetOptions) => Preset<Theme>;
 type PresetOrFactory<Theme extends object = object> = Preset<Theme> | PresetFactory<Theme, any>;
@@ -918,6 +928,7 @@ interface GenerateResult<T = Set<string>> {
     layers: string[];
     getLayer: (name?: string) => string | undefined;
     getLayers: (includes?: string[], excludes?: string[]) => string;
+    setLayer: (layer: string, callback: (content: string) => Promise<string>) => Promise<string>;
     matched: T;
 }
 type VariantMatchedResult<Theme extends object = object> = readonly [
@@ -1007,10 +1018,6 @@ interface GenerateOptions<T extends boolean> {
     extendedInfo?: T;
 }
 
-declare const defaultSplitRE: RegExp;
-declare const splitWithVariantGroupRE: RegExp;
-declare const extractorSplit: Extractor;
-
 declare function resolveShortcuts<Theme extends object = object>(shortcuts: UserShortcuts<Theme>): Shortcut<Theme>[];
 /**
  * Resolve a single preset, nested presets are ignored
@@ -1028,4 +1035,8 @@ 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>;
 
+declare const defaultSplitRE: RegExp;
+declare const splitWithVariantGroupRE: RegExp;
+declare const extractorSplit: Extractor;
+
 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

@@ -1,3 +1,82 @@
+const LAYER_DEFAULT = "default";
+const LAYER_PREFLIGHTS = "preflights";
+const LAYER_SHORTCUTS = "shortcuts";
+const LAYER_IMPORTS = "imports";
+const DEFAULT_LAYERS = {
+  [LAYER_IMPORTS]: -200,
+  [LAYER_PREFLIGHTS]: -100,
+  [LAYER_SHORTCUTS]: -10,
+  [LAYER_DEFAULT]: 0
+};
+
+const defaultSplitRE = /[\\:]?[\s'"`;{}]+/g;
+const splitWithVariantGroupRE = /([\\:]?[\s"'`;<>]|:\(|\)"|\)\s)/g;
+function splitCode(code) {
+  return code.split(defaultSplitRE);
+}
+const extractorSplit = {
+  name: "@unocss/core/extractor-split",
+  order: 0,
+  extract({ code }) {
+    return splitCode(code);
+  }
+};
+
+function toArray(value = []) {
+  return Array.isArray(value) ? value : [value];
+}
+function uniq(value) {
+  return Array.from(new Set(value));
+}
+function uniqueBy(array, equalFn) {
+  return array.reduce((acc, cur) => {
+    const index = acc.findIndex((item) => equalFn(cur, item));
+    if (index === -1)
+      acc.push(cur);
+    return acc;
+  }, []);
+}
+function isString(s) {
+  return typeof s === "string";
+}
+
+var __defProp$2 = Object.defineProperty;
+var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$2 = (obj, key, value) => {
+  __defNormalProp$2(obj, key + "" , value);
+  return value;
+};
+class CountableSet extends Set {
+  constructor(values) {
+    super(values);
+    __publicField$2(this, "_map");
+    this._map ?? (this._map = /* @__PURE__ */ new Map());
+  }
+  add(key) {
+    this._map ?? (this._map = /* @__PURE__ */ new Map());
+    this._map.set(key, (this._map.get(key) ?? 0) + 1);
+    return super.add(key);
+  }
+  delete(key) {
+    this._map.delete(key);
+    return super.delete(key);
+  }
+  clear() {
+    this._map.clear();
+    super.clear();
+  }
+  getCount(key) {
+    return this._map.get(key) ?? 0;
+  }
+  setCount(key, count) {
+    this._map.set(key, count);
+    return super.add(key);
+  }
+}
+function isCountableSet(value) {
+  return value instanceof CountableSet;
+}
+
 function escapeRegExp(string) {
   return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -47,111 +126,6 @@ function escapeSelector(str) {
 }
 const e = escapeSelector;
 
-function toArray(value = []) {
-  return Array.isArray(value) ? value : [value];
-}
-function uniq(value) {
-  return Array.from(new Set(value));
-}
-function uniqueBy(array, equalFn) {
-  return array.reduce((acc, cur) => {
-    const index = acc.findIndex((item) => equalFn(cur, item));
-    if (index === -1)
-      acc.push(cur);
-    return acc;
-  }, []);
-}
-function isString(s) {
-  return typeof s === "string";
-}
-
-function normalizeCSSEntries(obj) {
-  if (isString(obj))
-    return 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 clearIdenticalEntries(arr).map(([key, value]) => value != null && typeof value !== "function" ? `${key}:${value};` : void 0).filter(Boolean).join("");
-}
-function isObject(item) {
-  return item && typeof item === "object" && !Array.isArray(item);
-}
-function mergeDeep(original, patch, mergeArray = false) {
-  const o = original;
-  const p = patch;
-  if (Array.isArray(p)) {
-    if (mergeArray && Array.isArray(p))
-      return [...o, ...p];
-    else
-      return [...p];
-  }
-  const output = { ...o };
-  if (isObject(o) && isObject(p)) {
-    Object.keys(p).forEach((key) => {
-      if (isObject(o[key]) && isObject(p[key]) || Array.isArray(o[key]) && Array.isArray(p[key]))
-        output[key] = mergeDeep(o[key], p[key], mergeArray);
-      else
-        Object.assign(output, { [key]: p[key] });
-    });
-  }
-  return output;
-}
-function clone(val) {
-  let k, out, tmp;
-  if (Array.isArray(val)) {
-    out = Array(k = val.length);
-    while (k--)
-      out[k] = (tmp = val[k]) && typeof tmp === "object" ? clone(tmp) : tmp;
-    return out;
-  }
-  if (Object.prototype.toString.call(val) === "[object Object]") {
-    out = {};
-    for (k in val) {
-      if (k === "__proto__") {
-        Object.defineProperty(out, k, {
-          value: clone(val[k]),
-          configurable: true,
-          enumerable: true,
-          writable: true
-        });
-      } else {
-        out[k] = (tmp = val[k]) && typeof tmp === "object" ? clone(tmp) : tmp;
-      }
-    }
-    return out;
-  }
-  return val;
-}
-function isStaticRule(rule) {
-  return isString(rule[0]);
-}
-function isStaticShortcut(sc) {
-  return isString(sc[0]);
-}
-
 const attributifyRE = /^\[(.+?)~?="(.*)"\]$/;
 const cssIdRE = /\.(css|postcss|sass|scss|less|stylus|styl)($|\?)/;
 const validateFilterRE = /[\w\u00A0-\uFFFF%-?]/;
@@ -173,15 +147,25 @@ function notNull(value) {
 function noop() {
 }
 
-var __defProp$2 = Object.defineProperty;
-var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$2 = (obj, key, value) => {
-  __defNormalProp$2(obj, key + "" , value);
+function withLayer(layer, rules) {
+  rules.forEach((r) => {
+    if (!r[2])
+      r[2] = { layer };
+    else
+      r[2].layer = layer;
+  });
+  return rules;
+}
+
+var __defProp$1 = Object.defineProperty;
+var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$1 = (obj, key, value) => {
+  __defNormalProp$1(obj, key + "" , value);
   return value;
 };
 class TwoKeyMap {
   constructor() {
-    __publicField$2(this, "_map", /* @__PURE__ */ new Map());
+    __publicField$1(this, "_map", /* @__PURE__ */ new Map());
   }
   get(key1, key2) {
     const m2 = this._map.get(key1);
@@ -247,51 +231,91 @@ class BetterMap extends Map {
   }
 }
 
-var __defProp$1 = Object.defineProperty;
-var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$1 = (obj, key, value) => {
-  __defNormalProp$1(obj, key + "" , value);
-  return value;
-};
-class CountableSet extends Set {
-  constructor(values) {
-    super(values);
-    __publicField$1(this, "_map");
-    this._map ?? (this._map = /* @__PURE__ */ new Map());
-  }
-  add(key) {
-    this._map ?? (this._map = /* @__PURE__ */ new Map());
-    this._map.set(key, (this._map.get(key) ?? 0) + 1);
-    return super.add(key);
+function normalizeCSSEntries(obj) {
+  if (isString(obj))
+    return 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)];
   }
-  delete(key) {
-    this._map.delete(key);
-    return super.delete(key);
+}
+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 clearIdenticalEntries(arr).map(([key, value]) => value != null && typeof value !== "function" ? `${key}:${value};` : void 0).filter(Boolean).join("");
+}
+function isObject(item) {
+  return item && typeof item === "object" && !Array.isArray(item);
+}
+function mergeDeep(original, patch, mergeArray = false) {
+  const o = original;
+  const p = patch;
+  if (Array.isArray(p)) {
+    if (mergeArray && Array.isArray(p))
+      return [...o, ...p];
+    else
+      return [...p];
   }
-  clear() {
-    this._map.clear();
-    super.clear();
+  const output = { ...o };
+  if (isObject(o) && isObject(p)) {
+    Object.keys(p).forEach((key) => {
+      if (isObject(o[key]) && isObject(p[key]) || Array.isArray(o[key]) && Array.isArray(p[key]))
+        output[key] = mergeDeep(o[key], p[key], mergeArray);
+      else
+        Object.assign(output, { [key]: p[key] });
+    });
   }
-  getCount(key) {
-    return this._map.get(key) ?? 0;
+  return output;
+}
+function clone(val) {
+  let k, out, tmp;
+  if (Array.isArray(val)) {
+    out = Array.from({ length: k = val.length });
+    while (k--)
+      out[k] = (tmp = val[k]) && typeof tmp === "object" ? clone(tmp) : tmp;
+    return out;
   }
-  setCount(key, count) {
-    this._map.set(key, count);
-    return super.add(key);
+  if (Object.prototype.toString.call(val) === "[object Object]") {
+    out = {};
+    for (k in val) {
+      if (k === "__proto__") {
+        Object.defineProperty(out, k, {
+          value: clone(val[k]),
+          configurable: true,
+          enumerable: true,
+          writable: true
+        });
+      } else {
+        out[k] = (tmp = val[k]) && typeof tmp === "object" ? clone(tmp) : tmp;
+      }
+    }
+    return out;
   }
+  return val;
 }
-function isCountableSet(value) {
-  return value instanceof CountableSet;
+function isStaticRule(rule) {
+  return isString(rule[0]);
 }
-
-function withLayer(layer, rules) {
-  rules.forEach((r) => {
-    if (!r[2])
-      r[2] = { layer };
-    else
-      r[2].layer = layer;
-  });
-  return rules;
+function isStaticShortcut(sc) {
+  return isString(sc[0]);
 }
 
 const regexCache = {};
@@ -410,43 +434,6 @@ function warnOnce(msg) {
   warned.add(msg);
 }
 
-const defaultSplitRE = /[\\:]?[\s'"`;{}]+/g;
-const splitWithVariantGroupRE = /([\\:]?[\s"'`;<>]|:\(|\)"|\)\s)/g;
-function splitCode(code) {
-  return code.split(defaultSplitRE);
-}
-const extractorSplit = {
-  name: "@unocss/core/extractor-split",
-  order: 0,
-  extract({ code }) {
-    return splitCode(code);
-  }
-};
-
-function createNanoEvents() {
-  return {
-    events: {},
-    emit(event, ...args) {
-      (this.events[event] || []).forEach((i) => i(...args));
-    },
-    on(event, cb) {
-      (this.events[event] = this.events[event] || []).push(cb);
-      return () => this.events[event] = (this.events[event] || []).filter((i) => i !== cb);
-    }
-  };
-}
-
-const LAYER_DEFAULT = "default";
-const LAYER_PREFLIGHTS = "preflights";
-const LAYER_SHORTCUTS = "shortcuts";
-const LAYER_IMPORTS = "imports";
-const DEFAULT_LAYERS = {
-  [LAYER_IMPORTS]: -200,
-  [LAYER_PREFLIGHTS]: -100,
-  [LAYER_SHORTCUTS]: -10,
-  [LAYER_DEFAULT]: 0
-};
-
 function resolveShortcuts(shortcuts) {
   return toArray(shortcuts).flatMap((s) => {
     if (Array.isArray(s))
@@ -639,7 +626,20 @@ function definePreset(preset) {
   return preset;
 }
 
-const version = "0.62.3";
+const version = "0.63.0";
+
+function createNanoEvents() {
+  return {
+    events: {},
+    emit(event, ...args) {
+      (this.events[event] || []).forEach((i) => i(...args));
+    },
+    on(event, cb) {
+      (this.events[event] = this.events[event] || []).push(cb);
+      return () => this.events[event] = (this.events[event] || []).filter((i) => i !== cb);
+    }
+  };
+}
 
 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;
@@ -651,7 +651,8 @@ const symbols = {
   shortcutsNoMerge: "$$symbol-shortcut-no-merge",
   variants: "$$symbol-variants",
   parent: "$$symbol-parent",
-  selector: "$$symbol-selector"
+  selector: "$$symbol-selector",
+  layer: "$$symbol-layer"
 };
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -878,6 +879,11 @@ class UnoGenerator {
     const getLayers = (includes = layers, excludes) => {
       return includes.filter((i) => !excludes?.includes(i)).map((i) => getLayer(i) || "").filter(Boolean).join(nl);
     };
+    const setLayer = async (layer, callback) => {
+      const content = await callback(getLayer(layer));
+      layerCache[layer] = content;
+      return content;
+    };
     return {
       get css() {
         return getLayers();
@@ -885,7 +891,8 @@ class UnoGenerator {
       layers,
       matched,
       getLayers,
-      getLayer
+      getLayer,
+      setLayer
     };
   }
   async matchVariants(raw, current) {
@@ -1055,6 +1062,11 @@ class UnoGenerator {
                 { selector: entry[1] },
                 ...variants
               ];
+            } else if (entry[0] === symbols.layer) {
+              variants = [
+                { layer: entry[1] },
+                ...variants
+              ];
             }
           }
           return [i, raw, css, meta, variants];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/core",
   "type": "module",
-  "version": "0.62.3",
+  "version": "0.63.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.11",
-    "unconfig": "^0.5.5"
+    "unconfig": "^0.6.0"
   },
   "scripts": {
     "build": "unbuild",