@unocss/core 0.51.2 → 0.51.4

package/dist/index.cjs

@@ -413,21 +413,23 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     ...rawPresets.filter((p) => !p.enforce),
     ...rawPresets.filter((p) => p.enforce === "post")
   ];
-  const layers = Object.assign({}, DEFAULT_LAYERS, ...rawPresets.map((i) => i.layers), config.layers);
-  function mergePresets(key) {
-    return uniq([
-      ...sortedPresets.flatMap((p) => toArray(p[key] || [])),
-      ...toArray(config[key] || [])
-    ]);
-  }
-  const extractors = mergePresets("extractors");
-  let extractorDefault = [...sortedPresets, config].reverse().find((i) => i.extractorDefault !== void 0)?.extractorDefault;
+  const sources = [
+    ...sortedPresets,
+    config
+  ];
+  const sourcesReversed = [...sources].reverse();
+  const layers = Object.assign({}, DEFAULT_LAYERS, ...sources.map((i) => i.layers));
+  function getMerged(key) {
+    return uniq(sources.flatMap((p) => toArray(p[key] || [])));
+  }
+  const extractors = getMerged("extractors");
+  let extractorDefault = sourcesReversed.find((i) => i.extractorDefault !== void 0)?.extractorDefault;
   if (extractorDefault === void 0)
     extractorDefault = extractorSplit;
   if (extractorDefault && !extractors.includes(extractorDefault))
     extractors.unshift(extractorDefault);
   extractors.sort((a, b) => (a.order || 0) - (b.order || 0));
-  const rules = mergePresets("rules");
+  const rules = getMerged("rules");
   const rulesStaticMap = {};
   const rulesSize = rules.length;
   const rulesDynamic = rules.map((rule, i) => {
@@ -440,18 +442,15 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     }
     return [i, ...rule];
   }).filter(Boolean).reverse();
-  let theme = clone([
-    ...sortedPresets.map((p) => p.theme || {}),
-    config.theme || {}
-  ].reduce((a, p) => mergeDeep(a, p), {}));
-  const extendThemes = toArray(mergePresets("extendTheme"));
+  let theme = sources.map((p) => p.theme ? clone(p.theme) : {}).reduce((a, p) => mergeDeep(a, p), {});
+  const extendThemes = getMerged("extendTheme");
   for (const extendTheme of extendThemes)
     theme = extendTheme(theme) || theme;
   const autocomplete = {
-    templates: uniq(sortedPresets.map((p) => toArray(p.autocomplete?.templates)).flat()),
-    extractors: sortedPresets.map((p) => toArray(p.autocomplete?.extractors)).flat().sort((a, b) => (a.order || 0) - (b.order || 0))
+    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))
   };
-  let separators = toArray(mergePresets("separators"));
+  let separators = getMerged("separators");
   if (!separators.length)
     separators = [":", "-"];
   const resolved = {
@@ -468,23 +467,22 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     rulesSize,
     rulesDynamic,
     rulesStaticMap,
-    preprocess: mergePresets("preprocess"),
-    postprocess: mergePresets("postprocess"),
-    preflights: mergePresets("preflights"),
+    preprocess: getMerged("preprocess"),
+    postprocess: getMerged("postprocess"),
+    preflights: getMerged("preflights"),
     autocomplete,
-    variants: mergePresets("variants").map(normalizeVariant).sort((a, b) => (a.order || 0) - (b.order || 0)),
-    shortcuts: resolveShortcuts(mergePresets("shortcuts")).reverse(),
+    variants: getMerged("variants").map(normalizeVariant).sort((a, b) => (a.order || 0) - (b.order || 0)),
+    shortcuts: resolveShortcuts(getMerged("shortcuts")).reverse(),
     extractors,
-    safelist: mergePresets("safelist"),
+    safelist: getMerged("safelist"),
     separators
   };
-  for (const p of sortedPresets)
+  for (const p of sources)
     p?.configResolved?.(resolved);
-  userConfig?.configResolved?.(resolved);
   return resolved;
 }
 
-const version = "0.51.2";
+const version = "0.51.4";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {

package/dist/index.d.ts

@@ -158,6 +158,7 @@ declare function createValueHandler<K extends string>(handlers: Record<K, ValueH
 
 type Awaitable<T> = T | Promise<T>;
 type Arrayable<T> = T | T[];
+type ToArray<T> = T extends (infer U)[] ? U[] : T[];
 type ArgumentType<T> = T extends ((...args: infer A) => any) ? A : never;
 type Shift<T> = T extends [_: any, ...args: infer A] ? A : never;
 type RestArgs<T> = Shift<ArgumentType<T>>;
@@ -863,4 +864,4 @@ declare const defaultSplitRE: RegExp;
 declare const splitWithVariantGroupRE: RegExp;
 declare const extractorSplit: Extractor;
 
-export { ArgumentType, Arrayable, AutoCompleteExtractor, AutoCompleteExtractorContext, AutoCompleteExtractorResult, AutoCompleteFunction, AutoCompleteTemplate, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSColorValue, CSSEntries, CSSObject, CSSValue, CSSValues, CliEntryItem, CliOptions, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExtraContentOptions, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, PreparedRule, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, ShortcutValue, SourceCodeTransformer, SourceCodeTransformerEnforce, 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, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, defaultSplitRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, splitWithVariantGroupRE, 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, CliEntryItem, CliOptions, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExtraContentOptions, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, PreparedRule, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, ShortcutValue, SourceCodeTransformer, SourceCodeTransformerEnforce, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, ToArray, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, defaultSplitRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -409,21 +409,23 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     ...rawPresets.filter((p) => !p.enforce),
     ...rawPresets.filter((p) => p.enforce === "post")
   ];
-  const layers = Object.assign({}, DEFAULT_LAYERS, ...rawPresets.map((i) => i.layers), config.layers);
-  function mergePresets(key) {
-    return uniq([
-      ...sortedPresets.flatMap((p) => toArray(p[key] || [])),
-      ...toArray(config[key] || [])
-    ]);
-  }
-  const extractors = mergePresets("extractors");
-  let extractorDefault = [...sortedPresets, config].reverse().find((i) => i.extractorDefault !== void 0)?.extractorDefault;
+  const sources = [
+    ...sortedPresets,
+    config
+  ];
+  const sourcesReversed = [...sources].reverse();
+  const layers = Object.assign({}, DEFAULT_LAYERS, ...sources.map((i) => i.layers));
+  function getMerged(key) {
+    return uniq(sources.flatMap((p) => toArray(p[key] || [])));
+  }
+  const extractors = getMerged("extractors");
+  let extractorDefault = sourcesReversed.find((i) => i.extractorDefault !== void 0)?.extractorDefault;
   if (extractorDefault === void 0)
     extractorDefault = extractorSplit;
   if (extractorDefault && !extractors.includes(extractorDefault))
     extractors.unshift(extractorDefault);
   extractors.sort((a, b) => (a.order || 0) - (b.order || 0));
-  const rules = mergePresets("rules");
+  const rules = getMerged("rules");
   const rulesStaticMap = {};
   const rulesSize = rules.length;
   const rulesDynamic = rules.map((rule, i) => {
@@ -436,18 +438,15 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     }
     return [i, ...rule];
   }).filter(Boolean).reverse();
-  let theme = clone([
-    ...sortedPresets.map((p) => p.theme || {}),
-    config.theme || {}
-  ].reduce((a, p) => mergeDeep(a, p), {}));
-  const extendThemes = toArray(mergePresets("extendTheme"));
+  let theme = sources.map((p) => p.theme ? clone(p.theme) : {}).reduce((a, p) => mergeDeep(a, p), {});
+  const extendThemes = getMerged("extendTheme");
   for (const extendTheme of extendThemes)
     theme = extendTheme(theme) || theme;
   const autocomplete = {
-    templates: uniq(sortedPresets.map((p) => toArray(p.autocomplete?.templates)).flat()),
-    extractors: sortedPresets.map((p) => toArray(p.autocomplete?.extractors)).flat().sort((a, b) => (a.order || 0) - (b.order || 0))
+    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))
   };
-  let separators = toArray(mergePresets("separators"));
+  let separators = getMerged("separators");
   if (!separators.length)
     separators = [":", "-"];
   const resolved = {
@@ -464,23 +463,22 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     rulesSize,
     rulesDynamic,
     rulesStaticMap,
-    preprocess: mergePresets("preprocess"),
-    postprocess: mergePresets("postprocess"),
-    preflights: mergePresets("preflights"),
+    preprocess: getMerged("preprocess"),
+    postprocess: getMerged("postprocess"),
+    preflights: getMerged("preflights"),
     autocomplete,
-    variants: mergePresets("variants").map(normalizeVariant).sort((a, b) => (a.order || 0) - (b.order || 0)),
-    shortcuts: resolveShortcuts(mergePresets("shortcuts")).reverse(),
+    variants: getMerged("variants").map(normalizeVariant).sort((a, b) => (a.order || 0) - (b.order || 0)),
+    shortcuts: resolveShortcuts(getMerged("shortcuts")).reverse(),
     extractors,
-    safelist: mergePresets("safelist"),
+    safelist: getMerged("safelist"),
     separators
   };
-  for (const p of sortedPresets)
+  for (const p of sources)
     p?.configResolved?.(resolved);
-  userConfig?.configResolved?.(resolved);
   return resolved;
 }
 
-const version = "0.51.2";
+const version = "0.51.4";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {

package/package.json

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