@unocss/core 0.17.2 → 0.19.0

package/dist/index.cjs

@@ -110,6 +110,13 @@ function mergeSet(target, append) {
   append.forEach((i) => target.add(i));
   return target;
 }
+function cacheFunction(fn) {
+  const cache = Object.create(null);
+  return (str) => {
+    const hit = cache[str];
+    return hit || (cache[str] = fn(str));
+  };
+}
 
 const hexRE = /^#?([\da-f]+)$/i;
 function hex2rgba(hex = "") {
@@ -337,6 +344,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     ...sortedPresets.map((p) => p.theme || {}),
     config.theme || {}
   ].reduce((a, p) => mergeDeep(a, p), {});
+  const options = Object.assign({}, ...config.presets?.map((p) => Array.isArray(p) ? p : [p]).flat(1).map((p) => p.options ?? {}) || []);
   return {
     mergeSelectors: true,
     warn: true,
@@ -355,11 +363,12 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     preflights: mergePresets("preflights"),
     variants: mergePresets("variants").map(normalizeVariant),
     shortcuts: resolveShortcuts(mergePresets("shortcuts")),
-    extractors
+    extractors,
+    options
   };
 }
 
-const version = "0.17.2";
+const version = "0.19.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -388,7 +397,8 @@ class UnoGenerator {
         return code;
       },
       code,
-      id
+      id,
+      options: this.config.options
     };
     for (const extractor of this.config.extractors) {
       const result = await extractor.extract(context);
@@ -449,7 +459,8 @@ class UnoGenerator {
         theme: this.config.theme,
         generator: this,
         variantHandlers: applied[2],
-        constructCSS: (...args) => this.constructCustomCSS(context, ...args)
+        constructCSS: (...args) => this.constructCustomCSS(context, ...args),
+        options: this.config.options
       };
       const expanded = this.expandShortcut(applied[1], context);
       if (expanded) {
@@ -519,12 +530,18 @@ class UnoGenerator {
     const handlers = [];
     let processed = current || raw;
     let applied = false;
+    const context = {
+      rawSelector: raw,
+      theme: this.config.theme,
+      generator: this,
+      options: this.config.options
+    };
     while (true) {
       applied = false;
       for (const v of this.config.variants) {
         if (!v.multiPass && usedVariants.has(v))
           continue;
-        let handler = v.match(processed, raw, this.config.theme);
+        let handler = v.match(processed, context);
         if (!handler)
           continue;
         if (typeof handler === "string")
@@ -684,6 +701,7 @@ exports.BetterMap = BetterMap;
 exports.TwoKeyMap = TwoKeyMap;
 exports.UnoGenerator = UnoGenerator;
 exports.attributifyRE = attributifyRE;
+exports.cacheFunction = cacheFunction;
 exports.clearIdenticalEntries = clearIdenticalEntries;
 exports.createGenerator = createGenerator;
 exports.createValueHandler = createValueHandler;

package/dist/index.d.ts

@@ -55,10 +55,11 @@ declare type ParsedColorValue = {
      */
     no: string;
     /**
-     * Color scale. Preferrably 000 - 999
+     * {@link RGBAColorValue}
      */
     rgba?: RGBAColorValue;
 };
+declare type PresetOptions = Record<string, any>;
 interface RuleContext<Theme extends {} = {}> {
     /**
      * Unprocessed selector from user input.
@@ -86,11 +87,34 @@ interface RuleContext<Theme extends {} = {}> {
      * Variants and selector escaping will be handled automatically.
      */
     constructCSS: (body: CSSEntries | CSSObject, overrideSelector?: string) => string;
+    /**
+     * User-provided options from preset.
+     */
+    readonly options: PresetOptions;
+}
+interface VariantContext<Theme extends {} = {}> {
+    /**
+     * Unprocessed selector from user input.
+     */
+    rawSelector: string;
+    /**
+     * UnoCSS generator instance
+     */
+    generator: UnoGenerator;
+    /**
+     * The theme object
+     */
+    theme: Theme;
+    /**
+     * User-provided options from preset.
+     */
+    readonly options: PresetOptions;
 }
 interface ExtractorContext {
     readonly original: string;
     code: string;
     id?: string;
+    readonly options: PresetOptions;
 }
 interface Extractor {
     name: string;
@@ -110,11 +134,11 @@ interface RuleMeta {
     internal?: boolean;
 }
 declare type CSSValues = CSSObject | CSSEntries | (CSSObject | CSSEntries)[];
-declare type DynamicMatcher<Theme extends {} = {}> = ((match: string[], context: Readonly<RuleContext<Theme>>) => Awaitable<CSSValues | string | undefined>);
+declare type DynamicMatcher<Theme extends {} = {}> = ((match: RegExpMatchArray, context: Readonly<RuleContext<Theme>>) => Awaitable<CSSValues | 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: string[], context: Readonly<RuleContext<Theme>>) => (string | string[] | undefined));
+declare type DynamicShortcutMatcher<Theme extends {} = {}> = ((match: RegExpMatchArray, context: Readonly<RuleContext<Theme>>) => (string | string[] | undefined));
 declare type StaticShortcut = [string, string | string[]] | [string, string | string[], RuleMeta];
 declare type StaticShortcutMap = Record<string, string | string[]>;
 declare type DynamicShortcut<Theme extends {} = {}> = [RegExp, DynamicShortcutMatcher<Theme>] | [RegExp, DynamicShortcutMatcher<Theme>, RuleMeta];
@@ -144,7 +168,7 @@ interface VariantHandler {
      */
     parent?: string | [string, number] | undefined;
 }
-declare type VariantFunction<Theme extends {} = {}> = (matcher: string, raw: string, theme: Theme) => string | VariantHandler | undefined;
+declare type VariantFunction<Theme extends {} = {}> = (matcher: string, context: Readonly<VariantContext<Theme>>) => string | VariantHandler | undefined;
 declare type VariantObject<Theme extends {} = {}> = {
     /**
      * The entry function to match and rewrite the selector for futher processing.
@@ -285,6 +309,7 @@ interface ResolvedConfig extends Omit<RequiredByKey<UserConfig, 'mergeSelectors'
     rulesSize: number;
     rulesDynamic: (DynamicRule | undefined)[];
     rulesStaticMap: Record<string, [number, CSSObject | CSSEntries, RuleMeta | undefined] | undefined>;
+    options: PresetOptions;
 }
 interface GenerateResult {
     css: string;
@@ -362,6 +387,9 @@ declare function isStaticShortcut(sc: Shortcut): sc is StaticShortcut;
 declare function toArray<T>(value?: T | T[]): T[];
 declare function uniq<T>(value: T[]): T[];
 declare function mergeSet<T>(target: Set<T>, append: Set<T>): Set<T>;
+declare function cacheFunction<T extends (str: string) => R, R extends string | {
+    readonly [key: string]: string | number;
+}>(fn: T): T;
 
 declare function hex2rgba(hex?: string): RGBAColorValue | undefined;
 
@@ -409,4 +437,4 @@ declare const extractorSplit: Extractor;
 
 declare const extractorSvelte: Extractor;
 
-export { ArgumentType, Awaitable, BetterMap, BlocklistRule, CSSEntries, CSSObject, CSSValues, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Preflight, Preset, RGBAColorValue, RawUtil, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, TwoKeyMap, UnoGenerator, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, ValueHandler, ValueHandlerCallback, Variant, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, createGenerator, createValueHandler, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, toArray, uniq, validateFilterRE, warnOnce, withLayer };
+export { ArgumentType, Awaitable, BetterMap, BlocklistRule, CSSEntries, CSSObject, CSSValues, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Preflight, Preset, PresetOptions, RGBAColorValue, RawUtil, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, TwoKeyMap, UnoGenerator, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, cacheFunction, clearIdenticalEntries, createGenerator, createValueHandler, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, toArray, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -106,6 +106,13 @@ function mergeSet(target, append) {
   append.forEach((i) => target.add(i));
   return target;
 }
+function cacheFunction(fn) {
+  const cache = Object.create(null);
+  return (str) => {
+    const hit = cache[str];
+    return hit || (cache[str] = fn(str));
+  };
+}
 
 const hexRE = /^#?([\da-f]+)$/i;
 function hex2rgba(hex = "") {
@@ -333,6 +340,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     ...sortedPresets.map((p) => p.theme || {}),
     config.theme || {}
   ].reduce((a, p) => mergeDeep(a, p), {});
+  const options = Object.assign({}, ...config.presets?.map((p) => Array.isArray(p) ? p : [p]).flat(1).map((p) => p.options ?? {}) || []);
   return {
     mergeSelectors: true,
     warn: true,
@@ -351,11 +359,12 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     preflights: mergePresets("preflights"),
     variants: mergePresets("variants").map(normalizeVariant),
     shortcuts: resolveShortcuts(mergePresets("shortcuts")),
-    extractors
+    extractors,
+    options
   };
 }
 
-const version = "0.17.2";
+const version = "0.19.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -384,7 +393,8 @@ class UnoGenerator {
         return code;
       },
       code,
-      id
+      id,
+      options: this.config.options
     };
     for (const extractor of this.config.extractors) {
       const result = await extractor.extract(context);
@@ -445,7 +455,8 @@ class UnoGenerator {
         theme: this.config.theme,
         generator: this,
         variantHandlers: applied[2],
-        constructCSS: (...args) => this.constructCustomCSS(context, ...args)
+        constructCSS: (...args) => this.constructCustomCSS(context, ...args),
+        options: this.config.options
       };
       const expanded = this.expandShortcut(applied[1], context);
       if (expanded) {
@@ -515,12 +526,18 @@ class UnoGenerator {
     const handlers = [];
     let processed = current || raw;
     let applied = false;
+    const context = {
+      rawSelector: raw,
+      theme: this.config.theme,
+      generator: this,
+      options: this.config.options
+    };
     while (true) {
       applied = false;
       for (const v of this.config.variants) {
         if (!v.multiPass && usedVariants.has(v))
           continue;
-        let handler = v.match(processed, raw, this.config.theme);
+        let handler = v.match(processed, context);
         if (!handler)
           continue;
         if (typeof handler === "string")
@@ -676,4 +693,4 @@ function toEscapedSelector(raw) {
     return `.${e(raw)}`;
 }
 
-export { BetterMap, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, createGenerator, createValueHandler, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, toArray, uniq, validateFilterRE, warnOnce, withLayer };
+export { BetterMap, TwoKeyMap, UnoGenerator, attributifyRE, cacheFunction, clearIdenticalEntries, createGenerator, createValueHandler, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, toArray, uniq, validateFilterRE, warnOnce, withLayer };

package/package.json

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