@unocss/core 0.48.4 → 0.49.0

package/dist/index.cjs

@@ -219,9 +219,16 @@ function withLayer(layer, rules) {
   return rules;
 }
 
-const regexClassGroup = /((?:[!@\w+:_/-]|\[&?>?:?.*\])+?)([:-])\(((?:[~!\w\s:/\\,%#.$?-]|\[.*?\])+?)\)(?!\s*?=>)/gm;
+const regexCache = {};
+function makeRegexClassGroup(separators = ["-", ":"]) {
+  const key = separators.join("|");
+  if (!regexCache[key])
+    regexCache[key] = new RegExp(`((?:[!@\\w+:_/-]|\\[&?>?:?.*\\])+?)(${key})\\(((?:[~!\\w\\s:/\\\\,%#.$?-]|\\[.*?\\])+?)\\)(?!\\s*?=>)`, "gm");
+  regexCache[key].lastIndex = 0;
+  return regexCache[key];
+}
 function expandVariantGroup(str, separators = ["-", ":"], depth = 5) {
-  regexClassGroup.lastIndex = 0;
+  const regexClassGroup = makeRegexClassGroup(separators);
   let hasChanged = false;
   let content = str.toString();
   do {
@@ -408,6 +415,9 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     templates: uniq(sortedPresets.map((p) => toArray(p.autocomplete?.templates)).flat()),
     extractors: sortedPresets.map((p) => toArray(p.autocomplete?.extractors)).flat().sort((a, b) => (a.order || 0) - (b.order || 0))
   };
+  let separators = toArray(mergePresets("separators"));
+  if (!separators.length)
+    separators = [":", "-"];
   return {
     mergeSelectors: true,
     warn: true,
@@ -427,13 +437,14 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     preflights: mergePresets("preflights"),
     autocomplete,
     variants: mergePresets("variants").map(normalizeVariant),
-    shortcuts: resolveShortcuts(mergePresets("shortcuts")),
+    shortcuts: resolveShortcuts(mergePresets("shortcuts")).reverse(),
     extractors,
-    safelist: mergePresets("safelist")
+    safelist: mergePresets("safelist"),
+    separators
   };
 }
 
-const version = "0.48.4";
+const version = "0.49.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -894,8 +905,8 @@ class UnoGenerator {
 function createGenerator(config, defaults) {
   return new UnoGenerator(config, defaults);
 }
-const regexScopePlaceholder = / \$\$ /;
-const hasScopePlaceholder = (css) => css.match(regexScopePlaceholder);
+const regexScopePlaceholder = /\s\$\$\s+/g;
+const hasScopePlaceholder = (css) => css.match(/\s\$\$\s/);
 function applyScope(css, scope) {
   if (hasScopePlaceholder(css))
     return css.replace(regexScopePlaceholder, scope ? ` ${scope} ` : " ");
@@ -947,6 +958,7 @@ exports.isStaticRule = isStaticRule;
 exports.isStaticShortcut = isStaticShortcut;
 exports.isString = isString;
 exports.isValidSelector = isValidSelector;
+exports.makeRegexClassGroup = makeRegexClassGroup;
 exports.mergeDeep = mergeDeep;
 exports.movePseudoElementsEnd = movePseudoElementsEnd;
 exports.noop = noop;
@@ -954,7 +966,6 @@ exports.normalizeCSSEntries = normalizeCSSEntries;
 exports.normalizeCSSValues = normalizeCSSValues;
 exports.normalizeVariant = normalizeVariant;
 exports.notNull = notNull;
-exports.regexClassGroup = regexClassGroup;
 exports.regexScopePlaceholder = regexScopePlaceholder;
 exports.toArray = toArray;
 exports.toEscapedSelector = toEscapedSelector;

package/dist/index.d.ts

@@ -131,7 +131,7 @@ declare class BetterMap<K, V> extends Map<K, V> {
 
 declare function withLayer<T extends {}>(layer: string, rules: Rule<T>[]): Rule<T>[];
 
-declare const regexClassGroup: RegExp;
+declare function makeRegexClassGroup(separators?: string[]): RegExp;
 declare function expandVariantGroup(str: string, separators?: string[], depth?: number): string;
 declare function expandVariantGroup(str: MagicString, separators?: string[], depth?: number): MagicString;
 
@@ -422,9 +422,17 @@ type Postprocessor = (util: UtilObject) => void;
 type ThemeExtender<T> = (theme: T) => void;
 interface ConfigBase<Theme extends {} = {}> {
     /**
-     * Rules to generate CSS utilities
+     * Rules to generate CSS utilities.
+     *
+     * Later entries have higher priority.
      */
     rules?: Rule<Theme>[];
+    /**
+     * Variant separator
+     *
+     * @default [':', '-']
+     */
+    separators?: Arrayable<string>;
     /**
      * Variants that preprocess the selectors,
      * having the ability to rewrite the CSS object.
@@ -433,6 +441,8 @@ interface ConfigBase<Theme extends {} = {}> {
     /**
      * Similar to Windi CSS's shortcuts,
      * allows you have create new utilities by combining existing ones.
+     *
+     * Later entries have higher priority.
      */
     shortcuts?: UserShortcuts<Theme>;
     /**
@@ -727,6 +737,7 @@ interface ResolvedConfig<Theme extends {} = {}> extends Omit<RequiredByKey<UserC
         templates: (AutoCompleteFunction | AutoCompleteTemplate)[];
         extractors: AutoCompleteExtractor[];
     };
+    separators: string[];
 }
 interface GenerateResult {
     css: string;
@@ -810,4 +821,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, mergeDeep, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, 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, 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 };

package/dist/index.mjs

@@ -215,9 +215,16 @@ function withLayer(layer, rules) {
   return rules;
 }
 
-const regexClassGroup = /((?:[!@\w+:_/-]|\[&?>?:?.*\])+?)([:-])\(((?:[~!\w\s:/\\,%#.$?-]|\[.*?\])+?)\)(?!\s*?=>)/gm;
+const regexCache = {};
+function makeRegexClassGroup(separators = ["-", ":"]) {
+  const key = separators.join("|");
+  if (!regexCache[key])
+    regexCache[key] = new RegExp(`((?:[!@\\w+:_/-]|\\[&?>?:?.*\\])+?)(${key})\\(((?:[~!\\w\\s:/\\\\,%#.$?-]|\\[.*?\\])+?)\\)(?!\\s*?=>)`, "gm");
+  regexCache[key].lastIndex = 0;
+  return regexCache[key];
+}
 function expandVariantGroup(str, separators = ["-", ":"], depth = 5) {
-  regexClassGroup.lastIndex = 0;
+  const regexClassGroup = makeRegexClassGroup(separators);
   let hasChanged = false;
   let content = str.toString();
   do {
@@ -404,6 +411,9 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     templates: uniq(sortedPresets.map((p) => toArray(p.autocomplete?.templates)).flat()),
     extractors: sortedPresets.map((p) => toArray(p.autocomplete?.extractors)).flat().sort((a, b) => (a.order || 0) - (b.order || 0))
   };
+  let separators = toArray(mergePresets("separators"));
+  if (!separators.length)
+    separators = [":", "-"];
   return {
     mergeSelectors: true,
     warn: true,
@@ -423,13 +433,14 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     preflights: mergePresets("preflights"),
     autocomplete,
     variants: mergePresets("variants").map(normalizeVariant),
-    shortcuts: resolveShortcuts(mergePresets("shortcuts")),
+    shortcuts: resolveShortcuts(mergePresets("shortcuts")).reverse(),
     extractors,
-    safelist: mergePresets("safelist")
+    safelist: mergePresets("safelist"),
+    separators
   };
 }
 
-const version = "0.48.4";
+const version = "0.49.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -890,8 +901,8 @@ class UnoGenerator {
 function createGenerator(config, defaults) {
   return new UnoGenerator(config, defaults);
 }
-const regexScopePlaceholder = / \$\$ /;
-const hasScopePlaceholder = (css) => css.match(regexScopePlaceholder);
+const regexScopePlaceholder = /\s\$\$\s+/g;
+const hasScopePlaceholder = (css) => css.match(/\s\$\$\s/);
 function applyScope(css, scope) {
   if (hasScopePlaceholder(css))
     return css.replace(regexScopePlaceholder, scope ? ` ${scope} ` : " ");
@@ -917,4 +928,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, mergeDeep, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };
+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 };

package/package.json

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