@unocss/core 66.2.1 → 66.2.3

package/dist/index.d.mts

@@ -178,6 +178,7 @@ declare class UnoGeneratorInternal<Theme extends object = object> {
     private applyVariants;
     constructCustomCSS(context: Readonly<RuleContext<Theme>>, body: CSSObject | CSSEntries, overrideSelector?: string): string;
     parseUtil(input: string | VariantMatchedResult<Theme>, context: RuleContext<Theme>, internal?: boolean, shortcutPrefix?: string | string[] | undefined): Promise<(ParsedUtil | RawUtil)[] | undefined>;
+    private resolveCSSResult;
     stringifyUtil(parsed?: ParsedUtil | RawUtil, context?: RuleContext<Theme>): StringifiedUtil<Theme> | undefined;
     expandShortcut(input: string, context: RuleContext<Theme>, depth?: number): Promise<[(string | ShortcutInlineValue)[], RuleMeta | undefined] | undefined>;
     stringifyShortcuts(parent: VariantMatchedResult<Theme>, context: RuleContext<Theme>, expanded: (string | ShortcutInlineValue)[], meta?: RuleMeta): Promise<StringifiedUtil<Theme>[] | undefined>;
@@ -535,7 +536,7 @@ interface VariantObject<Theme extends object = object> {
 type Variant<Theme extends object = object> = VariantFunction<Theme> | VariantObject<Theme>;
 type Preprocessor = (matcher: string) => string | undefined;
 type Postprocessor = (util: UtilObject) => void;
-type ThemeExtender<T> = (theme: T) => T | void;
+type ThemeExtender<Theme extends object = object> = (theme: Theme, config: Readonly<ResolvedConfig<Theme>>) => Theme | void;
 interface ConfigBase<Theme extends object = object> {
     /**
      * Rules to generate CSS utilities.
@@ -651,7 +652,7 @@ interface ConfigBase<Theme extends object = object> {
      *
      * First presets runs first and the user config
      */
-    configResolved?: (config: ResolvedConfig) => void;
+    configResolved?: (config: ResolvedConfig<Theme>) => void;
     /**
      * Expose internal details for debugging / inspecting
      *

package/dist/index.d.ts

@@ -178,6 +178,7 @@ declare class UnoGeneratorInternal<Theme extends object = object> {
     private applyVariants;
     constructCustomCSS(context: Readonly<RuleContext<Theme>>, body: CSSObject | CSSEntries, overrideSelector?: string): string;
     parseUtil(input: string | VariantMatchedResult<Theme>, context: RuleContext<Theme>, internal?: boolean, shortcutPrefix?: string | string[] | undefined): Promise<(ParsedUtil | RawUtil)[] | undefined>;
+    private resolveCSSResult;
     stringifyUtil(parsed?: ParsedUtil | RawUtil, context?: RuleContext<Theme>): StringifiedUtil<Theme> | undefined;
     expandShortcut(input: string, context: RuleContext<Theme>, depth?: number): Promise<[(string | ShortcutInlineValue)[], RuleMeta | undefined] | undefined>;
     stringifyShortcuts(parent: VariantMatchedResult<Theme>, context: RuleContext<Theme>, expanded: (string | ShortcutInlineValue)[], meta?: RuleMeta): Promise<StringifiedUtil<Theme>[] | undefined>;
@@ -535,7 +536,7 @@ interface VariantObject<Theme extends object = object> {
 type Variant<Theme extends object = object> = VariantFunction<Theme> | VariantObject<Theme>;
 type Preprocessor = (matcher: string) => string | undefined;
 type Postprocessor = (util: UtilObject) => void;
-type ThemeExtender<T> = (theme: T) => T | void;
+type ThemeExtender<Theme extends object = object> = (theme: Theme, config: Readonly<ResolvedConfig<Theme>>) => Theme | void;
 interface ConfigBase<Theme extends object = object> {
     /**
      * Rules to generate CSS utilities.
@@ -651,7 +652,7 @@ interface ConfigBase<Theme extends object = object> {
      *
      * First presets runs first and the user config
      */
-    configResolved?: (config: ResolvedConfig) => void;
+    configResolved?: (config: ResolvedConfig<Theme>) => void;
     /**
      * Expose internal details for debugging / inspecting
      *

package/dist/index.mjs

@@ -567,10 +567,6 @@ async function resolveConfig(userConfig = {}, defaults = {}) {
     });
     return false;
   }).reverse();
-  let theme = mergeThemes(sources.map((p) => p.theme));
-  const extendThemes = getMerged("extendTheme");
-  for (const extendTheme of extendThemes)
-    theme = extendTheme(theme) || theme;
   const autocomplete = {
     templates: uniq(sources.flatMap((p) => toArray(p.autocomplete?.templates))),
     extractors: sources.flatMap((p) => toArray(p.autocomplete?.extractors)).sort((a, b) => (a.order || 0) - (b.order || 0)),
@@ -591,7 +587,7 @@ async function resolveConfig(userConfig = {}, defaults = {}) {
     envMode: config.envMode || "build",
     shortcutsLayer: config.shortcutsLayer || "shortcuts",
     layers,
-    theme,
+    theme: mergeThemes(sources.map((p) => p.theme)),
     rules,
     rulesSize,
     rulesDynamic,
@@ -609,6 +605,9 @@ async function resolveConfig(userConfig = {}, defaults = {}) {
     content,
     transformers: uniqueBy(getMerged("transformers"), (a, b) => a.name === b.name)
   };
+  const extendThemes = getMerged("extendTheme");
+  for (const extendTheme of extendThemes)
+    resolved.theme = extendTheme(resolved.theme, resolved) || resolved.theme;
   for (const p of sources)
     p?.configResolved?.(resolved);
   return resolved;
@@ -657,7 +656,7 @@ function definePreset(preset) {
   return preset;
 }
 
-const version = "66.2.1";
+const version = "66.2.3";
 
 const symbols = {
   shortcutsNoMerge: "$$symbol-shortcut-no-merge",
@@ -1050,27 +1049,17 @@ class UnoGeneratorInternal {
     const parse = async ([raw, processed, variantHandlers]) => {
       if (this.config.details)
         context.rules = context.rules ?? [];
+      const scopeContext = {
+        ...context,
+        variantHandlers
+      };
       const staticMatch = this.config.rulesStaticMap[processed];
       if (staticMatch) {
         if (staticMatch[1] && (internal || !staticMatch[2]?.internal)) {
-          if (this.config.details)
-            context.rules.push(staticMatch);
-          const index = this.config.rules.indexOf(staticMatch);
-          const entries = normalizeCSSValues(staticMatch[1]).filter((i) => i.length);
-          const meta = staticMatch[2];
-          if (entries.length) {
-            context.generator.activatedRules.add(staticMatch);
-            return entries.map((css) => {
-              if (isString(css))
-                return [index, css, meta];
-              return [index, raw, css, meta, variantHandlers];
-            });
-          }
+          return this.resolveCSSResult(raw, staticMatch[1], staticMatch, scopeContext);
         }
       }
-      context.variantHandlers = variantHandlers;
-      const { rulesDynamic } = this.config;
-      for (const rule of rulesDynamic) {
+      for (const rule of this.config.rulesDynamic) {
         const [matcher, handler, meta] = rule;
         if (meta?.internal && !internal)
           continue;
@@ -1091,71 +1080,24 @@ class UnoGeneratorInternal {
         const match = unprefixed.match(matcher);
         if (!match)
           continue;
-        let result = await handler(match, context);
+        let result = await handler(match, scopeContext);
         if (!result)
           continue;
-        if (this.config.details)
-          context.rules.push(rule);
         if (typeof result !== "string") {
           if (Symbol.asyncIterator in result) {
-            const entries2 = [];
+            const entries = [];
             for await (const r of result) {
               if (r)
-                entries2.push(r);
+                entries.push(r);
             }
-            result = entries2;
+            result = entries;
           } else if (Symbol.iterator in result && !Array.isArray(result)) {
             result = Array.from(result).filter(notNull);
           }
         }
-        const entries = normalizeCSSValues(result).filter((i) => i.length);
-        if (entries.length) {
-          context.generator.activatedRules.add(rule);
-          const index = this.config.rules.indexOf(rule);
-          return entries.map((css) => {
-            if (isString(css))
-              return [index, css, meta];
-            let variants = variantHandlers;
-            let entryMeta = meta;
-            for (const entry of css) {
-              if (entry[0] === symbols.variants) {
-                if (typeof entry[1] === "function") {
-                  variants = entry[1](variants) || variants;
-                } else {
-                  variants = [
-                    ...toArray(entry[1]),
-                    ...variants
-                  ];
-                }
-              } else if (entry[0] === symbols.parent) {
-                variants = [
-                  { parent: entry[1] },
-                  ...variants
-                ];
-              } else if (entry[0] === symbols.selector) {
-                variants = [
-                  { selector: entry[1] },
-                  ...variants
-                ];
-              } else if (entry[0] === symbols.layer) {
-                variants = [
-                  { layer: entry[1] },
-                  ...variants
-                ];
-              } else if (entry[0] === symbols.sort) {
-                entryMeta = {
-                  ...entryMeta,
-                  sort: entry[1]
-                };
-              } else if (entry[0] === symbols.noMerge) {
-                entryMeta = {
-                  ...entryMeta,
-                  noMerge: entry[1]
-                };
-              }
-            }
-            return [index, raw, css, entryMeta, variants];
-          });
+        const resolvedResult = this.resolveCSSResult(raw, result, rule, scopeContext);
+        if (resolvedResult) {
+          return resolvedResult;
         }
       }
     };
@@ -1164,6 +1106,61 @@ class UnoGeneratorInternal {
       return void 0;
     return parsed;
   }
+  resolveCSSResult = (raw, result, rule, context) => {
+    const entries = normalizeCSSValues(result).filter((i) => i.length);
+    if (entries.length) {
+      if (this.config.details) {
+        context.rules.push(rule);
+      }
+      context.generator.activatedRules.add(rule);
+      const index = context.generator.config.rules.indexOf(rule);
+      const meta = rule[2];
+      return entries.map((css) => {
+        if (isString(css))
+          return [index, css, meta];
+        let variants = context.variantHandlers;
+        let entryMeta = meta;
+        for (const entry of css) {
+          if (entry[0] === symbols.variants) {
+            if (typeof entry[1] === "function") {
+              variants = entry[1](variants) || variants;
+            } else {
+              variants = [
+                ...toArray(entry[1]),
+                ...variants
+              ];
+            }
+          } else if (entry[0] === symbols.parent) {
+            variants = [
+              { parent: entry[1] },
+              ...variants
+            ];
+          } else if (entry[0] === symbols.selector) {
+            variants = [
+              { selector: entry[1] },
+              ...variants
+            ];
+          } else if (entry[0] === symbols.layer) {
+            variants = [
+              { layer: entry[1] },
+              ...variants
+            ];
+          } else if (entry[0] === symbols.sort) {
+            entryMeta = {
+              ...entryMeta,
+              sort: entry[1]
+            };
+          } else if (entry[0] === symbols.noMerge) {
+            entryMeta = {
+              ...entryMeta,
+              noMerge: entry[1]
+            };
+          }
+        }
+        return [index, raw, css, entryMeta, variants];
+      });
+    }
+  };
   stringifyUtil(parsed, context) {
     if (!parsed)
       return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/core",
   "type": "module",
-  "version": "66.2.1",
+  "version": "66.2.3",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",