@unocss/core 0.55.6 → 0.56.0

package/dist/index.cjs

@@ -55,6 +55,14 @@ function toArray(value = []) {
 function uniq(value) {
   return Array.from(new Set(value));
 }
+function uniqueBy(array, equalFn) {
+  return array.reduce((acc, cur) => {
+    const index = acc.findIndex((item) => equalFn(cur, item));
+    if (index === -1)
+      acc.push(cur);
+    return acc;
+  }, []);
+}
 function isString(s) {
   return typeof s === "string";
 }
@@ -392,36 +400,6 @@ function warnOnce(msg) {
   warned.add(msg);
 }
 
-function createValueHandler(handlers) {
-  const handler = function(str) {
-    const s = this.__options?.sequence || [];
-    this.__options.sequence = [];
-    for (const n of s) {
-      const res = handlers[n](str);
-      if (res != null)
-        return res;
-    }
-  };
-  function addProcessor(that, name) {
-    if (!that.__options) {
-      that.__options = {
-        sequence: []
-      };
-    }
-    that.__options.sequence.push(name);
-    return that;
-  }
-  for (const name of Object.keys(handlers)) {
-    Object.defineProperty(handler, name, {
-      enumerable: true,
-      get() {
-        return addProcessor(this, name);
-      }
-    });
-  }
-  return handler;
-}
-
 const defaultSplitRE = /[\\:]?[\s'"`;{}]+/g;
 const splitWithVariantGroupRE = /([\\:]?[\s"'`;<>]|:\(|\)"|\)\s)/g;
 function splitCode(code) {
@@ -467,7 +445,8 @@ function resolveShortcuts(shortcuts) {
   });
 }
 const __RESOLVED = "_uno_resolved";
-function resolvePreset(preset) {
+function resolvePreset(presetInput) {
+  let preset = typeof presetInput === "function" ? presetInput() : presetInput;
   if (__RESOLVED in preset)
     return preset;
   preset = { ...preset };
@@ -501,7 +480,7 @@ function resolvePresets(preset) {
 }
 function resolveConfig(userConfig = {}, defaults = {}) {
   const config = Object.assign({}, defaults, userConfig);
-  const rawPresets = uniq((config.presets || []).flatMap(toArray).flatMap(resolvePresets));
+  const rawPresets = uniqueBy((config.presets || []).flatMap(toArray).flatMap(resolvePresets), (a, b) => a.name === b.name);
   const sortedPresets = [
     ...rawPresets.filter((p) => p.enforce === "pre"),
     ...rawPresets.filter((p) => !p.enforce),
@@ -612,8 +591,11 @@ function mergeAutocompleteShorthands(shorthands) {
     {}
   );
 }
+function definePreset(preset) {
+  return preset;
+}
 
-const version = "0.55.6";
+const version = "0.56.0";
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -1103,7 +1085,7 @@ class UnoGenerator {
     }).flat(2).filter(Boolean));
   }
   isBlocked(raw) {
-    return !raw || this.config.blocklist.some((e2) => isString(e2) ? e2 === raw : e2.test(raw));
+    return !raw || this.config.blocklist.some((e2) => typeof e2 === "function" ? e2(raw) : isString(e2) ? e2 === raw : e2.test(raw));
   }
 }
 function createGenerator(config, defaults) {
@@ -1139,9 +1121,9 @@ exports.clearIdenticalEntries = clearIdenticalEntries;
 exports.clone = clone;
 exports.collapseVariantGroup = collapseVariantGroup;
 exports.createGenerator = createGenerator;
-exports.createValueHandler = createValueHandler;
 exports.cssIdRE = cssIdRE;
 exports.defaultSplitRE = defaultSplitRE;
+exports.definePreset = definePreset;
 exports.e = e;
 exports.entriesToCss = entriesToCss;
 exports.escapeRegExp = escapeRegExp;
@@ -1176,6 +1158,7 @@ exports.splitWithVariantGroupRE = splitWithVariantGroupRE;
 exports.toArray = toArray;
 exports.toEscapedSelector = toEscapedSelector;
 exports.uniq = uniq;
+exports.uniqueBy = uniqueBy;
 exports.validateFilterRE = validateFilterRE;
 exports.warnOnce = warnOnce;
 exports.withLayer = withLayer;

package/dist/index.d.cts

@@ -73,6 +73,7 @@ declare function isStaticShortcut(sc: Shortcut<any>): sc is StaticShortcut;
 
 declare function toArray<T>(value?: T | T[]): T[];
 declare function uniq<T>(value: T[]): T[];
+declare function uniqueBy<T>(array: readonly T[], equalFn: (a: T, b: T) => boolean): T[];
 declare function isString(s: any): s is string;
 
 declare const attributifyRE: RegExp;
@@ -130,17 +131,6 @@ declare function expandVariantGroup(str: MagicString, separators?: string[], dep
 
 declare function warnOnce(msg: string): void;
 
-type ValueHandlerCallback = (str: string) => string | number | undefined;
-type ValueHandler<K extends string> = {
-    [S in K]: ValueHandler<K>;
-} & {
-    (str: string): string | undefined;
-    __options: {
-        sequence: K[];
-    };
-};
-declare function createValueHandler<K extends string>(handlers: Record<K, ValueHandlerCallback>): ValueHandler<K>;
-
 declare class UnoGenerator<Theme extends object = object> {
     userConfig: UserConfig<Theme>;
     defaults: UserConfigDefaults<Theme>;
@@ -362,7 +352,7 @@ interface Preflight<Theme extends object = object> {
     getCSS: (context: PreflightContext<Theme>) => Promise<string | undefined> | string | undefined;
     layer?: string;
 }
-type BlocklistRule = string | RegExp;
+type BlocklistRule = string | RegExp | ((selector: string) => boolean | null | undefined);
 interface VariantHandlerContext {
     /**
      * Rewrite the output selector. Often be used to append parents.
@@ -551,7 +541,7 @@ interface ConfigBase<Theme extends object = object> {
     /**
      * Presets
      */
-    presets?: (Preset<Theme> | Preset<Theme>[])[];
+    presets?: (PresetOrFactory<Theme> | PresetOrFactory<Theme>[])[];
     /**
      * Additional options for auto complete
      */
@@ -656,6 +646,8 @@ interface Preset<Theme extends object = object> extends ConfigBase<Theme> {
      */
     layer?: string;
 }
+type PresetFactory<Theme extends object = object, PresetOptions extends object | undefined = undefined> = (options?: PresetOptions) => Preset<Theme>;
+type PresetOrFactory<Theme extends object = object> = Preset<Theme> | PresetFactory<Theme, any>;
 interface GeneratorOptions {
     /**
      * Merge utilities with the exact same body to save the file size
@@ -838,7 +830,7 @@ interface PluginOptions {
      * The usage extracted from each source will be **merged** together.
      */
     content?: ContentOptions;
-    /** ========== DEPRECATED OPTIONS ========== **/
+    /** ========== DEPRECATED OPTIONS ========== */
     /**
      * @deprecated Renamed to `content`
      */
@@ -849,9 +841,9 @@ interface PluginOptions {
      */
     include?: FilterPattern;
     /**
-      * Patterns that filter the files NOT being extracted.
-      * @deprecated moved to `content.pipeline.exclude`
-      */
+     * Patterns that filter the files NOT being extracted.
+     * @deprecated moved to `content.pipeline.exclude`
+     */
     exclude?: FilterPattern;
 }
 interface UserConfig<Theme extends object = object> extends ConfigBase<Theme>, UserOnlyOptions<Theme>, GeneratorOptions, PluginOptions, CliOptions {
@@ -976,15 +968,17 @@ declare function resolveShortcuts<Theme extends object = object>(shortcuts: User
 /**
  * Resolve a single preset, nested presets are ignored
  */
-declare function resolvePreset<Theme extends object = object>(preset: Preset<Theme>): Preset<Theme>;
+declare function resolvePreset<Theme extends object = object>(presetInput: Preset<Theme> | PresetFactory<Theme, any>): Preset<Theme>;
 /**
  * Resolve presets with nested presets
  */
-declare function resolvePresets<Theme extends object = object>(preset: Preset<Theme>): Preset<Theme>[];
+declare function resolvePresets<Theme extends object = object>(preset: Preset<Theme> | PresetFactory<Theme, any>): Preset<Theme>[];
 declare function resolveConfig<Theme extends object = object>(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): ResolvedConfig<Theme>;
 /**
  * Merge multiple configs into one, later ones have higher priority
  */
 declare function mergeConfigs<Theme extends object = object>(configs: UserConfig<Theme>[]): UserConfig<Theme>;
+declare function definePreset<Options extends object | undefined = undefined, Theme extends object = object>(preset: PresetFactory<Theme, Options>): PresetFactory<Theme, Options>;
+declare function definePreset<Theme extends object = object>(preset: Preset<Theme>): Preset<Theme>;
 
-export { type ArgumentType, type Arrayable, type AutoCompleteExtractor, type AutoCompleteExtractorContext, type AutoCompleteExtractorResult, type AutoCompleteFunction, type AutoCompleteTemplate, type Awaitable, BetterMap, type BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, type CSSColorValue, type CSSEntries, type CSSObject, type CSSValue, type CSSValues, type CliEntryItem, type CliOptions, type ConfigBase, type ContentOptions, CountableSet, type DeepPartial, type DynamicMatcher, type DynamicRule, type DynamicShortcut, type DynamicShortcutMatcher, type ExtendedTokenInfo, type Extractor, type ExtractorContext, type FilterPattern, type FlatObjectTuple, type GenerateOptions, type GenerateResult, type GeneratorOptions, type HighlightAnnotation, type ParsedColorValue, type ParsedUtil, type PartialByKeys, type PluginOptions, type Postprocessor, type Preflight, type PreflightContext, type PreparedRule, type Preprocessor, type Preset, type PresetOptions, type RGBAColorValue, type RawUtil, type Replacement, type RequiredByKey, type ResolvedConfig, type RestArgs, type Rule, type RuleContext, type RuleMeta, type Shift, type Shortcut, type ShortcutValue, type SourceCodeTransformer, type SourceCodeTransformerEnforce, type SourceMap, type StaticRule, type StaticShortcut, type StaticShortcutMap, type StringifiedUtil, type SuggestResult, type ThemeExtender, type ToArray, TwoKeyMap, UnoGenerator, type UnocssPluginContext, type UserConfig, type UserConfigDefaults, type UserOnlyOptions, type UserShortcuts, type UtilObject, type ValueHandler, type ValueHandlerCallback, type Variant, type VariantContext, type VariantFunction, type VariantHandler, type VariantHandlerContext, type VariantMatchedResult, type VariantObject, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, defaultSplitRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isCountableSet, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };
+export { type ArgumentType, type Arrayable, type AutoCompleteExtractor, type AutoCompleteExtractorContext, type AutoCompleteExtractorResult, type AutoCompleteFunction, type AutoCompleteTemplate, type Awaitable, BetterMap, type BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, type CSSColorValue, type CSSEntries, type CSSObject, type CSSValue, type CSSValues, type CliEntryItem, type CliOptions, type ConfigBase, type ContentOptions, CountableSet, type DeepPartial, type DynamicMatcher, type DynamicRule, type DynamicShortcut, type DynamicShortcutMatcher, type ExtendedTokenInfo, type Extractor, type ExtractorContext, type FilterPattern, type FlatObjectTuple, type GenerateOptions, type GenerateResult, type GeneratorOptions, type HighlightAnnotation, type ParsedColorValue, type ParsedUtil, type PartialByKeys, type PluginOptions, type Postprocessor, type Preflight, type PreflightContext, type PreparedRule, type Preprocessor, type Preset, type PresetFactory, type PresetOptions, type PresetOrFactory, type RGBAColorValue, type RawUtil, type Replacement, type RequiredByKey, type ResolvedConfig, type RestArgs, type Rule, type RuleContext, type RuleMeta, type Shift, type Shortcut, type ShortcutValue, type SourceCodeTransformer, type SourceCodeTransformerEnforce, type SourceMap, type StaticRule, type StaticShortcut, type StaticShortcutMap, type StringifiedUtil, type SuggestResult, type ThemeExtender, type ToArray, TwoKeyMap, UnoGenerator, type UnocssPluginContext, type UserConfig, type UserConfigDefaults, type UserOnlyOptions, type UserShortcuts, type UtilObject, type Variant, type VariantContext, type VariantFunction, type VariantHandler, type VariantHandlerContext, type VariantMatchedResult, type VariantObject, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, cssIdRE, defaultSplitRE, definePreset, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isCountableSet, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, uniqueBy, validateFilterRE, warnOnce, withLayer };

package/dist/index.d.mts

@@ -73,6 +73,7 @@ declare function isStaticShortcut(sc: Shortcut<any>): sc is StaticShortcut;
 
 declare function toArray<T>(value?: T | T[]): T[];
 declare function uniq<T>(value: T[]): T[];
+declare function uniqueBy<T>(array: readonly T[], equalFn: (a: T, b: T) => boolean): T[];
 declare function isString(s: any): s is string;
 
 declare const attributifyRE: RegExp;
@@ -130,17 +131,6 @@ declare function expandVariantGroup(str: MagicString, separators?: string[], dep
 
 declare function warnOnce(msg: string): void;
 
-type ValueHandlerCallback = (str: string) => string | number | undefined;
-type ValueHandler<K extends string> = {
-    [S in K]: ValueHandler<K>;
-} & {
-    (str: string): string | undefined;
-    __options: {
-        sequence: K[];
-    };
-};
-declare function createValueHandler<K extends string>(handlers: Record<K, ValueHandlerCallback>): ValueHandler<K>;
-
 declare class UnoGenerator<Theme extends object = object> {
     userConfig: UserConfig<Theme>;
     defaults: UserConfigDefaults<Theme>;
@@ -362,7 +352,7 @@ interface Preflight<Theme extends object = object> {
     getCSS: (context: PreflightContext<Theme>) => Promise<string | undefined> | string | undefined;
     layer?: string;
 }
-type BlocklistRule = string | RegExp;
+type BlocklistRule = string | RegExp | ((selector: string) => boolean | null | undefined);
 interface VariantHandlerContext {
     /**
      * Rewrite the output selector. Often be used to append parents.
@@ -551,7 +541,7 @@ interface ConfigBase<Theme extends object = object> {
     /**
      * Presets
      */
-    presets?: (Preset<Theme> | Preset<Theme>[])[];
+    presets?: (PresetOrFactory<Theme> | PresetOrFactory<Theme>[])[];
     /**
      * Additional options for auto complete
      */
@@ -656,6 +646,8 @@ interface Preset<Theme extends object = object> extends ConfigBase<Theme> {
      */
     layer?: string;
 }
+type PresetFactory<Theme extends object = object, PresetOptions extends object | undefined = undefined> = (options?: PresetOptions) => Preset<Theme>;
+type PresetOrFactory<Theme extends object = object> = Preset<Theme> | PresetFactory<Theme, any>;
 interface GeneratorOptions {
     /**
      * Merge utilities with the exact same body to save the file size
@@ -838,7 +830,7 @@ interface PluginOptions {
      * The usage extracted from each source will be **merged** together.
      */
     content?: ContentOptions;
-    /** ========== DEPRECATED OPTIONS ========== **/
+    /** ========== DEPRECATED OPTIONS ========== */
     /**
      * @deprecated Renamed to `content`
      */
@@ -849,9 +841,9 @@ interface PluginOptions {
      */
     include?: FilterPattern;
     /**
-      * Patterns that filter the files NOT being extracted.
-      * @deprecated moved to `content.pipeline.exclude`
-      */
+     * Patterns that filter the files NOT being extracted.
+     * @deprecated moved to `content.pipeline.exclude`
+     */
     exclude?: FilterPattern;
 }
 interface UserConfig<Theme extends object = object> extends ConfigBase<Theme>, UserOnlyOptions<Theme>, GeneratorOptions, PluginOptions, CliOptions {
@@ -976,15 +968,17 @@ declare function resolveShortcuts<Theme extends object = object>(shortcuts: User
 /**
  * Resolve a single preset, nested presets are ignored
  */
-declare function resolvePreset<Theme extends object = object>(preset: Preset<Theme>): Preset<Theme>;
+declare function resolvePreset<Theme extends object = object>(presetInput: Preset<Theme> | PresetFactory<Theme, any>): Preset<Theme>;
 /**
  * Resolve presets with nested presets
  */
-declare function resolvePresets<Theme extends object = object>(preset: Preset<Theme>): Preset<Theme>[];
+declare function resolvePresets<Theme extends object = object>(preset: Preset<Theme> | PresetFactory<Theme, any>): Preset<Theme>[];
 declare function resolveConfig<Theme extends object = object>(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): ResolvedConfig<Theme>;
 /**
  * Merge multiple configs into one, later ones have higher priority
  */
 declare function mergeConfigs<Theme extends object = object>(configs: UserConfig<Theme>[]): UserConfig<Theme>;
+declare function definePreset<Options extends object | undefined = undefined, Theme extends object = object>(preset: PresetFactory<Theme, Options>): PresetFactory<Theme, Options>;
+declare function definePreset<Theme extends object = object>(preset: Preset<Theme>): Preset<Theme>;
 
-export { type ArgumentType, type Arrayable, type AutoCompleteExtractor, type AutoCompleteExtractorContext, type AutoCompleteExtractorResult, type AutoCompleteFunction, type AutoCompleteTemplate, type Awaitable, BetterMap, type BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, type CSSColorValue, type CSSEntries, type CSSObject, type CSSValue, type CSSValues, type CliEntryItem, type CliOptions, type ConfigBase, type ContentOptions, CountableSet, type DeepPartial, type DynamicMatcher, type DynamicRule, type DynamicShortcut, type DynamicShortcutMatcher, type ExtendedTokenInfo, type Extractor, type ExtractorContext, type FilterPattern, type FlatObjectTuple, type GenerateOptions, type GenerateResult, type GeneratorOptions, type HighlightAnnotation, type ParsedColorValue, type ParsedUtil, type PartialByKeys, type PluginOptions, type Postprocessor, type Preflight, type PreflightContext, type PreparedRule, type Preprocessor, type Preset, type PresetOptions, type RGBAColorValue, type RawUtil, type Replacement, type RequiredByKey, type ResolvedConfig, type RestArgs, type Rule, type RuleContext, type RuleMeta, type Shift, type Shortcut, type ShortcutValue, type SourceCodeTransformer, type SourceCodeTransformerEnforce, type SourceMap, type StaticRule, type StaticShortcut, type StaticShortcutMap, type StringifiedUtil, type SuggestResult, type ThemeExtender, type ToArray, TwoKeyMap, UnoGenerator, type UnocssPluginContext, type UserConfig, type UserConfigDefaults, type UserOnlyOptions, type UserShortcuts, type UtilObject, type ValueHandler, type ValueHandlerCallback, type Variant, type VariantContext, type VariantFunction, type VariantHandler, type VariantHandlerContext, type VariantMatchedResult, type VariantObject, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, defaultSplitRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isCountableSet, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };
+export { type ArgumentType, type Arrayable, type AutoCompleteExtractor, type AutoCompleteExtractorContext, type AutoCompleteExtractorResult, type AutoCompleteFunction, type AutoCompleteTemplate, type Awaitable, BetterMap, type BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, type CSSColorValue, type CSSEntries, type CSSObject, type CSSValue, type CSSValues, type CliEntryItem, type CliOptions, type ConfigBase, type ContentOptions, CountableSet, type DeepPartial, type DynamicMatcher, type DynamicRule, type DynamicShortcut, type DynamicShortcutMatcher, type ExtendedTokenInfo, type Extractor, type ExtractorContext, type FilterPattern, type FlatObjectTuple, type GenerateOptions, type GenerateResult, type GeneratorOptions, type HighlightAnnotation, type ParsedColorValue, type ParsedUtil, type PartialByKeys, type PluginOptions, type Postprocessor, type Preflight, type PreflightContext, type PreparedRule, type Preprocessor, type Preset, type PresetFactory, type PresetOptions, type PresetOrFactory, type RGBAColorValue, type RawUtil, type Replacement, type RequiredByKey, type ResolvedConfig, type RestArgs, type Rule, type RuleContext, type RuleMeta, type Shift, type Shortcut, type ShortcutValue, type SourceCodeTransformer, type SourceCodeTransformerEnforce, type SourceMap, type StaticRule, type StaticShortcut, type StaticShortcutMap, type StringifiedUtil, type SuggestResult, type ThemeExtender, type ToArray, TwoKeyMap, UnoGenerator, type UnocssPluginContext, type UserConfig, type UserConfigDefaults, type UserOnlyOptions, type UserShortcuts, type UtilObject, type Variant, type VariantContext, type VariantFunction, type VariantHandler, type VariantHandlerContext, type VariantMatchedResult, type VariantObject, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, cssIdRE, defaultSplitRE, definePreset, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isCountableSet, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, uniqueBy, validateFilterRE, warnOnce, withLayer };

package/dist/index.d.ts

@@ -73,6 +73,7 @@ declare function isStaticShortcut(sc: Shortcut<any>): sc is StaticShortcut;
 
 declare function toArray<T>(value?: T | T[]): T[];
 declare function uniq<T>(value: T[]): T[];
+declare function uniqueBy<T>(array: readonly T[], equalFn: (a: T, b: T) => boolean): T[];
 declare function isString(s: any): s is string;
 
 declare const attributifyRE: RegExp;
@@ -130,17 +131,6 @@ declare function expandVariantGroup(str: MagicString, separators?: string[], dep
 
 declare function warnOnce(msg: string): void;
 
-type ValueHandlerCallback = (str: string) => string | number | undefined;
-type ValueHandler<K extends string> = {
-    [S in K]: ValueHandler<K>;
-} & {
-    (str: string): string | undefined;
-    __options: {
-        sequence: K[];
-    };
-};
-declare function createValueHandler<K extends string>(handlers: Record<K, ValueHandlerCallback>): ValueHandler<K>;
-
 declare class UnoGenerator<Theme extends object = object> {
     userConfig: UserConfig<Theme>;
     defaults: UserConfigDefaults<Theme>;
@@ -362,7 +352,7 @@ interface Preflight<Theme extends object = object> {
     getCSS: (context: PreflightContext<Theme>) => Promise<string | undefined> | string | undefined;
     layer?: string;
 }
-type BlocklistRule = string | RegExp;
+type BlocklistRule = string | RegExp | ((selector: string) => boolean | null | undefined);
 interface VariantHandlerContext {
     /**
      * Rewrite the output selector. Often be used to append parents.
@@ -551,7 +541,7 @@ interface ConfigBase<Theme extends object = object> {
     /**
      * Presets
      */
-    presets?: (Preset<Theme> | Preset<Theme>[])[];
+    presets?: (PresetOrFactory<Theme> | PresetOrFactory<Theme>[])[];
     /**
      * Additional options for auto complete
      */
@@ -656,6 +646,8 @@ interface Preset<Theme extends object = object> extends ConfigBase<Theme> {
      */
     layer?: string;
 }
+type PresetFactory<Theme extends object = object, PresetOptions extends object | undefined = undefined> = (options?: PresetOptions) => Preset<Theme>;
+type PresetOrFactory<Theme extends object = object> = Preset<Theme> | PresetFactory<Theme, any>;
 interface GeneratorOptions {
     /**
      * Merge utilities with the exact same body to save the file size
@@ -838,7 +830,7 @@ interface PluginOptions {
      * The usage extracted from each source will be **merged** together.
      */
     content?: ContentOptions;
-    /** ========== DEPRECATED OPTIONS ========== **/
+    /** ========== DEPRECATED OPTIONS ========== */
     /**
      * @deprecated Renamed to `content`
      */
@@ -849,9 +841,9 @@ interface PluginOptions {
      */
     include?: FilterPattern;
     /**
-      * Patterns that filter the files NOT being extracted.
-      * @deprecated moved to `content.pipeline.exclude`
-      */
+     * Patterns that filter the files NOT being extracted.
+     * @deprecated moved to `content.pipeline.exclude`
+     */
     exclude?: FilterPattern;
 }
 interface UserConfig<Theme extends object = object> extends ConfigBase<Theme>, UserOnlyOptions<Theme>, GeneratorOptions, PluginOptions, CliOptions {
@@ -976,15 +968,17 @@ declare function resolveShortcuts<Theme extends object = object>(shortcuts: User
 /**
  * Resolve a single preset, nested presets are ignored
  */
-declare function resolvePreset<Theme extends object = object>(preset: Preset<Theme>): Preset<Theme>;
+declare function resolvePreset<Theme extends object = object>(presetInput: Preset<Theme> | PresetFactory<Theme, any>): Preset<Theme>;
 /**
  * Resolve presets with nested presets
  */
-declare function resolvePresets<Theme extends object = object>(preset: Preset<Theme>): Preset<Theme>[];
+declare function resolvePresets<Theme extends object = object>(preset: Preset<Theme> | PresetFactory<Theme, any>): Preset<Theme>[];
 declare function resolveConfig<Theme extends object = object>(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): ResolvedConfig<Theme>;
 /**
  * Merge multiple configs into one, later ones have higher priority
  */
 declare function mergeConfigs<Theme extends object = object>(configs: UserConfig<Theme>[]): UserConfig<Theme>;
+declare function definePreset<Options extends object | undefined = undefined, Theme extends object = object>(preset: PresetFactory<Theme, Options>): PresetFactory<Theme, Options>;
+declare function definePreset<Theme extends object = object>(preset: Preset<Theme>): Preset<Theme>;
 
-export { type ArgumentType, type Arrayable, type AutoCompleteExtractor, type AutoCompleteExtractorContext, type AutoCompleteExtractorResult, type AutoCompleteFunction, type AutoCompleteTemplate, type Awaitable, BetterMap, type BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, type CSSColorValue, type CSSEntries, type CSSObject, type CSSValue, type CSSValues, type CliEntryItem, type CliOptions, type ConfigBase, type ContentOptions, CountableSet, type DeepPartial, type DynamicMatcher, type DynamicRule, type DynamicShortcut, type DynamicShortcutMatcher, type ExtendedTokenInfo, type Extractor, type ExtractorContext, type FilterPattern, type FlatObjectTuple, type GenerateOptions, type GenerateResult, type GeneratorOptions, type HighlightAnnotation, type ParsedColorValue, type ParsedUtil, type PartialByKeys, type PluginOptions, type Postprocessor, type Preflight, type PreflightContext, type PreparedRule, type Preprocessor, type Preset, type PresetOptions, type RGBAColorValue, type RawUtil, type Replacement, type RequiredByKey, type ResolvedConfig, type RestArgs, type Rule, type RuleContext, type RuleMeta, type Shift, type Shortcut, type ShortcutValue, type SourceCodeTransformer, type SourceCodeTransformerEnforce, type SourceMap, type StaticRule, type StaticShortcut, type StaticShortcutMap, type StringifiedUtil, type SuggestResult, type ThemeExtender, type ToArray, TwoKeyMap, UnoGenerator, type UnocssPluginContext, type UserConfig, type UserConfigDefaults, type UserOnlyOptions, type UserShortcuts, type UtilObject, type ValueHandler, type ValueHandlerCallback, type Variant, type VariantContext, type VariantFunction, type VariantHandler, type VariantHandlerContext, type VariantMatchedResult, type VariantObject, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, defaultSplitRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isCountableSet, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };
+export { type ArgumentType, type Arrayable, type AutoCompleteExtractor, type AutoCompleteExtractorContext, type AutoCompleteExtractorResult, type AutoCompleteFunction, type AutoCompleteTemplate, type Awaitable, BetterMap, type BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, type CSSColorValue, type CSSEntries, type CSSObject, type CSSValue, type CSSValues, type CliEntryItem, type CliOptions, type ConfigBase, type ContentOptions, CountableSet, type DeepPartial, type DynamicMatcher, type DynamicRule, type DynamicShortcut, type DynamicShortcutMatcher, type ExtendedTokenInfo, type Extractor, type ExtractorContext, type FilterPattern, type FlatObjectTuple, type GenerateOptions, type GenerateResult, type GeneratorOptions, type HighlightAnnotation, type ParsedColorValue, type ParsedUtil, type PartialByKeys, type PluginOptions, type Postprocessor, type Preflight, type PreflightContext, type PreparedRule, type Preprocessor, type Preset, type PresetFactory, type PresetOptions, type PresetOrFactory, type RGBAColorValue, type RawUtil, type Replacement, type RequiredByKey, type ResolvedConfig, type RestArgs, type Rule, type RuleContext, type RuleMeta, type Shift, type Shortcut, type ShortcutValue, type SourceCodeTransformer, type SourceCodeTransformerEnforce, type SourceMap, type StaticRule, type StaticShortcut, type StaticShortcutMap, type StringifiedUtil, type SuggestResult, type ThemeExtender, type ToArray, TwoKeyMap, UnoGenerator, type UnocssPluginContext, type UserConfig, type UserConfigDefaults, type UserOnlyOptions, type UserShortcuts, type UtilObject, type Variant, type VariantContext, type VariantFunction, type VariantHandler, type VariantHandlerContext, type VariantMatchedResult, type VariantObject, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, cssIdRE, defaultSplitRE, definePreset, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isCountableSet, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, uniqueBy, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -53,6 +53,14 @@ function toArray(value = []) {
 function uniq(value) {
   return Array.from(new Set(value));
 }
+function uniqueBy(array, equalFn) {
+  return array.reduce((acc, cur) => {
+    const index = acc.findIndex((item) => equalFn(cur, item));
+    if (index === -1)
+      acc.push(cur);
+    return acc;
+  }, []);
+}
 function isString(s) {
   return typeof s === "string";
 }
@@ -390,36 +398,6 @@ function warnOnce(msg) {
   warned.add(msg);
 }
 
-function createValueHandler(handlers) {
-  const handler = function(str) {
-    const s = this.__options?.sequence || [];
-    this.__options.sequence = [];
-    for (const n of s) {
-      const res = handlers[n](str);
-      if (res != null)
-        return res;
-    }
-  };
-  function addProcessor(that, name) {
-    if (!that.__options) {
-      that.__options = {
-        sequence: []
-      };
-    }
-    that.__options.sequence.push(name);
-    return that;
-  }
-  for (const name of Object.keys(handlers)) {
-    Object.defineProperty(handler, name, {
-      enumerable: true,
-      get() {
-        return addProcessor(this, name);
-      }
-    });
-  }
-  return handler;
-}
-
 const defaultSplitRE = /[\\:]?[\s'"`;{}]+/g;
 const splitWithVariantGroupRE = /([\\:]?[\s"'`;<>]|:\(|\)"|\)\s)/g;
 function splitCode(code) {
@@ -465,7 +443,8 @@ function resolveShortcuts(shortcuts) {
   });
 }
 const __RESOLVED = "_uno_resolved";
-function resolvePreset(preset) {
+function resolvePreset(presetInput) {
+  let preset = typeof presetInput === "function" ? presetInput() : presetInput;
   if (__RESOLVED in preset)
     return preset;
   preset = { ...preset };
@@ -499,7 +478,7 @@ function resolvePresets(preset) {
 }
 function resolveConfig(userConfig = {}, defaults = {}) {
   const config = Object.assign({}, defaults, userConfig);
-  const rawPresets = uniq((config.presets || []).flatMap(toArray).flatMap(resolvePresets));
+  const rawPresets = uniqueBy((config.presets || []).flatMap(toArray).flatMap(resolvePresets), (a, b) => a.name === b.name);
   const sortedPresets = [
     ...rawPresets.filter((p) => p.enforce === "pre"),
     ...rawPresets.filter((p) => !p.enforce),
@@ -610,8 +589,11 @@ function mergeAutocompleteShorthands(shorthands) {
     {}
   );
 }
+function definePreset(preset) {
+  return preset;
+}
 
-const version = "0.55.6";
+const version = "0.56.0";
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -1101,7 +1083,7 @@ class UnoGenerator {
     }).flat(2).filter(Boolean));
   }
   isBlocked(raw) {
-    return !raw || this.config.blocklist.some((e2) => isString(e2) ? e2 === raw : e2.test(raw));
+    return !raw || this.config.blocklist.some((e2) => typeof e2 === "function" ? e2(raw) : isString(e2) ? e2 === raw : e2.test(raw));
   }
 }
 function createGenerator(config, defaults) {
@@ -1127,4 +1109,4 @@ function defaultVariantHandler(input, next) {
   return next(input);
 }
 
-export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, CountableSet, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, defaultSplitRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isCountableSet, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };
+export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, CountableSet, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, cssIdRE, defaultSplitRE, definePreset, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isCountableSet, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, uniqueBy, validateFilterRE, warnOnce, withLayer };

package/package.json

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