mirror of
https://github.com/tailwindlabs/tailwindcss.git
synced 2025-12-08 21:36:08 +00:00
ffadf2ba4b
* Generate types: do not intersect with Config theme type when generating DefaultTheme * Merge default theme in ResolvedConfig * UnwrapResolvables on theme.extend as well * Apply extend to overrides and default theme * Omit extend from DefaultTheme * Relax generic constraints, better generic variable names * Fall back to ThemeConfig if key not in DefaultTheme * Split out ThemeConfigCustomizable to avoid anys in ThemeConfigResolved * Allow custom theme properties * handle TypeScript error * apply prettier formatting * update changelog * change type name --------- Co-authored-by: Nikita Gaidakov <ngaidakov@podfather.com> Co-authored-by: Robin Malfait <malfait.robin@gmail.com>
32 lines
1.1 KiB
TypeScript
32 lines
1.1 KiB
TypeScript
import { Config, ResolvableTo, ThemeConfig } from './types/config'
|
|
import { DefaultTheme } from './types/generated/default-theme'
|
|
import { DefaultColors } from './types/generated/colors'
|
|
|
|
type ResolvedConfig<T extends Config> = Omit<T, 'theme'> & {
|
|
theme: MergeThemes<
|
|
UnwrapResolvables<Omit<T['theme'], 'extend'>>,
|
|
T['theme'] extends { extend: infer TExtend } ? UnwrapResolvables<TExtend> : {}
|
|
>
|
|
}
|
|
|
|
type UnwrapResolvables<T> = {
|
|
[K in keyof T]: T[K] extends ResolvableTo<infer R> ? R : T[K]
|
|
}
|
|
|
|
type ThemeConfigResolved = UnwrapResolvables<ThemeConfig>
|
|
type DefaultThemeFull = DefaultTheme & { colors: DefaultColors }
|
|
|
|
type MergeThemes<Overrides extends object, Extensions extends object> = {
|
|
[K in keyof ThemeConfigResolved | keyof Overrides]: (K extends keyof Overrides
|
|
? Overrides[K]
|
|
: K extends keyof DefaultThemeFull
|
|
? DefaultThemeFull[K]
|
|
: K extends keyof ThemeConfigResolved
|
|
? ThemeConfigResolved[K]
|
|
: never) &
|
|
(K extends keyof Extensions ? Extensions[K] : {})
|
|
}
|
|
|
|
declare function resolveConfig<T extends Config>(config: T): ResolvedConfig<T>
|
|
export = resolveConfig
|