@unocss/core 0.50.6 → 0.50.8

package/dist/index.cjs

@@ -326,11 +326,12 @@ function createValueHandler(handlers) {
   return handler;
 }
 
-const defaultSplitRE = /\\?[\s'"`;{}]+/g;
+const defaultSplitRE = /[\\:]?[\s'"`;{}]+/g;
+const splitWithVariantGroupRE = /([\\:]?[\s"'`;<>*]|:\(|\)"|\)\s)/g;
 const quotedArbitraryValuesRE = /(?:[\w&:[\]-]|\[\S+=\S+\])+\[\\?['"]?\S+?['"]\]\]?[\w:-]*/g;
-const arbitraryPropertyRE = /\[(\\\W|[\w-])+:['"]?\S+?['"]?\]/g;
-const arbitraryPropertyCandidateRE = new RegExp(`^${arbitraryPropertyRE.source}$`);
-const splitCode = (code) => {
+const arbitraryPropertyRE = /\[(\\\W|[\w-])+:[^\s:]*?("\S+?"|'\S+?'|`\S+?`|[^\s:]+?)[^\s:]*?\)?\]/g;
+const arbitraryPropertyCandidateRE = /^\[(\\\W|[\w-])+:['"]?\S+?['"]?\]$/;
+function splitCode(code) {
   const result = /* @__PURE__ */ new Set();
   for (const match of code.matchAll(arbitraryPropertyRE)) {
     if (!code[match.index - 1]?.match(/^[\s'"`]/))
@@ -340,10 +341,11 @@ const splitCode = (code) => {
   for (const match of code.matchAll(quotedArbitraryValuesRE))
     result.add(match[0]);
   code.split(defaultSplitRE).forEach((match) => {
-    isValidSelector(match) && !arbitraryPropertyCandidateRE.test(match) && result.add(match);
+    if (isValidSelector(match) && !arbitraryPropertyCandidateRE.test(match))
+      result.add(match);
   });
   return [...result];
-};
+}
 const extractorSplit = {
   name: "split",
   order: 0,
@@ -458,7 +460,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   let separators = toArray(mergePresets("separators"));
   if (!separators.length)
     separators = [":", "-"];
-  return {
+  const resolved = {
     mergeSelectors: true,
     warn: true,
     blocklist: [],
@@ -482,9 +484,13 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     safelist: mergePresets("safelist"),
     separators
   };
+  for (const p of sortedPresets)
+    p?.configResolved?.(resolved);
+  userConfig?.configResolved?.(resolved);
+  return resolved;
 }
 
-const version = "0.50.6";
+const version = "0.50.8";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -950,7 +956,9 @@ function createGenerator(config, defaults) {
   return new UnoGenerator(config, defaults);
 }
 const regexScopePlaceholder = /\s\$\$\s+/g;
-const hasScopePlaceholder = (css) => css.match(/\s\$\$\s/);
+function hasScopePlaceholder(css) {
+  return css.match(/\s\$\$\s/);
+}
 function applyScope(css, scope) {
   if (hasScopePlaceholder(css))
     return css.replace(regexScopePlaceholder, scope ? ` ${scope} ` : " ");
@@ -979,6 +987,7 @@ exports.collapseVariantGroup = collapseVariantGroup;
 exports.createGenerator = createGenerator;
 exports.createValueHandler = createValueHandler;
 exports.cssIdRE = cssIdRE;
+exports.defaultSplitRE = defaultSplitRE;
 exports.e = e;
 exports.entriesToCss = entriesToCss;
 exports.escapeRegExp = escapeRegExp;
@@ -1004,6 +1013,7 @@ exports.notNull = notNull;
 exports.parseVariantGroup = parseVariantGroup;
 exports.quotedArbitraryValuesRE = quotedArbitraryValuesRE;
 exports.regexScopePlaceholder = regexScopePlaceholder;
+exports.splitWithVariantGroupRE = splitWithVariantGroupRE;
 exports.toArray = toArray;
 exports.toEscapedSelector = toEscapedSelector;
 exports.uniq = uniq;

package/dist/index.d.ts

@@ -79,7 +79,7 @@ declare class UnoGenerator<Theme extends {} = {}> {
 }
 declare function createGenerator<Theme extends {} = {}>(config?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): UnoGenerator<Theme>;
 declare const regexScopePlaceholder: RegExp;
-declare const hasScopePlaceholder: (css: string) => RegExpMatchArray | null;
+declare function hasScopePlaceholder(css: string): RegExpMatchArray | null;
 declare function toEscapedSelector(raw: string): string;
 
 declare function escapeRegExp(string: string): string;
@@ -510,6 +510,12 @@ interface ConfigBase<Theme extends {} = {}> {
          */
         extractors?: Arrayable<AutoCompleteExtractor>;
     };
+    /**
+     * Hook to modify the resolved config.
+     *
+     * First presets runs first and the user config
+     */
+    configResolved?: (config: ResolvedConfig) => void;
     /**
      * Expose internal details for debugging / inspecting
      *
@@ -572,6 +578,9 @@ interface AutoCompleteExtractor {
 }
 interface Preset<Theme extends {} = {}> extends ConfigBase<Theme> {
     name: string;
+    /**
+     * Enforce the preset to be applied before or after other presets
+     */
     enforce?: 'pre' | 'post';
     /**
      * Preset options for other tools like IDE to consume
@@ -825,10 +834,12 @@ interface GenerateOptions {
     scope?: string;
 }
 
+declare const defaultSplitRE: RegExp;
+declare const splitWithVariantGroupRE: RegExp;
 declare const quotedArbitraryValuesRE: RegExp;
 declare const arbitraryPropertyRE: RegExp;
 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, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, quotedArbitraryValuesRE, 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, defaultSplitRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, quotedArbitraryValuesRE, regexScopePlaceholder, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -322,11 +322,12 @@ function createValueHandler(handlers) {
   return handler;
 }
 
-const defaultSplitRE = /\\?[\s'"`;{}]+/g;
+const defaultSplitRE = /[\\:]?[\s'"`;{}]+/g;
+const splitWithVariantGroupRE = /([\\:]?[\s"'`;<>*]|:\(|\)"|\)\s)/g;
 const quotedArbitraryValuesRE = /(?:[\w&:[\]-]|\[\S+=\S+\])+\[\\?['"]?\S+?['"]\]\]?[\w:-]*/g;
-const arbitraryPropertyRE = /\[(\\\W|[\w-])+:['"]?\S+?['"]?\]/g;
-const arbitraryPropertyCandidateRE = new RegExp(`^${arbitraryPropertyRE.source}$`);
-const splitCode = (code) => {
+const arbitraryPropertyRE = /\[(\\\W|[\w-])+:[^\s:]*?("\S+?"|'\S+?'|`\S+?`|[^\s:]+?)[^\s:]*?\)?\]/g;
+const arbitraryPropertyCandidateRE = /^\[(\\\W|[\w-])+:['"]?\S+?['"]?\]$/;
+function splitCode(code) {
   const result = /* @__PURE__ */ new Set();
   for (const match of code.matchAll(arbitraryPropertyRE)) {
     if (!code[match.index - 1]?.match(/^[\s'"`]/))
@@ -336,10 +337,11 @@ const splitCode = (code) => {
   for (const match of code.matchAll(quotedArbitraryValuesRE))
     result.add(match[0]);
   code.split(defaultSplitRE).forEach((match) => {
-    isValidSelector(match) && !arbitraryPropertyCandidateRE.test(match) && result.add(match);
+    if (isValidSelector(match) && !arbitraryPropertyCandidateRE.test(match))
+      result.add(match);
   });
   return [...result];
-};
+}
 const extractorSplit = {
   name: "split",
   order: 0,
@@ -454,7 +456,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   let separators = toArray(mergePresets("separators"));
   if (!separators.length)
     separators = [":", "-"];
-  return {
+  const resolved = {
     mergeSelectors: true,
     warn: true,
     blocklist: [],
@@ -478,9 +480,13 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     safelist: mergePresets("safelist"),
     separators
   };
+  for (const p of sortedPresets)
+    p?.configResolved?.(resolved);
+  userConfig?.configResolved?.(resolved);
+  return resolved;
 }
 
-const version = "0.50.6";
+const version = "0.50.8";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -946,7 +952,9 @@ function createGenerator(config, defaults) {
   return new UnoGenerator(config, defaults);
 }
 const regexScopePlaceholder = /\s\$\$\s+/g;
-const hasScopePlaceholder = (css) => css.match(/\s\$\$\s/);
+function hasScopePlaceholder(css) {
+  return css.match(/\s\$\$\s/);
+}
 function applyScope(css, scope) {
   if (hasScopePlaceholder(css))
     return css.replace(regexScopePlaceholder, scope ? ` ${scope} ` : " ");
@@ -963,4 +971,4 @@ function defaultVariantHandler(input, next) {
   return next(input);
 }
 
-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, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, quotedArbitraryValuesRE, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };
+export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, TwoKeyMap, UnoGenerator, arbitraryPropertyRE, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, defaultSplitRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, quotedArbitraryValuesRE, regexScopePlaceholder, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/package.json

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