@unocss/core 66.5.10-beta.1 → 66.5.10

package/dist/index.d.mts

@@ -180,7 +180,7 @@ 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>;
     private resolveCSSResult;
-    stringifyUtil(parsed?: ParsedUtil | RawUtil, context?: RuleContext<Theme>): StringifiedUtil<Theme> | undefined;
+    stringifyUtil(parsed?: ParsedUtil | RawUtil, context?: RuleContext<Theme>): 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;
@@ -548,7 +548,7 @@ interface VariantObject<Theme extends object = object> {
 }
 type Variant<Theme extends object = object> = VariantFunction<Theme> | VariantObject<Theme>;
 type Preprocessor = (matcher: string) => string | undefined;
-type Postprocessor = (util: UtilObject) => void;
+type Postprocessor = (util: UtilObject) => void | UtilObject | (UtilObject | null | undefined)[];
 type ThemeExtender<Theme extends object = object> = (theme: Theme, config: Readonly<ResolvedConfig<Theme>>) => Theme | void;
 interface ConfigBase<Theme extends object = object> {
     /**

package/dist/index.d.ts

@@ -180,7 +180,7 @@ 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>;
     private resolveCSSResult;
-    stringifyUtil(parsed?: ParsedUtil | RawUtil, context?: RuleContext<Theme>): StringifiedUtil<Theme> | undefined;
+    stringifyUtil(parsed?: ParsedUtil | RawUtil, context?: RuleContext<Theme>): 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;
@@ -548,7 +548,7 @@ interface VariantObject<Theme extends object = object> {
 }
 type Variant<Theme extends object = object> = VariantFunction<Theme> | VariantObject<Theme>;
 type Preprocessor = (matcher: string) => string | undefined;
-type Postprocessor = (util: UtilObject) => void;
+type Postprocessor = (util: UtilObject) => void | UtilObject | (UtilObject | null | undefined)[];
 type ThemeExtender<Theme extends object = object> = (theme: Theme, config: Readonly<ResolvedConfig<Theme>>) => Theme | void;
 interface ConfigBase<Theme extends object = object> {
     /**

package/dist/index.mjs

@@ -654,7 +654,7 @@ function definePreset(preset) {
   return preset;
 }
 
-const version = "66.5.10-beta.1";
+const version = "66.5.10";
 
 const symbols = {
   shortcutsNoMerge: "$$symbol-shortcut-no-merge",
@@ -755,7 +755,7 @@ class UnoGeneratorInternal {
       if (this.config.details)
         context.variants = [...matched[3]];
       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);
+      const utils = expanded ? await this.stringifyShortcuts(context.variantMatch, context, expanded[0], expanded[1]) : (await this.parseUtil(context.variantMatch, context))?.flatMap((i) => this.stringifyUtil(i, context)).filter(notNull);
       return utils;
     };
     const result = (await Promise.all(variantResults.map((i) => handleVariantResult(i)))).flat().filter((x) => !!x);
@@ -1027,19 +1027,32 @@ class UnoGeneratorInternal {
       sort: variantContextResult.sort,
       noMerge: variantContextResult.noMerge
     };
-    for (const p of this.config.postprocess)
-      p(obj);
-    return obj;
+    return this.config.postprocess.reduce(
+      (utilities, p) => {
+        const result = [];
+        for (const util of utilities) {
+          const processed = p(util);
+          if (Array.isArray(processed)) {
+            result.push(...processed.filter(notNull));
+          } else {
+            result.push(processed || util);
+          }
+        }
+        return result;
+      },
+      [obj]
+    );
   }
   constructCustomCSS(context, body, overrideSelector) {
     const normalizedBody = normalizeCSSEntries(body);
     if (isString(normalizedBody))
       return normalizedBody;
-    const { selector, entries, parent } = this.applyVariants([0, overrideSelector || context.rawSelector, normalizedBody, void 0, context.variantHandlers]);
-    const cssBody = `${selector}{${entriesToCss(entries)}}`;
-    if (parent)
-      return `${parent}{${cssBody}}`;
-    return cssBody;
+    return this.applyVariants([0, overrideSelector || context.rawSelector, normalizedBody, void 0, context.variantHandlers]).map(({ selector, entries, parent }) => {
+      const cssBody = `${selector}{${entriesToCss(entries)}}`;
+      if (parent)
+        return `${parent}{${cssBody}}`;
+      return cssBody;
+    }).join("");
   }
   async parseUtil(input, context, internal = false, shortcutPrefix) {
     const variantResults = isString(input) ? await this.matchVariants(input) : [input];
@@ -1163,25 +1176,30 @@ class UnoGeneratorInternal {
     if (!parsed)
       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 body = entriesToCss(entries);
-    if (!body)
-      return;
-    const { layer: metaLayer, sort: metaSort, ...meta } = parsed[3] ?? {};
-    const ruleMeta = {
-      ...meta,
-      layer: variantLayer ?? metaLayer,
-      sort: variantSort ?? metaSort
-    };
-    return [parsed[0], selector, body, parent, ruleMeta, this.config.details ? context : void 0, noMerge];
+      return [[parsed[0], void 0, parsed[1], void 0, parsed[2], this.config.details ? context : void 0, void 0]];
+    const utilities = this.applyVariants(parsed);
+    const result = [];
+    for (const util of utilities) {
+      const {
+        selector,
+        entries,
+        parent,
+        layer: variantLayer,
+        sort: variantSort,
+        noMerge
+      } = util;
+      const body = entriesToCss(entries);
+      if (!body)
+        continue;
+      const { layer: metaLayer, sort: metaSort, ...meta } = parsed[3] ?? {};
+      const ruleMeta = {
+        ...meta,
+        layer: variantLayer ?? metaLayer,
+        sort: variantSort ?? metaSort
+      };
+      result.push([parsed[0], selector, body, parent, ruleMeta, this.config.details ? context : void 0, noMerge]);
+    }
+    return result;
   }
   async expandShortcut(input, context, depth = 5) {
     if (depth === 0)
@@ -1267,10 +1285,11 @@ class UnoGeneratorInternal {
       }
       const isNoMerge = Object.fromEntries(item[2])[symbols.shortcutsNoMerge];
       const variants = [...item[4], ...!isNoMerge ? parentVariants : []];
-      const { selector, entries, parent: parent2, sort, noMerge, layer } = this.applyVariants(item, variants, raw);
-      const selectorMap = layerMap.getFallback(layer ?? meta.layer, new TwoKeyMap());
-      const mapItem = selectorMap.getFallback(selector, parent2, [[], item[0]]);
-      mapItem[0].push([entries, !!(noMerge ?? item[3]?.noMerge), sort ?? 0]);
+      for (const { selector, entries, parent: parent2, sort, noMerge, layer } of this.applyVariants(item, variants, raw)) {
+        const selectorMap = layerMap.getFallback(layer ?? meta.layer, new TwoKeyMap());
+        const mapItem = selectorMap.getFallback(selector, parent2, [[], item[0]]);
+        mapItem[0].push([entries, !!(noMerge ?? item[3]?.noMerge), sort ?? 0]);
+      }
     }
     return rawStringifiedUtil.concat(layerMap.flatMap(
       (selectorMap, layer) => selectorMap.map(([e2, index], selector, joinedParents) => {

package/package.json

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