@unocss/core 0.65.1 → 0.65.3

package/dist/index.d.mts

@@ -136,15 +136,15 @@ declare const symbols: ControlSymbols;
 declare class UnoGeneratorInternal<Theme extends object = object> {
     userConfig: UserConfig<Theme>;
     defaults: UserConfigDefaults<Theme>;
-    version: string;
-    private _cache;
+    readonly version: string;
+    readonly events: Emitter<{
+        config: (config: ResolvedConfig<Theme>) => void;
+    }>;
     config: ResolvedConfig<Theme>;
+    cache: Map<string, StringifiedUtil<Theme>[] | null>;
     blocked: Set<string>;
     parentOrders: Map<string, number>;
     activatedRules: Set<Rule<Theme>>;
-    events: Emitter<{
-        config: (config: ResolvedConfig<Theme>) => void;
-    }>;
     protected constructor(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>);
     static create<Theme extends object = object>(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): Promise<UnoGeneratorInternal<Theme>>;
     setConfig(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): Promise<void>;
@@ -159,8 +159,8 @@ declare class UnoGeneratorInternal<Theme extends object = object> {
     constructCustomCSS(context: Readonly<RuleContext<Theme>>, body: CSSObject | CSSEntries, overrideSelector?: string): string;
     parseUtil(input: string | VariantMatchedResult<Theme>, context: RuleContext<Theme>, internal?: boolean, shortcutPrefix?: string | string[] | undefined): Promise<(ParsedUtil | RawUtil)[] | undefined>;
     stringifyUtil(parsed?: ParsedUtil | RawUtil, context?: RuleContext<Theme>): StringifiedUtil<Theme> | undefined;
-    expandShortcut(input: string, context: RuleContext<Theme>, depth?: number): Promise<[ShortcutValue[], RuleMeta | undefined] | undefined>;
-    stringifyShortcuts(parent: VariantMatchedResult<Theme>, context: RuleContext<Theme>, expanded: ShortcutValue[], meta?: RuleMeta): Promise<StringifiedUtil<Theme>[] | undefined>;
+    expandShortcut(input: string, context: RuleContext<Theme>, depth?: number): Promise<[(string | ShortcutInlineValue)[], RuleMeta | undefined] | undefined>;
+    stringifyShortcuts(parent: VariantMatchedResult<Theme>, context: RuleContext<Theme>, expanded: (string | ShortcutInlineValue)[], meta?: RuleMeta): Promise<StringifiedUtil<Theme>[] | undefined>;
     isBlocked(raw: string): boolean;
     getBlocked(raw: string): [BlocklistValue, BlocklistMeta | undefined] | undefined;
 }
@@ -385,6 +385,10 @@ type StaticShortcutMap = Record<string, string | ShortcutValue[]>;
 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>;
+interface ShortcutInlineValue {
+    handles: VariantHandler[];
+    value: ShortcutValue;
+}
 type ShortcutValue = string | CSSValue;
 type FilterPattern = ReadonlyArray<string | RegExp> | string | RegExp | null;
 interface Preflight<Theme extends object = object> {
@@ -768,15 +772,29 @@ interface CliOptions {
     };
 }
 interface UnocssPluginContext<Config extends UserConfig = UserConfig> {
+    /**
+     * Singleton promise for config loading
+     */
     ready: Promise<LoadConfigResult<Config>>;
+    /**
+     * The UnoCSS generator instance. Should be used after `ready` resolved.
+     */
     uno: UnoGenerator;
-    /** All tokens scanned */
+    /**
+     * All tokens scanned
+     */
     tokens: Set<string>;
-    /** Map for all module's raw content */
+    /**
+     * Map for all module's raw content
+     */
     modules: BetterMap<string, string>;
-    /** Module IDs that been affected by UnoCSS */
+    /**
+     * Module IDs that been affected by UnoCSS
+     */
     affectedModules: Set<string>;
-    /** Pending promises */
+    /**
+     *  Pending promises
+     */
     tasks: Promise<any>[];
     /**
      * Await all pending tasks
@@ -1056,10 +1074,11 @@ declare function resolveConfig<Theme extends object = object>(userConfig?: UserC
  */
 declare function mergeConfigs<Theme extends object = object>(configs: UserConfig<Theme>[]): UserConfig<Theme>;
 declare function definePreset<Options extends object | undefined = undefined, Theme extends object = object>(preset: PresetFactory<Theme, Options>): PresetFactory<Theme, Options>;
+declare function definePreset<Options extends object | undefined = undefined, Theme extends object = object>(preset: PresetFactoryAwaitable<Theme, Options>): PresetFactoryAwaitable<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 PresetFactoryAwaitable, type PresetOptions, type PresetOrFactory, type PresetOrFactoryAwaitable, 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 };
+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 PresetFactoryAwaitable, type PresetOptions, type PresetOrFactory, type PresetOrFactoryAwaitable, type RawUtil, type Replacement, type RequiredByKey, type ResolvedConfig, type RestArgs, type Rule, type RuleContext, type RuleMeta, type SafeListContext, type Shift, type Shortcut, type ShortcutInlineValue, 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

@@ -136,15 +136,15 @@ declare const symbols: ControlSymbols;
 declare class UnoGeneratorInternal<Theme extends object = object> {
     userConfig: UserConfig<Theme>;
     defaults: UserConfigDefaults<Theme>;
-    version: string;
-    private _cache;
+    readonly version: string;
+    readonly events: Emitter<{
+        config: (config: ResolvedConfig<Theme>) => void;
+    }>;
     config: ResolvedConfig<Theme>;
+    cache: Map<string, StringifiedUtil<Theme>[] | null>;
     blocked: Set<string>;
     parentOrders: Map<string, number>;
     activatedRules: Set<Rule<Theme>>;
-    events: Emitter<{
-        config: (config: ResolvedConfig<Theme>) => void;
-    }>;
     protected constructor(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>);
     static create<Theme extends object = object>(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): Promise<UnoGeneratorInternal<Theme>>;
     setConfig(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): Promise<void>;
@@ -159,8 +159,8 @@ declare class UnoGeneratorInternal<Theme extends object = object> {
     constructCustomCSS(context: Readonly<RuleContext<Theme>>, body: CSSObject | CSSEntries, overrideSelector?: string): string;
     parseUtil(input: string | VariantMatchedResult<Theme>, context: RuleContext<Theme>, internal?: boolean, shortcutPrefix?: string | string[] | undefined): Promise<(ParsedUtil | RawUtil)[] | undefined>;
     stringifyUtil(parsed?: ParsedUtil | RawUtil, context?: RuleContext<Theme>): StringifiedUtil<Theme> | undefined;
-    expandShortcut(input: string, context: RuleContext<Theme>, depth?: number): Promise<[ShortcutValue[], RuleMeta | undefined] | undefined>;
-    stringifyShortcuts(parent: VariantMatchedResult<Theme>, context: RuleContext<Theme>, expanded: ShortcutValue[], meta?: RuleMeta): Promise<StringifiedUtil<Theme>[] | undefined>;
+    expandShortcut(input: string, context: RuleContext<Theme>, depth?: number): Promise<[(string | ShortcutInlineValue)[], RuleMeta | undefined] | undefined>;
+    stringifyShortcuts(parent: VariantMatchedResult<Theme>, context: RuleContext<Theme>, expanded: (string | ShortcutInlineValue)[], meta?: RuleMeta): Promise<StringifiedUtil<Theme>[] | undefined>;
     isBlocked(raw: string): boolean;
     getBlocked(raw: string): [BlocklistValue, BlocklistMeta | undefined] | undefined;
 }
@@ -385,6 +385,10 @@ type StaticShortcutMap = Record<string, string | ShortcutValue[]>;
 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>;
+interface ShortcutInlineValue {
+    handles: VariantHandler[];
+    value: ShortcutValue;
+}
 type ShortcutValue = string | CSSValue;
 type FilterPattern = ReadonlyArray<string | RegExp> | string | RegExp | null;
 interface Preflight<Theme extends object = object> {
@@ -768,15 +772,29 @@ interface CliOptions {
     };
 }
 interface UnocssPluginContext<Config extends UserConfig = UserConfig> {
+    /**
+     * Singleton promise for config loading
+     */
     ready: Promise<LoadConfigResult<Config>>;
+    /**
+     * The UnoCSS generator instance. Should be used after `ready` resolved.
+     */
     uno: UnoGenerator;
-    /** All tokens scanned */
+    /**
+     * All tokens scanned
+     */
     tokens: Set<string>;
-    /** Map for all module's raw content */
+    /**
+     * Map for all module's raw content
+     */
     modules: BetterMap<string, string>;
-    /** Module IDs that been affected by UnoCSS */
+    /**
+     * Module IDs that been affected by UnoCSS
+     */
     affectedModules: Set<string>;
-    /** Pending promises */
+    /**
+     *  Pending promises
+     */
     tasks: Promise<any>[];
     /**
      * Await all pending tasks
@@ -1056,10 +1074,11 @@ declare function resolveConfig<Theme extends object = object>(userConfig?: UserC
  */
 declare function mergeConfigs<Theme extends object = object>(configs: UserConfig<Theme>[]): UserConfig<Theme>;
 declare function definePreset<Options extends object | undefined = undefined, Theme extends object = object>(preset: PresetFactory<Theme, Options>): PresetFactory<Theme, Options>;
+declare function definePreset<Options extends object | undefined = undefined, Theme extends object = object>(preset: PresetFactoryAwaitable<Theme, Options>): PresetFactoryAwaitable<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 PresetFactoryAwaitable, type PresetOptions, type PresetOrFactory, type PresetOrFactoryAwaitable, 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 };
+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 PresetFactoryAwaitable, type PresetOptions, type PresetOrFactory, type PresetOrFactoryAwaitable, type RawUtil, type Replacement, type RequiredByKey, type ResolvedConfig, type RestArgs, type Rule, type RuleContext, type RuleMeta, type SafeListContext, type Shift, type Shortcut, type ShortcutInlineValue, 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

@@ -40,20 +40,14 @@ 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 {
+  _map;
   constructor(values) {
     super(values);
-    __publicField$2(this, "_map");
-    this._map ?? (this._map = /* @__PURE__ */ new Map());
+    this._map ??= /* @__PURE__ */ new Map();
   }
   add(key) {
-    this._map ?? (this._map = /* @__PURE__ */ new Map());
+    this._map ??= /* @__PURE__ */ new Map();
     this._map.set(key, (this._map.get(key) ?? 0) + 1);
     return super.add(key);
   }
@@ -157,16 +151,8 @@ function withLayer(layer, rules) {
   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$1(this, "_map", /* @__PURE__ */ new Map());
-  }
+  _map = /* @__PURE__ */ new Map();
   get(key1, key2) {
     const m2 = this._map.get(key1);
     if (m2)
@@ -289,8 +275,7 @@ 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;
+    while (k--) out[k] = (tmp = val[k]) && typeof tmp === "object" ? clone(tmp) : tmp;
     return out;
   }
   if (Object.prototype.toString.call(val) === "[object Object]") {
@@ -653,7 +638,7 @@ function definePreset(preset) {
   return preset;
 }
 
-const version = "0.65.1";
+const version = "0.65.3";
 
 function createNanoEvents() {
   return {
@@ -668,12 +653,6 @@ function createNanoEvents() {
   };
 }
 
-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;
-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",
@@ -686,14 +665,14 @@ class UnoGeneratorInternal {
   constructor(userConfig = {}, defaults = {}) {
     this.userConfig = userConfig;
     this.defaults = defaults;
-    __publicField(this, "version", version);
-    __publicField(this, "_cache", /* @__PURE__ */ new Map());
-    __publicField(this, "config");
-    __publicField(this, "blocked", /* @__PURE__ */ new Set());
-    __publicField(this, "parentOrders", /* @__PURE__ */ new Map());
-    __publicField(this, "activatedRules", /* @__PURE__ */ new Set());
-    __publicField(this, "events", createNanoEvents());
   }
+  version = version;
+  events = createNanoEvents();
+  config = void 0;
+  cache = /* @__PURE__ */ new Map();
+  blocked = /* @__PURE__ */ new Set();
+  parentOrders = /* @__PURE__ */ new Map();
+  activatedRules = /* @__PURE__ */ new Set();
   static async create(userConfig = {}, defaults = {}) {
     const uno = new UnoGeneratorInternal(userConfig, defaults);
     uno.config = await resolveConfig(uno.userConfig, uno.defaults);
@@ -709,7 +688,7 @@ class UnoGeneratorInternal {
     this.blocked.clear();
     this.parentOrders.clear();
     this.activatedRules.clear();
-    this._cache.clear();
+    this.cache.clear();
     this.config = await resolveConfig(userConfig, this.defaults);
     this.events.emit("config", this.config);
   }
@@ -752,20 +731,20 @@ class UnoGeneratorInternal {
     if (this.blocked.has(raw))
       return;
     const cacheKey = `${raw}${alias ? ` ${alias}` : ""}`;
-    if (this._cache.has(cacheKey))
-      return this._cache.get(cacheKey);
+    if (this.cache.has(cacheKey))
+      return this.cache.get(cacheKey);
     let current = raw;
     for (const p of this.config.preprocess)
       current = p(raw);
     if (this.isBlocked(current)) {
       this.blocked.add(raw);
-      this._cache.set(cacheKey, null);
+      this.cache.set(cacheKey, null);
       return;
     }
     const variantResults = await this.matchVariants(raw, current);
     if (variantResults.every((i) => !i || this.isBlocked(i[1]))) {
       this.blocked.add(raw);
-      this._cache.set(cacheKey, null);
+      this.cache.set(cacheKey, null);
       return;
     }
     const handleVariantResult = async (matched) => {
@@ -778,10 +757,10 @@ class UnoGeneratorInternal {
     };
     const result = (await Promise.all(variantResults.map((i) => handleVariantResult(i)))).flat().filter((x) => !!x);
     if (result?.length) {
-      this._cache.set(cacheKey, result);
+      this.cache.set(cacheKey, result);
       return result;
     }
-    this._cache.set(cacheKey, null);
+    this.cache.set(cacheKey, null);
   }
   async generate(input, options = {}) {
     const {
@@ -1196,6 +1175,8 @@ class UnoGeneratorInternal {
     } : noop;
     let meta;
     let result;
+    let stringResult;
+    let inlineResult;
     for (const s of this.config.shortcuts) {
       let unprefixed = input;
       if (s[2]?.prefix) {
@@ -1224,34 +1205,38 @@ class UnoGeneratorInternal {
       }
     }
     if (result) {
-      result = toArray(result).map((s) => {
-        if (isString(s))
-          return expandVariantGroup(s.trim()).split(/\s+/g);
-        return s;
-      }).flat();
+      stringResult = uniq(toArray(result).filter(isString).map((s) => expandVariantGroup(s.trim()).split(/\s+/g)).flat());
+      inlineResult = toArray(result).filter((i) => !isString(i)).map((i) => ({ handles: [], value: i }));
     }
     if (!result) {
       const matched = isString(input) ? await this.matchVariants(input) : [input];
       for (const match of matched) {
-        const [raw, inputWithoutVariant] = match;
+        const [raw, inputWithoutVariant, handles] = match;
         if (raw !== inputWithoutVariant) {
           const expanded = await this.expandShortcut(inputWithoutVariant, context, depth - 1);
-          if (expanded)
-            result = expanded[0].map((item) => isString(item) ? raw.replace(inputWithoutVariant, item) : item);
+          if (expanded) {
+            stringResult = expanded[0].filter(isString).map((item) => raw.replace(inputWithoutVariant, item));
+            inlineResult = expanded[0].filter((i) => !isString(i)).map((item) => {
+              return { handles: [...item.handles, ...handles], value: item.value };
+            });
+          }
         }
       }
     }
-    if (!result)
+    if (!stringResult?.length && !inlineResult?.length)
       return;
     return [
-      (await Promise.all(result.map(async (r) => (isString(r) ? (await this.expandShortcut(r, context, depth - 1))?.[0] : void 0) || [r]))).flat(1).filter((x) => !!x),
+      [
+        await Promise.all(toArray(stringResult).map(async (s) => (await this.expandShortcut(s, context, depth - 1))?.[0] || [s])),
+        inlineResult
+      ].flat(2).filter((x) => !!x),
       meta
     ];
   }
   async stringifyShortcuts(parent, context, expanded, meta = { layer: this.config.shortcutsLayer }) {
     const layerMap = new BetterMap();
     const parsed = (await Promise.all(uniq(expanded).map(async (i) => {
-      const result = isString(i) ? await this.parseUtil(i, context, true, meta.prefix) : [[Number.POSITIVE_INFINITY, "{inline}", normalizeCSSEntries(i), void 0, []]];
+      const result = isString(i) ? await this.parseUtil(i, context, true, meta.prefix) : [[Number.POSITIVE_INFINITY, "{inline}", normalizeCSSEntries(i.value), void 0, i.handles]];
       if (!result && this.config.warn)
         warnOnce(`unmatched utility "${i}" in shortcut "${parent[1]}"`);
       return result || [];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/core",
   "type": "module",
-  "version": "0.65.1",
+  "version": "0.65.3",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,11 +37,12 @@
     "dist"
   ],
   "devDependencies": {
-    "magic-string": "^0.30.14",
-    "unconfig": "~0.5.5"
+    "magic-string": "^0.30.17",
+    "unconfig": "~0.6.0"
   },
   "scripts": {
     "build": "unbuild",
-    "stub": "unbuild --stub"
+    "stub": "unbuild --stub",
+    "test:attw": "attw --pack --config-path ../../.attw-esm-only.json"
   }
 }