fix(core): uniq resolved presets (#3078)

unocss · Sep 4, 2023 · 6bff23c · 6bff23c
1 parent 1b7275a
commit 6bff23c
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts
@@ -1,5 +1,5 @@
 import type { Preset, ResolvedConfig, Rule, Shortcut, ToArray, UserConfig, UserConfigDefaults, UserShortcuts } from './types'
-import { clone, isStaticRule, mergeDeep, normalizeVariant, toArray, uniq } from './utils'
+import { clone, isStaticRule, mergeDeep, normalizeVariant, toArray, uniq, uniqueBy } from './utils'
 import { extractorSplit } from './extractors'
 import { DEFAULT_LAYERS } from './constants'
 
@@ -64,7 +64,7 @@ export function resolveConfig<Theme extends object = object>(
   defaults: UserConfigDefaults<Theme> = {},
 ): ResolvedConfig<Theme> {
   const config = Object.assign({}, defaults, userConfig) as UserConfigDefaults<Theme>
-  const rawPresets = uniq((config.presets || []).flatMap(toArray).flatMap(resolvePresets))
+  const rawPresets = uniqueBy((config.presets || []).flatMap(toArray).flatMap(resolvePresets), (a, b) => a.name === b.name)
 
   const sortedPresets = [
     ...rawPresets.filter(p => p.enforce === 'pre'),

diff --git a/packages/core/src/utils/basic.ts b/packages/core/src/utils/basic.ts
@@ -6,6 +6,15 @@ export function uniq<T>(value: T[]): T[] {
   return Array.from(new Set(value))
 }
 
+export function uniqueBy<T>(array: readonly T[], equalFn: (a: T, b: T) => boolean): T[] {
+  return array.reduce((acc: T[], cur: T) => {
+    const index = acc.findIndex((item: T) => equalFn(cur, item))
+    if (index === -1)
+      acc.push(cur)
+    return acc
+  }, [])
+}
+
 export function isString(s: any): s is string {
   return typeof s === 'string'
 }
diff --git a/test/config.test.ts b/test/config.test.ts
@@ -132,6 +132,32 @@ describe('config', () => {
       .text-yellow-500{color:yellow;}"
     `)
   })
+
+  test('uniq presets', async () => {
+    const presetA: Preset = { name: 'presetA' }
+    const presetB: Preset = { name: 'presetB' }
+    const presetC: Preset = { name: 'presetC', presets: [presetA] }
+
+    const unoA = createGenerator({
+      presets: [
+        presetA,
+        presetB,
+        presetA,
+      ],
+    })
+
+    expect(unoA.config.presets.map(i => i.name)).toEqual(['presetA', 'presetB'])
+
+    const unoB = createGenerator({
+      presets: [
+        presetA,
+        presetB,
+        presetC,
+      ],
+    })
+
+    expect(unoB.config.presets.map(i => i.name)).toEqual(['presetA', 'presetB', 'presetC'])
+  })
 })
 
 describe('mergeConfigs', () => {