@unocss/core 0.20.0 → 0.21.0

package/dist/index.cjs

@@ -249,7 +249,6 @@ function createValueHandler(handlers) {
       if (res != null)
         return res;
     }
-    return void 0;
   };
   function addProcessor(that, name) {
     if (!that.__options) {
@@ -337,7 +336,6 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     ...sortedPresets.map((p) => p.theme || {}),
     config.theme || {}
   ].reduce((a, p) => mergeDeep(a, p), {});
-  const options = Object.assign({}, ...config.presets?.map((p) => Array.isArray(p) ? p : [p]).flat(1).map((p) => p.options ?? {}) || []);
   return {
     mergeSelectors: true,
     warn: true,
@@ -358,12 +356,11 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     preflights: mergePresets("preflights"),
     variants: mergePresets("variants").map(normalizeVariant),
     shortcuts: resolveShortcuts(mergePresets("shortcuts")),
-    extractors,
-    options
+    extractors
   };
 }
 
-const version = "0.20.0";
+const version = "0.21.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -392,8 +389,7 @@ class UnoGenerator {
         return code;
       },
       code,
-      id,
-      options: this.config.options
+      id
     };
     for (const extractor of this.config.extractors) {
       const result = await extractor.extract(context);
@@ -454,8 +450,7 @@ class UnoGenerator {
         theme: this.config.theme,
         generator: this,
         variantHandlers: applied[2],
-        constructCSS: (...args) => this.constructCustomCSS(context, ...args),
-        options: this.config.options
+        constructCSS: (...args) => this.constructCustomCSS(context, ...args)
       };
       const expanded = this.expandShortcut(applied[1], context);
       if (expanded) {
@@ -480,13 +475,7 @@ class UnoGenerator {
     const getLayer = (layer) => {
       if (layerCache[layer])
         return layerCache[layer];
-      let css = Array.from(sheet).sort((a, b) => {
-        const parentOrderA = this.parentOrders.get(a[0]);
-        const parentOrderB = this.parentOrders.get(b[0]);
-        if (parentOrderA !== void 0 && parentOrderB !== void 0)
-          return parentOrderA - parentOrderB;
-        return a[0]?.localeCompare(b[0] || "");
-      }).map(([parent, items]) => {
+      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[1]?.localeCompare(b[1] || "") || 0).map((a) => [a[1] ? applyScope(a[1], scope) : a[1], a[2]]);
         if (!sorted.length)
@@ -496,7 +485,7 @@ class UnoGenerator {
             for (let i = idx + 1; i < size; i++) {
               const current = sorted[i];
               if (current && current[0] && current[1] === body) {
-                current[0] = `${current[0]},${selector}`;
+                current[0] = `${current[0]},${nl}${selector}`;
                 return null;
               }
             }
@@ -534,8 +523,7 @@ class UnoGenerator {
     const context = {
       rawSelector: raw,
       theme: this.config.theme,
-      generator: this,
-      options: this.config.options
+      generator: this
     };
     while (true) {
       applied = false;
@@ -565,11 +553,12 @@ class UnoGenerator {
     return [raw, processed, handlers];
   }
   applyVariants(parsed, variantHandlers = parsed[4], raw = parsed[1]) {
-    const entries = variantHandlers.reduce((p, v) => v.body?.(p) || p, parsed[2]);
+    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 obj = {
-      selector: variantHandlers.reduce((p, v) => v.selector?.(p, entries) || p, toEscapedSelector(raw)),
+      selector: handlers.reduce((p, v) => v.selector?.(p, entries) || p, toEscapedSelector(raw)),
       entries,
-      parent: variantHandlers.reduce((p, v) => Array.isArray(v.parent) ? v.parent[0] : v.parent || p, void 0)
+      parent: handlers.reduce((p, v) => Array.isArray(v.parent) ? v.parent[0] : v.parent || p, void 0)
     };
     for (const p of this.config.postprocess)
       p(obj);

package/dist/index.d.ts

@@ -51,13 +51,17 @@ declare type ParsedColorValue = {
      */
     name: string;
     /**
-     * Color scale. Preferrably 000 - 999
+     * Color scale, preferrably 000 - 999.
      */
     no: string;
     /**
      * {@link RGBAColorValue}
      */
     rgba?: RGBAColorValue;
+    /**
+     * Parsed rgba's alpha value.
+     */
+    alpha?: number | string;
 };
 declare type PresetOptions = Record<string, any>;
 interface RuleContext<Theme extends {} = {}> {
@@ -87,10 +91,6 @@ interface RuleContext<Theme extends {} = {}> {
      * Variants and selector escaping will be handled automatically.
      */
     constructCSS: (body: CSSEntries | CSSObject, overrideSelector?: string) => string;
-    /**
-     * User-provided options from preset.
-     */
-    readonly options: PresetOptions;
 }
 interface VariantContext<Theme extends {} = {}> {
     /**
@@ -105,16 +105,11 @@ interface VariantContext<Theme extends {} = {}> {
      * The theme object
      */
     theme: Theme;
-    /**
-     * User-provided options from preset.
-     */
-    readonly options: PresetOptions;
 }
 interface ExtractorContext {
     readonly original: string;
     code: string;
     id?: string;
-    readonly options: PresetOptions;
 }
 interface Extractor {
     name: string;
@@ -167,6 +162,10 @@ interface VariantHandler {
      * Provide a parent selector(e.g. media query) to the output css.
      */
     parent?: string | [string, number] | undefined;
+    /**
+     * Variant ordering.
+     */
+    order?: number;
 }
 declare type VariantFunction<Theme extends {} = {}> = (matcher: string, context: Readonly<VariantContext<Theme>>) => string | VariantHandler | undefined;
 declare type VariantObject<Theme extends {} = {}> = {
@@ -317,7 +316,6 @@ interface ResolvedConfig extends Omit<RequiredByKey<UserConfig, 'mergeSelectors'
     rulesSize: number;
     rulesDynamic: (DynamicRule | undefined)[];
     rulesStaticMap: Record<string, [number, CSSObject | CSSEntries, RuleMeta | undefined] | undefined>;
-    options: PresetOptions;
 }
 interface GenerateResult {
     css: string;

package/dist/index.mjs

@@ -245,7 +245,6 @@ function createValueHandler(handlers) {
       if (res != null)
         return res;
     }
-    return void 0;
   };
   function addProcessor(that, name) {
     if (!that.__options) {
@@ -333,7 +332,6 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     ...sortedPresets.map((p) => p.theme || {}),
     config.theme || {}
   ].reduce((a, p) => mergeDeep(a, p), {});
-  const options = Object.assign({}, ...config.presets?.map((p) => Array.isArray(p) ? p : [p]).flat(1).map((p) => p.options ?? {}) || []);
   return {
     mergeSelectors: true,
     warn: true,
@@ -354,12 +352,11 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     preflights: mergePresets("preflights"),
     variants: mergePresets("variants").map(normalizeVariant),
     shortcuts: resolveShortcuts(mergePresets("shortcuts")),
-    extractors,
-    options
+    extractors
   };
 }
 
-const version = "0.20.0";
+const version = "0.21.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -388,8 +385,7 @@ class UnoGenerator {
         return code;
       },
       code,
-      id,
-      options: this.config.options
+      id
     };
     for (const extractor of this.config.extractors) {
       const result = await extractor.extract(context);
@@ -450,8 +446,7 @@ class UnoGenerator {
         theme: this.config.theme,
         generator: this,
         variantHandlers: applied[2],
-        constructCSS: (...args) => this.constructCustomCSS(context, ...args),
-        options: this.config.options
+        constructCSS: (...args) => this.constructCustomCSS(context, ...args)
       };
       const expanded = this.expandShortcut(applied[1], context);
       if (expanded) {
@@ -476,13 +471,7 @@ class UnoGenerator {
     const getLayer = (layer) => {
       if (layerCache[layer])
         return layerCache[layer];
-      let css = Array.from(sheet).sort((a, b) => {
-        const parentOrderA = this.parentOrders.get(a[0]);
-        const parentOrderB = this.parentOrders.get(b[0]);
-        if (parentOrderA !== void 0 && parentOrderB !== void 0)
-          return parentOrderA - parentOrderB;
-        return a[0]?.localeCompare(b[0] || "");
-      }).map(([parent, items]) => {
+      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[1]?.localeCompare(b[1] || "") || 0).map((a) => [a[1] ? applyScope(a[1], scope) : a[1], a[2]]);
         if (!sorted.length)
@@ -492,7 +481,7 @@ class UnoGenerator {
             for (let i = idx + 1; i < size; i++) {
               const current = sorted[i];
               if (current && current[0] && current[1] === body) {
-                current[0] = `${current[0]},${selector}`;
+                current[0] = `${current[0]},${nl}${selector}`;
                 return null;
               }
             }
@@ -530,8 +519,7 @@ class UnoGenerator {
     const context = {
       rawSelector: raw,
       theme: this.config.theme,
-      generator: this,
-      options: this.config.options
+      generator: this
     };
     while (true) {
       applied = false;
@@ -561,11 +549,12 @@ class UnoGenerator {
     return [raw, processed, handlers];
   }
   applyVariants(parsed, variantHandlers = parsed[4], raw = parsed[1]) {
-    const entries = variantHandlers.reduce((p, v) => v.body?.(p) || p, parsed[2]);
+    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 obj = {
-      selector: variantHandlers.reduce((p, v) => v.selector?.(p, entries) || p, toEscapedSelector(raw)),
+      selector: handlers.reduce((p, v) => v.selector?.(p, entries) || p, toEscapedSelector(raw)),
       entries,
-      parent: variantHandlers.reduce((p, v) => Array.isArray(v.parent) ? v.parent[0] : v.parent || p, void 0)
+      parent: handlers.reduce((p, v) => Array.isArray(v.parent) ? v.parent[0] : v.parent || p, void 0)
     };
     for (const p of this.config.postprocess)
       p(obj);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "The instant on-demand Atomic CSS engine.",
   "keywords": [
     "unocss",