@unocss/core 0.42.1 → 0.43.2

package/dist/index.cjs

@@ -39,8 +39,22 @@ function escapeSelector(str) {
 }
 const e = escapeSelector;
 
+function toArray(value = []) {
+  return Array.isArray(value) ? value : [value];
+}
+function uniq(value) {
+  return Array.from(new Set(value));
+}
+function mergeSet(target, append) {
+  append.forEach((i) => target.add(i));
+  return target;
+}
+function isString(s) {
+  return typeof s === "string";
+}
+
 function normalizeCSSEntries(obj) {
-  if (typeof obj === "string")
+  if (isString(obj))
     return obj;
   return (!Array.isArray(obj) ? Object.entries(obj) : obj).filter((i) => i[1] != null);
 }
@@ -118,21 +132,10 @@ function clone(val) {
   return val;
 }
 function isStaticRule(rule) {
-  return typeof rule[0] === "string";
+  return isString(rule[0]);
 }
 function isStaticShortcut(sc) {
-  return typeof sc[0] === "string";
-}
-
-function toArray(value = []) {
-  return Array.isArray(value) ? value : [value];
-}
-function uniq(value) {
-  return Array.from(new Set(value));
-}
-function mergeSet(target, append) {
-  append.forEach((i) => target.add(i));
-  return target;
+  return isString(sc[0]);
 }
 
 const attributifyRE = /^\[(.+?)~?="(.*)"\]$/;
@@ -386,6 +389,15 @@ function createNanoEvents() {
   };
 }
 
+const LAYER_DEFAULT = "default";
+const LAYER_PREFLIGHTS = "preflights";
+const LAYER_SHORTCUTS = "shortcuts";
+const DEAFULT_LAYERS = {
+  [LAYER_PREFLIGHTS]: -100,
+  [LAYER_SHORTCUTS]: -10,
+  [LAYER_DEFAULT]: 0
+};
+
 function resolveShortcuts(shortcuts) {
   return toArray(shortcuts).flatMap((s) => {
     if (Array.isArray(s))
@@ -393,20 +405,33 @@ function resolveShortcuts(shortcuts) {
     return Object.entries(s);
   });
 }
-const defaultLayers = {
-  preflights: -100,
-  shortcuts: -10,
-  default: 0
-};
+function resolvePreset(preset) {
+  const shortcuts = preset.shortcuts ? resolveShortcuts(preset.shortcuts) : void 0;
+  preset.shortcuts = shortcuts;
+  if (preset.prefix || preset.layer) {
+    const apply = (i) => {
+      if (!i[2])
+        i[2] = {};
+      const meta = i[2];
+      if (meta.prefix == null && preset.prefix)
+        meta.prefix = preset.prefix;
+      if (meta.layer == null && preset.layer)
+        meta.prefix = preset.layer;
+    };
+    shortcuts?.forEach(apply);
+    preset.rules?.forEach(apply);
+  }
+  return preset;
+}
 function resolveConfig(userConfig = {}, defaults = {}) {
   const config = Object.assign({}, defaults, userConfig);
-  const rawPresets = (config.presets || []).flatMap(toArray);
+  const rawPresets = (config.presets || []).flatMap(toArray).map(resolvePreset);
   const sortedPresets = [
     ...rawPresets.filter((p) => p.enforce === "pre"),
     ...rawPresets.filter((p) => !p.enforce),
     ...rawPresets.filter((p) => p.enforce === "post")
   ];
-  const layers = Object.assign(defaultLayers, ...rawPresets.map((i) => i.layers), userConfig.layers);
+  const layers = Object.assign(DEAFULT_LAYERS, ...rawPresets.map((i) => i.layers), userConfig.layers);
   function mergePresets(key) {
     return uniq([
       ...sortedPresets.flatMap((p) => toArray(p[key] || [])),
@@ -422,7 +447,8 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   const rulesSize = rules.length;
   rules.forEach((rule, i) => {
     if (isStaticRule(rule)) {
-      rulesStaticMap[rule[0]] = [i, rule[1], rule[2], rule];
+      const prefix = rule[2]?.prefix || "";
+      rulesStaticMap[prefix + rule[0]] = [i, rule[1], rule[2], rule];
       delete rules[i];
     }
   });
@@ -460,7 +486,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.42.1";
+const version = "0.43.2";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -551,18 +577,19 @@ class UnoGenerator {
     }
     this._cache.set(cacheKey, null);
   }
-  async generate(input = "", {
-    id,
-    scope,
-    preflights = true,
-    safelist = true,
-    minify = false
-  } = {}) {
-    const tokens = typeof input === "string" ? await this.applyExtractors(input, id) : input;
+  async generate(input, options = {}) {
+    const {
+      id,
+      scope,
+      preflights = true,
+      safelist = true,
+      minify = false
+    } = options;
+    const tokens = isString(input) ? await this.applyExtractors(input, id) : Array.isArray(input) ? new Set(input) : input;
     if (safelist)
       this.config.safelist.forEach((s) => tokens.add(s));
     const nl = minify ? "" : "\n";
-    const layerSet = /* @__PURE__ */ new Set(["default"]);
+    const layerSet = /* @__PURE__ */ new Set([LAYER_DEFAULT]);
     const matched = /* @__PURE__ */ new Set();
     const sheet = /* @__PURE__ */ new Map();
     let preflightsMap = {};
@@ -591,12 +618,12 @@ class UnoGenerator {
         theme: this.config.theme
       };
       const preflightLayerSet = /* @__PURE__ */ new Set([]);
-      this.config.preflights.forEach(({ layer = "preflights" }) => {
+      this.config.preflights.forEach(({ layer = LAYER_PREFLIGHTS }) => {
         layerSet.add(layer);
         preflightLayerSet.add(layer);
       });
       preflightsMap = Object.fromEntries(await Promise.all(Array.from(preflightLayerSet).map(async (layer) => {
-        const preflights2 = await Promise.all(this.config.preflights.filter((i) => (i.layer || "preflights") === layer).map(async (i) => await i.getCSS(preflightContext)));
+        const preflights2 = await Promise.all(this.config.preflights.filter((i) => (i.layer || LAYER_PREFLIGHTS) === layer).map(async (i) => await i.getCSS(preflightContext)));
         const css = preflights2.filter(Boolean).join(nl);
         return [layer, css];
       })));
@@ -612,7 +639,7 @@ class UnoGenerator {
         return layerCache[layer];
       let css = Array.from(sheet).sort((a, b) => (this.parentOrders.get(a[0]) ?? 0) - (this.parentOrders.get(b[0]) ?? 0) || a[0]?.localeCompare(b[0] || "") || 0).map(([parent, items]) => {
         const size = items.length;
-        const sorted = items.filter((i) => (i[4]?.layer || "default") === layer).sort((a, b) => a[0] - b[0] || (a[4]?.sort || 0) - (b[4]?.sort || 0) || a[1]?.localeCompare(b[1] || "") || a[2]?.localeCompare(b[2] || "") || 0).map(([, selector, body, , meta]) => {
+        const sorted = items.filter((i) => (i[4]?.layer || LAYER_DEFAULT) === layer).sort((a, b) => a[0] - b[0] || (a[4]?.sort || 0) - (b[4]?.sort || 0) || a[1]?.localeCompare(b[1] || "") || a[2]?.localeCompare(b[2] || "") || 0).map(([, selector, body, , meta]) => {
           const scopedSelector = selector ? applyScope(selector, scope) : selector;
           return [
             [[scopedSelector ?? "", meta?.sort ?? 0]],
@@ -633,7 +660,7 @@ class UnoGenerator {
               }
             }
           }
-          const selectors = selectorSortPair ? [...new Set(selectorSortPair.sort((a, b) => a[1] - b[1] || a[0]?.localeCompare(b[0] || "") || 0).map((pair) => pair[0]).filter(Boolean))] : [];
+          const selectors = selectorSortPair ? uniq(selectorSortPair.sort((a, b) => a[1] - b[1] || a[0]?.localeCompare(b[0] || "") || 0).map((pair) => pair[0]).filter(Boolean)) : [];
           return selectors.length ? `${selectors.join(`,${nl}`)}{${body}}` : body;
         }).filter(Boolean).reverse().join(nl);
         if (!parent)
@@ -644,7 +671,8 @@ class UnoGenerator {
       if (preflights) {
         css = [preflightsMap[layer], css].filter(Boolean).join(nl);
       }
-      return layerCache[layer] = !minify && css ? `/* layer: ${layer} */${nl}${css}` : css;
+      const layerMark = minify ? "" : `/* layer: ${layer} */${nl}`;
+      return layerCache[layer] = css ? layerMark + css : "";
     };
     const getLayers = (includes = layers, excludes) => {
       return includes.filter((i) => !excludes?.includes(i)).map((i) => getLayer(i) || "").filter(Boolean).join(nl);
@@ -654,9 +682,9 @@ class UnoGenerator {
         return getLayers();
       },
       layers,
+      matched,
       getLayers,
-      getLayer,
-      matched
+      getLayer
     };
   }
   matchVariants(raw, current) {
@@ -677,7 +705,7 @@ class UnoGenerator {
         let handler = v.match(processed, context);
         if (!handler)
           continue;
-        if (typeof handler === "string")
+        if (isString(handler))
           handler = { matcher: handler };
         processed = handler.matcher;
         handlers.unshift(handler);
@@ -732,7 +760,7 @@ class UnoGenerator {
   }
   constructCustomCSS(context, body, overrideSelector) {
     const normalizedBody = normalizeCSSEntries(body);
-    if (typeof normalizedBody === "string")
+    if (isString(normalizedBody))
       return normalizedBody;
     const { selector, entries, parent } = this.applyVariants([0, overrideSelector || context.rawSelector, normalizedBody, void 0, context.variantHandlers]);
     const cssBody = `${selector}{${entriesToCss(entries)}}`;
@@ -741,7 +769,7 @@ class UnoGenerator {
     return cssBody;
   }
   async parseUtil(input, context, internal = false) {
-    const [raw, processed, variantHandlers] = typeof input === "string" ? this.matchVariants(input) : input;
+    const [raw, processed, variantHandlers] = isString(input) ? this.matchVariants(input) : input;
     const recordRule = this.config.details ? (r) => {
       context.rules = context.rules ?? [];
       context.rules.push(r);
@@ -753,7 +781,7 @@ class UnoGenerator {
         const index = staticMatch[0];
         const entry = normalizeCSSEntries(staticMatch[1]);
         const meta = staticMatch[2];
-        if (typeof entry === "string")
+        if (isString(entry))
           return [[index, entry, meta]];
         else
           return [[index, raw, entry, meta, variantHandlers]];
@@ -768,7 +796,10 @@ class UnoGenerator {
       if (rule[2]?.internal && !internal)
         continue;
       const [matcher, handler, meta] = rule;
-      const match = processed.match(matcher);
+      if (meta?.prefix && !processed.startsWith(meta.prefix))
+        continue;
+      const unprefixed = meta?.prefix ? processed.slice(meta.prefix.length) : processed;
+      const match = unprefixed.match(matcher);
       if (!match)
         continue;
       const result = await handler(match, context);
@@ -778,7 +809,7 @@ class UnoGenerator {
       const entries = normalizeCSSValues(result).filter((i2) => i2.length);
       if (entries.length) {
         return entries.map((e2) => {
-          if (typeof e2 === "string")
+          if (isString(e2))
             return [i, e2, meta];
           else
             return [i, raw, e2, meta, variantHandlers];
@@ -803,7 +834,7 @@ class UnoGenerator {
     };
     return [parsed[0], selector, body, parent, ruleMeta, this.config.details ? context : void 0];
   }
-  expandShortcut(processed, context, depth = 3) {
+  expandShortcut(input, context, depth = 5) {
     if (depth === 0)
       return;
     const recordShortcut = this.config.details ? (s) => {
@@ -813,15 +844,16 @@ class UnoGenerator {
     let meta;
     let result;
     for (const s of this.config.shortcuts) {
+      const unprefixed = s[2]?.prefix ? input.slice(s[2].prefix.length) : input;
       if (isStaticShortcut(s)) {
-        if (s[0] === processed) {
+        if (s[0] === unprefixed) {
           meta = meta || s[2];
           result = s[1];
           recordShortcut(s);
           break;
         }
       } else {
-        const match = processed.match(s[0]);
+        const match = unprefixed.match(s[0]);
         if (match)
           result = s[1](match, context);
         if (result) {
@@ -831,30 +863,27 @@ class UnoGenerator {
         }
       }
     }
-    if (typeof result === "string")
+    if (isString(result))
       result = expandVariantGroup(result).split(/\s+/g);
     if (!result) {
-      const [raw, rematchedProcess] = typeof processed === "string" ? this.matchVariants(processed) : processed;
-      if (raw !== rematchedProcess) {
-        const expanded = this.expandShortcut(rematchedProcess, context, depth - 1);
-        if (expanded) {
-          expanded[0].forEach((item, index) => {
-            expanded[0][index] = raw.replace(rematchedProcess, item);
-          });
-          return expanded;
-        }
+      const [raw, inputWithoutVariant] = isString(input) ? this.matchVariants(input) : input;
+      if (raw !== inputWithoutVariant) {
+        const expanded = this.expandShortcut(inputWithoutVariant, context, depth - 1);
+        if (expanded)
+          result = expanded[0].map((item) => isString(item) ? raw.replace(inputWithoutVariant, item) : item);
       }
-      return;
     }
+    if (!result)
+      return;
     return [
-      result.flatMap((r) => this.expandShortcut(r, context, depth - 1)?.[0] || [r]).filter((r) => r !== ""),
+      result.flatMap((r) => (isString(r) ? this.expandShortcut(r, context, depth - 1)?.[0] : void 0) || [r]).filter(Boolean),
       meta
     ];
   }
   async stringifyShortcuts(parent, context, expanded, meta = { layer: this.config.shortcutsLayer }) {
     const selectorMap = new TwoKeyMap();
     const parsed = (await Promise.all(uniq(expanded).map(async (i) => {
-      const result = await this.parseUtil(i, context, true);
+      const result = isString(i) ? await this.parseUtil(i, context, true) : [[Infinity, "{inline}", normalizeCSSEntries(i), void 0, []]];
       if (!result)
         warnOnce(`unmatched utility "${i}" in shortcut "${parent[1]}"`);
       return result || [];
@@ -892,7 +921,7 @@ class UnoGenerator {
     }).flat(2).filter(Boolean));
   }
   isBlocked(raw) {
-    return !raw || this.config.blocklist.some((e2) => typeof e2 === "string" ? e2 === raw : e2.test(raw));
+    return !raw || this.config.blocklist.some((e2) => isString(e2) ? e2 === raw : e2.test(raw));
   }
 }
 function createGenerator(config, defaults) {
@@ -948,6 +977,7 @@ exports.isObject = isObject;
 exports.isRawUtil = isRawUtil;
 exports.isStaticRule = isStaticRule;
 exports.isStaticShortcut = isStaticShortcut;
+exports.isString = isString;
 exports.isValidSelector = isValidSelector;
 exports.matchingPair = matchingPair;
 exports.mergeDeep = mergeDeep;

package/dist/index.d.ts

@@ -67,14 +67,14 @@ declare class UnoGenerator {
     applyExtractors(code: string, id?: string, set?: Set<string>): Promise<Set<string>>;
     makeContext(raw: string, applied: VariantMatchedResult): RuleContext<{}>;
     parseToken(raw: string, alias?: string): Promise<StringifiedUtil[] | null | undefined>;
-    generate(input?: string | Set<string>, { id, scope, preflights, safelist, minify, }?: GenerateOptions): Promise<GenerateResult>;
+    generate(input: string | Set<string> | string[], options?: GenerateOptions): Promise<GenerateResult>;
     matchVariants(raw: string, current?: string): VariantMatchedResult;
-    applyVariants(parsed: ParsedUtil, variantHandlers?: VariantHandler[], raw?: string): UtilObject;
+    private applyVariants;
     constructCustomCSS(context: Readonly<RuleContext>, body: CSSObject | CSSEntries, overrideSelector?: string): string;
     parseUtil(input: string | VariantMatchedResult, context: RuleContext, internal?: boolean): Promise<(ParsedUtil | RawUtil)[] | undefined>;
     stringifyUtil(parsed?: ParsedUtil | RawUtil, context?: RuleContext): 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>;
+    expandShortcut(input: string, context: RuleContext, depth?: number): [ShortcutValue[], RuleMeta | undefined] | undefined;
+    stringifyShortcuts(parent: VariantMatchedResult, context: RuleContext, expanded: ShortcutValue[], meta?: RuleMeta): Promise<StringifiedUtil[] | undefined>;
     isBlocked(raw: string): boolean;
 }
 declare function createGenerator(config?: UserConfig, defaults?: UserConfigDefaults): UnoGenerator;
@@ -103,6 +103,7 @@ 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 isString(s: any): s is string;
 
 declare const attributifyRE: RegExp;
 declare const cssIdRE: RegExp;
@@ -309,6 +310,10 @@ interface RuleMeta {
      * Templates to provide autocomplete suggestions
      */
     autocomplete?: Arrayable<AutoCompleteTemplate>;
+    /**
+     * Matching prefix before this util
+     */
+    prefix?: string;
     /**
      * Internal rules will only be matched for shortcuts but not the user code.
      * @default false
@@ -321,12 +326,13 @@ declare type DynamicMatcher<Theme extends {} = {}> = ((match: RegExpMatchArray,
 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 | string[] | undefined));
-declare type StaticShortcut = [string, string | string[]] | [string, string | string[], RuleMeta];
-declare type StaticShortcutMap = Record<string, string | string[]>;
+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;
 interface Preflight<Theme extends {} = {}> {
     getCSS: (context: PreflightContext<Theme>) => Promise<string | undefined> | string | undefined;
@@ -564,6 +570,14 @@ interface Preset<Theme extends {} = {}> extends ConfigBase<Theme> {
      * Preset options for other tools like IDE to consume
      */
     options?: PresetOptions;
+    /**
+     * Apply prefix to all utilities and shortcuts
+     */
+    prefix?: string;
+    /**
+     * Apply layer to all utilities and shortcuts
+     */
+    layer?: string;
 }
 interface GeneratorOptions {
     /**
@@ -772,4 +786,4 @@ 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, ConfigBase, DeepPartial, DetailString, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExtractStringOptions, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, PreparedRule, Preprocessor, Preset, PresetOptions, RGBAColorValue, Range, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, SourceCodeTransformer, 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, extractQuoted, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, matchingPair, mergeDeep, mergeSet, 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, ConfigBase, DeepPartial, DetailString, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExtractStringOptions, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, PreparedRule, Preprocessor, Preset, PresetOptions, RGBAColorValue, Range, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, ShortcutValue, SourceCodeTransformer, 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, extractQuoted, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, matchingPair, mergeDeep, mergeSet, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -35,8 +35,22 @@ function escapeSelector(str) {
 }
 const e = escapeSelector;
 
+function toArray(value = []) {
+  return Array.isArray(value) ? value : [value];
+}
+function uniq(value) {
+  return Array.from(new Set(value));
+}
+function mergeSet(target, append) {
+  append.forEach((i) => target.add(i));
+  return target;
+}
+function isString(s) {
+  return typeof s === "string";
+}
+
 function normalizeCSSEntries(obj) {
-  if (typeof obj === "string")
+  if (isString(obj))
     return obj;
   return (!Array.isArray(obj) ? Object.entries(obj) : obj).filter((i) => i[1] != null);
 }
@@ -114,21 +128,10 @@ function clone(val) {
   return val;
 }
 function isStaticRule(rule) {
-  return typeof rule[0] === "string";
+  return isString(rule[0]);
 }
 function isStaticShortcut(sc) {
-  return typeof sc[0] === "string";
-}
-
-function toArray(value = []) {
-  return Array.isArray(value) ? value : [value];
-}
-function uniq(value) {
-  return Array.from(new Set(value));
-}
-function mergeSet(target, append) {
-  append.forEach((i) => target.add(i));
-  return target;
+  return isString(sc[0]);
 }
 
 const attributifyRE = /^\[(.+?)~?="(.*)"\]$/;
@@ -382,6 +385,15 @@ function createNanoEvents() {
   };
 }
 
+const LAYER_DEFAULT = "default";
+const LAYER_PREFLIGHTS = "preflights";
+const LAYER_SHORTCUTS = "shortcuts";
+const DEAFULT_LAYERS = {
+  [LAYER_PREFLIGHTS]: -100,
+  [LAYER_SHORTCUTS]: -10,
+  [LAYER_DEFAULT]: 0
+};
+
 function resolveShortcuts(shortcuts) {
   return toArray(shortcuts).flatMap((s) => {
     if (Array.isArray(s))
@@ -389,20 +401,33 @@ function resolveShortcuts(shortcuts) {
     return Object.entries(s);
   });
 }
-const defaultLayers = {
-  preflights: -100,
-  shortcuts: -10,
-  default: 0
-};
+function resolvePreset(preset) {
+  const shortcuts = preset.shortcuts ? resolveShortcuts(preset.shortcuts) : void 0;
+  preset.shortcuts = shortcuts;
+  if (preset.prefix || preset.layer) {
+    const apply = (i) => {
+      if (!i[2])
+        i[2] = {};
+      const meta = i[2];
+      if (meta.prefix == null && preset.prefix)
+        meta.prefix = preset.prefix;
+      if (meta.layer == null && preset.layer)
+        meta.prefix = preset.layer;
+    };
+    shortcuts?.forEach(apply);
+    preset.rules?.forEach(apply);
+  }
+  return preset;
+}
 function resolveConfig(userConfig = {}, defaults = {}) {
   const config = Object.assign({}, defaults, userConfig);
-  const rawPresets = (config.presets || []).flatMap(toArray);
+  const rawPresets = (config.presets || []).flatMap(toArray).map(resolvePreset);
   const sortedPresets = [
     ...rawPresets.filter((p) => p.enforce === "pre"),
     ...rawPresets.filter((p) => !p.enforce),
     ...rawPresets.filter((p) => p.enforce === "post")
   ];
-  const layers = Object.assign(defaultLayers, ...rawPresets.map((i) => i.layers), userConfig.layers);
+  const layers = Object.assign(DEAFULT_LAYERS, ...rawPresets.map((i) => i.layers), userConfig.layers);
   function mergePresets(key) {
     return uniq([
       ...sortedPresets.flatMap((p) => toArray(p[key] || [])),
@@ -418,7 +443,8 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   const rulesSize = rules.length;
   rules.forEach((rule, i) => {
     if (isStaticRule(rule)) {
-      rulesStaticMap[rule[0]] = [i, rule[1], rule[2], rule];
+      const prefix = rule[2]?.prefix || "";
+      rulesStaticMap[prefix + rule[0]] = [i, rule[1], rule[2], rule];
       delete rules[i];
     }
   });
@@ -456,7 +482,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.42.1";
+const version = "0.43.2";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -547,18 +573,19 @@ class UnoGenerator {
     }
     this._cache.set(cacheKey, null);
   }
-  async generate(input = "", {
-    id,
-    scope,
-    preflights = true,
-    safelist = true,
-    minify = false
-  } = {}) {
-    const tokens = typeof input === "string" ? await this.applyExtractors(input, id) : input;
+  async generate(input, options = {}) {
+    const {
+      id,
+      scope,
+      preflights = true,
+      safelist = true,
+      minify = false
+    } = options;
+    const tokens = isString(input) ? await this.applyExtractors(input, id) : Array.isArray(input) ? new Set(input) : input;
     if (safelist)
       this.config.safelist.forEach((s) => tokens.add(s));
     const nl = minify ? "" : "\n";
-    const layerSet = /* @__PURE__ */ new Set(["default"]);
+    const layerSet = /* @__PURE__ */ new Set([LAYER_DEFAULT]);
     const matched = /* @__PURE__ */ new Set();
     const sheet = /* @__PURE__ */ new Map();
     let preflightsMap = {};
@@ -587,12 +614,12 @@ class UnoGenerator {
         theme: this.config.theme
       };
       const preflightLayerSet = /* @__PURE__ */ new Set([]);
-      this.config.preflights.forEach(({ layer = "preflights" }) => {
+      this.config.preflights.forEach(({ layer = LAYER_PREFLIGHTS }) => {
         layerSet.add(layer);
         preflightLayerSet.add(layer);
       });
       preflightsMap = Object.fromEntries(await Promise.all(Array.from(preflightLayerSet).map(async (layer) => {
-        const preflights2 = await Promise.all(this.config.preflights.filter((i) => (i.layer || "preflights") === layer).map(async (i) => await i.getCSS(preflightContext)));
+        const preflights2 = await Promise.all(this.config.preflights.filter((i) => (i.layer || LAYER_PREFLIGHTS) === layer).map(async (i) => await i.getCSS(preflightContext)));
         const css = preflights2.filter(Boolean).join(nl);
         return [layer, css];
       })));
@@ -608,7 +635,7 @@ class UnoGenerator {
         return layerCache[layer];
       let css = Array.from(sheet).sort((a, b) => (this.parentOrders.get(a[0]) ?? 0) - (this.parentOrders.get(b[0]) ?? 0) || a[0]?.localeCompare(b[0] || "") || 0).map(([parent, items]) => {
         const size = items.length;
-        const sorted = items.filter((i) => (i[4]?.layer || "default") === layer).sort((a, b) => a[0] - b[0] || (a[4]?.sort || 0) - (b[4]?.sort || 0) || a[1]?.localeCompare(b[1] || "") || a[2]?.localeCompare(b[2] || "") || 0).map(([, selector, body, , meta]) => {
+        const sorted = items.filter((i) => (i[4]?.layer || LAYER_DEFAULT) === layer).sort((a, b) => a[0] - b[0] || (a[4]?.sort || 0) - (b[4]?.sort || 0) || a[1]?.localeCompare(b[1] || "") || a[2]?.localeCompare(b[2] || "") || 0).map(([, selector, body, , meta]) => {
           const scopedSelector = selector ? applyScope(selector, scope) : selector;
           return [
             [[scopedSelector ?? "", meta?.sort ?? 0]],
@@ -629,7 +656,7 @@ class UnoGenerator {
               }
             }
           }
-          const selectors = selectorSortPair ? [...new Set(selectorSortPair.sort((a, b) => a[1] - b[1] || a[0]?.localeCompare(b[0] || "") || 0).map((pair) => pair[0]).filter(Boolean))] : [];
+          const selectors = selectorSortPair ? uniq(selectorSortPair.sort((a, b) => a[1] - b[1] || a[0]?.localeCompare(b[0] || "") || 0).map((pair) => pair[0]).filter(Boolean)) : [];
           return selectors.length ? `${selectors.join(`,${nl}`)}{${body}}` : body;
         }).filter(Boolean).reverse().join(nl);
         if (!parent)
@@ -640,7 +667,8 @@ class UnoGenerator {
       if (preflights) {
         css = [preflightsMap[layer], css].filter(Boolean).join(nl);
       }
-      return layerCache[layer] = !minify && css ? `/* layer: ${layer} */${nl}${css}` : css;
+      const layerMark = minify ? "" : `/* layer: ${layer} */${nl}`;
+      return layerCache[layer] = css ? layerMark + css : "";
     };
     const getLayers = (includes = layers, excludes) => {
       return includes.filter((i) => !excludes?.includes(i)).map((i) => getLayer(i) || "").filter(Boolean).join(nl);
@@ -650,9 +678,9 @@ class UnoGenerator {
         return getLayers();
       },
       layers,
+      matched,
       getLayers,
-      getLayer,
-      matched
+      getLayer
     };
   }
   matchVariants(raw, current) {
@@ -673,7 +701,7 @@ class UnoGenerator {
         let handler = v.match(processed, context);
         if (!handler)
           continue;
-        if (typeof handler === "string")
+        if (isString(handler))
           handler = { matcher: handler };
         processed = handler.matcher;
         handlers.unshift(handler);
@@ -728,7 +756,7 @@ class UnoGenerator {
   }
   constructCustomCSS(context, body, overrideSelector) {
     const normalizedBody = normalizeCSSEntries(body);
-    if (typeof normalizedBody === "string")
+    if (isString(normalizedBody))
       return normalizedBody;
     const { selector, entries, parent } = this.applyVariants([0, overrideSelector || context.rawSelector, normalizedBody, void 0, context.variantHandlers]);
     const cssBody = `${selector}{${entriesToCss(entries)}}`;
@@ -737,7 +765,7 @@ class UnoGenerator {
     return cssBody;
   }
   async parseUtil(input, context, internal = false) {
-    const [raw, processed, variantHandlers] = typeof input === "string" ? this.matchVariants(input) : input;
+    const [raw, processed, variantHandlers] = isString(input) ? this.matchVariants(input) : input;
     const recordRule = this.config.details ? (r) => {
       context.rules = context.rules ?? [];
       context.rules.push(r);
@@ -749,7 +777,7 @@ class UnoGenerator {
         const index = staticMatch[0];
         const entry = normalizeCSSEntries(staticMatch[1]);
         const meta = staticMatch[2];
-        if (typeof entry === "string")
+        if (isString(entry))
           return [[index, entry, meta]];
         else
           return [[index, raw, entry, meta, variantHandlers]];
@@ -764,7 +792,10 @@ class UnoGenerator {
       if (rule[2]?.internal && !internal)
         continue;
       const [matcher, handler, meta] = rule;
-      const match = processed.match(matcher);
+      if (meta?.prefix && !processed.startsWith(meta.prefix))
+        continue;
+      const unprefixed = meta?.prefix ? processed.slice(meta.prefix.length) : processed;
+      const match = unprefixed.match(matcher);
       if (!match)
         continue;
       const result = await handler(match, context);
@@ -774,7 +805,7 @@ class UnoGenerator {
       const entries = normalizeCSSValues(result).filter((i2) => i2.length);
       if (entries.length) {
         return entries.map((e2) => {
-          if (typeof e2 === "string")
+          if (isString(e2))
             return [i, e2, meta];
           else
             return [i, raw, e2, meta, variantHandlers];
@@ -799,7 +830,7 @@ class UnoGenerator {
     };
     return [parsed[0], selector, body, parent, ruleMeta, this.config.details ? context : void 0];
   }
-  expandShortcut(processed, context, depth = 3) {
+  expandShortcut(input, context, depth = 5) {
     if (depth === 0)
       return;
     const recordShortcut = this.config.details ? (s) => {
@@ -809,15 +840,16 @@ class UnoGenerator {
     let meta;
     let result;
     for (const s of this.config.shortcuts) {
+      const unprefixed = s[2]?.prefix ? input.slice(s[2].prefix.length) : input;
       if (isStaticShortcut(s)) {
-        if (s[0] === processed) {
+        if (s[0] === unprefixed) {
           meta = meta || s[2];
           result = s[1];
           recordShortcut(s);
           break;
         }
       } else {
-        const match = processed.match(s[0]);
+        const match = unprefixed.match(s[0]);
         if (match)
           result = s[1](match, context);
         if (result) {
@@ -827,30 +859,27 @@ class UnoGenerator {
         }
       }
     }
-    if (typeof result === "string")
+    if (isString(result))
       result = expandVariantGroup(result).split(/\s+/g);
     if (!result) {
-      const [raw, rematchedProcess] = typeof processed === "string" ? this.matchVariants(processed) : processed;
-      if (raw !== rematchedProcess) {
-        const expanded = this.expandShortcut(rematchedProcess, context, depth - 1);
-        if (expanded) {
-          expanded[0].forEach((item, index) => {
-            expanded[0][index] = raw.replace(rematchedProcess, item);
-          });
-          return expanded;
-        }
+      const [raw, inputWithoutVariant] = isString(input) ? this.matchVariants(input) : input;
+      if (raw !== inputWithoutVariant) {
+        const expanded = this.expandShortcut(inputWithoutVariant, context, depth - 1);
+        if (expanded)
+          result = expanded[0].map((item) => isString(item) ? raw.replace(inputWithoutVariant, item) : item);
       }
-      return;
     }
+    if (!result)
+      return;
     return [
-      result.flatMap((r) => this.expandShortcut(r, context, depth - 1)?.[0] || [r]).filter((r) => r !== ""),
+      result.flatMap((r) => (isString(r) ? this.expandShortcut(r, context, depth - 1)?.[0] : void 0) || [r]).filter(Boolean),
       meta
     ];
   }
   async stringifyShortcuts(parent, context, expanded, meta = { layer: this.config.shortcutsLayer }) {
     const selectorMap = new TwoKeyMap();
     const parsed = (await Promise.all(uniq(expanded).map(async (i) => {
-      const result = await this.parseUtil(i, context, true);
+      const result = isString(i) ? await this.parseUtil(i, context, true) : [[Infinity, "{inline}", normalizeCSSEntries(i), void 0, []]];
       if (!result)
         warnOnce(`unmatched utility "${i}" in shortcut "${parent[1]}"`);
       return result || [];
@@ -888,7 +917,7 @@ class UnoGenerator {
     }).flat(2).filter(Boolean));
   }
   isBlocked(raw) {
-    return !raw || this.config.blocklist.some((e2) => typeof e2 === "string" ? e2 === raw : e2.test(raw));
+    return !raw || this.config.blocklist.some((e2) => isString(e2) ? e2 === raw : e2.test(raw));
   }
 }
 function createGenerator(config, defaults) {
@@ -920,4 +949,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, extractQuoted, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, matchingPair, mergeDeep, mergeSet, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };
+export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractQuoted, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, matchingPair, mergeDeep, mergeSet, 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.42.1",
+  "version": "0.43.2",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",