@unocss/core 0.12.17 → 0.14.0

package/dist/index.d.ts

@@ -13,7 +13,7 @@ declare class UnoGenerator {
     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, context: RuleContext, internal?: boolean): 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, context: RuleContext, depth?: number): [string[], RuleMeta | undefined] | undefined;
     stringifyShortcuts(parent: VariantMatchedResult, context: RuleContext, expanded: string[], meta?: RuleMeta): Promise<StringifiedUtil[] | undefined>;
@@ -21,6 +21,8 @@ declare class UnoGenerator {
 }
 declare function createGenerator(config?: UserConfig, defaults?: UserConfigDefaults): UnoGenerator;
 declare const hasScopePlaceholder: (css: string) => RegExpMatchArray | null;
+declare function normalizeCSSEntries(obj: CSSEntries | CSSObject): CSSEntries;
+declare function normalizeCSSValues(obj: CSSValues): CSSEntries[];
 
 declare type Awaitable<T> = T | Promise<T>;
 declare type ArgumentType<T> = T extends ((...args: infer A) => any) ? A : never;
@@ -33,6 +35,7 @@ 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 RequiredByKey<T, K extends keyof T = keyof T> = FlatObjectTuple<Required<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 {} = {}> {
@@ -85,7 +88,8 @@ interface RuleMeta {
      */
     internal?: boolean;
 }
-declare type DynamicMatcher<Theme extends {} = {}> = ((match: string[], context: Readonly<RuleContext<Theme>>) => Awaitable<CSSObject | CSSEntries | string | undefined>);
+declare type CSSValues = CSSObject | CSSEntries | (CSSObject | CSSEntries)[];
+declare type DynamicMatcher<Theme extends {} = {}> = ((match: string[], 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;
@@ -95,6 +99,7 @@ declare type StaticShortcutMap = Record<string, string | string[]>;
 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 FilterPattern = ReadonlyArray<string | RegExp> | string | RegExp | null;
 interface Preflight {
     getCSS: () => string | undefined;
     layer?: string;
@@ -226,11 +231,34 @@ interface UserOnlyOptions<Theme extends {} = {}> {
      */
     envMode?: 'dev' | 'build';
 }
-interface UserConfig<Theme extends {} = {}> extends ConfigBase<Theme>, UserOnlyOptions<Theme>, GeneratorOptions {
+/**
+ * For other modules to aggregate the options
+ */
+interface PluginOptions {
+    /**
+     * Load from configs files
+     *
+     * set `false` to disable
+     */
+    configFile?: string | false;
+    /**
+     * List of files that will also triggers config reloads
+     */
+    configDeps?: string[];
+    /**
+     * Patterns that filter the files being extracted.
+     */
+    include?: FilterPattern;
+    /**
+     * Patterns that filter the files NOT being extracted.
+     */
+    exclude?: FilterPattern;
+}
+interface UserConfig<Theme extends {} = {}> extends ConfigBase<Theme>, UserOnlyOptions<Theme>, GeneratorOptions, PluginOptions {
 }
 interface UserConfigDefaults<Theme extends {} = {}> extends ConfigBase<Theme>, UserOnlyOptions<Theme> {
 }
-interface ResolvedConfig extends Omit<PartialByKeys<Required<UserConfig>, 'preprocess'>, 'rules' | 'shortcuts'> {
+interface ResolvedConfig extends Omit<RequiredByKey<UserConfig, 'mergeSelectors' | 'theme' | 'rules' | 'variants' | 'layers' | 'extractors' | 'blocklist' | 'safelist' | 'preflights' | 'sortLayers'>, 'rules' | 'shortcuts'> {
     shortcuts: Shortcut[];
     variants: VariantObject[];
     rulesSize: number;
@@ -319,6 +347,7 @@ declare function isAttributifySelector(selector: string): RegExpMatchArray | nul
 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>>;
@@ -343,4 +372,4 @@ declare function warnOnce(msg: string): void;
 
 declare const extractorSplit: Extractor;
 
-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, expandVariantGroup, extractorSplit, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeVariant, 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, ParsedUtil, PartialByKeys, PluginOptions, Preflight, Preset, RawUtil, RequiredByKey, 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, expandVariantGroup, extractorSplit, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, toArray, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.js

@@ -29,7 +29,10 @@ __export(exports, {
   isValidSelector: () => isValidSelector,
   mergeDeep: () => mergeDeep,
   mergeSet: () => mergeSet,
+  normalizeCSSEntries: () => normalizeCSSEntries,
+  normalizeCSSValues: () => normalizeCSSValues,
   normalizeVariant: () => normalizeVariant,
+  notNull: () => notNull,
   regexClassGroup: () => regexClassGroup,
   toArray: () => toArray,
   uniq: () => uniq,
@@ -164,6 +167,9 @@ function normalizeVariant(variant) {
 function isRawUtil(util) {
   return util.length === 3;
 }
+function notNull(value) {
+  return value != null;
+}
 
 // src/utils/map.ts
 var TwoKeyMap = class {
@@ -336,7 +342,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
 }
 
 // package.json
-var version = "0.12.17";
+var version = "0.14.0";
 
 // src/generator/index.ts
 var UnoGenerator = class {
@@ -406,6 +412,7 @@ var UnoGenerator = class {
       this._cache.set(raw, null);
     };
     await Promise.all(Array.from(tokens).map(async (raw) => {
+      var _a;
       if (matched.has(raw) || this.blocked.has(raw))
         return;
       if (this._cache.has(raw)) {
@@ -436,9 +443,9 @@ var UnoGenerator = class {
         if (utils == null ? void 0 : utils.length)
           return hit(raw, utils);
       } else {
-        const util = this.stringifyUtil(await this.parseUtil(applied, context));
-        if (util)
-          return hit(raw, [util]);
+        const utils = (_a = await this.parseUtil(applied, context)) == null ? void 0 : _a.map((i) => this.stringifyUtil(i)).filter(notNull);
+        if (utils == null ? void 0 : utils.length)
+          return hit(raw, utils);
       }
       this._cache.set(raw, null);
     }));
@@ -467,18 +474,18 @@ var UnoGenerator = class {
         }).map((a) => [a[1] ? applyScope(a[1], scope) : a[1], a[2]]);
         if (!sorted.length)
           return void 0;
-        const rules = sorted.map(([selector, body], idx) => {
+        const rules = sorted.reverse().map(([selector, body], idx) => {
           if (selector && this.config.mergeSelectors) {
-            for (let i = size - 1; i > idx; i--) {
+            for (let i = idx + 1; i < size; i++) {
               const current = sorted[i];
               if (current && current[0] && current[1] === body) {
-                current[0] = `${selector},${current[0]}`;
+                current[0] = `${current[0]},${selector}`;
                 return null;
               }
             }
           }
           return selector ? `${selector}{${body}}` : body;
-        }).filter(Boolean).join(nl);
+        }).filter(Boolean).reverse().join(nl);
         return parent ? `${parent}{${nl}${rules}${nl}}` : rules;
       }).filter(Boolean).join(nl);
       if (preflights) {
@@ -548,7 +555,7 @@ var UnoGenerator = class {
     ];
   }
   constructCustomCSS(context, body, overrideSelector) {
-    body = normalizeEntries(body);
+    body = normalizeCSSEntries(body);
     const [selector, entries, mediaQuery] = this.applyVariants([0, overrideSelector || context.rawSelector, body, void 0, context.variantHandlers]);
     const cssBody = `${selector}{${entriesToCss(entries)}}`;
     if (mediaQuery)
@@ -561,7 +568,7 @@ var UnoGenerator = class {
     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];
+        return [[staticMatch[0], raw, normalizeCSSEntries(staticMatch[1]), staticMatch[2], variantHandlers]];
     }
     context.variantHandlers = variantHandlers;
     const { rulesDynamic, rulesSize } = this.config;
@@ -579,10 +586,10 @@ var UnoGenerator = class {
       if (!result)
         continue;
       if (typeof result === "string")
-        return [i, result, meta];
-      const entries = normalizeEntries(result).filter((i2) => i2[1] != null);
+        return [[i, result, meta]];
+      const entries = normalizeCSSValues(result).filter((i2) => i2.length);
       if (entries.length)
-        return [i, raw, entries, meta, variantHandlers];
+        return entries.map((e2) => [i, raw, e2, meta, variantHandlers]);
     }
   }
   stringifyUtil(parsed) {
@@ -636,8 +643,8 @@ var UnoGenerator = class {
       const result = await this.parseUtil(i, context, true);
       if (!result)
         warnOnce(`unmatched utility "${i}" in shortcut "${parent[1]}"`);
-      return result;
-    }))).filter(Boolean).sort((a, b) => a[0] - b[0]);
+      return result || [];
+    }))).flat(1).filter(Boolean).sort((a, b) => a[0] - b[0]);
     const [raw, , parentVariants] = parent;
     for (const item of parsed) {
       if (isRawUtil(item))
@@ -676,8 +683,18 @@ function toEscapedSelector(raw) {
   else
     return `.${e(raw)}`;
 }
-function normalizeEntries(obj) {
-  return !Array.isArray(obj) ? Object.entries(obj) : obj;
+function normalizeCSSEntries(obj) {
+  return (!Array.isArray(obj) ? Object.entries(obj) : obj).filter((i) => i[1] != null);
+}
+function normalizeCSSValues(obj) {
+  if (Array.isArray(obj)) {
+    if (obj.find((i) => !Array.isArray(i) || Array.isArray(i[0])))
+      return obj.map((i) => normalizeCSSEntries(i));
+    else
+      return [obj];
+  } else {
+    return [normalizeCSSEntries(obj)];
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -702,7 +719,10 @@ function normalizeEntries(obj) {
   isValidSelector,
   mergeDeep,
   mergeSet,
+  normalizeCSSEntries,
+  normalizeCSSValues,
   normalizeVariant,
+  notNull,
   regexClassGroup,
   toArray,
   uniq,

package/dist/index.mjs

@@ -124,6 +124,9 @@ function normalizeVariant(variant) {
 function isRawUtil(util) {
   return util.length === 3;
 }
+function notNull(value) {
+  return value != null;
+}
 
 // src/utils/map.ts
 var TwoKeyMap = class {
@@ -296,7 +299,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
 }
 
 // package.json
-var version = "0.12.17";
+var version = "0.14.0";
 
 // src/generator/index.ts
 var UnoGenerator = class {
@@ -366,6 +369,7 @@ var UnoGenerator = class {
       this._cache.set(raw, null);
     };
     await Promise.all(Array.from(tokens).map(async (raw) => {
+      var _a;
       if (matched.has(raw) || this.blocked.has(raw))
         return;
       if (this._cache.has(raw)) {
@@ -396,9 +400,9 @@ var UnoGenerator = class {
         if (utils == null ? void 0 : utils.length)
           return hit(raw, utils);
       } else {
-        const util = this.stringifyUtil(await this.parseUtil(applied, context));
-        if (util)
-          return hit(raw, [util]);
+        const utils = (_a = await this.parseUtil(applied, context)) == null ? void 0 : _a.map((i) => this.stringifyUtil(i)).filter(notNull);
+        if (utils == null ? void 0 : utils.length)
+          return hit(raw, utils);
       }
       this._cache.set(raw, null);
     }));
@@ -427,18 +431,18 @@ var UnoGenerator = class {
         }).map((a) => [a[1] ? applyScope(a[1], scope) : a[1], a[2]]);
         if (!sorted.length)
           return void 0;
-        const rules = sorted.map(([selector, body], idx) => {
+        const rules = sorted.reverse().map(([selector, body], idx) => {
           if (selector && this.config.mergeSelectors) {
-            for (let i = size - 1; i > idx; i--) {
+            for (let i = idx + 1; i < size; i++) {
               const current = sorted[i];
               if (current && current[0] && current[1] === body) {
-                current[0] = `${selector},${current[0]}`;
+                current[0] = `${current[0]},${selector}`;
                 return null;
               }
             }
           }
           return selector ? `${selector}{${body}}` : body;
-        }).filter(Boolean).join(nl);
+        }).filter(Boolean).reverse().join(nl);
         return parent ? `${parent}{${nl}${rules}${nl}}` : rules;
       }).filter(Boolean).join(nl);
       if (preflights) {
@@ -508,7 +512,7 @@ var UnoGenerator = class {
     ];
   }
   constructCustomCSS(context, body, overrideSelector) {
-    body = normalizeEntries(body);
+    body = normalizeCSSEntries(body);
     const [selector, entries, mediaQuery] = this.applyVariants([0, overrideSelector || context.rawSelector, body, void 0, context.variantHandlers]);
     const cssBody = `${selector}{${entriesToCss(entries)}}`;
     if (mediaQuery)
@@ -521,7 +525,7 @@ var UnoGenerator = class {
     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];
+        return [[staticMatch[0], raw, normalizeCSSEntries(staticMatch[1]), staticMatch[2], variantHandlers]];
     }
     context.variantHandlers = variantHandlers;
     const { rulesDynamic, rulesSize } = this.config;
@@ -539,10 +543,10 @@ var UnoGenerator = class {
       if (!result)
         continue;
       if (typeof result === "string")
-        return [i, result, meta];
-      const entries = normalizeEntries(result).filter((i2) => i2[1] != null);
+        return [[i, result, meta]];
+      const entries = normalizeCSSValues(result).filter((i2) => i2.length);
       if (entries.length)
-        return [i, raw, entries, meta, variantHandlers];
+        return entries.map((e2) => [i, raw, e2, meta, variantHandlers]);
     }
   }
   stringifyUtil(parsed) {
@@ -596,8 +600,8 @@ var UnoGenerator = class {
       const result = await this.parseUtil(i, context, true);
       if (!result)
         warnOnce(`unmatched utility "${i}" in shortcut "${parent[1]}"`);
-      return result;
-    }))).filter(Boolean).sort((a, b) => a[0] - b[0]);
+      return result || [];
+    }))).flat(1).filter(Boolean).sort((a, b) => a[0] - b[0]);
     const [raw, , parentVariants] = parent;
     for (const item of parsed) {
       if (isRawUtil(item))
@@ -636,8 +640,18 @@ function toEscapedSelector(raw) {
   else
     return `.${e(raw)}`;
 }
-function normalizeEntries(obj) {
-  return !Array.isArray(obj) ? Object.entries(obj) : obj;
+function normalizeCSSEntries(obj) {
+  return (!Array.isArray(obj) ? Object.entries(obj) : obj).filter((i) => i[1] != null);
+}
+function normalizeCSSValues(obj) {
+  if (Array.isArray(obj)) {
+    if (obj.find((i) => !Array.isArray(i) || Array.isArray(i[0])))
+      return obj.map((i) => normalizeCSSEntries(i));
+    else
+      return [obj];
+  } else {
+    return [normalizeCSSEntries(obj)];
+  }
 }
 export {
   BetterMap,
@@ -661,7 +675,10 @@ export {
   isValidSelector,
   mergeDeep,
   mergeSet,
+  normalizeCSSEntries,
+  normalizeCSSValues,
   normalizeVariant,
+  notNull,
   regexClassGroup,
   toArray,
   uniq,

package/package.json

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