@unocss/core 0.21.0 → 0.21.1

package/dist/index.cjs

@@ -93,6 +93,32 @@ function mergeDeep(original, patch) {
   }
   return output;
 }
+function clone(val) {
+  let k, out, tmp;
+  if (Array.isArray(val)) {
+    out = Array(k = val.length);
+    while (k--)
+      out[k] = (tmp = val[k]) && typeof tmp === "object" ? clone(tmp) : tmp;
+    return out;
+  }
+  if (Object.prototype.toString.call(val) === "[object Object]") {
+    out = {};
+    for (k in val) {
+      if (k === "__proto__") {
+        Object.defineProperty(out, k, {
+          value: clone(val[k]),
+          configurable: true,
+          enumerable: true,
+          writable: true
+        });
+      } else {
+        out[k] = (tmp = val[k]) && typeof tmp === "object" ? clone(tmp) : tmp;
+      }
+    }
+    return out;
+  }
+  return val;
+}
 function isStaticRule(rule) {
   return typeof rule[0] === "string";
 }
@@ -332,10 +358,11 @@ function resolveConfig(userConfig = {}, defaults = {}) {
       delete rules[i];
     }
   });
-  const theme = [
+  const theme = clone([
     ...sortedPresets.map((p) => p.theme || {}),
     config.theme || {}
-  ].reduce((a, p) => mergeDeep(a, p), {});
+  ].reduce((a, p) => mergeDeep(a, p), {}));
+  mergePresets("extendTheme").forEach((extendTheme) => extendTheme(theme));
   return {
     mergeSelectors: true,
     warn: true,
@@ -360,7 +387,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.21.0";
+const version = "0.21.1";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -695,6 +722,7 @@ exports.TwoKeyMap = TwoKeyMap;
 exports.UnoGenerator = UnoGenerator;
 exports.attributifyRE = attributifyRE;
 exports.clearIdenticalEntries = clearIdenticalEntries;
+exports.clone = clone;
 exports.createGenerator = createGenerator;
 exports.createValueHandler = createValueHandler;
 exports.e = e;

package/dist/index.d.ts

@@ -23,6 +23,7 @@ declare function createGenerator(config?: UserConfig, defaults?: UserConfigDefau
 declare const hasScopePlaceholder: (css: string) => RegExpMatchArray | null;
 
 declare type Awaitable<T> = T | Promise<T>;
+declare type Arrayable<T> = T | T[];
 declare type ArgumentType<T> = T extends ((...args: infer A) => any) ? A : never;
 declare type Shift<T> = T extends [_: any, ...args: infer A] ? A : never;
 declare type RestArgs<T> = Shift<ArgumentType<T>>;
@@ -183,6 +184,7 @@ declare type VariantObject<Theme extends {} = {}> = {
 declare type Variant<Theme extends {} = {}> = VariantFunction<Theme> | VariantObject<Theme>;
 declare type Preprocessor = (matcher: string) => string | undefined;
 declare type Postprocessor = (util: UtilObject) => void;
+declare type ThemeExtender<T> = (theme: T) => void;
 interface ConfigBase<Theme extends {} = {}> {
     /**
      * Rules to generate CSS utilities
@@ -231,11 +233,15 @@ interface ConfigBase<Theme extends {} = {}> {
     /**
      * Preprocess the incoming utilities, return falsy value to exclude
      */
-    preprocess?: Preprocessor | Preprocessor[];
+    preprocess?: Arrayable<Preprocessor>;
     /**
      * Process the generate utils object
      */
-    postprocess?: Postprocessor | Postprocessor[];
+    postprocess?: Arrayable<Postprocessor>;
+    /**
+     * Custom functions to extend the theme object
+     */
+    extendTheme?: Arrayable<ThemeExtender<Theme>>;
 }
 interface Preset<Theme extends {} = {}> extends ConfigBase<Theme> {
     name: string;
@@ -392,6 +398,7 @@ declare function clearIdenticalEntries(entry: CSSEntries): CSSEntries;
 declare function entriesToCss(arr?: CSSEntries): string;
 declare function isObject(item: any): item is Record<string, any>;
 declare function mergeDeep<T>(original: T, patch: DeepPartial<T>): T;
+declare function clone<T>(val: T): T;
 declare function isStaticRule(rule: Rule): rule is StaticRule;
 declare function isStaticShortcut(sc: Shortcut): sc is StaticShortcut;
 
@@ -445,4 +452,4 @@ declare const extractorSplit: Extractor;
 
 declare const extractorSvelte: Extractor;
 
-export { ArgumentType, Awaitable, BetterMap, BlocklistRule, CSSEntries, CSSObject, CSSValues, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, TwoKeyMap, UnoGenerator, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, createGenerator, createValueHandler, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, toArray, uniq, validateFilterRE, warnOnce, withLayer };
+export { ArgumentType, Arrayable, Awaitable, BetterMap, BlocklistRule, CSSEntries, CSSObject, CSSValues, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, ThemeExtender, TwoKeyMap, UnoGenerator, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, toArray, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -89,6 +89,32 @@ function mergeDeep(original, patch) {
   }
   return output;
 }
+function clone(val) {
+  let k, out, tmp;
+  if (Array.isArray(val)) {
+    out = Array(k = val.length);
+    while (k--)
+      out[k] = (tmp = val[k]) && typeof tmp === "object" ? clone(tmp) : tmp;
+    return out;
+  }
+  if (Object.prototype.toString.call(val) === "[object Object]") {
+    out = {};
+    for (k in val) {
+      if (k === "__proto__") {
+        Object.defineProperty(out, k, {
+          value: clone(val[k]),
+          configurable: true,
+          enumerable: true,
+          writable: true
+        });
+      } else {
+        out[k] = (tmp = val[k]) && typeof tmp === "object" ? clone(tmp) : tmp;
+      }
+    }
+    return out;
+  }
+  return val;
+}
 function isStaticRule(rule) {
   return typeof rule[0] === "string";
 }
@@ -328,10 +354,11 @@ function resolveConfig(userConfig = {}, defaults = {}) {
       delete rules[i];
     }
   });
-  const theme = [
+  const theme = clone([
     ...sortedPresets.map((p) => p.theme || {}),
     config.theme || {}
-  ].reduce((a, p) => mergeDeep(a, p), {});
+  ].reduce((a, p) => mergeDeep(a, p), {}));
+  mergePresets("extendTheme").forEach((extendTheme) => extendTheme(theme));
   return {
     mergeSelectors: true,
     warn: true,
@@ -356,7 +383,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.21.0";
+const version = "0.21.1";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -686,4 +713,4 @@ function toEscapedSelector(raw) {
     return `.${e(raw)}`;
 }
 
-export { BetterMap, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, createGenerator, createValueHandler, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, toArray, uniq, validateFilterRE, warnOnce, withLayer };
+export { BetterMap, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, toArray, uniq, validateFilterRE, warnOnce, withLayer };

package/package.json

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