@unocss/core 0.51.0 → 0.51.2

package/dist/index.cjs

@@ -83,16 +83,20 @@ function entriesToCss(arr) {
 function isObject(item) {
   return item && typeof item === "object" && !Array.isArray(item);
 }
-function mergeDeep(original, patch) {
+function mergeDeep(original, patch, mergeArray = false) {
   const o = original;
   const p = patch;
-  if (Array.isArray(o))
-    return [...p];
+  if (Array.isArray(p)) {
+    if (mergeArray && Array.isArray(p))
+      return [...o, ...p];
+    else
+      return [...p];
+  }
   const output = { ...o };
   if (isObject(o) && isObject(p)) {
     Object.keys(p).forEach((key) => {
       if (isObject(o[key]) && isObject(p[key]) || Array.isArray(o[key]) && Array.isArray(p[key]))
-        output[key] = mergeDeep(o[key], p[key]);
+        output[key] = mergeDeep(o[key], p[key], mergeArray);
       else
         Object.assign(output, { [key]: p[key] });
     });
@@ -368,7 +372,15 @@ function resolveShortcuts(shortcuts) {
     return Object.entries(s);
   });
 }
+const __RESOLVED = "_uno_resolved";
 function resolvePreset(preset) {
+  if (__RESOLVED in preset)
+    return preset;
+  preset = { ...preset };
+  Object.defineProperty(preset, __RESOLVED, {
+    value: true,
+    enumerable: false
+  });
   const shortcuts = preset.shortcuts ? resolveShortcuts(preset.shortcuts) : void 0;
   preset.shortcuts = shortcuts;
   if (preset.prefix || preset.layer) {
@@ -386,9 +398,16 @@ function resolvePreset(preset) {
   }
   return preset;
 }
+function resolvePresets(preset) {
+  const root = resolvePreset(preset);
+  if (!root.presets)
+    return [root];
+  const nested = (root.presets || []).flatMap(toArray).flatMap(resolvePresets);
+  return [root, ...nested];
+}
 function resolveConfig(userConfig = {}, defaults = {}) {
   const config = Object.assign({}, defaults, userConfig);
-  const rawPresets = (config.presets || []).flatMap(toArray).map(resolvePreset);
+  const rawPresets = uniq((config.presets || []).flatMap(toArray).flatMap(resolvePresets));
   const sortedPresets = [
     ...rawPresets.filter((p) => p.enforce === "pre"),
     ...rawPresets.filter((p) => !p.enforce),
@@ -465,7 +484,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   return resolved;
 }
 
-const version = "0.51.0";
+const version = "0.51.2";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {

package/dist/index.d.ts

@@ -94,7 +94,10 @@ declare function normalizeCSSValues(obj: CSSValue | string | (CSSValue | string)
 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;
+/**
+ * Deep merge two objects
+ */
+declare function mergeDeep<T>(original: T, patch: DeepPartial<T>, mergeArray?: boolean): T;
 declare function clone<T>(val: T): T;
 declare function isStaticRule(rule: Rule<any>): rule is StaticRule;
 declare function isStaticShortcut(sc: Shortcut<any>): sc is StaticShortcut;
@@ -518,6 +521,10 @@ interface ConfigBase<Theme extends {} = {}> {
      * It's also possible to return a new theme object to completely replace the original one.
      */
     extendTheme?: Arrayable<ThemeExtender<Theme>>;
+    /**
+     * Presets
+     */
+    presets?: (Preset<Theme> | Preset<Theme>[])[];
     /**
      * Additional options for auto complete
      */
@@ -642,10 +649,6 @@ interface UserOnlyOptions<Theme extends {} = {}> {
      * @default 'shortcuts'
      */
     shortcutsLayer?: string;
-    /**
-     * Presets
-     */
-    presets?: (Preset<Theme> | Preset<Theme>[])[];
     /**
      * Environment mode
      *

package/dist/index.mjs

@@ -79,16 +79,20 @@ function entriesToCss(arr) {
 function isObject(item) {
   return item && typeof item === "object" && !Array.isArray(item);
 }
-function mergeDeep(original, patch) {
+function mergeDeep(original, patch, mergeArray = false) {
   const o = original;
   const p = patch;
-  if (Array.isArray(o))
-    return [...p];
+  if (Array.isArray(p)) {
+    if (mergeArray && Array.isArray(p))
+      return [...o, ...p];
+    else
+      return [...p];
+  }
   const output = { ...o };
   if (isObject(o) && isObject(p)) {
     Object.keys(p).forEach((key) => {
       if (isObject(o[key]) && isObject(p[key]) || Array.isArray(o[key]) && Array.isArray(p[key]))
-        output[key] = mergeDeep(o[key], p[key]);
+        output[key] = mergeDeep(o[key], p[key], mergeArray);
       else
         Object.assign(output, { [key]: p[key] });
     });
@@ -364,7 +368,15 @@ function resolveShortcuts(shortcuts) {
     return Object.entries(s);
   });
 }
+const __RESOLVED = "_uno_resolved";
 function resolvePreset(preset) {
+  if (__RESOLVED in preset)
+    return preset;
+  preset = { ...preset };
+  Object.defineProperty(preset, __RESOLVED, {
+    value: true,
+    enumerable: false
+  });
   const shortcuts = preset.shortcuts ? resolveShortcuts(preset.shortcuts) : void 0;
   preset.shortcuts = shortcuts;
   if (preset.prefix || preset.layer) {
@@ -382,9 +394,16 @@ function resolvePreset(preset) {
   }
   return preset;
 }
+function resolvePresets(preset) {
+  const root = resolvePreset(preset);
+  if (!root.presets)
+    return [root];
+  const nested = (root.presets || []).flatMap(toArray).flatMap(resolvePresets);
+  return [root, ...nested];
+}
 function resolveConfig(userConfig = {}, defaults = {}) {
   const config = Object.assign({}, defaults, userConfig);
-  const rawPresets = (config.presets || []).flatMap(toArray).map(resolvePreset);
+  const rawPresets = uniq((config.presets || []).flatMap(toArray).flatMap(resolvePresets));
   const sortedPresets = [
     ...rawPresets.filter((p) => p.enforce === "pre"),
     ...rawPresets.filter((p) => !p.enforce),
@@ -461,7 +480,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   return resolved;
 }
 
-const version = "0.51.0";
+const version = "0.51.2";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {

package/package.json

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