@unocss/core 0.11.0 → 0.11.4

package/dist/index.d.ts

@@ -9,13 +9,13 @@ declare class UnoGenerator {
     setConfig(userConfig?: UserConfig, defaults?: UserConfigDefaults): void;
     applyExtractors(code: string, id?: string, set?: Set<string>): Promise<Set<string>>;
     generate(input: string | Set<string>, { id, scope, preflights, safelist, minify, }?: GenerateOptions): Promise<GenerateResult>;
-    matchVariants(raw: string): VariantMatchedResult;
+    matchVariants(raw: string, current?: string): VariantMatchedResult;
     applyVariants(parsed: ParsedUtil, variantHandlers?: VariantHandler[], raw?: string): readonly [string, CSSEntries, string | undefined];
     constructCustomCSS(context: Readonly<RuleContext>, body: CSSObject | CSSEntries, overrideSelector?: string): string;
-    parseUtil(input: string | VariantMatchedResult): Promise<ParsedUtil | RawUtil | undefined>;
+    parseUtil(input: string | VariantMatchedResult, context: RuleContext, internal?: boolean): Promise<ParsedUtil | RawUtil | undefined>;
     stringifyUtil(parsed?: ParsedUtil | RawUtil): StringifiedUtil | undefined;
-    expandShortcut(processed: string, depth?: number): [string[], RuleMeta | undefined] | undefined;
-    stringifyShortcuts(parent: VariantMatchedResult, expanded: string[], meta?: RuleMeta): Promise<StringifiedUtil[] | undefined>;
+    expandShortcut(processed: string, context: RuleContext, depth?: number): [string[], RuleMeta | undefined] | undefined;
+    stringifyShortcuts(parent: VariantMatchedResult, context: RuleContext, expanded: string[], meta?: RuleMeta): Promise<StringifiedUtil[] | undefined>;
     isBlocked(raw: string): boolean;
 }
 declare function createGenerator(config?: UserConfig, defaults?: UserConfigDefaults): UnoGenerator;
@@ -28,6 +28,10 @@ declare type RestArgs<T> = Shift<ArgumentType<T>>;
 declare type DeepPartial<T> = {
     [P in keyof T]?: DeepPartial<T[P]>;
 };
+declare 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 CSSObject = Record<string, string | number | undefined>;
 declare type CSSEntries = [string, string | number | undefined][];
 interface RuleContext<Theme extends {} = {}> {
@@ -69,18 +73,27 @@ interface Extractor {
     order?: number;
 }
 interface RuleMeta {
+    /**
+     * The layer name of this rule.
+     * @default 'default'
+     */
     layer?: string;
+    /**
+     * Internal rules will only be matched for shortcuts but not the user code.
+     * @default false
+     */
+    internal?: boolean;
 }
 declare type DynamicMatcher<Theme extends {} = {}> = ((match: string[], context: Readonly<RuleContext<Theme>>) => Awaitable<CSSObject | CSSEntries | 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 = ((match: string[]) => (string | string[] | undefined));
-declare type DynamicShortcut = [RegExp, DynamicShortcutMatcher] | [RegExp, DynamicShortcutMatcher, RuleMeta];
+declare type DynamicShortcutMatcher<Theme extends {} = {}> = ((match: string[], 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 UserShortcuts = StaticShortcutMap | (StaticShortcut | DynamicShortcut | StaticShortcutMap)[];
-declare type Shortcut = StaticShortcut | DynamicShortcut;
+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>;
 interface Preflight {
     getCSS: () => string | undefined;
     layer?: string;
@@ -187,6 +200,10 @@ interface UserOnlyOptions<Theme extends {} = {}> {
      * The theme object, will be merged with the theme provides by presets
      */
     theme?: Theme;
+    /**
+     * Preprocess the incoming utilities, return falsy value to exclude
+     */
+    preprocess?: (matcher: string) => string | undefined;
     /**
      * Layout name of shortcuts
      *
@@ -208,7 +225,7 @@ interface UserConfig<Theme extends {} = {}> extends ConfigBase<Theme>, UserOnlyO
 }
 interface UserConfigDefaults<Theme extends {} = {}> extends ConfigBase<Theme>, UserOnlyOptions<Theme> {
 }
-interface ResolvedConfig extends Omit<Required<UserConfig>, 'rules' | 'shortcuts'> {
+interface ResolvedConfig extends Omit<PartialByKeys<Required<UserConfig>, 'preprocess'>, 'rules' | 'shortcuts'> {
     shortcuts: Shortcut[];
     variants: VariantObject[];
     rulesSize: number;
@@ -316,4 +333,4 @@ declare function withLayer<T>(layer: string, rules: Rule<T>[]): Rule<T>[];
 
 declare const extractorSplit: Extractor;
 
-export { ArgumentType, Awaitable, BetterMap, BlocklistRule, CSSEntries, CSSObject, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, GenerateOptions, GenerateResult, GeneratorOptions, ParsedUtil, Preflight, Preset, RawUtil, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, TwoKeyMap, UnoGenerator, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, Variant, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, createGenerator, e, entriesToCss, escapeRegExp, escapeSelector, extractorSplit, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeVariant, toArray, uniq, validateFilterRE, withLayer };
+export { ArgumentType, Awaitable, BetterMap, BlocklistRule, CSSEntries, CSSObject, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedUtil, PartialByKeys, Preflight, Preset, RawUtil, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, TwoKeyMap, UnoGenerator, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, Variant, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, createGenerator, e, entriesToCss, escapeRegExp, escapeSelector, extractorSplit, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeVariant, toArray, uniq, validateFilterRE, withLayer };

package/dist/index.js

@@ -366,6 +366,10 @@ var UnoGenerator = class {
           layerSet.add(item[4].layer);
       }
     };
+    const block = (raw) => {
+      this.blocked.add(raw);
+      this._cache.set(raw, null);
+    };
     await Promise.all(Array.from(tokens).map(async (raw) => {
       if (matched.has(raw) || this.blocked.has(raw))
         return;
@@ -375,30 +379,31 @@ var UnoGenerator = class {
           hit(raw, r);
         return;
       }
-      if (this.isBlocked(raw)) {
-        this.blocked.add(raw);
-        this._cache.set(raw, null);
-        return;
-      }
-      const applied = this.matchVariants(raw);
-      if (this.isBlocked(applied[1])) {
-        this.blocked.add(raw);
-        this._cache.set(raw, null);
-        return;
-      }
-      const expanded = this.expandShortcut(applied[1]);
+      let current = raw;
+      if (this.config.preprocess)
+        current = this.config.preprocess(raw);
+      if (this.isBlocked(current))
+        return block(current);
+      const applied = this.matchVariants(raw, current);
+      if (!applied || this.isBlocked(applied[1]))
+        return block(raw);
+      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);
       if (expanded) {
-        const utils = await this.stringifyShortcuts(applied, expanded[0], expanded[1]);
-        if (utils == null ? void 0 : utils.length) {
-          hit(raw, utils);
-          return;
-        }
+        const utils = await this.stringifyShortcuts(applied, context, expanded[0], expanded[1]);
+        if (utils == null ? void 0 : utils.length)
+          return hit(raw, utils);
       } else {
-        const util = this.stringifyUtil(await this.parseUtil(applied));
-        if (util) {
-          hit(raw, [util]);
-          return;
-        }
+        const util = this.stringifyUtil(await this.parseUtil(applied, context));
+        if (util)
+          return hit(raw, [util]);
       }
       this._cache.set(raw, null);
     }));
@@ -462,10 +467,10 @@ var UnoGenerator = class {
       matched
     };
   }
-  matchVariants(raw) {
+  matchVariants(raw, current) {
     const usedVariants = new Set();
     const handlers = [];
-    let processed = raw;
+    let processed = current || raw;
     let applied = false;
     while (true) {
       applied = false;
@@ -515,24 +520,22 @@ var UnoGenerator = class {
       return `${mediaQuery}{${cssBody}}`;
     return cssBody;
   }
-  async parseUtil(input) {
-    const { theme, rulesStaticMap, rulesDynamic, rulesSize } = this.config;
+  async parseUtil(input, context, internal = false) {
+    var _a, _b;
     const [raw, processed, variantHandlers] = typeof input === "string" ? this.matchVariants(input) : input;
-    const staticMatch = rulesStaticMap[processed];
-    if (staticMatch == null ? void 0 : staticMatch[1])
-      return [staticMatch[0], raw, normalizeEntries(staticMatch[1]), staticMatch[2], variantHandlers];
-    const context = {
-      rawSelector: raw,
-      currentSelector: processed,
-      theme,
-      generator: this,
-      variantHandlers,
-      constructCSS: (...args) => this.constructCustomCSS(context, ...args)
-    };
+    const staticMatch = this.config.rulesStaticMap[processed];
+    if (staticMatch) {
+      if (staticMatch[1] && (internal || !((_a = staticMatch[2]) == null ? void 0 : _a.internal)))
+        return [staticMatch[0], raw, normalizeEntries(staticMatch[1]), staticMatch[2], variantHandlers];
+    }
+    context.variantHandlers = variantHandlers;
+    const { rulesDynamic, rulesSize } = this.config;
     for (let i = rulesSize; i >= 0; i--) {
       const rule = rulesDynamic[i];
       if (!rule)
         continue;
+      if (((_b = rule[2]) == null ? void 0 : _b.internal) && !internal)
+        continue;
       const [matcher, handler, meta] = rule;
       const match = processed.match(matcher);
       if (!match)
@@ -558,7 +561,7 @@ var UnoGenerator = class {
       return;
     return [parsed[0], selector, body, mediaQuery, parsed[3]];
   }
-  expandShortcut(processed, depth = 3) {
+  expandShortcut(processed, context, depth = 3) {
     if (depth === 0)
       return;
     let meta;
@@ -573,7 +576,7 @@ var UnoGenerator = class {
       } else {
         const match = processed.match(s[0]);
         if (match)
-          result = s[1](match);
+          result = s[1](match, context);
         if (result) {
           meta = meta || s[2];
           break;
@@ -587,14 +590,14 @@ var UnoGenerator = class {
     return [
       result.flatMap((r) => {
         var _a;
-        return ((_a = this.expandShortcut(r, depth - 1)) == null ? void 0 : _a[0]) || [r];
+        return ((_a = this.expandShortcut(r, context, depth - 1)) == null ? void 0 : _a[0]) || [r];
       }),
       meta
     ];
   }
-  async stringifyShortcuts(parent, expanded, meta = { layer: this.config.shortcutsLayer }) {
+  async stringifyShortcuts(parent, context, expanded, meta = { layer: this.config.shortcutsLayer }) {
     const selectorMap = new TwoKeyMap();
-    const parsed = (await Promise.all(uniq(expanded).map((i) => this.parseUtil(i)))).filter(Boolean).sort((a, b) => a[0] - b[0]);
+    const parsed = (await Promise.all(uniq(expanded).map((i) => this.parseUtil(i, context, true)))).filter(Boolean).sort((a, b) => a[0] - b[0]);
     const [raw, , parentVariants] = parent;
     for (const item of parsed) {
       if (isRawUtil(item))
@@ -613,7 +616,7 @@ var UnoGenerator = class {
     }).filter(Boolean);
   }
   isBlocked(raw) {
-    return this.config.blocklist.some((e2) => typeof e2 === "string" ? e2 === raw : e2.test(raw));
+    return !raw || this.config.blocklist.some((e2) => typeof e2 === "string" ? e2 === raw : e2.test(raw));
   }
 };
 function createGenerator(config, defaults) {

package/dist/index.mjs

@@ -329,6 +329,10 @@ var UnoGenerator = class {
           layerSet.add(item[4].layer);
       }
     };
+    const block = (raw) => {
+      this.blocked.add(raw);
+      this._cache.set(raw, null);
+    };
     await Promise.all(Array.from(tokens).map(async (raw) => {
       if (matched.has(raw) || this.blocked.has(raw))
         return;
@@ -338,30 +342,31 @@ var UnoGenerator = class {
           hit(raw, r);
         return;
       }
-      if (this.isBlocked(raw)) {
-        this.blocked.add(raw);
-        this._cache.set(raw, null);
-        return;
-      }
-      const applied = this.matchVariants(raw);
-      if (this.isBlocked(applied[1])) {
-        this.blocked.add(raw);
-        this._cache.set(raw, null);
-        return;
-      }
-      const expanded = this.expandShortcut(applied[1]);
+      let current = raw;
+      if (this.config.preprocess)
+        current = this.config.preprocess(raw);
+      if (this.isBlocked(current))
+        return block(current);
+      const applied = this.matchVariants(raw, current);
+      if (!applied || this.isBlocked(applied[1]))
+        return block(raw);
+      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);
       if (expanded) {
-        const utils = await this.stringifyShortcuts(applied, expanded[0], expanded[1]);
-        if (utils == null ? void 0 : utils.length) {
-          hit(raw, utils);
-          return;
-        }
+        const utils = await this.stringifyShortcuts(applied, context, expanded[0], expanded[1]);
+        if (utils == null ? void 0 : utils.length)
+          return hit(raw, utils);
       } else {
-        const util = this.stringifyUtil(await this.parseUtil(applied));
-        if (util) {
-          hit(raw, [util]);
-          return;
-        }
+        const util = this.stringifyUtil(await this.parseUtil(applied, context));
+        if (util)
+          return hit(raw, [util]);
       }
       this._cache.set(raw, null);
     }));
@@ -425,10 +430,10 @@ var UnoGenerator = class {
       matched
     };
   }
-  matchVariants(raw) {
+  matchVariants(raw, current) {
     const usedVariants = new Set();
     const handlers = [];
-    let processed = raw;
+    let processed = current || raw;
     let applied = false;
     while (true) {
       applied = false;
@@ -478,24 +483,22 @@ var UnoGenerator = class {
       return `${mediaQuery}{${cssBody}}`;
     return cssBody;
   }
-  async parseUtil(input) {
-    const { theme, rulesStaticMap, rulesDynamic, rulesSize } = this.config;
+  async parseUtil(input, context, internal = false) {
+    var _a, _b;
     const [raw, processed, variantHandlers] = typeof input === "string" ? this.matchVariants(input) : input;
-    const staticMatch = rulesStaticMap[processed];
-    if (staticMatch == null ? void 0 : staticMatch[1])
-      return [staticMatch[0], raw, normalizeEntries(staticMatch[1]), staticMatch[2], variantHandlers];
-    const context = {
-      rawSelector: raw,
-      currentSelector: processed,
-      theme,
-      generator: this,
-      variantHandlers,
-      constructCSS: (...args) => this.constructCustomCSS(context, ...args)
-    };
+    const staticMatch = this.config.rulesStaticMap[processed];
+    if (staticMatch) {
+      if (staticMatch[1] && (internal || !((_a = staticMatch[2]) == null ? void 0 : _a.internal)))
+        return [staticMatch[0], raw, normalizeEntries(staticMatch[1]), staticMatch[2], variantHandlers];
+    }
+    context.variantHandlers = variantHandlers;
+    const { rulesDynamic, rulesSize } = this.config;
     for (let i = rulesSize; i >= 0; i--) {
       const rule = rulesDynamic[i];
       if (!rule)
         continue;
+      if (((_b = rule[2]) == null ? void 0 : _b.internal) && !internal)
+        continue;
       const [matcher, handler, meta] = rule;
       const match = processed.match(matcher);
       if (!match)
@@ -521,7 +524,7 @@ var UnoGenerator = class {
       return;
     return [parsed[0], selector, body, mediaQuery, parsed[3]];
   }
-  expandShortcut(processed, depth = 3) {
+  expandShortcut(processed, context, depth = 3) {
     if (depth === 0)
       return;
     let meta;
@@ -536,7 +539,7 @@ var UnoGenerator = class {
       } else {
         const match = processed.match(s[0]);
         if (match)
-          result = s[1](match);
+          result = s[1](match, context);
         if (result) {
           meta = meta || s[2];
           break;
@@ -550,14 +553,14 @@ var UnoGenerator = class {
     return [
       result.flatMap((r) => {
         var _a;
-        return ((_a = this.expandShortcut(r, depth - 1)) == null ? void 0 : _a[0]) || [r];
+        return ((_a = this.expandShortcut(r, context, depth - 1)) == null ? void 0 : _a[0]) || [r];
       }),
       meta
     ];
   }
-  async stringifyShortcuts(parent, expanded, meta = { layer: this.config.shortcutsLayer }) {
+  async stringifyShortcuts(parent, context, expanded, meta = { layer: this.config.shortcutsLayer }) {
     const selectorMap = new TwoKeyMap();
-    const parsed = (await Promise.all(uniq(expanded).map((i) => this.parseUtil(i)))).filter(Boolean).sort((a, b) => a[0] - b[0]);
+    const parsed = (await Promise.all(uniq(expanded).map((i) => this.parseUtil(i, context, true)))).filter(Boolean).sort((a, b) => a[0] - b[0]);
     const [raw, , parentVariants] = parent;
     for (const item of parsed) {
       if (isRawUtil(item))
@@ -576,7 +579,7 @@ var UnoGenerator = class {
     }).filter(Boolean);
   }
   isBlocked(raw) {
-    return this.config.blocklist.some((e2) => typeof e2 === "string" ? e2 === raw : e2.test(raw));
+    return !raw || this.config.blocklist.some((e2) => typeof e2 === "string" ? e2 === raw : e2.test(raw));
   }
 };
 function createGenerator(config, defaults) {

package/package.json

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