@unocss/core 0.65.0-beta.2 → 0.65.0

package/dist/index.d.mts

@@ -141,6 +141,7 @@ declare class UnoGeneratorInternal<Theme extends object = object> {
     config: ResolvedConfig<Theme>;
     blocked: Set<string>;
     parentOrders: Map<string, number>;
+    activatedRules: Set<Rule<Theme>>;
     events: Emitter<{
         config: (config: ResolvedConfig<Theme>) => void;
     }>;
@@ -248,6 +249,7 @@ declare const SymbolVariants: unique symbol;
 declare const SymbolParent: unique symbol;
 declare const SymbolSelector: unique symbol;
 declare const SymbolLayer: unique symbol;
+declare const SymbolSort: unique symbol;
 interface ControlSymbols {
     /**
      * Prevent merging in shortcuts
@@ -269,6 +271,10 @@ interface ControlSymbols {
      * Layer modifier
      */
     layer: typeof SymbolLayer;
+    /**
+     * Sort modifier
+     */
+    sort: typeof SymbolSort;
 }
 interface ControlSymbolsValue {
     [SymbolShortcutsNoMerge]: true;
@@ -276,6 +282,7 @@ interface ControlSymbolsValue {
     [SymbolParent]: string;
     [SymbolSelector]: (selector: string) => string;
     [SymbolLayer]: string;
+    [SymbolSort]: number;
 }
 type ObjectToEntry<T> = {
     [K in keyof T]: [K, T[K]];
@@ -302,7 +309,7 @@ interface ExtractorContext {
     extracted: Set<string> | CountableSet<string>;
     envMode?: 'dev' | 'build';
 }
-interface PreflightContext<Theme extends object = object> {
+interface BaseContext<Theme extends object = object> {
     /**
      * UnoCSS generator instance
      */
@@ -312,7 +319,9 @@ interface PreflightContext<Theme extends object = object> {
      */
     theme: Theme;
 }
-interface SafeListContext<Theme extends object = object> extends PreflightContext<Theme> {
+interface PreflightContext<Theme extends object = object> extends BaseContext<Theme> {
+}
+interface SafeListContext<Theme extends object = object> extends BaseContext<Theme> {
 }
 interface Extractor {
     name: string;
@@ -359,6 +368,10 @@ interface RuleMeta {
      * @private
      */
     __hash?: string;
+    /**
+     * Custom metadata
+     */
+    custom?: Record<string, any>;
 }
 type CSSValue = CSSObject | CSSEntries;
 type CSSValues = CSSValue | CSSValue[];
@@ -923,8 +936,9 @@ interface ResolvedConfig<Theme extends object = object> extends Omit<RequiredByK
     preprocess: Preprocessor[];
     postprocess: Postprocessor[];
     rulesSize: number;
-    rulesDynamic: [number, ...DynamicRule<Theme>][];
-    rulesStaticMap: Record<string, [number, CSSObject | CSSEntries, RuleMeta | undefined, Rule<Theme>] | undefined>;
+    rules: readonly Rule<Theme>[];
+    rulesDynamic: readonly DynamicRule<Theme>[];
+    rulesStaticMap: Record<string, StaticRule | undefined>;
     autocomplete: {
         templates: (AutoCompleteFunction | AutoCompleteTemplate)[];
         extractors: AutoCompleteExtractor[];

package/dist/index.d.ts

@@ -141,6 +141,7 @@ declare class UnoGeneratorInternal<Theme extends object = object> {
     config: ResolvedConfig<Theme>;
     blocked: Set<string>;
     parentOrders: Map<string, number>;
+    activatedRules: Set<Rule<Theme>>;
     events: Emitter<{
         config: (config: ResolvedConfig<Theme>) => void;
     }>;
@@ -248,6 +249,7 @@ declare const SymbolVariants: unique symbol;
 declare const SymbolParent: unique symbol;
 declare const SymbolSelector: unique symbol;
 declare const SymbolLayer: unique symbol;
+declare const SymbolSort: unique symbol;
 interface ControlSymbols {
     /**
      * Prevent merging in shortcuts
@@ -269,6 +271,10 @@ interface ControlSymbols {
      * Layer modifier
      */
     layer: typeof SymbolLayer;
+    /**
+     * Sort modifier
+     */
+    sort: typeof SymbolSort;
 }
 interface ControlSymbolsValue {
     [SymbolShortcutsNoMerge]: true;
@@ -276,6 +282,7 @@ interface ControlSymbolsValue {
     [SymbolParent]: string;
     [SymbolSelector]: (selector: string) => string;
     [SymbolLayer]: string;
+    [SymbolSort]: number;
 }
 type ObjectToEntry<T> = {
     [K in keyof T]: [K, T[K]];
@@ -302,7 +309,7 @@ interface ExtractorContext {
     extracted: Set<string> | CountableSet<string>;
     envMode?: 'dev' | 'build';
 }
-interface PreflightContext<Theme extends object = object> {
+interface BaseContext<Theme extends object = object> {
     /**
      * UnoCSS generator instance
      */
@@ -312,7 +319,9 @@ interface PreflightContext<Theme extends object = object> {
      */
     theme: Theme;
 }
-interface SafeListContext<Theme extends object = object> extends PreflightContext<Theme> {
+interface PreflightContext<Theme extends object = object> extends BaseContext<Theme> {
+}
+interface SafeListContext<Theme extends object = object> extends BaseContext<Theme> {
 }
 interface Extractor {
     name: string;
@@ -359,6 +368,10 @@ interface RuleMeta {
      * @private
      */
     __hash?: string;
+    /**
+     * Custom metadata
+     */
+    custom?: Record<string, any>;
 }
 type CSSValue = CSSObject | CSSEntries;
 type CSSValues = CSSValue | CSSValue[];
@@ -923,8 +936,9 @@ interface ResolvedConfig<Theme extends object = object> extends Omit<RequiredByK
     preprocess: Preprocessor[];
     postprocess: Postprocessor[];
     rulesSize: number;
-    rulesDynamic: [number, ...DynamicRule<Theme>][];
-    rulesStaticMap: Record<string, [number, CSSObject | CSSEntries, RuleMeta | undefined, Rule<Theme>] | undefined>;
+    rules: readonly Rule<Theme>[];
+    rulesDynamic: readonly DynamicRule<Theme>[];
+    rulesStaticMap: Record<string, StaticRule | undefined>;
     autocomplete: {
         templates: (AutoCompleteFunction | AutoCompleteTemplate)[];
         extractors: AutoCompleteExtractor[];

package/dist/index.mjs

@@ -554,16 +554,15 @@ async function resolveConfig(userConfig = {}, defaults = {}) {
   const rules = getMerged("rules");
   const rulesStaticMap = {};
   const rulesSize = rules.length;
-  const rulesDynamic = rules.map((rule, i) => {
-    if (isStaticRule(rule)) {
-      const prefixes = toArray(rule[2]?.prefix || "");
-      prefixes.forEach((prefix) => {
-        rulesStaticMap[prefix + rule[0]] = [i, rule[1], rule[2], rule];
-      });
-      return void 0;
-    }
-    return [i, ...rule];
-  }).filter(Boolean).reverse();
+  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();
   let theme = mergeThemes(sources.map((p) => p.theme));
   const extendThemes = getMerged("extendTheme");
   for (const extendTheme of extendThemes)
@@ -589,6 +588,7 @@ async function resolveConfig(userConfig = {}, defaults = {}) {
     shortcutsLayer: config.shortcutsLayer || "shortcuts",
     layers,
     theme,
+    rules,
     rulesSize,
     rulesDynamic,
     rulesStaticMap,
@@ -653,7 +653,7 @@ function definePreset(preset) {
   return preset;
 }
 
-const version = "0.65.0-beta.2";
+const version = "0.65.0";
 
 function createNanoEvents() {
   return {
@@ -679,7 +679,8 @@ const symbols = {
   variants: "$$symbol-variants",
   parent: "$$symbol-parent",
   selector: "$$symbol-selector",
-  layer: "$$symbol-layer"
+  layer: "$$symbol-layer",
+  sort: "$$symbol-sort"
 };
 class UnoGeneratorInternal {
   constructor(userConfig = {}, defaults = {}) {
@@ -690,6 +691,7 @@ class UnoGeneratorInternal {
     __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());
   }
   static async create(userConfig = {}, defaults = {}) {
@@ -706,6 +708,7 @@ class UnoGeneratorInternal {
     this.userConfig = userConfig;
     this.blocked.clear();
     this.parentOrders.clear();
+    this.activatedRules.clear();
     this._cache.clear();
     this.config = await resolveConfig(userConfig, this.defaults);
     this.events.emit("config", this.config);
@@ -789,7 +792,6 @@ class UnoGeneratorInternal {
       minify = false,
       extendedInfo = false
     } = options;
-    const outputCssLayers = this.config.outputToCssLayers;
     const tokens = isString(input) ? await this.applyExtractors(
       input,
       id,
@@ -861,6 +863,14 @@ class UnoGeneratorInternal {
     })();
     const layers = this.config.sortLayers(Array.from(layerSet).sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b)));
     const layerCache = {};
+    const outputCssLayers = this.config.outputToCssLayers;
+    const getLayerAlias = (layer) => {
+      let alias = layer;
+      if (typeof outputCssLayers === "object") {
+        alias = outputCssLayers.cssLayerName?.(layer);
+      }
+      return alias === null ? null : alias ?? layer;
+    };
     const getLayer = (layer = LAYER_DEFAULT) => {
       if (layerCache[layer])
         return layerCache[layer];
@@ -900,19 +910,22 @@ class UnoGeneratorInternal {
       if (preflights) {
         css = [preflightsMap[layer], css].filter(Boolean).join(nl);
       }
+      let alias;
       if (outputCssLayers && css) {
-        let cssLayer = typeof outputCssLayers === "object" ? outputCssLayers.cssLayerName?.(layer) : void 0;
-        if (cssLayer !== null) {
-          if (!cssLayer)
-            cssLayer = layer;
-          css = `@layer ${cssLayer}{${nl}${css}${nl}}`;
+        alias = getLayerAlias(layer);
+        if (alias !== null) {
+          css = `@layer ${alias}{${nl}${css}${nl}}`;
         }
       }
-      const layerMark = minify ? "" : `/* layer: ${layer} */${nl}`;
+      const layerMark = minify ? "" : `/* layer: ${layer}${alias && alias !== layer ? `, alias: ${alias}` : ""} */${nl}`;
       return layerCache[layer] = css ? layerMark + css : "";
     };
     const getLayers = (includes = layers, excludes) => {
-      return includes.filter((i) => !excludes?.includes(i)).map((i) => getLayer(i) || "").filter(Boolean).join(nl);
+      const layers2 = includes.filter((i) => !excludes?.includes(i));
+      return [
+        outputCssLayers && layers2.length > 0 ? `@layer ${layers2.map(getLayerAlias).filter(notNull).join(", ")};` : void 0,
+        ...layers2.map((i) => getLayer(i) || "")
+      ].filter(Boolean).join(nl);
     };
     const setLayer = async (layer, callback) => {
       const content = await callback(getLayer(layer));
@@ -1051,9 +1064,10 @@ class UnoGeneratorInternal {
       const staticMatch = this.config.rulesStaticMap[processed];
       if (staticMatch) {
         if (staticMatch[1] && (internal || !staticMatch[2]?.internal)) {
+          context.generator.activatedRules.add(staticMatch);
           if (this.config.details)
-            context.rules.push(staticMatch[3]);
-          const index = staticMatch[0];
+            context.rules.push(staticMatch);
+          const index = this.config.rules.indexOf(staticMatch);
           const entry = normalizeCSSEntries(staticMatch[1]);
           const meta = staticMatch[2];
           if (isString(entry))
@@ -1064,7 +1078,8 @@ class UnoGeneratorInternal {
       }
       context.variantHandlers = variantHandlers;
       const { rulesDynamic } = this.config;
-      for (const [i, matcher, handler, meta] of rulesDynamic) {
+      for (const rule of rulesDynamic) {
+        const [matcher, handler, meta] = rule;
         if (meta?.internal && !internal)
           continue;
         let unprefixed = processed;
@@ -1072,10 +1087,10 @@ class UnoGeneratorInternal {
           const prefixes = toArray(meta.prefix);
           if (shortcutPrefix) {
             const shortcutPrefixes = toArray(shortcutPrefix);
-            if (!prefixes.some((i2) => shortcutPrefixes.includes(i2)))
+            if (!prefixes.some((i) => shortcutPrefixes.includes(i)))
               continue;
           } else {
-            const prefix = prefixes.find((i2) => processed.startsWith(i2));
+            const prefix = prefixes.find((i) => processed.startsWith(i));
             if (prefix == null)
               continue;
             unprefixed = processed.slice(prefix.length);
@@ -1087,8 +1102,9 @@ class UnoGeneratorInternal {
         let result = await handler(match, context);
         if (!result)
           continue;
+        context.generator.activatedRules.add(rule);
         if (this.config.details)
-          context.rules.push([matcher, handler, meta]);
+          context.rules.push(rule);
         if (typeof result !== "string") {
           if (Symbol.asyncIterator in result) {
             const entries2 = [];
@@ -1101,12 +1117,14 @@ class UnoGeneratorInternal {
             result = Array.from(result).filter(notNull);
           }
         }
-        const entries = normalizeCSSValues(result).filter((i2) => i2.length);
+        const entries = normalizeCSSValues(result).filter((i) => i.length);
         if (entries.length) {
+          const index = this.config.rules.indexOf(rule);
           return entries.map((css) => {
             if (isString(css))
-              return [i, css, meta];
+              return [index, css, meta];
             let variants = variantHandlers;
+            let entryMeta = meta;
             for (const entry of css) {
               if (entry[0] === symbols.variants) {
                 variants = [
@@ -1128,9 +1146,14 @@ class UnoGeneratorInternal {
                   { layer: entry[1] },
                   ...variants
                 ];
+              } else if (entry[0] === symbols.sort) {
+                entryMeta = {
+                  ...entryMeta,
+                  sort: entry[1]
+                };
               }
             }
-            return [i, raw, css, meta, variants];
+            return [index, raw, css, entryMeta, variants];
           });
         }
       }

package/package.json

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