@unocss/core 0.49.2 → 0.49.4

package/dist/index.cjs

@@ -227,10 +227,11 @@ function makeRegexClassGroup(separators = ["-", ":"]) {
   regexCache[key].lastIndex = 0;
   return regexCache[key];
 }
-function expandVariantGroup(str, separators = ["-", ":"], depth = 5) {
+function parseVariantGroup(str, separators = ["-", ":"], depth = 5) {
   const regexClassGroup = makeRegexClassGroup(separators);
   let hasChanged = false;
   let content = str.toString();
+  const prefixes = /* @__PURE__ */ new Set();
   do {
     const before = content;
     content = content.replace(
@@ -238,16 +239,52 @@ function expandVariantGroup(str, separators = ["-", ":"], depth = 5) {
       (from, pre, sep, body) => {
         if (!separators.includes(sep))
           return from;
+        prefixes.add(pre + sep);
         return body.split(/\s/g).filter(Boolean).map((i) => i === "~" ? pre : i.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`)).join(" ");
       }
     );
     hasChanged = content !== before;
     depth -= 1;
   } while (hasChanged && depth);
+  return {
+    prefixes: Array.from(prefixes),
+    expanded: content,
+    hasChanged
+  };
+}
+function collapseVariantGroup(str, prefixes) {
+  const collection = /* @__PURE__ */ new Map();
+  const sortedPrefix = prefixes.sort((a, b) => b.length - a.length);
+  return str.split(/\s+/g).map((part) => {
+    const prefix = sortedPrefix.find((prefix2) => part.startsWith(prefix2));
+    if (!prefix)
+      return part;
+    const body = part.slice(prefix.length);
+    if (collection.has(prefix)) {
+      collection.get(prefix).push(body);
+      return null;
+    } else {
+      const items = [body];
+      collection.set(prefix, items);
+      return {
+        prefix,
+        items
+      };
+    }
+  }).filter(notNull).map((i) => {
+    if (typeof i === "string")
+      return i;
+    return `${i.prefix}(${i.items.join(" ")})`;
+  }).join(" ");
+}
+function expandVariantGroup(str, separators = ["-", ":"], depth = 5) {
+  const {
+    expanded
+  } = parseVariantGroup(str.toString(), separators, depth);
   if (typeof str === "string") {
-    return content;
+    return expanded;
   } else {
-    return str.length() ? str.overwrite(0, str.length(), content) : str;
+    return str.length() ? str.overwrite(0, str.length(), expanded) : str;
   }
 }
 
@@ -444,7 +481,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.49.2";
+const version = "0.49.4";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -940,6 +977,7 @@ exports.arbitraryPropertyRE = arbitraryPropertyRE;
 exports.attributifyRE = attributifyRE;
 exports.clearIdenticalEntries = clearIdenticalEntries;
 exports.clone = clone;
+exports.collapseVariantGroup = collapseVariantGroup;
 exports.createGenerator = createGenerator;
 exports.createValueHandler = createValueHandler;
 exports.cssIdRE = cssIdRE;
@@ -966,6 +1004,7 @@ exports.normalizeCSSEntries = normalizeCSSEntries;
 exports.normalizeCSSValues = normalizeCSSValues;
 exports.normalizeVariant = normalizeVariant;
 exports.notNull = notNull;
+exports.parseVariantGroup = parseVariantGroup;
 exports.regexScopePlaceholder = regexScopePlaceholder;
 exports.toArray = toArray;
 exports.toEscapedSelector = toEscapedSelector;

package/dist/index.d.ts

@@ -132,6 +132,12 @@ declare class BetterMap<K, V> extends Map<K, V> {
 declare function withLayer<T extends {}>(layer: string, rules: Rule<T>[]): Rule<T>[];
 
 declare function makeRegexClassGroup(separators?: string[]): RegExp;
+declare function parseVariantGroup(str: string, separators?: string[], depth?: number): {
+    prefixes: string[];
+    expanded: string;
+    hasChanged: boolean;
+};
+declare function collapseVariantGroup(str: string, prefixes: string[]): string;
 declare function expandVariantGroup(str: string, separators?: string[], depth?: number): string;
 declare function expandVariantGroup(str: MagicString, separators?: string[], depth?: number): MagicString;
 
@@ -821,4 +827,4 @@ declare const extractorSplit: Extractor;
 
 declare const extractorSvelte: Extractor;
 
-export { ArgumentType, Arrayable, AutoCompleteExtractor, AutoCompleteExtractorContext, AutoCompleteExtractorResult, AutoCompleteFunction, AutoCompleteTemplate, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSColorValue, CSSEntries, CSSObject, CSSValue, CSSValues, CliEntryItem, CliOptions, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExtraContentOptions, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, PreparedRule, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, ShortcutValue, SourceCodeTransformer, SourceCodeTransformerEnforce, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject, arbitraryPropertyRE, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeDeep, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };
+export { ArgumentType, Arrayable, AutoCompleteExtractor, AutoCompleteExtractorContext, AutoCompleteExtractorResult, AutoCompleteFunction, AutoCompleteTemplate, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSColorValue, CSSEntries, CSSObject, CSSValue, CSSValues, CliEntryItem, CliOptions, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExtraContentOptions, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, PreparedRule, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, ShortcutValue, SourceCodeTransformer, SourceCodeTransformerEnforce, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject, arbitraryPropertyRE, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeDeep, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -223,10 +223,11 @@ function makeRegexClassGroup(separators = ["-", ":"]) {
   regexCache[key].lastIndex = 0;
   return regexCache[key];
 }
-function expandVariantGroup(str, separators = ["-", ":"], depth = 5) {
+function parseVariantGroup(str, separators = ["-", ":"], depth = 5) {
   const regexClassGroup = makeRegexClassGroup(separators);
   let hasChanged = false;
   let content = str.toString();
+  const prefixes = /* @__PURE__ */ new Set();
   do {
     const before = content;
     content = content.replace(
@@ -234,16 +235,52 @@ function expandVariantGroup(str, separators = ["-", ":"], depth = 5) {
       (from, pre, sep, body) => {
         if (!separators.includes(sep))
           return from;
+        prefixes.add(pre + sep);
         return body.split(/\s/g).filter(Boolean).map((i) => i === "~" ? pre : i.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`)).join(" ");
       }
     );
     hasChanged = content !== before;
     depth -= 1;
   } while (hasChanged && depth);
+  return {
+    prefixes: Array.from(prefixes),
+    expanded: content,
+    hasChanged
+  };
+}
+function collapseVariantGroup(str, prefixes) {
+  const collection = /* @__PURE__ */ new Map();
+  const sortedPrefix = prefixes.sort((a, b) => b.length - a.length);
+  return str.split(/\s+/g).map((part) => {
+    const prefix = sortedPrefix.find((prefix2) => part.startsWith(prefix2));
+    if (!prefix)
+      return part;
+    const body = part.slice(prefix.length);
+    if (collection.has(prefix)) {
+      collection.get(prefix).push(body);
+      return null;
+    } else {
+      const items = [body];
+      collection.set(prefix, items);
+      return {
+        prefix,
+        items
+      };
+    }
+  }).filter(notNull).map((i) => {
+    if (typeof i === "string")
+      return i;
+    return `${i.prefix}(${i.items.join(" ")})`;
+  }).join(" ");
+}
+function expandVariantGroup(str, separators = ["-", ":"], depth = 5) {
+  const {
+    expanded
+  } = parseVariantGroup(str.toString(), separators, depth);
   if (typeof str === "string") {
-    return content;
+    return expanded;
   } else {
-    return str.length() ? str.overwrite(0, str.length(), content) : str;
+    return str.length() ? str.overwrite(0, str.length(), expanded) : str;
   }
 }
 
@@ -440,7 +477,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.49.2";
+const version = "0.49.4";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -928,4 +965,4 @@ function defaultVariantHandler(input, next) {
   return next(input);
 }
 
-export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, TwoKeyMap, UnoGenerator, arbitraryPropertyRE, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeDeep, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };
+export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, TwoKeyMap, UnoGenerator, arbitraryPropertyRE, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeDeep, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/package.json

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