@unocss/core 0.23.0 → 0.24.3

package/README.md

@@ -1,6 +1,6 @@
 # @unocss/core
 
-The core engine of [UnoCSS](https://github.com/antfu/unocss) without any presets. It can be used as the engine of your own atomic CSS framework.
+The core engine of [UnoCSS](https://github.com/unocss/unocss) without any presets. It can be used as the engine of your own atomic CSS framework.
 
 ## Usage
 

package/dist/index.cjs

@@ -366,7 +366,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.23.0";
+const version = "0.24.3";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -497,7 +497,7 @@ 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[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] || "") || 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]]);
         if (!sorted.length)
           return void 0;
         const rules = sorted.reverse().map(([selector, body, noMerge], idx) => {
@@ -576,7 +576,8 @@ class UnoGenerator {
       selector: handlers.reduce((p, v) => v.selector?.(p, entries) || p, toEscapedSelector(raw)),
       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)
+      layer: handlers.reduce((p, v) => v.layer || p, void 0),
+      sort: handlers.reduce((p, v) => v.sort || p, void 0)
     };
     for (const p of this.config.postprocess)
       p(obj);
@@ -624,12 +625,17 @@ class UnoGenerator {
       return;
     if (isRawUtil(parsed))
       return [parsed[0], void 0, parsed[1], void 0, parsed[2]];
-    const { selector, entries, parent, layer: variantLayer } = this.applyVariants(parsed);
+    const { selector, entries, parent, layer: variantLayer, sort: variantSort } = this.applyVariants(parsed);
     const body = entriesToCss(entries);
     if (!body)
       return;
-    const { layer: metaLayer, ...meta } = parsed[3] ?? {};
-    return [parsed[0], selector, body, parent, { ...meta, layer: variantLayer ?? metaLayer }];
+    const { layer: metaLayer, sort: metaSort, ...meta } = parsed[3] ?? {};
+    const ruleMeta = {
+      ...meta,
+      layer: variantLayer ?? metaLayer,
+      sort: variantSort ?? metaSort
+    };
+    return [parsed[0], selector, body, parent, ruleMeta];
   }
   expandShortcut(processed, context, depth = 3) {
     if (depth === 0)

package/dist/index.d.ts

@@ -62,13 +62,13 @@ interface ParsedColorValue {
      */
     no: string;
     /**
-     * {@link RGBAColorValue}
+     * {@link CSSColorValue}
      */
-    rgba?: RGBAColorValue;
+    cssColor: CSSColorValue | undefined;
     /**
-     * Parsed rgba's alpha value.
+     * Parsed alpha value from opacity
      */
-    alpha?: number | string;
+    alpha: string | number | undefined;
 }
 declare type PresetOptions = Record<string, any>;
 interface RuleContext<Theme extends {} = {}> {
@@ -134,6 +134,10 @@ interface RuleMeta {
      * @default false
      */
     noMerge?: boolean;
+    /**
+     * Fine tune sort
+     */
+    sort?: number;
     /**
      * Internal rules will only be matched for shortcuts but not the user code.
      * @default false
@@ -175,9 +179,13 @@ interface VariantHandler {
      */
     parent?: string | [string, number] | undefined;
     /**
-     * Variant ordering.
+     * Order in which the variant is applied to selector.
      */
     order?: number;
+    /**
+     * Order in which the variant is sorted within single rule.
+     */
+    sort?: number;
     /**
      * Override layer to the output css.
      */
@@ -374,6 +382,7 @@ interface UtilObject {
     entries: CSSEntries;
     parent: string | undefined;
     layer: string | undefined;
+    sort: number | undefined;
 }
 interface GenerateOptions {
     /**

package/dist/index.mjs

@@ -362,7 +362,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.23.0";
+const version = "0.24.3";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -493,7 +493,7 @@ 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[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] || "") || 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]]);
         if (!sorted.length)
           return void 0;
         const rules = sorted.reverse().map(([selector, body, noMerge], idx) => {
@@ -572,7 +572,8 @@ class UnoGenerator {
       selector: handlers.reduce((p, v) => v.selector?.(p, entries) || p, toEscapedSelector(raw)),
       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)
+      layer: handlers.reduce((p, v) => v.layer || p, void 0),
+      sort: handlers.reduce((p, v) => v.sort || p, void 0)
     };
     for (const p of this.config.postprocess)
       p(obj);
@@ -620,12 +621,17 @@ class UnoGenerator {
       return;
     if (isRawUtil(parsed))
       return [parsed[0], void 0, parsed[1], void 0, parsed[2]];
-    const { selector, entries, parent, layer: variantLayer } = this.applyVariants(parsed);
+    const { selector, entries, parent, layer: variantLayer, sort: variantSort } = this.applyVariants(parsed);
     const body = entriesToCss(entries);
     if (!body)
       return;
-    const { layer: metaLayer, ...meta } = parsed[3] ?? {};
-    return [parsed[0], selector, body, parent, { ...meta, layer: variantLayer ?? metaLayer }];
+    const { layer: metaLayer, sort: metaSort, ...meta } = parsed[3] ?? {};
+    const ruleMeta = {
+      ...meta,
+      layer: variantLayer ?? metaLayer,
+      sort: variantSort ?? metaSort
+    };
+    return [parsed[0], selector, body, parent, ruleMeta];
   }
   expandShortcut(processed, context, depth = 3) {
     if (depth === 0)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.23.0",
+  "version": "0.24.3",
   "description": "The instant on-demand Atomic CSS engine.",
   "keywords": [
     "unocss",
@@ -10,13 +10,13 @@
     "tailwind",
     "windicss"
   ],
-  "homepage": "https://github.com/antfu/unocss/tree/main/packages/core#readme",
+  "homepage": "https://github.com/unocss/unocss/tree/main/packages/core#readme",
   "bugs": {
-    "url": "https://github.com/antfu/unocss/issues"
+    "url": "https://github.com/unocss/unocss/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/antfu/unocss.git",
+    "url": "git+https://github.com/unocss/unocss.git",
     "directory": "packages/core"
   },
   "funding": "https://github.com/sponsors/antfu",