@unocss/core 0.38.2 → 0.39.0

package/dist/index.cjs

@@ -40,6 +40,8 @@ function escapeSelector(str) {
 const e = escapeSelector;
 
 function normalizeCSSEntries(obj) {
+  if (typeof obj === "string")
+    return obj;
   return (!Array.isArray(obj) ? Object.entries(obj) : obj).filter((i) => i[1] != null);
 }
 function normalizeCSSValues(obj) {
@@ -458,7 +460,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.38.2";
+const version = "0.39.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -612,20 +614,29 @@ 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 || "default") === layer).sort((a, b) => a[0] - b[0] || (a[4]?.sort || 0) - (b[4]?.sort || 0) || a[1]?.localeCompare(b[1] || "") || 0).map((a) => [a[1] ? applyScope(a[1], scope) : a[1], a[2], !!a[4]?.noMerge]).map((a) => [a[0] == null ? a[0] : [a[0]], a[1], a[2]]);
+        const sorted = items.filter((i) => (i[4]?.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]) => {
+          const scopedSelector = selector ? applyScope(selector, scope) : selector;
+          return [
+            [[scopedSelector ?? "", meta?.sort ?? 0]],
+            body,
+            !!meta?.noMerge
+          ];
+        });
         if (!sorted.length)
           return void 0;
-        const rules = sorted.reverse().map(([selector, body, noMerge], idx) => {
-          if (!noMerge && selector && this.config.mergeSelectors) {
+        const rules = sorted.reverse().map(([selectorSortPair, body, noMerge], idx) => {
+          if (!noMerge && this.config.mergeSelectors) {
             for (let i = idx + 1; i < size; i++) {
               const current = sorted[i];
-              if (current && !current[2] && current[0] && current[1] === body) {
-                current[0].push(...selector);
+              if (current && !current[2] && (selectorSortPair && current[0] || selectorSortPair == null && current[0] == null) && current[1] === body) {
+                if (selectorSortPair && current[0])
+                  current[0].push(...selectorSortPair);
                 return null;
               }
             }
           }
-          return selector ? `${[...new Set(selector)].join(`,${nl}`)}{${body}}` : body;
+          const selectors = selectorSortPair ? [...new Set(selectorSortPair.sort((a, b) => a[1] - b[1] || a[0]?.localeCompare(b[0] || "") || 0).map((pair) => pair[0]).filter(Boolean))] : [];
+          return selectors.length ? `${selectors.join(`,${nl}`)}{${body}}` : body;
         }).filter(Boolean).reverse().join(nl);
         return parent ? `${parent}{${nl}${rules}${nl}}` : rules;
       }).filter(Boolean).join(nl);
@@ -684,22 +695,34 @@ class UnoGenerator {
   }
   applyVariants(parsed, variantHandlers = parsed[4], raw = parsed[1]) {
     const handlers = [...variantHandlers].sort((a, b) => (a.order || 0) - (b.order || 0));
-    const entries = handlers.reduce((p, v) => v.body?.(p) || p, parsed[2]);
-    const selector = handlers.reduce((p, v) => v.selector?.(p, entries) || p, toEscapedSelector(raw));
+    let entries = parsed[2];
+    let selector = toEscapedSelector(raw);
+    let parent;
+    let layer;
+    let sort;
+    handlers.forEach((v) => {
+      entries = v.body?.(entries) || entries;
+      selector = v.selector?.(selector, entries) || selector;
+      parent = Array.isArray(v.parent) ? v.parent[0] : v.parent || parent;
+      layer = v.layer || layer;
+      sort = v.sort || sort;
+    });
     const obj = {
       selector: movePseudoElementsEnd(selector),
       entries,
-      parent: handlers.reduce((p, v) => Array.isArray(v.parent) ? v.parent[0] : v.parent || p, void 0),
-      layer: handlers.reduce((p, v) => v.layer || p, void 0),
-      sort: handlers.reduce((p, v) => v.sort || p, void 0)
+      parent,
+      layer,
+      sort
     };
     for (const p of this.config.postprocess)
       p(obj);
     return obj;
   }
   constructCustomCSS(context, body, overrideSelector) {
-    body = normalizeCSSEntries(body);
-    const { selector, entries, parent } = this.applyVariants([0, overrideSelector || context.rawSelector, body, void 0, context.variantHandlers]);
+    const normalizedBody = normalizeCSSEntries(body);
+    if (typeof normalizedBody === "string")
+      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}}`;
@@ -715,7 +738,13 @@ class UnoGenerator {
     if (staticMatch) {
       if (staticMatch[1] && (internal || !staticMatch[2]?.internal)) {
         recordRule(staticMatch[3]);
-        return [[staticMatch[0], raw, normalizeCSSEntries(staticMatch[1]), staticMatch[2], variantHandlers]];
+        const index = staticMatch[0];
+        const entry = normalizeCSSEntries(staticMatch[1]);
+        const meta = staticMatch[2];
+        if (typeof entry === "string")
+          return [[index, entry, meta]];
+        else
+          return [[index, raw, entry, meta, variantHandlers]];
       }
     }
     context.variantHandlers = variantHandlers;
@@ -734,11 +763,15 @@ class UnoGenerator {
       if (!result)
         continue;
       recordRule(rule);
-      if (typeof result === "string")
-        return [[i, result, meta]];
       const entries = normalizeCSSValues(result).filter((i2) => i2.length);
-      if (entries.length)
-        return entries.map((e2) => [i, raw, e2, meta, variantHandlers]);
+      if (entries.length) {
+        return entries.map((e2) => {
+          if (typeof e2 === "string")
+            return [i, e2, meta];
+          else
+            return [i, raw, e2, meta, variantHandlers];
+        });
+      }
     }
   }
   stringifyUtil(parsed, context) {

package/dist/index.d.ts

@@ -71,7 +71,7 @@ declare class UnoGenerator {
     matchVariants(raw: string, current?: string): VariantMatchedResult;
     applyVariants(parsed: ParsedUtil, variantHandlers?: VariantHandler[], raw?: string): UtilObject;
     constructCustomCSS(context: Readonly<RuleContext>, body: CSSObject | CSSEntries, overrideSelector?: string): string;
-    parseUtil(input: string | VariantMatchedResult, context: RuleContext, internal?: boolean): Promise<ParsedUtil[] | RawUtil[] | undefined>;
+    parseUtil(input: string | VariantMatchedResult, context: RuleContext, internal?: boolean): Promise<(ParsedUtil | RawUtil)[] | undefined>;
     stringifyUtil(parsed?: ParsedUtil | RawUtil, context?: RuleContext): StringifiedUtil | undefined;
     expandShortcut(processed: string, context: RuleContext, depth?: number): [string[], RuleMeta | undefined] | undefined;
     stringifyShortcuts(parent: VariantMatchedResult, context: RuleContext, expanded: string[], meta?: RuleMeta): Promise<StringifiedUtil[] | undefined>;
@@ -90,8 +90,8 @@ declare function escapeRegExp(string: string): string;
 declare function escapeSelector(str: string): string;
 declare const e: typeof escapeSelector;
 
-declare function normalizeCSSEntries(obj: CSSEntries | CSSObject): CSSEntries;
-declare function normalizeCSSValues(obj: CSSValues): CSSEntries[];
+declare function normalizeCSSEntries(obj: string | CSSEntries | CSSObject): string | CSSEntries;
+declare function normalizeCSSValues(obj: CSSValue | string | (CSSValue | 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>;
@@ -315,8 +315,9 @@ interface RuleMeta {
      */
     internal?: boolean;
 }
-declare type CSSValues = CSSObject | CSSEntries | (CSSObject | CSSEntries)[];
-declare type DynamicMatcher<Theme extends {} = {}> = ((match: RegExpMatchArray, context: Readonly<RuleContext<Theme>>) => Awaitable<CSSValues | string | undefined>);
+declare type CSSValue = CSSObject | CSSEntries;
+declare type CSSValues = CSSValue | CSSValue[];
+declare type DynamicMatcher<Theme extends {} = {}> = ((match: RegExpMatchArray, context: Readonly<RuleContext<Theme>>) => Awaitable<CSSValue | string | (CSSValue | string)[] | undefined>);
 declare type DynamicRule<Theme extends {} = {}> = [RegExp, DynamicMatcher<Theme>] | [RegExp, DynamicMatcher<Theme>, RuleMeta];
 declare type StaticRule = [string, CSSObject | CSSEntries] | [string, CSSObject | CSSEntries, RuleMeta];
 declare type Rule<Theme extends {} = {}> = DynamicRule<Theme> | StaticRule;
@@ -688,6 +689,11 @@ declare type StringifiedUtil = readonly [
     meta: RuleMeta | undefined,
     context: RuleContext | undefined
 ];
+declare type PreparedRule = readonly [
+    selector: [string, number][],
+    body: string,
+    noMerge: boolean
+];
 interface UtilObject {
     selector: string;
     entries: CSSEntries;
@@ -725,4 +731,4 @@ 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, CSSValues, ConfigBase, DeepPartial, DetailString, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExtractStringOptions, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, Preprocessor, Preset, PresetOptions, RGBAColorValue, Range, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, SourceCodeTransformer, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractQuoted, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, matchingPair, mergeDeep, mergeSet, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, 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, ConfigBase, DeepPartial, DetailString, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExtractStringOptions, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, PreparedRule, Preprocessor, Preset, PresetOptions, RGBAColorValue, Range, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, SourceCodeTransformer, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractQuoted, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, matchingPair, mergeDeep, mergeSet, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -36,6 +36,8 @@ function escapeSelector(str) {
 const e = escapeSelector;
 
 function normalizeCSSEntries(obj) {
+  if (typeof obj === "string")
+    return obj;
   return (!Array.isArray(obj) ? Object.entries(obj) : obj).filter((i) => i[1] != null);
 }
 function normalizeCSSValues(obj) {
@@ -454,7 +456,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.38.2";
+const version = "0.39.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -608,20 +610,29 @@ 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 || "default") === layer).sort((a, b) => a[0] - b[0] || (a[4]?.sort || 0) - (b[4]?.sort || 0) || a[1]?.localeCompare(b[1] || "") || 0).map((a) => [a[1] ? applyScope(a[1], scope) : a[1], a[2], !!a[4]?.noMerge]).map((a) => [a[0] == null ? a[0] : [a[0]], a[1], a[2]]);
+        const sorted = items.filter((i) => (i[4]?.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]) => {
+          const scopedSelector = selector ? applyScope(selector, scope) : selector;
+          return [
+            [[scopedSelector ?? "", meta?.sort ?? 0]],
+            body,
+            !!meta?.noMerge
+          ];
+        });
         if (!sorted.length)
           return void 0;
-        const rules = sorted.reverse().map(([selector, body, noMerge], idx) => {
-          if (!noMerge && selector && this.config.mergeSelectors) {
+        const rules = sorted.reverse().map(([selectorSortPair, body, noMerge], idx) => {
+          if (!noMerge && this.config.mergeSelectors) {
             for (let i = idx + 1; i < size; i++) {
               const current = sorted[i];
-              if (current && !current[2] && current[0] && current[1] === body) {
-                current[0].push(...selector);
+              if (current && !current[2] && (selectorSortPair && current[0] || selectorSortPair == null && current[0] == null) && current[1] === body) {
+                if (selectorSortPair && current[0])
+                  current[0].push(...selectorSortPair);
                 return null;
               }
             }
           }
-          return selector ? `${[...new Set(selector)].join(`,${nl}`)}{${body}}` : body;
+          const selectors = selectorSortPair ? [...new Set(selectorSortPair.sort((a, b) => a[1] - b[1] || a[0]?.localeCompare(b[0] || "") || 0).map((pair) => pair[0]).filter(Boolean))] : [];
+          return selectors.length ? `${selectors.join(`,${nl}`)}{${body}}` : body;
         }).filter(Boolean).reverse().join(nl);
         return parent ? `${parent}{${nl}${rules}${nl}}` : rules;
       }).filter(Boolean).join(nl);
@@ -680,22 +691,34 @@ class UnoGenerator {
   }
   applyVariants(parsed, variantHandlers = parsed[4], raw = parsed[1]) {
     const handlers = [...variantHandlers].sort((a, b) => (a.order || 0) - (b.order || 0));
-    const entries = handlers.reduce((p, v) => v.body?.(p) || p, parsed[2]);
-    const selector = handlers.reduce((p, v) => v.selector?.(p, entries) || p, toEscapedSelector(raw));
+    let entries = parsed[2];
+    let selector = toEscapedSelector(raw);
+    let parent;
+    let layer;
+    let sort;
+    handlers.forEach((v) => {
+      entries = v.body?.(entries) || entries;
+      selector = v.selector?.(selector, entries) || selector;
+      parent = Array.isArray(v.parent) ? v.parent[0] : v.parent || parent;
+      layer = v.layer || layer;
+      sort = v.sort || sort;
+    });
     const obj = {
       selector: movePseudoElementsEnd(selector),
       entries,
-      parent: handlers.reduce((p, v) => Array.isArray(v.parent) ? v.parent[0] : v.parent || p, void 0),
-      layer: handlers.reduce((p, v) => v.layer || p, void 0),
-      sort: handlers.reduce((p, v) => v.sort || p, void 0)
+      parent,
+      layer,
+      sort
     };
     for (const p of this.config.postprocess)
       p(obj);
     return obj;
   }
   constructCustomCSS(context, body, overrideSelector) {
-    body = normalizeCSSEntries(body);
-    const { selector, entries, parent } = this.applyVariants([0, overrideSelector || context.rawSelector, body, void 0, context.variantHandlers]);
+    const normalizedBody = normalizeCSSEntries(body);
+    if (typeof normalizedBody === "string")
+      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}}`;
@@ -711,7 +734,13 @@ class UnoGenerator {
     if (staticMatch) {
       if (staticMatch[1] && (internal || !staticMatch[2]?.internal)) {
         recordRule(staticMatch[3]);
-        return [[staticMatch[0], raw, normalizeCSSEntries(staticMatch[1]), staticMatch[2], variantHandlers]];
+        const index = staticMatch[0];
+        const entry = normalizeCSSEntries(staticMatch[1]);
+        const meta = staticMatch[2];
+        if (typeof entry === "string")
+          return [[index, entry, meta]];
+        else
+          return [[index, raw, entry, meta, variantHandlers]];
       }
     }
     context.variantHandlers = variantHandlers;
@@ -730,11 +759,15 @@ class UnoGenerator {
       if (!result)
         continue;
       recordRule(rule);
-      if (typeof result === "string")
-        return [[i, result, meta]];
       const entries = normalizeCSSValues(result).filter((i2) => i2.length);
-      if (entries.length)
-        return entries.map((e2) => [i, raw, e2, meta, variantHandlers]);
+      if (entries.length) {
+        return entries.map((e2) => {
+          if (typeof e2 === "string")
+            return [i, e2, meta];
+          else
+            return [i, raw, e2, meta, variantHandlers];
+        });
+      }
     }
   }
   stringifyUtil(parsed, context) {

package/package.json

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