@unocss/core 66.4.1 → 66.5.0

package/dist/index.d.mts

@@ -125,6 +125,7 @@ declare class BetterMap<K, V> extends Map<K, V> {
 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 const VirtualKey = "__virtual_key__";
 declare function entriesToCss(arr?: CSSEntries): string;
 declare function isObject(item: any): item is Record<string, any>;
 /**
@@ -277,6 +278,7 @@ declare const SymbolParent: unique symbol;
 declare const SymbolSelector: unique symbol;
 declare const SymbolLayer: unique symbol;
 declare const SymbolSort: unique symbol;
+declare const SymbolBody: unique symbol;
 interface ControlSymbols {
     /**
      * Prevent merging in shortcuts
@@ -306,6 +308,10 @@ interface ControlSymbols {
      * Sort modifier
      */
     sort: typeof SymbolSort;
+    /**
+     * Custom css body modifier
+     */
+    body: typeof SymbolBody;
 }
 interface ControlSymbolsValue {
     [SymbolShortcutsNoMerge]: true;
@@ -315,6 +321,7 @@ interface ControlSymbolsValue {
     [SymbolSelector]: (selector: string) => string;
     [SymbolLayer]: string;
     [SymbolSort]: number;
+    [SymbolBody]: string;
 }
 type ObjectToEntry<T> = {
     [K in keyof T]: [K, T[K]];
@@ -400,6 +407,12 @@ interface RuleMeta {
      * @private
      */
     __hash?: string;
+    /**
+     * Internal index of the rulelist
+     * @internal
+     * @private
+     */
+    __index?: number;
     /**
      * Custom metadata
      */
@@ -1106,5 +1119,5 @@ declare const defaultSplitRE: RegExp;
 declare const splitWithVariantGroupRE: RegExp;
 declare const extractorSplit: Extractor;
 
-export { BetterMap, CountableSet, DEFAULT_LAYERS, Emitter, LAYER_DEFAULT, LAYER_IMPORTS, LAYER_PREFLIGHTS, LAYER_SHORTCUTS, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createNanoEvents, 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 { BetterMap, CountableSet, DEFAULT_LAYERS, Emitter, LAYER_DEFAULT, LAYER_IMPORTS, LAYER_PREFLIGHTS, LAYER_SHORTCUTS, TwoKeyMap, UnoGenerator, VirtualKey, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createNanoEvents, 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, Arrayable, AutoCompleteExtractor, AutoCompleteExtractorContext, AutoCompleteExtractorResult, AutoCompleteFunction, AutoCompleteTemplate, Awaitable, BaseContext, BlocklistMeta, BlocklistRule, BlocklistValue, CSSEntries, CSSEntriesInput, CSSEntry, CSSObject, CSSObjectInput, CSSValue, CSSValueInput, CSSValues, CliEntryItem, CliOptions, ConfigBase, ContentOptions, ControlSymbols, ControlSymbolsEntry, ControlSymbolsValue, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExtendedTokenInfo, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, HighlightAnnotation, ObjectToEntry, OutputCssLayersOptions, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, PreparedRule, Preprocessor, Preset, PresetFactory, PresetFactoryAwaitable, PresetOptions, PresetOrFactory, PresetOrFactoryAwaitable, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, SafeListContext, Shift, Shortcut, ShortcutInlineValue, ShortcutValue, SourceCodeTransformer, SourceCodeTransformerEnforce, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, ToArray, UnocssPluginContext, Unsubscribe, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject };

package/dist/index.d.ts

@@ -125,6 +125,7 @@ declare class BetterMap<K, V> extends Map<K, V> {
 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 const VirtualKey = "__virtual_key__";
 declare function entriesToCss(arr?: CSSEntries): string;
 declare function isObject(item: any): item is Record<string, any>;
 /**
@@ -277,6 +278,7 @@ declare const SymbolParent: unique symbol;
 declare const SymbolSelector: unique symbol;
 declare const SymbolLayer: unique symbol;
 declare const SymbolSort: unique symbol;
+declare const SymbolBody: unique symbol;
 interface ControlSymbols {
     /**
      * Prevent merging in shortcuts
@@ -306,6 +308,10 @@ interface ControlSymbols {
      * Sort modifier
      */
     sort: typeof SymbolSort;
+    /**
+     * Custom css body modifier
+     */
+    body: typeof SymbolBody;
 }
 interface ControlSymbolsValue {
     [SymbolShortcutsNoMerge]: true;
@@ -315,6 +321,7 @@ interface ControlSymbolsValue {
     [SymbolSelector]: (selector: string) => string;
     [SymbolLayer]: string;
     [SymbolSort]: number;
+    [SymbolBody]: string;
 }
 type ObjectToEntry<T> = {
     [K in keyof T]: [K, T[K]];
@@ -400,6 +407,12 @@ interface RuleMeta {
      * @private
      */
     __hash?: string;
+    /**
+     * Internal index of the rulelist
+     * @internal
+     * @private
+     */
+    __index?: number;
     /**
      * Custom metadata
      */
@@ -1106,5 +1119,5 @@ declare const defaultSplitRE: RegExp;
 declare const splitWithVariantGroupRE: RegExp;
 declare const extractorSplit: Extractor;
 
-export { BetterMap, CountableSet, DEFAULT_LAYERS, Emitter, LAYER_DEFAULT, LAYER_IMPORTS, LAYER_PREFLIGHTS, LAYER_SHORTCUTS, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createNanoEvents, 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 { BetterMap, CountableSet, DEFAULT_LAYERS, Emitter, LAYER_DEFAULT, LAYER_IMPORTS, LAYER_PREFLIGHTS, LAYER_SHORTCUTS, TwoKeyMap, UnoGenerator, VirtualKey, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createNanoEvents, 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, Arrayable, AutoCompleteExtractor, AutoCompleteExtractorContext, AutoCompleteExtractorResult, AutoCompleteFunction, AutoCompleteTemplate, Awaitable, BaseContext, BlocklistMeta, BlocklistRule, BlocklistValue, CSSEntries, CSSEntriesInput, CSSEntry, CSSObject, CSSObjectInput, CSSValue, CSSValueInput, CSSValues, CliEntryItem, CliOptions, ConfigBase, ContentOptions, ControlSymbols, ControlSymbolsEntry, ControlSymbolsValue, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExtendedTokenInfo, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, HighlightAnnotation, ObjectToEntry, OutputCssLayersOptions, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, PreparedRule, Preprocessor, Preset, PresetFactory, PresetFactoryAwaitable, PresetOptions, PresetOrFactory, PresetOrFactoryAwaitable, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, SafeListContext, Shift, Shortcut, ShortcutInlineValue, ShortcutValue, SourceCodeTransformer, SourceCodeTransformerEnforce, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, ToArray, UnocssPluginContext, Unsubscribe, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject };

package/dist/index.mjs

@@ -262,10 +262,11 @@ function clearIdenticalEntries(entry) {
     return true;
   });
 }
+const VirtualKey = "__virtual_key__";
 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("");
+  return clearIdenticalEntries(arr).map(([key, value]) => value != null && typeof value !== "function" ? key !== VirtualKey ? `${key}:${value};` : value : void 0).filter(Boolean).join("");
 }
 function isObject(item) {
   return item && typeof item === "object" && !Array.isArray(item);
@@ -549,17 +550,21 @@ async function resolveConfig(userConfig = {}, defaults = {}) {
     extractors.unshift(extractorDefault);
   extractors.sort((a, b) => (a.order || 0) - (b.order || 0));
   const rules = getMerged("rules");
-  const rulesStaticMap = {};
   const rulesSize = rules.length;
-  const rulesDynamic = rules.filter((rule) => {
-    if (!isStaticRule(rule))
-      return true;
-    const prefixes = toArray(rule[2]?.prefix || "");
-    prefixes.forEach((prefix) => {
-      rulesStaticMap[prefix + rule[0]] = rule;
-    });
-    return false;
-  }).reverse();
+  const rulesStaticMap = {};
+  const rulesDynamic = [];
+  for (const [index, rule] of rules.entries()) {
+    const meta = rule[2] ?? (rule[2] = {});
+    meta.__index = index;
+    if (isStaticRule(rule)) {
+      const prefixes = toArray(meta.prefix ?? "");
+      prefixes.forEach((prefix) => {
+        rulesStaticMap[prefix + rule[0]] = rule;
+      });
+    } else {
+      rulesDynamic.unshift(rule);
+    }
+  }
   const autocomplete = {
     templates: uniq(sources.flatMap((p) => toArray(p.autocomplete?.templates))),
     extractors: sources.flatMap((p) => toArray(p.autocomplete?.extractors)).sort((a, b) => (a.order || 0) - (b.order || 0)),
@@ -649,7 +654,7 @@ function definePreset(preset) {
   return preset;
 }
 
-const version = "66.4.1";
+const version = "66.5.0";
 
 const symbols = {
   shortcutsNoMerge: "$$symbol-shortcut-no-merge",
@@ -658,7 +663,8 @@ const symbols = {
   parent: "$$symbol-parent",
   selector: "$$symbol-selector",
   layer: "$$symbol-layer",
-  sort: "$$symbol-sort"
+  sort: "$$symbol-sort",
+  body: "$$symbol-body"
 };
 class UnoGeneratorInternal {
   constructor(userConfig = {}, defaults = {}) {
@@ -1104,11 +1110,10 @@ class UnoGeneratorInternal {
         context.rules.push(rule);
       }
       context.generator.activatedRules.add(rule);
-      const index = context.generator.config.rules.indexOf(rule);
       const meta = rule[2];
       return entries.map((css) => {
         if (isString(css))
-          return [index, css, meta];
+          return [meta.__index, css, meta];
         let variants = context.variantHandlers;
         let entryMeta = meta;
         for (const entry of css) {
@@ -1146,9 +1151,11 @@ class UnoGeneratorInternal {
               ...entryMeta,
               noMerge: entry[1]
             };
+          } else if (entry[0] === symbols.body) {
+            entry[0] = VirtualKey;
           }
         }
-        return [index, raw, css, entryMeta, variants];
+        return [meta.__index, raw, css, entryMeta, variants];
       });
     }
   };
@@ -1329,4 +1336,4 @@ function defaultVariantHandler(input, next) {
   return next(input);
 }
 
-export { BetterMap, CountableSet, DEFAULT_LAYERS, LAYER_DEFAULT, LAYER_IMPORTS, LAYER_PREFLIGHTS, LAYER_SHORTCUTS, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createNanoEvents, 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 { BetterMap, CountableSet, DEFAULT_LAYERS, LAYER_DEFAULT, LAYER_IMPORTS, LAYER_PREFLIGHTS, LAYER_SHORTCUTS, TwoKeyMap, UnoGenerator, VirtualKey, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createNanoEvents, 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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/core",
   "type": "module",
-  "version": "66.4.1",
+  "version": "66.5.0",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,8 +37,8 @@
     "dist"
   ],
   "devDependencies": {
-    "magic-string": "^0.30.17",
-    "unconfig": "^7.3.2"
+    "magic-string": "^0.30.18",
+    "unconfig": "^7.3.3"
   },
   "scripts": {
     "build": "unbuild",