@unocss/core 0.25.1 → 0.26.0

package/dist/index.cjs

@@ -366,7 +366,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.25.1";
+const version = "0.26.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -403,48 +403,55 @@ class UnoGenerator {
     }
     return set;
   }
-  async parseToken(raw) {
+  makeContext(raw, applied) {
+    const context = {
+      rawSelector: raw,
+      currentSelector: applied[1],
+      theme: this.config.theme,
+      generator: this,
+      variantHandlers: applied[2],
+      constructCSS: (...args) => this.constructCustomCSS(context, ...args),
+      variantMatch: applied
+    };
+    return context;
+  }
+  async parseToken(raw, alias) {
     if (this.blocked.has(raw))
       return;
-    if (this._cache.has(raw))
-      return this._cache.get(raw);
+    const cacheKey = `${raw}${alias ? ` ${alias}` : ""}`;
+    const cached = this._cache.get(cacheKey);
+    if (cached)
+      return cached;
     let current = raw;
     for (const p of this.config.preprocess)
       current = p(raw);
     if (this.isBlocked(current)) {
       this.blocked.add(raw);
-      this._cache.set(raw, null);
+      this._cache.set(cacheKey, null);
       return;
     }
     const applied = this.matchVariants(raw, current);
     if (!applied || this.isBlocked(applied[1])) {
       this.blocked.add(raw);
-      this._cache.set(raw, null);
+      this._cache.set(cacheKey, null);
       return;
     }
-    const context = {
-      rawSelector: raw,
-      currentSelector: applied[1],
-      theme: this.config.theme,
-      generator: this,
-      variantHandlers: applied[2],
-      constructCSS: (...args) => this.constructCustomCSS(context, ...args)
-    };
-    const expanded = this.expandShortcut(applied[1], context);
+    const context = this.makeContext(raw, [alias || applied[0], applied[1], applied[2]]);
+    const expanded = this.expandShortcut(context.currentSelector, context);
     if (expanded) {
-      const utils = await this.stringifyShortcuts(applied, context, expanded[0], expanded[1]);
+      const utils = await this.stringifyShortcuts(context.variantMatch, context, expanded[0], expanded[1]);
       if (utils?.length) {
-        this._cache.set(raw, utils);
+        this._cache.set(cacheKey, utils);
         return utils;
       }
     } else {
-      const utils = (await this.parseUtil(applied, context))?.map((i) => this.stringifyUtil(i)).filter(notNull);
+      const utils = (await this.parseUtil(context.variantMatch, context))?.map((i) => this.stringifyUtil(i)).filter(notNull);
       if (utils?.length) {
-        this._cache.set(raw, utils);
+        this._cache.set(cacheKey, utils);
         return utils;
       }
     }
-    this._cache.set(raw, null);
+    this._cache.set(cacheKey, null);
   }
   async generate(input, {
     id,

package/dist/index.d.ts

@@ -1,3 +1,5 @@
+import { LoadConfigResult } from 'unconfig';
+
 declare class UnoGenerator {
     userConfig: UserConfig;
     defaults: UserConfigDefaults;
@@ -9,7 +11,8 @@ declare class UnoGenerator {
     constructor(userConfig?: UserConfig, defaults?: UserConfigDefaults);
     setConfig(userConfig?: UserConfig, defaults?: UserConfigDefaults): void;
     applyExtractors(code: string, id?: string, set?: Set<string>): Promise<Set<string>>;
-    parseToken(raw: string): Promise<StringifiedUtil[] | null | undefined>;
+    makeContext(raw: string, applied: VariantMatchedResult): RuleContext<{}>;
+    parseToken(raw: string, alias?: string): Promise<StringifiedUtil[] | undefined>;
     generate(input: string | Set<string>, { id, scope, preflights, safelist, minify, }?: GenerateOptions): Promise<GenerateResult>;
     matchVariants(raw: string, current?: string): VariantMatchedResult;
     applyVariants(parsed: ParsedUtil, variantHandlers?: VariantHandler[], raw?: string): UtilObject;
@@ -23,6 +26,68 @@ declare class UnoGenerator {
 declare function createGenerator(config?: UserConfig, defaults?: UserConfigDefaults): UnoGenerator;
 declare const hasScopePlaceholder: (css: string) => RegExpMatchArray | null;
 
+declare function escapeRegExp(string: string): string;
+/**
+ * CSS Selector Escape
+ */
+declare function escapeSelector(str: string): string;
+declare const e: typeof escapeSelector;
+
+declare function normalizeCSSEntries(obj: CSSEntries | CSSObject): CSSEntries;
+declare function normalizeCSSValues(obj: CSSValues): CSSEntries[];
+declare function clearIdenticalEntries(entry: CSSEntries): CSSEntries;
+declare function entriesToCss(arr?: CSSEntries): string;
+declare function isObject(item: any): item is Record<string, any>;
+declare function mergeDeep<T>(original: T, patch: DeepPartial<T>): T;
+declare function clone<T>(val: T): T;
+declare function isStaticRule(rule: Rule): rule is StaticRule;
+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 const attributifyRE: RegExp;
+declare const validateFilterRE: RegExp;
+declare const CONTROL_SHORTCUT_NO_MERGE = "$$shortcut-no-merge";
+declare function isAttributifySelector(selector: string): RegExpMatchArray | null;
+declare function isValidSelector(selector?: string): selector is string;
+declare function normalizeVariant(variant: Variant): VariantObject;
+declare function isRawUtil(util: ParsedUtil | RawUtil | StringifiedUtil): util is RawUtil;
+declare function notNull<T>(value: T | null | undefined): value is T;
+
+declare class TwoKeyMap<K1, K2, V> {
+    _map: Map<K1, Map<K2, V>>;
+    get(key1: K1, key2: K2): V | undefined;
+    getFallback(key1: K1, key2: K2, fallback: V): V;
+    set(key1: K1, key2: K2, value: V): this;
+    has(key1: K1, key2: K2): boolean | undefined;
+    delete(key1: K1, key2: K2): boolean;
+    deleteTop(key1: K1): boolean;
+    map<T>(fn: (v: V, k1: K1, k2: K2) => T): T[];
+}
+declare class BetterMap<K, V> extends Map<K, V> {
+    map<R>(mapFn: (value: V, key: K) => R): R[];
+}
+
+declare function withLayer<T>(layer: string, rules: Rule<T>[]): Rule<T>[];
+
+declare const regexClassGroup: RegExp;
+declare function expandVariantGroup(str: string): string;
+
+declare function warnOnce(msg: string): void;
+
+declare type ValueHandlerCallback = (str: string) => string | number | undefined;
+declare 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 type Awaitable<T> = T | Promise<T>;
 declare type Arrayable<T> = T | T[];
 declare type ArgumentType<T> = T extends ((...args: infer A) => any) ? A : never;
@@ -93,6 +158,10 @@ interface RuleContext<Theme extends {} = {}> {
      * Matched variants handlers for this rule.
      */
     variantHandlers: VariantHandler[];
+    /**
+     * The result of variant matching.
+     */
+    variantMatch: VariantMatchedResult;
     /**
      * Constrcut a custom CSS rule.
      * Variants and selector escaping will be handled automatically.
@@ -310,6 +379,48 @@ interface UserOnlyOptions<Theme extends {} = {}> {
      */
     envMode?: 'dev' | 'build';
 }
+interface UnocssPluginContext<Config extends UserConfig = UserConfig> {
+    ready: Promise<LoadConfigResult<Config>>;
+    uno: UnoGenerator;
+    tokens: Set<string>;
+    modules: BetterMap<string, string>;
+    filter: (code: string, id: string) => boolean;
+    extract: (code: string, id?: string) => Promise<void>;
+    reloadConfig: () => Promise<LoadConfigResult<Config>>;
+    getConfig: () => Promise<Config>;
+    invalidate: () => void;
+    onInvalidate: (fn: () => void) => void;
+}
+interface SourceMap {
+    file?: string;
+    mappings?: string;
+    names?: string[];
+    sources?: string[];
+    sourcesContent?: string[];
+    version?: number;
+}
+interface TransformResult {
+    code: string;
+    map?: SourceMap | null;
+    etag?: string;
+    deps?: string[];
+    dynamicDeps?: string[];
+}
+interface SourceCodeTransformer {
+    name: string;
+    /**
+     * The order of transformer
+     */
+    enforce?: 'pre' | 'post';
+    /**
+     * Custom id filter, if not provided, the extraction filter will be applied
+     */
+    idFilter?: (id: string) => boolean;
+    /**
+     * The transform function
+     */
+    transform: (code: string, id: string, ctx: UnocssPluginContext) => Awaitable<string | TransformResult | null | undefined>;
+}
 /**
  * For other modules to aggregate the options
  */
@@ -332,6 +443,12 @@ interface PluginOptions {
      * Patterns that filter the files NOT being extracted.
      */
     exclude?: FilterPattern;
+    /**
+     * Custom transformers to the source code
+     *
+     * Currently only supported in Vite
+     */
+    transformers?: SourceCodeTransformer[];
 }
 interface UserConfig<Theme extends {} = {}> extends ConfigBase<Theme>, UserOnlyOptions<Theme>, GeneratorOptions, PluginOptions {
 }
@@ -410,70 +527,8 @@ interface GenerateOptions {
     scope?: string;
 }
 
-declare function escapeRegExp(string: string): string;
-/**
- * CSS Selector Escape
- */
-declare function escapeSelector(str: string): string;
-declare const e: typeof escapeSelector;
-
-declare function normalizeCSSEntries(obj: CSSEntries | CSSObject): CSSEntries;
-declare function normalizeCSSValues(obj: CSSValues): CSSEntries[];
-declare function clearIdenticalEntries(entry: CSSEntries): CSSEntries;
-declare function entriesToCss(arr?: CSSEntries): string;
-declare function isObject(item: any): item is Record<string, any>;
-declare function mergeDeep<T>(original: T, patch: DeepPartial<T>): T;
-declare function clone<T>(val: T): T;
-declare function isStaticRule(rule: Rule): rule is StaticRule;
-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 const attributifyRE: RegExp;
-declare const validateFilterRE: RegExp;
-declare const CONTROL_SHORTCUT_NO_MERGE = "$$shortcut-no-merge";
-declare function isAttributifySelector(selector: string): RegExpMatchArray | null;
-declare function isValidSelector(selector?: string): selector is string;
-declare function normalizeVariant(variant: Variant): VariantObject;
-declare function isRawUtil(util: ParsedUtil | RawUtil | StringifiedUtil): util is RawUtil;
-declare function notNull<T>(value: T | null | undefined): value is T;
-
-declare class TwoKeyMap<K1, K2, V> {
-    _map: Map<K1, Map<K2, V>>;
-    get(key1: K1, key2: K2): V | undefined;
-    getFallback(key1: K1, key2: K2, fallback: V): V;
-    set(key1: K1, key2: K2, value: V): this;
-    has(key1: K1, key2: K2): boolean | undefined;
-    delete(key1: K1, key2: K2): boolean;
-    deleteTop(key1: K1): boolean;
-    map<T>(fn: (v: V, k1: K1, k2: K2) => T): T[];
-}
-declare class BetterMap<K, V> extends Map<K, V> {
-    map<R>(mapFn: (value: V, key: K) => R): R[];
-}
-
-declare function withLayer<T>(layer: string, rules: Rule<T>[]): Rule<T>[];
-
-declare const regexClassGroup: RegExp;
-declare function expandVariantGroup(str: string): string;
-
-declare function warnOnce(msg: string): void;
-
-declare type ValueHandlerCallback = (str: string) => string | number | undefined;
-declare 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 const extractorSplit: Extractor;
 
 declare const extractorSvelte: Extractor;
 
-export { ArgumentType, Arrayable, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSColorValue, CSSEntries, CSSObject, CSSValues, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, ThemeExtender, TwoKeyMap, UnoGenerator, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, toArray, uniq, validateFilterRE, warnOnce, withLayer };
+export { ArgumentType, Arrayable, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSColorValue, CSSEntries, CSSObject, CSSValues, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, SourceCodeTransformer, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, ThemeExtender, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, toArray, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -362,7 +362,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.25.1";
+const version = "0.26.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -399,48 +399,55 @@ class UnoGenerator {
     }
     return set;
   }
-  async parseToken(raw) {
+  makeContext(raw, applied) {
+    const context = {
+      rawSelector: raw,
+      currentSelector: applied[1],
+      theme: this.config.theme,
+      generator: this,
+      variantHandlers: applied[2],
+      constructCSS: (...args) => this.constructCustomCSS(context, ...args),
+      variantMatch: applied
+    };
+    return context;
+  }
+  async parseToken(raw, alias) {
     if (this.blocked.has(raw))
       return;
-    if (this._cache.has(raw))
-      return this._cache.get(raw);
+    const cacheKey = `${raw}${alias ? ` ${alias}` : ""}`;
+    const cached = this._cache.get(cacheKey);
+    if (cached)
+      return cached;
     let current = raw;
     for (const p of this.config.preprocess)
       current = p(raw);
     if (this.isBlocked(current)) {
       this.blocked.add(raw);
-      this._cache.set(raw, null);
+      this._cache.set(cacheKey, null);
       return;
     }
     const applied = this.matchVariants(raw, current);
     if (!applied || this.isBlocked(applied[1])) {
       this.blocked.add(raw);
-      this._cache.set(raw, null);
+      this._cache.set(cacheKey, null);
       return;
     }
-    const context = {
-      rawSelector: raw,
-      currentSelector: applied[1],
-      theme: this.config.theme,
-      generator: this,
-      variantHandlers: applied[2],
-      constructCSS: (...args) => this.constructCustomCSS(context, ...args)
-    };
-    const expanded = this.expandShortcut(applied[1], context);
+    const context = this.makeContext(raw, [alias || applied[0], applied[1], applied[2]]);
+    const expanded = this.expandShortcut(context.currentSelector, context);
     if (expanded) {
-      const utils = await this.stringifyShortcuts(applied, context, expanded[0], expanded[1]);
+      const utils = await this.stringifyShortcuts(context.variantMatch, context, expanded[0], expanded[1]);
       if (utils?.length) {
-        this._cache.set(raw, utils);
+        this._cache.set(cacheKey, utils);
         return utils;
       }
     } else {
-      const utils = (await this.parseUtil(applied, context))?.map((i) => this.stringifyUtil(i)).filter(notNull);
+      const utils = (await this.parseUtil(context.variantMatch, context))?.map((i) => this.stringifyUtil(i)).filter(notNull);
       if (utils?.length) {
-        this._cache.set(raw, utils);
+        this._cache.set(cacheKey, utils);
         return utils;
       }
     }
-    this._cache.set(raw, null);
+    this._cache.set(cacheKey, null);
   }
   async generate(input, {
     id,

package/package.json

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