@unocss/core 0.20.2 → 0.21.2

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";
 }
@@ -249,7 +275,6 @@ function createValueHandler(handlers) {
       if (res != null)
         return res;
     }
-    return void 0;
   };
   function addProcessor(that, name) {
     if (!that.__options) {
@@ -333,11 +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), {});
-  const options = Object.assign({}, ...config.presets?.map((p) => Array.isArray(p) ? p : [p]).flat(1).map((p) => p.options ?? {}) || []);
+  ].reduce((a, p) => mergeDeep(a, p), {}));
+  mergePresets("extendTheme").forEach((extendTheme) => extendTheme(theme));
   return {
     mergeSelectors: true,
     warn: true,
@@ -358,12 +383,11 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     preflights: mergePresets("preflights"),
     variants: mergePresets("variants").map(normalizeVariant),
     shortcuts: resolveShortcuts(mergePresets("shortcuts")),
-    extractors,
-    options
+    extractors
   };
 }
 
-const version = "0.20.2";
+const version = "0.21.2";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -392,8 +416,7 @@ class UnoGenerator {
         return code;
       },
       code,
-      id,
-      options: this.config.options
+      id
     };
     for (const extractor of this.config.extractors) {
       const result = await extractor.extract(context);
@@ -454,8 +477,7 @@ class UnoGenerator {
         theme: this.config.theme,
         generator: this,
         variantHandlers: applied[2],
-        constructCSS: (...args) => this.constructCustomCSS(context, ...args),
-        options: this.config.options
+        constructCSS: (...args) => this.constructCustomCSS(context, ...args)
       };
       const expanded = this.expandShortcut(applied[1], context);
       if (expanded) {
@@ -480,13 +502,7 @@ class UnoGenerator {
     const getLayer = (layer) => {
       if (layerCache[layer])
         return layerCache[layer];
-      let css = Array.from(sheet).sort((a, b) => {
-        const parentOrderA = this.parentOrders.get(a[0]);
-        const parentOrderB = this.parentOrders.get(b[0]);
-        if (parentOrderA !== void 0 && parentOrderB !== void 0)
-          return parentOrderA - parentOrderB;
-        return a[0]?.localeCompare(b[0] || "");
-      }).map(([parent, items]) => {
+      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[1]?.localeCompare(b[1] || "") || 0).map((a) => [a[1] ? applyScope(a[1], scope) : a[1], a[2]]);
         if (!sorted.length)
@@ -496,7 +512,7 @@ class UnoGenerator {
             for (let i = idx + 1; i < size; i++) {
               const current = sorted[i];
               if (current && current[0] && current[1] === body) {
-                current[0] = `${current[0]},${selector}`;
+                current[0] = `${current[0]},${nl}${selector}`;
                 return null;
               }
             }
@@ -534,8 +550,7 @@ class UnoGenerator {
     const context = {
       rawSelector: raw,
       theme: this.config.theme,
-      generator: this,
-      options: this.config.options
+      generator: this
     };
     while (true) {
       applied = false;
@@ -707,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>>;
@@ -91,10 +92,6 @@ interface RuleContext<Theme extends {} = {}> {
      * Variants and selector escaping will be handled automatically.
      */
     constructCSS: (body: CSSEntries | CSSObject, overrideSelector?: string) => string;
-    /**
-     * User-provided options from preset.
-     */
-    readonly options: PresetOptions;
 }
 interface VariantContext<Theme extends {} = {}> {
     /**
@@ -109,16 +106,11 @@ interface VariantContext<Theme extends {} = {}> {
      * The theme object
      */
     theme: Theme;
-    /**
-     * User-provided options from preset.
-     */
-    readonly options: PresetOptions;
 }
 interface ExtractorContext {
     readonly original: string;
     code: string;
     id?: string;
-    readonly options: PresetOptions;
 }
 interface Extractor {
     name: string;
@@ -192,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
@@ -240,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;
@@ -325,7 +322,6 @@ interface ResolvedConfig extends Omit<RequiredByKey<UserConfig, 'mergeSelectors'
     rulesSize: number;
     rulesDynamic: (DynamicRule | undefined)[];
     rulesStaticMap: Record<string, [number, CSSObject | CSSEntries, RuleMeta | undefined] | undefined>;
-    options: PresetOptions;
 }
 interface GenerateResult {
     css: string;
@@ -402,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;
 
@@ -455,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";
 }
@@ -245,7 +271,6 @@ function createValueHandler(handlers) {
       if (res != null)
         return res;
     }
-    return void 0;
   };
   function addProcessor(that, name) {
     if (!that.__options) {
@@ -329,11 +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), {});
-  const options = Object.assign({}, ...config.presets?.map((p) => Array.isArray(p) ? p : [p]).flat(1).map((p) => p.options ?? {}) || []);
+  ].reduce((a, p) => mergeDeep(a, p), {}));
+  mergePresets("extendTheme").forEach((extendTheme) => extendTheme(theme));
   return {
     mergeSelectors: true,
     warn: true,
@@ -354,12 +379,11 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     preflights: mergePresets("preflights"),
     variants: mergePresets("variants").map(normalizeVariant),
     shortcuts: resolveShortcuts(mergePresets("shortcuts")),
-    extractors,
-    options
+    extractors
   };
 }
 
-const version = "0.20.2";
+const version = "0.21.2";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -388,8 +412,7 @@ class UnoGenerator {
         return code;
       },
       code,
-      id,
-      options: this.config.options
+      id
     };
     for (const extractor of this.config.extractors) {
       const result = await extractor.extract(context);
@@ -450,8 +473,7 @@ class UnoGenerator {
         theme: this.config.theme,
         generator: this,
         variantHandlers: applied[2],
-        constructCSS: (...args) => this.constructCustomCSS(context, ...args),
-        options: this.config.options
+        constructCSS: (...args) => this.constructCustomCSS(context, ...args)
       };
       const expanded = this.expandShortcut(applied[1], context);
       if (expanded) {
@@ -476,13 +498,7 @@ class UnoGenerator {
     const getLayer = (layer) => {
       if (layerCache[layer])
         return layerCache[layer];
-      let css = Array.from(sheet).sort((a, b) => {
-        const parentOrderA = this.parentOrders.get(a[0]);
-        const parentOrderB = this.parentOrders.get(b[0]);
-        if (parentOrderA !== void 0 && parentOrderB !== void 0)
-          return parentOrderA - parentOrderB;
-        return a[0]?.localeCompare(b[0] || "");
-      }).map(([parent, items]) => {
+      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[1]?.localeCompare(b[1] || "") || 0).map((a) => [a[1] ? applyScope(a[1], scope) : a[1], a[2]]);
         if (!sorted.length)
@@ -492,7 +508,7 @@ class UnoGenerator {
             for (let i = idx + 1; i < size; i++) {
               const current = sorted[i];
               if (current && current[0] && current[1] === body) {
-                current[0] = `${current[0]},${selector}`;
+                current[0] = `${current[0]},${nl}${selector}`;
                 return null;
               }
             }
@@ -530,8 +546,7 @@ class UnoGenerator {
     const context = {
       rawSelector: raw,
       theme: this.config.theme,
-      generator: this,
-      options: this.config.options
+      generator: this
     };
     while (true) {
       applied = false;
@@ -698,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.20.2",
+  "version": "0.21.2",
   "description": "The instant on-demand Atomic CSS engine.",
   "keywords": [
     "unocss",