@unocss/core 0.12.6 → 0.12.10

package/dist/index.d.ts

@@ -194,7 +194,7 @@ interface GeneratorOptions {
      *
      * @default true
      */
-    warnBlocked?: boolean;
+    warn?: boolean;
 }
 interface UserOnlyOptions<Theme extends {} = {}> {
     /**
@@ -332,6 +332,11 @@ declare class BetterMap<K, V> extends Map<K, V> {
 
 declare function withLayer<T>(layer: string, rules: Rule<T>[]): Rule<T>[];
 
+declare const regexClassGroup: RegExp;
+declare function expandVariantGroup(str: string): string;
+
+declare function warnOnce(msg: string): void;
+
 declare const extractorSplit: Extractor;
 
-export { ArgumentType, Awaitable, BetterMap, BlocklistRule, CSSEntries, CSSObject, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedUtil, PartialByKeys, Preflight, Preset, RawUtil, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, TwoKeyMap, UnoGenerator, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, Variant, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, createGenerator, e, entriesToCss, escapeRegExp, escapeSelector, extractorSplit, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeVariant, toArray, uniq, validateFilterRE, withLayer };
+export { ArgumentType, Awaitable, BetterMap, BlocklistRule, CSSEntries, CSSObject, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedUtil, PartialByKeys, Preflight, Preset, RawUtil, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, TwoKeyMap, UnoGenerator, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, Variant, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, createGenerator, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeVariant, regexClassGroup, toArray, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.js

@@ -17,6 +17,7 @@ __export(exports, {
   entriesToCss: () => entriesToCss,
   escapeRegExp: () => escapeRegExp,
   escapeSelector: () => escapeSelector,
+  expandVariantGroup: () => expandVariantGroup,
   extractorSplit: () => extractorSplit,
   hasScopePlaceholder: () => hasScopePlaceholder,
   hex2rgba: () => hex2rgba,
@@ -29,9 +30,11 @@ __export(exports, {
   mergeDeep: () => mergeDeep,
   mergeSet: () => mergeSet,
   normalizeVariant: () => normalizeVariant,
+  regexClassGroup: () => regexClassGroup,
   toArray: () => toArray,
   uniq: () => uniq,
   validateFilterRE: () => validateFilterRE,
+  warnOnce: () => warnOnce,
   withLayer: () => withLayer
 });
 
@@ -229,6 +232,34 @@ function withLayer(layer, rules) {
   return rules;
 }
 
+// src/utils/variantGroup.ts
+var regexClassGroup = /([!\w+:_/-]+?)([:-])\(((?:[!\w\s:/\\,%#.$-]|\[.*?\])*?)\)/gm;
+function expandVariantGroup(str) {
+  const replaces = [];
+  let match;
+  while (match = regexClassGroup.exec(str)) {
+    const start = match.index;
+    const end = start + match[0].length;
+    const [, pre, sep, body] = match;
+    const replacement = body.split(/\s/g).map((i) => i.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`)).join(" ");
+    replaces.unshift([start, end, replacement]);
+  }
+  let result = str;
+  replaces.forEach(([start, end, replacement]) => {
+    result = result.slice(0, start) + replacement + result.slice(end);
+  });
+  return result;
+}
+
+// src/utils/warn.ts
+var warned = new Set();
+function warnOnce(msg) {
+  if (warned.has(msg))
+    return;
+  console.warn("[unocss]", msg);
+  warned.add(msg);
+}
+
 // src/extractors/split.ts
 var extractorSplit = {
   name: "split",
@@ -284,7 +315,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   ].reduce((a, p) => mergeDeep(a, p), {});
   return {
     mergeSelectors: true,
-    warnBlocked: true,
+    warn: true,
     blocklist: [],
     safelist: [],
     presets: [],
@@ -305,7 +336,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
 }
 
 // package.json
-var version = "0.12.6";
+var version = "0.12.10";
 
 // src/generator/index.ts
 var UnoGenerator = class {
@@ -587,10 +618,10 @@ var UnoGenerator = class {
         }
       }
     }
+    if (typeof result === "string")
+      result = expandVariantGroup(result).split(/\s+/g);
     if (!result)
       return;
-    if (typeof result === "string")
-      result = result.split(/ /g);
     return [
       result.flatMap((r) => {
         var _a;
@@ -601,7 +632,12 @@ var UnoGenerator = class {
   }
   async stringifyShortcuts(parent, context, expanded, meta = { layer: this.config.shortcutsLayer }) {
     const selectorMap = new TwoKeyMap();
-    const parsed = (await Promise.all(uniq(expanded).map((i) => this.parseUtil(i, context, true)))).filter(Boolean).sort((a, b) => a[0] - b[0]);
+    const parsed = (await Promise.all(uniq(expanded).map(async (i) => {
+      const result = await this.parseUtil(i, context, true);
+      if (!result)
+        warnOnce(`unmatched utility "${i}" in shortcut "${parent[1]}"`);
+      return result;
+    }))).filter(Boolean).sort((a, b) => a[0] - b[0]);
     const [raw, , parentVariants] = parent;
     for (const item of parsed) {
       if (isRawUtil(item))
@@ -654,6 +690,7 @@ function normalizeEntries(obj) {
   entriesToCss,
   escapeRegExp,
   escapeSelector,
+  expandVariantGroup,
   extractorSplit,
   hasScopePlaceholder,
   hex2rgba,
@@ -666,8 +703,10 @@ function normalizeEntries(obj) {
   mergeDeep,
   mergeSet,
   normalizeVariant,
+  regexClassGroup,
   toArray,
   uniq,
   validateFilterRE,
+  warnOnce,
   withLayer
 });

package/dist/index.mjs

@@ -192,6 +192,34 @@ function withLayer(layer, rules) {
   return rules;
 }
 
+// src/utils/variantGroup.ts
+var regexClassGroup = /([!\w+:_/-]+?)([:-])\(((?:[!\w\s:/\\,%#.$-]|\[.*?\])*?)\)/gm;
+function expandVariantGroup(str) {
+  const replaces = [];
+  let match;
+  while (match = regexClassGroup.exec(str)) {
+    const start = match.index;
+    const end = start + match[0].length;
+    const [, pre, sep, body] = match;
+    const replacement = body.split(/\s/g).map((i) => i.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`)).join(" ");
+    replaces.unshift([start, end, replacement]);
+  }
+  let result = str;
+  replaces.forEach(([start, end, replacement]) => {
+    result = result.slice(0, start) + replacement + result.slice(end);
+  });
+  return result;
+}
+
+// src/utils/warn.ts
+var warned = new Set();
+function warnOnce(msg) {
+  if (warned.has(msg))
+    return;
+  console.warn("[unocss]", msg);
+  warned.add(msg);
+}
+
 // src/extractors/split.ts
 var extractorSplit = {
   name: "split",
@@ -247,7 +275,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   ].reduce((a, p) => mergeDeep(a, p), {});
   return {
     mergeSelectors: true,
-    warnBlocked: true,
+    warn: true,
     blocklist: [],
     safelist: [],
     presets: [],
@@ -268,7 +296,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
 }
 
 // package.json
-var version = "0.12.6";
+var version = "0.12.10";
 
 // src/generator/index.ts
 var UnoGenerator = class {
@@ -550,10 +578,10 @@ var UnoGenerator = class {
         }
       }
     }
+    if (typeof result === "string")
+      result = expandVariantGroup(result).split(/\s+/g);
     if (!result)
       return;
-    if (typeof result === "string")
-      result = result.split(/ /g);
     return [
       result.flatMap((r) => {
         var _a;
@@ -564,7 +592,12 @@ var UnoGenerator = class {
   }
   async stringifyShortcuts(parent, context, expanded, meta = { layer: this.config.shortcutsLayer }) {
     const selectorMap = new TwoKeyMap();
-    const parsed = (await Promise.all(uniq(expanded).map((i) => this.parseUtil(i, context, true)))).filter(Boolean).sort((a, b) => a[0] - b[0]);
+    const parsed = (await Promise.all(uniq(expanded).map(async (i) => {
+      const result = await this.parseUtil(i, context, true);
+      if (!result)
+        warnOnce(`unmatched utility "${i}" in shortcut "${parent[1]}"`);
+      return result;
+    }))).filter(Boolean).sort((a, b) => a[0] - b[0]);
     const [raw, , parentVariants] = parent;
     for (const item of parsed) {
       if (isRawUtil(item))
@@ -616,6 +649,7 @@ export {
   entriesToCss,
   escapeRegExp,
   escapeSelector,
+  expandVariantGroup,
   extractorSplit,
   hasScopePlaceholder,
   hex2rgba,
@@ -628,8 +662,10 @@ export {
   mergeDeep,
   mergeSet,
   normalizeVariant,
+  regexClassGroup,
   toArray,
   uniq,
   validateFilterRE,
+  warnOnce,
   withLayer
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.12.6",
+  "version": "0.12.10",
   "description": "The instant on-demand Atomic CSS engine.",
   "keywords": [
     "unocss",