@unocss/core 0.48.0 → 0.48.2

package/dist/index.cjs

@@ -219,7 +219,7 @@ function withLayer(layer, rules) {
   return rules;
 }
 
-const regexClassGroup = /((?:[!@\w+:_/-]|\[&?>?:?.*\])+?)([:-])\(((?:[~!\w\s:/\\,%#.$-]|\[.*?\])+?)\)(?!\s*?=>)/gm;
+const regexClassGroup = /((?:[!@\w+:_/-]|\[&?>?:?.*\])+?)([:-])\(((?:[~!\w\s:/\\,%#.$?-]|\[.*?\])+?)\)(?!\s*?=>)/gm;
 function expandVariantGroup(str, separators = ["-", ":"], depth = 5) {
   regexClassGroup.lastIndex = 0;
   let hasChanged = false;
@@ -358,9 +358,9 @@ function resolvePreset(preset) {
         i[2] = {};
       const meta = i[2];
       if (meta.prefix == null && preset.prefix)
-        meta.prefix = preset.prefix;
+        meta.prefix = toArray(preset.prefix);
       if (meta.layer == null && preset.layer)
-        meta.prefix = preset.layer;
+        meta.layer = preset.layer;
     };
     shortcuts?.forEach(apply);
     preset.rules?.forEach(apply);
@@ -391,8 +391,10 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   const rulesSize = rules.length;
   const rulesDynamic = rules.map((rule, i) => {
     if (isStaticRule(rule)) {
-      const prefix = rule[2]?.prefix || "";
-      rulesStaticMap[prefix + rule[0]] = [i, rule[1], rule[2], 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];
@@ -431,7 +433,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.48.0";
+const version = "0.48.2";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -719,7 +721,7 @@ class UnoGenerator {
       return `${parent}{${cssBody}}`;
     return cssBody;
   }
-  async parseUtil(input, context, internal = false, shortcutPrefix = void 0) {
+  async parseUtil(input, context, internal = false, shortcutPrefix) {
     const [raw, processed, variantHandlers] = isString(input) ? this.matchVariants(input) : input;
     if (this.config.details)
       context.rules = context.rules ?? [];
@@ -744,13 +746,16 @@ class UnoGenerator {
         continue;
       let unprefixed = processed;
       if (meta?.prefix) {
+        const prefixes = toArray(meta.prefix);
         if (shortcutPrefix) {
-          if (shortcutPrefix !== meta.prefix)
+          const shortcutPrefixes = toArray(shortcutPrefix);
+          if (!prefixes.some((i2) => shortcutPrefixes.includes(i2)))
             continue;
         } else {
-          if (!processed.startsWith(meta.prefix))
+          const prefix = prefixes.find((i2) => processed.startsWith(i2));
+          if (prefix == null)
             continue;
-          unprefixed = processed.slice(meta.prefix.length);
+          unprefixed = processed.slice(prefix.length);
         }
       }
       const match = unprefixed.match(matcher);
@@ -801,9 +806,11 @@ class UnoGenerator {
     for (const s of this.config.shortcuts) {
       let unprefixed = input;
       if (s[2]?.prefix) {
-        if (!input.startsWith(s[2].prefix))
+        const prefixes = toArray(s[2].prefix);
+        const prefix = prefixes.find((i) => input.startsWith(i));
+        if (prefix == null)
           continue;
-        unprefixed = input.slice(s[2].prefix.length);
+        unprefixed = input.slice(prefix.length);
       }
       if (isStaticShortcut(s)) {
         if (s[0] === unprefixed) {

package/dist/index.d.ts

@@ -71,7 +71,7 @@ declare class UnoGenerator<Theme extends {} = {}> {
     matchVariants(raw: string, current?: string): VariantMatchedResult<Theme>;
     private applyVariants;
     constructCustomCSS(context: Readonly<RuleContext<Theme>>, body: CSSObject | CSSEntries, overrideSelector?: string): string;
-    parseUtil(input: string | VariantMatchedResult<Theme>, context: RuleContext<Theme>, internal?: boolean, shortcutPrefix?: string | undefined): Promise<(ParsedUtil | RawUtil)[] | undefined>;
+    parseUtil(input: string | VariantMatchedResult<Theme>, context: RuleContext<Theme>, internal?: boolean, shortcutPrefix?: string | string[] | undefined): Promise<(ParsedUtil | RawUtil)[] | undefined>;
     stringifyUtil(parsed?: ParsedUtil | RawUtil, context?: RuleContext<Theme>): StringifiedUtil<Theme> | undefined;
     expandShortcut(input: string, context: RuleContext<Theme>, depth?: number): [ShortcutValue[], RuleMeta | undefined] | undefined;
     stringifyShortcuts(parent: VariantMatchedResult<Theme>, context: RuleContext<Theme>, expanded: ShortcutValue[], meta?: RuleMeta): Promise<StringifiedUtil<Theme>[] | undefined>;
@@ -296,7 +296,7 @@ interface RuleMeta {
     /**
      * Matching prefix before this util
      */
-    prefix?: string;
+    prefix?: string | string[];
     /**
      * Internal rules will only be matched for shortcuts but not the user code.
      * @default false
@@ -561,7 +561,7 @@ interface Preset<Theme extends {} = {}> extends ConfigBase<Theme> {
     /**
      * Apply prefix to all utilities and shortcuts
      */
-    prefix?: string;
+    prefix?: string | string[];
     /**
      * Apply layer to all utilities and shortcuts
      */

package/dist/index.mjs

@@ -215,7 +215,7 @@ function withLayer(layer, rules) {
   return rules;
 }
 
-const regexClassGroup = /((?:[!@\w+:_/-]|\[&?>?:?.*\])+?)([:-])\(((?:[~!\w\s:/\\,%#.$-]|\[.*?\])+?)\)(?!\s*?=>)/gm;
+const regexClassGroup = /((?:[!@\w+:_/-]|\[&?>?:?.*\])+?)([:-])\(((?:[~!\w\s:/\\,%#.$?-]|\[.*?\])+?)\)(?!\s*?=>)/gm;
 function expandVariantGroup(str, separators = ["-", ":"], depth = 5) {
   regexClassGroup.lastIndex = 0;
   let hasChanged = false;
@@ -354,9 +354,9 @@ function resolvePreset(preset) {
         i[2] = {};
       const meta = i[2];
       if (meta.prefix == null && preset.prefix)
-        meta.prefix = preset.prefix;
+        meta.prefix = toArray(preset.prefix);
       if (meta.layer == null && preset.layer)
-        meta.prefix = preset.layer;
+        meta.layer = preset.layer;
     };
     shortcuts?.forEach(apply);
     preset.rules?.forEach(apply);
@@ -387,8 +387,10 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   const rulesSize = rules.length;
   const rulesDynamic = rules.map((rule, i) => {
     if (isStaticRule(rule)) {
-      const prefix = rule[2]?.prefix || "";
-      rulesStaticMap[prefix + rule[0]] = [i, rule[1], rule[2], 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];
@@ -427,7 +429,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.48.0";
+const version = "0.48.2";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -715,7 +717,7 @@ class UnoGenerator {
       return `${parent}{${cssBody}}`;
     return cssBody;
   }
-  async parseUtil(input, context, internal = false, shortcutPrefix = void 0) {
+  async parseUtil(input, context, internal = false, shortcutPrefix) {
     const [raw, processed, variantHandlers] = isString(input) ? this.matchVariants(input) : input;
     if (this.config.details)
       context.rules = context.rules ?? [];
@@ -740,13 +742,16 @@ class UnoGenerator {
         continue;
       let unprefixed = processed;
       if (meta?.prefix) {
+        const prefixes = toArray(meta.prefix);
         if (shortcutPrefix) {
-          if (shortcutPrefix !== meta.prefix)
+          const shortcutPrefixes = toArray(shortcutPrefix);
+          if (!prefixes.some((i2) => shortcutPrefixes.includes(i2)))
             continue;
         } else {
-          if (!processed.startsWith(meta.prefix))
+          const prefix = prefixes.find((i2) => processed.startsWith(i2));
+          if (prefix == null)
             continue;
-          unprefixed = processed.slice(meta.prefix.length);
+          unprefixed = processed.slice(prefix.length);
         }
       }
       const match = unprefixed.match(matcher);
@@ -797,9 +802,11 @@ class UnoGenerator {
     for (const s of this.config.shortcuts) {
       let unprefixed = input;
       if (s[2]?.prefix) {
-        if (!input.startsWith(s[2].prefix))
+        const prefixes = toArray(s[2].prefix);
+        const prefix = prefixes.find((i) => input.startsWith(i));
+        if (prefix == null)
           continue;
-        unprefixed = input.slice(s[2].prefix.length);
+        unprefixed = input.slice(prefix.length);
       }
       if (isStaticShortcut(s)) {
         if (s[0] === unprefixed) {

package/package.json

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