@unocss/core 0.49.7 → 0.50.0

package/dist/index.cjs

@@ -327,6 +327,7 @@ function createValueHandler(handlers) {
 }
 
 const defaultSplitRE = /\\?[\s'"`;{}]+/g;
+const quotedArbitraryValuesRE = /(?:[\w&:[\]-]|\[\S+=\S+\])+\[\\?['"]?\S+?['"]\]\]?[\w:-]*/g;
 const arbitraryPropertyRE = /\[(\\\W|[\w-])+:['"]?\S+?['"]?\]/g;
 const arbitraryPropertyCandidateRE = new RegExp(`^${arbitraryPropertyRE.source}$`);
 const splitCode = (code) => {
@@ -336,6 +337,8 @@ const splitCode = (code) => {
       continue;
     result.add(match[0]);
   }
+  for (const match of code.matchAll(quotedArbitraryValuesRE))
+    result.add(match[0]);
   code.split(defaultSplitRE).forEach((match) => {
     isValidSelector(match) && !arbitraryPropertyCandidateRE.test(match) && result.add(match);
   });
@@ -419,7 +422,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     ...rawPresets.filter((p) => !p.enforce),
     ...rawPresets.filter((p) => p.enforce === "post")
   ];
-  const layers = Object.assign(DEFAULT_LAYERS, ...rawPresets.map((i) => i.layers), userConfig.layers);
+  const layers = Object.assign({}, DEFAULT_LAYERS, ...rawPresets.map((i) => i.layers), config.layers);
   function mergePresets(key) {
     return uniq([
       ...sortedPresets.flatMap((p) => toArray(p[key] || [])),
@@ -473,7 +476,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     postprocess: mergePresets("postprocess"),
     preflights: mergePresets("preflights"),
     autocomplete,
-    variants: mergePresets("variants").map(normalizeVariant),
+    variants: mergePresets("variants").map(normalizeVariant).sort((a, b) => (a.order || 0) - (b.order || 0)),
     shortcuts: resolveShortcuts(mergePresets("shortcuts")).reverse(),
     extractors,
     safelist: mergePresets("safelist"),
@@ -481,7 +484,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.49.7";
+const version = "0.50.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -550,7 +553,7 @@ class UnoGenerator {
       this._cache.set(cacheKey, null);
       return;
     }
-    const applied = this.matchVariants(raw, current);
+    const applied = await this.matchVariants(raw, current);
     if (!applied || this.isBlocked(applied[1])) {
       this.blocked.add(raw);
       this._cache.set(cacheKey, null);
@@ -559,7 +562,7 @@ class UnoGenerator {
     const context = this.makeContext(raw, [alias || applied[0], applied[1], applied[2], applied[3]]);
     if (this.config.details)
       context.variants = [...applied[3]];
-    const expanded = this.expandShortcut(context.currentSelector, context);
+    const expanded = await this.expandShortcut(context.currentSelector, context);
     const utils = expanded ? await this.stringifyShortcuts(context.variantMatch, context, expanded[0], expanded[1]) : (await this.parseUtil(context.variantMatch, context))?.map((i) => this.stringifyUtil(i, context)).filter(notNull);
     if (utils?.length) {
       this._cache.set(cacheKey, utils);
@@ -634,7 +637,9 @@ class UnoGenerator {
         return layerCache[layer];
       let css = Array.from(sheet).sort((a, b) => (this.parentOrders.get(a[0]) ?? 0) - (this.parentOrders.get(b[0]) ?? 0) || a[0]?.localeCompare(b[0] || "") || 0).map(([parent, items]) => {
         const size = items.length;
-        const sorted = items.filter((i) => (i[4]?.layer || LAYER_DEFAULT) === layer).sort((a, b) => a[0] - b[0] || (a[4]?.sort || 0) - (b[4]?.sort || 0) || a[1]?.localeCompare(b[1] || "") || a[2]?.localeCompare(b[2] || "") || 0).map(([, selector, body, , meta, , variantNoMerge]) => {
+        const sorted = items.filter((i) => (i[4]?.layer || LAYER_DEFAULT) === layer).sort(
+          (a, b) => a[0] - b[0] || (a[4]?.sort || 0) - (b[4]?.sort || 0) || a[5]?.currentSelector?.localeCompare(b[5]?.currentSelector ?? "") || a[1]?.localeCompare(b[1] || "") || a[2]?.localeCompare(b[2] || "") || 0
+        ).map(([, selector, body, , meta, , variantNoMerge]) => {
           const scopedSelector = selector ? applyScope(selector, scope) : selector;
           return [
             [[scopedSelector ?? "", meta?.sort ?? 0]],
@@ -684,7 +689,7 @@ class UnoGenerator {
       getLayer
     };
   }
-  matchVariants(raw, current) {
+  async matchVariants(raw, current) {
     const variants = /* @__PURE__ */ new Set();
     const handlers = [];
     let processed = current || raw;
@@ -699,7 +704,7 @@ class UnoGenerator {
       for (const v of this.config.variants) {
         if (!v.multiPass && variants.has(v))
           continue;
-        let handler = v.match(processed, context);
+        let handler = await v.match(processed, context);
         if (!handler)
           continue;
         if (isString(handler))
@@ -744,11 +749,11 @@ class UnoGenerator {
     if (parent != null && parentOrder != null)
       this.parentOrders.set(parent, parentOrder);
     const obj = {
-      selector: movePseudoElementsEnd([
+      selector: [
         variantContextResult.prefix,
         variantContextResult.selector,
         variantContextResult.pseudo
-      ].join("")),
+      ].join(""),
       entries: variantContextResult.entries,
       parent,
       layer: variantContextResult.layer,
@@ -770,7 +775,7 @@ class UnoGenerator {
     return cssBody;
   }
   async parseUtil(input, context, internal = false, shortcutPrefix) {
-    const [raw, processed, variantHandlers] = isString(input) ? this.matchVariants(input) : input;
+    const [raw, processed, variantHandlers] = isString(input) ? await this.matchVariants(input) : input;
     if (this.config.details)
       context.rules = context.rules ?? [];
     const staticMatch = this.config.rulesStaticMap[processed];
@@ -842,7 +847,7 @@ class UnoGenerator {
     };
     return [parsed[0], selector, body, parent, ruleMeta, this.config.details ? context : void 0, noMerge];
   }
-  expandShortcut(input, context, depth = 5) {
+  async expandShortcut(input, context, depth = 5) {
     if (depth === 0)
       return;
     const recordShortcut = this.config.details ? (s) => {
@@ -881,9 +886,9 @@ class UnoGenerator {
     if (isString(result))
       result = expandVariantGroup(result.trim()).split(/\s+/g);
     if (!result) {
-      const [raw, inputWithoutVariant] = isString(input) ? this.matchVariants(input) : input;
+      const [raw, inputWithoutVariant] = isString(input) ? await this.matchVariants(input) : input;
       if (raw !== inputWithoutVariant) {
-        const expanded = this.expandShortcut(inputWithoutVariant, context, depth - 1);
+        const expanded = await this.expandShortcut(inputWithoutVariant, context, depth - 1);
         if (expanded)
           result = expanded[0].map((item) => isString(item) ? raw.replace(inputWithoutVariant, item) : item);
       }
@@ -891,7 +896,9 @@ class UnoGenerator {
     if (!result)
       return;
     return [
-      result.flatMap((r) => (isString(r) ? this.expandShortcut(r, context, depth - 1)?.[0] : void 0) || [r]).filter(Boolean),
+      (await Promise.all(result.map(
+        async (r) => (isString(r) ? (await this.expandShortcut(r, context, depth - 1))?.[0] : void 0) || [r]
+      ))).flat(1).filter(Boolean),
       meta
     ];
   }
@@ -950,15 +957,6 @@ function applyScope(css, scope) {
   else
     return scope ? `${scope} ${css}` : css;
 }
-function movePseudoElementsEnd(selector) {
-  const pseudoElements = selector.match(/::[\w-]+(\([\w-]+\))?/g);
-  if (pseudoElements) {
-    for (const e2 of pseudoElements)
-      selector = selector.replace(e2, "");
-    selector += pseudoElements.join("");
-  }
-  return selector;
-}
 const attributifyRe = /^\[(.+?)(~?=)"(.*)"\]$/;
 function toEscapedSelector(raw) {
   if (attributifyRe.test(raw))
@@ -998,13 +996,13 @@ exports.isString = isString;
 exports.isValidSelector = isValidSelector;
 exports.makeRegexClassGroup = makeRegexClassGroup;
 exports.mergeDeep = mergeDeep;
-exports.movePseudoElementsEnd = movePseudoElementsEnd;
 exports.noop = noop;
 exports.normalizeCSSEntries = normalizeCSSEntries;
 exports.normalizeCSSValues = normalizeCSSValues;
 exports.normalizeVariant = normalizeVariant;
 exports.notNull = notNull;
 exports.parseVariantGroup = parseVariantGroup;
+exports.quotedArbitraryValuesRE = quotedArbitraryValuesRE;
 exports.regexScopePlaceholder = regexScopePlaceholder;
 exports.toArray = toArray;
 exports.toEscapedSelector = toEscapedSelector;

package/dist/index.d.ts

@@ -68,19 +68,18 @@ declare class UnoGenerator<Theme extends {} = {}> {
     makeContext(raw: string, applied: VariantMatchedResult<Theme>): RuleContext<Theme>;
     parseToken(raw: string, alias?: string): Promise<StringifiedUtil<Theme>[] | null | undefined>;
     generate(input: string | Set<string> | string[], options?: GenerateOptions): Promise<GenerateResult>;
-    matchVariants(raw: string, current?: string): VariantMatchedResult<Theme>;
+    matchVariants(raw: string, current?: string): Promise<VariantMatchedResult<Theme>>;
     private applyVariants;
     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): [ShortcutValue[], RuleMeta | undefined] | 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>;
     isBlocked(raw: string): boolean;
 }
 declare function createGenerator<Theme extends {} = {}>(config?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): UnoGenerator<Theme>;
 declare const regexScopePlaceholder: RegExp;
 declare const hasScopePlaceholder: (css: string) => RegExpMatchArray | null;
-declare function movePseudoElementsEnd(selector: string): string;
 declare function toEscapedSelector(raw: string): string;
 
 declare function escapeRegExp(string: string): string;
@@ -401,7 +400,7 @@ interface VariantHandler {
      */
     layer?: string | undefined;
 }
-type VariantFunction<Theme extends {} = {}> = (matcher: string, context: Readonly<VariantContext<Theme>>) => string | VariantHandler | undefined;
+type VariantFunction<Theme extends {} = {}> = (matcher: string, context: Readonly<VariantContext<Theme>>) => Awaitable<string | VariantHandler | undefined>;
 interface VariantObject<Theme extends {} = {}> {
     /**
      * The name of the variant.
@@ -411,6 +410,10 @@ interface VariantObject<Theme extends {} = {}> {
      * The entry function to match and rewrite the selector for further processing.
      */
     match: VariantFunction<Theme>;
+    /**
+     * Sort for when the match is applied.
+     */
+    order?: number;
     /**
      * Allows this variant to be used more than once in matching a single rule
      *
@@ -822,9 +825,10 @@ interface GenerateOptions {
     scope?: string;
 }
 
+declare const quotedArbitraryValuesRE: RegExp;
 declare const arbitraryPropertyRE: RegExp;
 declare const extractorSplit: Extractor;
 
 declare const extractorSvelte: Extractor;
 
-export { ArgumentType, Arrayable, AutoCompleteExtractor, AutoCompleteExtractorContext, AutoCompleteExtractorResult, AutoCompleteFunction, AutoCompleteTemplate, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSColorValue, CSSEntries, CSSObject, CSSValue, CSSValues, CliEntryItem, CliOptions, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExtraContentOptions, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, PreparedRule, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, ShortcutValue, SourceCodeTransformer, SourceCodeTransformerEnforce, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject, arbitraryPropertyRE, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeDeep, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };
+export { ArgumentType, Arrayable, AutoCompleteExtractor, AutoCompleteExtractorContext, AutoCompleteExtractorResult, AutoCompleteFunction, AutoCompleteTemplate, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSColorValue, CSSEntries, CSSObject, CSSValue, CSSValues, CliEntryItem, CliOptions, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExtraContentOptions, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, PreparedRule, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, ShortcutValue, SourceCodeTransformer, SourceCodeTransformerEnforce, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject, arbitraryPropertyRE, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, quotedArbitraryValuesRE, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -323,6 +323,7 @@ function createValueHandler(handlers) {
 }
 
 const defaultSplitRE = /\\?[\s'"`;{}]+/g;
+const quotedArbitraryValuesRE = /(?:[\w&:[\]-]|\[\S+=\S+\])+\[\\?['"]?\S+?['"]\]\]?[\w:-]*/g;
 const arbitraryPropertyRE = /\[(\\\W|[\w-])+:['"]?\S+?['"]?\]/g;
 const arbitraryPropertyCandidateRE = new RegExp(`^${arbitraryPropertyRE.source}$`);
 const splitCode = (code) => {
@@ -332,6 +333,8 @@ const splitCode = (code) => {
       continue;
     result.add(match[0]);
   }
+  for (const match of code.matchAll(quotedArbitraryValuesRE))
+    result.add(match[0]);
   code.split(defaultSplitRE).forEach((match) => {
     isValidSelector(match) && !arbitraryPropertyCandidateRE.test(match) && result.add(match);
   });
@@ -415,7 +418,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     ...rawPresets.filter((p) => !p.enforce),
     ...rawPresets.filter((p) => p.enforce === "post")
   ];
-  const layers = Object.assign(DEFAULT_LAYERS, ...rawPresets.map((i) => i.layers), userConfig.layers);
+  const layers = Object.assign({}, DEFAULT_LAYERS, ...rawPresets.map((i) => i.layers), config.layers);
   function mergePresets(key) {
     return uniq([
       ...sortedPresets.flatMap((p) => toArray(p[key] || [])),
@@ -469,7 +472,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     postprocess: mergePresets("postprocess"),
     preflights: mergePresets("preflights"),
     autocomplete,
-    variants: mergePresets("variants").map(normalizeVariant),
+    variants: mergePresets("variants").map(normalizeVariant).sort((a, b) => (a.order || 0) - (b.order || 0)),
     shortcuts: resolveShortcuts(mergePresets("shortcuts")).reverse(),
     extractors,
     safelist: mergePresets("safelist"),
@@ -477,7 +480,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.49.7";
+const version = "0.50.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -546,7 +549,7 @@ class UnoGenerator {
       this._cache.set(cacheKey, null);
       return;
     }
-    const applied = this.matchVariants(raw, current);
+    const applied = await this.matchVariants(raw, current);
     if (!applied || this.isBlocked(applied[1])) {
       this.blocked.add(raw);
       this._cache.set(cacheKey, null);
@@ -555,7 +558,7 @@ class UnoGenerator {
     const context = this.makeContext(raw, [alias || applied[0], applied[1], applied[2], applied[3]]);
     if (this.config.details)
       context.variants = [...applied[3]];
-    const expanded = this.expandShortcut(context.currentSelector, context);
+    const expanded = await this.expandShortcut(context.currentSelector, context);
     const utils = expanded ? await this.stringifyShortcuts(context.variantMatch, context, expanded[0], expanded[1]) : (await this.parseUtil(context.variantMatch, context))?.map((i) => this.stringifyUtil(i, context)).filter(notNull);
     if (utils?.length) {
       this._cache.set(cacheKey, utils);
@@ -630,7 +633,9 @@ class UnoGenerator {
         return layerCache[layer];
       let css = Array.from(sheet).sort((a, b) => (this.parentOrders.get(a[0]) ?? 0) - (this.parentOrders.get(b[0]) ?? 0) || a[0]?.localeCompare(b[0] || "") || 0).map(([parent, items]) => {
         const size = items.length;
-        const sorted = items.filter((i) => (i[4]?.layer || LAYER_DEFAULT) === layer).sort((a, b) => a[0] - b[0] || (a[4]?.sort || 0) - (b[4]?.sort || 0) || a[1]?.localeCompare(b[1] || "") || a[2]?.localeCompare(b[2] || "") || 0).map(([, selector, body, , meta, , variantNoMerge]) => {
+        const sorted = items.filter((i) => (i[4]?.layer || LAYER_DEFAULT) === layer).sort(
+          (a, b) => a[0] - b[0] || (a[4]?.sort || 0) - (b[4]?.sort || 0) || a[5]?.currentSelector?.localeCompare(b[5]?.currentSelector ?? "") || a[1]?.localeCompare(b[1] || "") || a[2]?.localeCompare(b[2] || "") || 0
+        ).map(([, selector, body, , meta, , variantNoMerge]) => {
           const scopedSelector = selector ? applyScope(selector, scope) : selector;
           return [
             [[scopedSelector ?? "", meta?.sort ?? 0]],
@@ -680,7 +685,7 @@ class UnoGenerator {
       getLayer
     };
   }
-  matchVariants(raw, current) {
+  async matchVariants(raw, current) {
     const variants = /* @__PURE__ */ new Set();
     const handlers = [];
     let processed = current || raw;
@@ -695,7 +700,7 @@ class UnoGenerator {
       for (const v of this.config.variants) {
         if (!v.multiPass && variants.has(v))
           continue;
-        let handler = v.match(processed, context);
+        let handler = await v.match(processed, context);
         if (!handler)
           continue;
         if (isString(handler))
@@ -740,11 +745,11 @@ class UnoGenerator {
     if (parent != null && parentOrder != null)
       this.parentOrders.set(parent, parentOrder);
     const obj = {
-      selector: movePseudoElementsEnd([
+      selector: [
         variantContextResult.prefix,
         variantContextResult.selector,
         variantContextResult.pseudo
-      ].join("")),
+      ].join(""),
       entries: variantContextResult.entries,
       parent,
       layer: variantContextResult.layer,
@@ -766,7 +771,7 @@ class UnoGenerator {
     return cssBody;
   }
   async parseUtil(input, context, internal = false, shortcutPrefix) {
-    const [raw, processed, variantHandlers] = isString(input) ? this.matchVariants(input) : input;
+    const [raw, processed, variantHandlers] = isString(input) ? await this.matchVariants(input) : input;
     if (this.config.details)
       context.rules = context.rules ?? [];
     const staticMatch = this.config.rulesStaticMap[processed];
@@ -838,7 +843,7 @@ class UnoGenerator {
     };
     return [parsed[0], selector, body, parent, ruleMeta, this.config.details ? context : void 0, noMerge];
   }
-  expandShortcut(input, context, depth = 5) {
+  async expandShortcut(input, context, depth = 5) {
     if (depth === 0)
       return;
     const recordShortcut = this.config.details ? (s) => {
@@ -877,9 +882,9 @@ class UnoGenerator {
     if (isString(result))
       result = expandVariantGroup(result.trim()).split(/\s+/g);
     if (!result) {
-      const [raw, inputWithoutVariant] = isString(input) ? this.matchVariants(input) : input;
+      const [raw, inputWithoutVariant] = isString(input) ? await this.matchVariants(input) : input;
       if (raw !== inputWithoutVariant) {
-        const expanded = this.expandShortcut(inputWithoutVariant, context, depth - 1);
+        const expanded = await this.expandShortcut(inputWithoutVariant, context, depth - 1);
         if (expanded)
           result = expanded[0].map((item) => isString(item) ? raw.replace(inputWithoutVariant, item) : item);
       }
@@ -887,7 +892,9 @@ class UnoGenerator {
     if (!result)
       return;
     return [
-      result.flatMap((r) => (isString(r) ? this.expandShortcut(r, context, depth - 1)?.[0] : void 0) || [r]).filter(Boolean),
+      (await Promise.all(result.map(
+        async (r) => (isString(r) ? (await this.expandShortcut(r, context, depth - 1))?.[0] : void 0) || [r]
+      ))).flat(1).filter(Boolean),
       meta
     ];
   }
@@ -946,15 +953,6 @@ function applyScope(css, scope) {
   else
     return scope ? `${scope} ${css}` : css;
 }
-function movePseudoElementsEnd(selector) {
-  const pseudoElements = selector.match(/::[\w-]+(\([\w-]+\))?/g);
-  if (pseudoElements) {
-    for (const e2 of pseudoElements)
-      selector = selector.replace(e2, "");
-    selector += pseudoElements.join("");
-  }
-  return selector;
-}
 const attributifyRe = /^\[(.+?)(~?=)"(.*)"\]$/;
 function toEscapedSelector(raw) {
   if (attributifyRe.test(raw))
@@ -965,4 +963,4 @@ function defaultVariantHandler(input, next) {
   return next(input);
 }
 
-export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, TwoKeyMap, UnoGenerator, arbitraryPropertyRE, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeDeep, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };
+export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, TwoKeyMap, UnoGenerator, arbitraryPropertyRE, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, quotedArbitraryValuesRE, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.49.7",
+  "version": "0.50.0",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "dist"
   ],
   "devDependencies": {
-    "magic-string": "^0.27.0",
+    "magic-string": "^0.29.0",
     "unconfig": "^0.3.7"
   },
   "scripts": {