@unocss/core 0.45.30 → 0.46.1

package/dist/index.cjs

@@ -416,7 +416,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.45.30";
+const version = "0.46.1";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -535,7 +535,8 @@ class UnoGenerator {
           layerSet.add(layer);
       }
     });
-    const preflightPromise = (async () => {
+    await Promise.all(tokenPromises);
+    await (async () => {
       if (!preflights)
         return;
       const preflightContext = {
@@ -559,10 +560,6 @@ class UnoGenerator {
         ))
       );
     })();
-    await Promise.all([
-      ...tokenPromises,
-      preflightPromise
-    ]);
     const layers = this.config.sortLayers(
       Array.from(layerSet).sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b))
     );
@@ -656,7 +653,7 @@ class UnoGenerator {
     return [raw, processed, handlers, variants];
   }
   applyVariants(parsed, variantHandlers = parsed[4], raw = parsed[1]) {
-    const handler = [...variantHandlers].sort((a, b) => (a.order || 0) - (b.order || 0)).reverse().reduce(
+    const handler = variantHandlers.slice().sort((a, b) => (a.order || 0) - (b.order || 0)).reduceRight(
       (previous, v) => (input) => {
         const entries = v.body?.(input.entries) || input.entries;
         const parents = Array.isArray(v.parent) ? v.parent : [v.parent, void 0];
@@ -707,7 +704,7 @@ class UnoGenerator {
       return `${parent}{${cssBody}}`;
     return cssBody;
   }
-  async parseUtil(input, context, internal = false) {
+  async parseUtil(input, context, internal = false, shortcutPrefix = void 0) {
     const [raw, processed, variantHandlers] = isString(input) ? this.matchVariants(input) : input;
     if (this.config.details)
       context.rules = context.rules ?? [];
@@ -732,9 +729,14 @@ class UnoGenerator {
         continue;
       let unprefixed = processed;
       if (meta?.prefix) {
-        if (!processed.startsWith(meta.prefix))
-          continue;
-        unprefixed = processed.slice(meta.prefix.length);
+        if (shortcutPrefix) {
+          if (shortcutPrefix !== meta.prefix)
+            continue;
+        } else {
+          if (!processed.startsWith(meta.prefix))
+            continue;
+          unprefixed = processed.slice(meta.prefix.length);
+        }
       }
       const match = unprefixed.match(matcher);
       if (!match)
@@ -821,7 +823,7 @@ class UnoGenerator {
   async stringifyShortcuts(parent, context, expanded, meta = { layer: this.config.shortcutsLayer }) {
     const selectorMap = new TwoKeyMap();
     const parsed = (await Promise.all(uniq(expanded).map(async (i) => {
-      const result = isString(i) ? await this.parseUtil(i, context, true) : [[Infinity, "{inline}", normalizeCSSEntries(i), void 0, []]];
+      const result = isString(i) ? await this.parseUtil(i, context, true, meta.prefix) : [[Infinity, "{inline}", normalizeCSSEntries(i), void 0, []]];
       if (!result)
         warnOnce(`unmatched utility "${i}" in shortcut "${parent[1]}"`);
       return result || [];

package/dist/index.d.ts

@@ -71,7 +71,7 @@ declare class UnoGenerator {
     matchVariants(raw: string, current?: string): VariantMatchedResult;
     private applyVariants;
     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, shortcutPrefix?: string | undefined): Promise<(ParsedUtil | RawUtil)[] | undefined>;
     stringifyUtil(parsed?: ParsedUtil | RawUtil, context?: RuleContext): StringifiedUtil | undefined;
     expandShortcut(input: string, context: RuleContext, depth?: number): [ShortcutValue[], RuleMeta | undefined] | undefined;
     stringifyShortcuts(parent: VariantMatchedResult, context: RuleContext, expanded: ShortcutValue[], meta?: RuleMeta): Promise<StringifiedUtil[] | undefined>;

package/dist/index.mjs

@@ -412,7 +412,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.45.30";
+const version = "0.46.1";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -531,7 +531,8 @@ class UnoGenerator {
           layerSet.add(layer);
       }
     });
-    const preflightPromise = (async () => {
+    await Promise.all(tokenPromises);
+    await (async () => {
       if (!preflights)
         return;
       const preflightContext = {
@@ -555,10 +556,6 @@ class UnoGenerator {
         ))
       );
     })();
-    await Promise.all([
-      ...tokenPromises,
-      preflightPromise
-    ]);
     const layers = this.config.sortLayers(
       Array.from(layerSet).sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b))
     );
@@ -652,7 +649,7 @@ class UnoGenerator {
     return [raw, processed, handlers, variants];
   }
   applyVariants(parsed, variantHandlers = parsed[4], raw = parsed[1]) {
-    const handler = [...variantHandlers].sort((a, b) => (a.order || 0) - (b.order || 0)).reverse().reduce(
+    const handler = variantHandlers.slice().sort((a, b) => (a.order || 0) - (b.order || 0)).reduceRight(
       (previous, v) => (input) => {
         const entries = v.body?.(input.entries) || input.entries;
         const parents = Array.isArray(v.parent) ? v.parent : [v.parent, void 0];
@@ -703,7 +700,7 @@ class UnoGenerator {
       return `${parent}{${cssBody}}`;
     return cssBody;
   }
-  async parseUtil(input, context, internal = false) {
+  async parseUtil(input, context, internal = false, shortcutPrefix = void 0) {
     const [raw, processed, variantHandlers] = isString(input) ? this.matchVariants(input) : input;
     if (this.config.details)
       context.rules = context.rules ?? [];
@@ -728,9 +725,14 @@ class UnoGenerator {
         continue;
       let unprefixed = processed;
       if (meta?.prefix) {
-        if (!processed.startsWith(meta.prefix))
-          continue;
-        unprefixed = processed.slice(meta.prefix.length);
+        if (shortcutPrefix) {
+          if (shortcutPrefix !== meta.prefix)
+            continue;
+        } else {
+          if (!processed.startsWith(meta.prefix))
+            continue;
+          unprefixed = processed.slice(meta.prefix.length);
+        }
       }
       const match = unprefixed.match(matcher);
       if (!match)
@@ -817,7 +819,7 @@ class UnoGenerator {
   async stringifyShortcuts(parent, context, expanded, meta = { layer: this.config.shortcutsLayer }) {
     const selectorMap = new TwoKeyMap();
     const parsed = (await Promise.all(uniq(expanded).map(async (i) => {
-      const result = isString(i) ? await this.parseUtil(i, context, true) : [[Infinity, "{inline}", normalizeCSSEntries(i), void 0, []]];
+      const result = isString(i) ? await this.parseUtil(i, context, true, meta.prefix) : [[Infinity, "{inline}", normalizeCSSEntries(i), void 0, []]];
       if (!result)
         warnOnce(`unmatched utility "${i}" in shortcut "${parent[1]}"`);
       return result || [];

package/package.json

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