@unocss/core 0.46.5 → 0.47.1

package/dist/index.cjs

@@ -219,7 +219,7 @@ function withLayer(layer, rules) {
   return rules;
 }
 
-const regexClassGroup = /((?:[!\w+:_/-]|\[&?>?:?.*\])+?)([:-])\(((?:[~!\w\s:/\\,%#.$-]|\[.*?\])*?)\)/gm;
+const regexClassGroup = /((?:[!\w+:_/-]|\[&?>?:?.*\])+?)([:-])\(((?:[~!\w\s:/\\,%#.$-]|\[.*?\])+?)\)(?!\s*?=>)/gm;
 function expandVariantGroup(str, seperators = ["-", ":"], depth = 5) {
   regexClassGroup.lastIndex = 0;
   let hasChanged = false;
@@ -282,7 +282,21 @@ function createValueHandler(handlers) {
   return handler;
 }
 
-const splitCode = (code) => [...new Set(code.split(/\\?[\s'"`;{}]+/g))].filter(isValidSelector);
+const defaultSplitRE = /\\?[\s'"`;{}]+/g;
+const arbitraryPropertyRE = /\[(\\\W|[\w-])+:['"]?\S+?['"]?\]/g;
+const arbitraryPropertyCandidateRE = new RegExp(`^${arbitraryPropertyRE.source}$`);
+const splitCode = (code) => {
+  const result = /* @__PURE__ */ new Set();
+  for (const match of code.matchAll(arbitraryPropertyRE)) {
+    if (!code[match.index - 1]?.match(/^[\s'"`]/))
+      continue;
+    result.add(match[0]);
+  }
+  code.split(defaultSplitRE).forEach((match) => {
+    isValidSelector(match) && !arbitraryPropertyCandidateRE.test(match) && result.add(match);
+  });
+  return [...result];
+};
 const extractorSplit = {
   name: "split",
   order: 0,
@@ -417,7 +431,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.46.5";
+const version = "0.47.1";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -904,6 +918,7 @@ exports.BetterMap = BetterMap;
 exports.CONTROL_SHORTCUT_NO_MERGE = CONTROL_SHORTCUT_NO_MERGE;
 exports.TwoKeyMap = TwoKeyMap;
 exports.UnoGenerator = UnoGenerator;
+exports.arbitraryPropertyRE = arbitraryPropertyRE;
 exports.attributifyRE = attributifyRE;
 exports.clearIdenticalEntries = clearIdenticalEntries;
 exports.clone = clone;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { LoadConfigResult } from 'unconfig';
 import MagicString from 'magic-string';
 
-declare type EventsMap = Record<string, any>;
+type EventsMap = Record<string, any>;
 interface DefaultEvents extends EventsMap {
     [event: string]: (...args: any) => void;
 }
@@ -137,8 +137,8 @@ declare function expandVariantGroup(str: MagicString, seperators?: string[], dep
 
 declare function warnOnce(msg: string): void;
 
-declare type ValueHandlerCallback = (str: string) => string | number | undefined;
-declare type ValueHandler<K extends string> = {
+type ValueHandlerCallback = (str: string) => string | number | undefined;
+type ValueHandler<K extends string> = {
     [S in K]: ValueHandler<K>;
 } & {
     (str: string): string | undefined;
@@ -148,27 +148,27 @@ declare type ValueHandler<K extends string> = {
 };
 declare function createValueHandler<K extends string>(handlers: Record<K, ValueHandlerCallback>): ValueHandler<K>;
 
-declare type Awaitable<T> = T | Promise<T>;
-declare type Arrayable<T> = T | T[];
-declare type ArgumentType<T> = T extends ((...args: infer A) => any) ? A : never;
-declare type Shift<T> = T extends [_: any, ...args: infer A] ? A : never;
-declare type RestArgs<T> = Shift<ArgumentType<T>>;
-declare type DeepPartial<T> = {
+type Awaitable<T> = T | Promise<T>;
+type Arrayable<T> = T | T[];
+type ArgumentType<T> = T extends ((...args: infer A) => any) ? A : never;
+type Shift<T> = T extends [_: any, ...args: infer A] ? A : never;
+type RestArgs<T> = Shift<ArgumentType<T>>;
+type DeepPartial<T> = {
     [P in keyof T]?: DeepPartial<T[P]>;
 };
-declare type FlatObjectTuple<T> = {
+type FlatObjectTuple<T> = {
     [K in keyof T]: T[K];
 };
-declare type PartialByKeys<T, K extends keyof T = keyof T> = FlatObjectTuple<Partial<Pick<T, Extract<keyof T, K>>> & Omit<T, K>>;
-declare type RequiredByKey<T, K extends keyof T = keyof T> = FlatObjectTuple<Required<Pick<T, Extract<keyof T, K>>> & Omit<T, K>>;
-declare type CSSObject = Record<string, string | number | undefined>;
-declare type CSSEntries = [string, string | number | undefined][];
+type PartialByKeys<T, K extends keyof T = keyof T> = FlatObjectTuple<Partial<Pick<T, Extract<keyof T, K>>> & Omit<T, K>>;
+type RequiredByKey<T, K extends keyof T = keyof T> = FlatObjectTuple<Required<Pick<T, Extract<keyof T, K>>> & Omit<T, K>>;
+type CSSObject = Record<string, string | number | undefined>;
+type CSSEntries = [string, string | number | undefined][];
 interface CSSColorValue {
     type: string;
     components: (string | number)[];
     alpha: string | number | undefined;
 }
-declare type RGBAColorValue = [number, number, number, number] | [number, number, number];
+type RGBAColorValue = [number, number, number, number] | [number, number, number];
 interface ParsedColorValue {
     /**
      * Parsed color value.
@@ -195,7 +195,7 @@ interface ParsedColorValue {
      */
     alpha: string | number | undefined;
 }
-declare type PresetOptions = Record<string, any>;
+type PresetOptions = Record<string, any>;
 interface RuleContext<Theme extends {} = {}> {
     /**
      * Unprocessed selector from user input.
@@ -303,25 +303,25 @@ interface RuleMeta {
      */
     internal?: boolean;
 }
-declare type CSSValue = CSSObject | CSSEntries;
-declare type CSSValues = CSSValue | CSSValue[];
-declare type DynamicMatcher<Theme extends {} = {}> = ((match: RegExpMatchArray, context: Readonly<RuleContext<Theme>>) => Awaitable<CSSValue | string | (CSSValue | string)[] | undefined>);
-declare type DynamicRule<Theme extends {} = {}> = [RegExp, DynamicMatcher<Theme>] | [RegExp, DynamicMatcher<Theme>, RuleMeta];
-declare type StaticRule = [string, CSSObject | CSSEntries] | [string, CSSObject | CSSEntries, RuleMeta];
-declare type Rule<Theme extends {} = {}> = DynamicRule<Theme> | StaticRule;
-declare type DynamicShortcutMatcher<Theme extends {} = {}> = ((match: RegExpMatchArray, context: Readonly<RuleContext<Theme>>) => (string | ShortcutValue[] | undefined));
-declare type StaticShortcut = [string, string | ShortcutValue[]] | [string, string | ShortcutValue[], RuleMeta];
-declare type StaticShortcutMap = Record<string, string | ShortcutValue[]>;
-declare type DynamicShortcut<Theme extends {} = {}> = [RegExp, DynamicShortcutMatcher<Theme>] | [RegExp, DynamicShortcutMatcher<Theme>, RuleMeta];
-declare type UserShortcuts<Theme extends {} = {}> = StaticShortcutMap | (StaticShortcut | DynamicShortcut<Theme> | StaticShortcutMap)[];
-declare type Shortcut<Theme extends {} = {}> = StaticShortcut | DynamicShortcut<Theme>;
-declare type ShortcutValue = string | CSSValue;
-declare type FilterPattern = ReadonlyArray<string | RegExp> | string | RegExp | null;
+type CSSValue = CSSObject | CSSEntries;
+type CSSValues = CSSValue | CSSValue[];
+type DynamicMatcher<Theme extends {} = {}> = ((match: RegExpMatchArray, context: Readonly<RuleContext<Theme>>) => Awaitable<CSSValue | string | (CSSValue | string)[] | undefined>);
+type DynamicRule<Theme extends {} = {}> = [RegExp, DynamicMatcher<Theme>] | [RegExp, DynamicMatcher<Theme>, RuleMeta];
+type StaticRule = [string, CSSObject | CSSEntries] | [string, CSSObject | CSSEntries, RuleMeta];
+type Rule<Theme extends {} = {}> = DynamicRule<Theme> | StaticRule;
+type DynamicShortcutMatcher<Theme extends {} = {}> = ((match: RegExpMatchArray, context: Readonly<RuleContext<Theme>>) => (string | ShortcutValue[] | undefined));
+type StaticShortcut = [string, string | ShortcutValue[]] | [string, string | ShortcutValue[], RuleMeta];
+type StaticShortcutMap = Record<string, string | ShortcutValue[]>;
+type DynamicShortcut<Theme extends {} = {}> = [RegExp, DynamicShortcutMatcher<Theme>] | [RegExp, DynamicShortcutMatcher<Theme>, RuleMeta];
+type UserShortcuts<Theme extends {} = {}> = StaticShortcutMap | (StaticShortcut | DynamicShortcut<Theme> | StaticShortcutMap)[];
+type Shortcut<Theme extends {} = {}> = StaticShortcut | DynamicShortcut<Theme>;
+type ShortcutValue = string | CSSValue;
+type FilterPattern = ReadonlyArray<string | RegExp> | string | RegExp | null;
 interface Preflight<Theme extends {} = {}> {
     getCSS: (context: PreflightContext<Theme>) => Promise<string | undefined> | string | undefined;
     layer?: string;
 }
-declare type BlocklistRule = string | RegExp;
+type BlocklistRule = string | RegExp;
 interface VariantHandlerContext {
     /**
      * Rewrite the output selector. Often be used to append parents.
@@ -395,7 +395,7 @@ interface VariantHandler {
      */
     layer?: string | undefined;
 }
-declare type VariantFunction<Theme extends {} = {}> = (matcher: string, context: Readonly<VariantContext<Theme>>) => string | VariantHandler | undefined;
+type VariantFunction<Theme extends {} = {}> = (matcher: string, context: Readonly<VariantContext<Theme>>) => string | VariantHandler | undefined;
 interface VariantObject<Theme extends {} = {}> {
     /**
      * The name of the variant.
@@ -416,10 +416,10 @@ interface VariantObject<Theme extends {} = {}> {
      */
     autocomplete?: Arrayable<AutoCompleteFunction | AutoCompleteTemplate>;
 }
-declare type Variant<Theme extends {} = {}> = VariantFunction<Theme> | VariantObject<Theme>;
-declare type Preprocessor = (matcher: string) => string | undefined;
-declare type Postprocessor = (util: UtilObject) => void;
-declare type ThemeExtender<T> = (theme: T) => void;
+type Variant<Theme extends {} = {}> = VariantFunction<Theme> | VariantObject<Theme>;
+type Preprocessor = (matcher: string) => string | undefined;
+type Postprocessor = (util: UtilObject) => void;
+type ThemeExtender<T> = (theme: T) => void;
 interface ConfigBase<Theme extends {} = {}> {
     /**
      * Rules to generate CSS utilities
@@ -502,8 +502,8 @@ interface ConfigBase<Theme extends {} = {}> {
      */
     details?: boolean;
 }
-declare type AutoCompleteTemplate = string;
-declare type AutoCompleteFunction = (input: string) => Awaitable<string[]>;
+type AutoCompleteTemplate = string;
+type AutoCompleteFunction = (input: string) => Awaitable<string[]>;
 interface AutoCompleteExtractorContext {
     content: string;
     cursor: number;
@@ -646,7 +646,7 @@ interface TransformResult {
     deps?: string[];
     dynamicDeps?: string[];
 }
-declare type SourceCodeTransformerEnforce = 'pre' | 'post' | 'default';
+type SourceCodeTransformerEnforce = 'pre' | 'post' | 'default';
 interface SourceCodeTransformer {
     name: string;
     /**
@@ -714,25 +714,25 @@ interface GenerateResult {
     getLayers(includes?: string[], excludes?: string[]): string;
     matched: Set<string>;
 }
-declare type VariantMatchedResult<Theme extends {} = {}> = readonly [
+type VariantMatchedResult<Theme extends {} = {}> = readonly [
     raw: string,
     current: string,
     variantHandlers: VariantHandler[],
     variants: Set<Variant<Theme>>
 ];
-declare type ParsedUtil = readonly [
+type ParsedUtil = readonly [
     index: number,
     raw: string,
     entries: CSSEntries,
     meta: RuleMeta | undefined,
     variantHandlers: VariantHandler[]
 ];
-declare type RawUtil = readonly [
+type RawUtil = readonly [
     index: number,
     rawCSS: string,
     meta: RuleMeta | undefined
 ];
-declare type StringifiedUtil<Theme extends {} = {}> = readonly [
+type StringifiedUtil<Theme extends {} = {}> = readonly [
     index: number,
     selector: string | undefined,
     body: string,
@@ -741,7 +741,7 @@ declare type StringifiedUtil<Theme extends {} = {}> = readonly [
     context: RuleContext<Theme> | undefined,
     noMerge: boolean | undefined
 ];
-declare type PreparedRule = readonly [
+type PreparedRule = readonly [
     selector: [string, number][],
     body: string,
     noMerge: boolean
@@ -784,8 +784,9 @@ interface GenerateOptions {
     scope?: string;
 }
 
+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, 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, 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, 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 };

package/dist/index.mjs

@@ -215,7 +215,7 @@ function withLayer(layer, rules) {
   return rules;
 }
 
-const regexClassGroup = /((?:[!\w+:_/-]|\[&?>?:?.*\])+?)([:-])\(((?:[~!\w\s:/\\,%#.$-]|\[.*?\])*?)\)/gm;
+const regexClassGroup = /((?:[!\w+:_/-]|\[&?>?:?.*\])+?)([:-])\(((?:[~!\w\s:/\\,%#.$-]|\[.*?\])+?)\)(?!\s*?=>)/gm;
 function expandVariantGroup(str, seperators = ["-", ":"], depth = 5) {
   regexClassGroup.lastIndex = 0;
   let hasChanged = false;
@@ -278,7 +278,21 @@ function createValueHandler(handlers) {
   return handler;
 }
 
-const splitCode = (code) => [...new Set(code.split(/\\?[\s'"`;{}]+/g))].filter(isValidSelector);
+const defaultSplitRE = /\\?[\s'"`;{}]+/g;
+const arbitraryPropertyRE = /\[(\\\W|[\w-])+:['"]?\S+?['"]?\]/g;
+const arbitraryPropertyCandidateRE = new RegExp(`^${arbitraryPropertyRE.source}$`);
+const splitCode = (code) => {
+  const result = /* @__PURE__ */ new Set();
+  for (const match of code.matchAll(arbitraryPropertyRE)) {
+    if (!code[match.index - 1]?.match(/^[\s'"`]/))
+      continue;
+    result.add(match[0]);
+  }
+  code.split(defaultSplitRE).forEach((match) => {
+    isValidSelector(match) && !arbitraryPropertyCandidateRE.test(match) && result.add(match);
+  });
+  return [...result];
+};
 const extractorSplit = {
   name: "split",
   order: 0,
@@ -413,7 +427,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.46.5";
+const version = "0.47.1";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -896,4 +910,4 @@ function defaultVariantHandler(input, next) {
   return next(input);
 }
 
-export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, TwoKeyMap, UnoGenerator, 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, mergeDeep, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/package.json

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