@unocss/core 0.46.0 → 0.46.2

package/dist/index.cjs

@@ -282,7 +282,7 @@ function createValueHandler(handlers) {
   return handler;
 }
 
-const splitCode = (code) => [...new Set(code.split(/\\?[\s'"`;={}]+/g))].filter(isValidSelector);
+const splitCode = (code) => [...new Set(code.split(/\\?[\s'"`;{}]+/g))].filter(isValidSelector);
 const extractorSplit = {
   name: "split",
   order: 0,
@@ -416,7 +416,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.46.0";
+const version = "0.46.2";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -704,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 ?? [];
@@ -729,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)
@@ -779,7 +784,12 @@ class UnoGenerator {
     let meta;
     let result;
     for (const s of this.config.shortcuts) {
-      const unprefixed = s[2]?.prefix ? input.slice(s[2].prefix.length) : input;
+      let unprefixed = input;
+      if (s[2]?.prefix) {
+        if (!input.startsWith(s[2].prefix))
+          continue;
+        unprefixed = input.slice(s[2].prefix.length);
+      }
       if (isStaticShortcut(s)) {
         if (s[0] === unprefixed) {
           meta = meta || s[2];
@@ -818,7 +828,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

@@ -278,7 +278,7 @@ function createValueHandler(handlers) {
   return handler;
 }
 
-const splitCode = (code) => [...new Set(code.split(/\\?[\s'"`;={}]+/g))].filter(isValidSelector);
+const splitCode = (code) => [...new Set(code.split(/\\?[\s'"`;{}]+/g))].filter(isValidSelector);
 const extractorSplit = {
   name: "split",
   order: 0,
@@ -412,7 +412,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.46.0";
+const version = "0.46.2";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -700,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 ?? [];
@@ -725,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)
@@ -775,7 +780,12 @@ class UnoGenerator {
     let meta;
     let result;
     for (const s of this.config.shortcuts) {
-      const unprefixed = s[2]?.prefix ? input.slice(s[2].prefix.length) : input;
+      let unprefixed = input;
+      if (s[2]?.prefix) {
+        if (!input.startsWith(s[2].prefix))
+          continue;
+        unprefixed = input.slice(s[2].prefix.length);
+      }
       if (isStaticShortcut(s)) {
         if (s[0] === unprefixed) {
           meta = meta || s[2];
@@ -814,7 +824,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.46.0",
+  "version": "0.46.2",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",