archive-gh-me/tailwindcss
1
0
Fork 0
mirror of https://github.com/tailwindlabs/tailwindcss.git synced 2025-12-08 21:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Simplify resolveConfig slightly, try to catch more in tests

Browse Source
This commit is contained in:
Adam Wathan 2019-03-18 11:21:32 -04:00
parent a4e896ecac
commit 509b698bfc
2 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
__tests__/resolveConfig.test.js
View File

@ -767,8 +767,12 @@ test('theme values in the extend section are lazily evaluated', () => {
blue: 'blue',
},
extend: {
colors: {
orange: 'orange',
},
borderColor: theme => ({
default: theme('colors.red'),
foo: theme('colors.orange'),
bar: theme('colors.red'),
}),
},
},
@ -802,12 +806,16 @@ test('theme values in the extend section are lazily evaluated', () => {
separator: ':',
theme: {
colors: {
orange: 'orange',
red: 'red',
green: 'green',
blue: 'blue',
},
borderColor: {
default: 'red',
default: 'currentColor',
foo: 'orange',
bar: 'red',
orange: 'orange',
red: 'red',
green: 'green',
blue: 'blue',

62
src/util/resolveConfig.js
View File

@ -4,34 +4,7 @@ import defaults from 'lodash/defaults'
import map from 'lodash/map'
import get from 'lodash/get'
function resolveFunctionKeys(object) {
const getKey = (key, defaultValue) => get(object, key, defaultValue)
return Object.keys(object).reduce((resolved, key) => {
return {
...resolved,
[key]: isFunction(object[key]) ? object[key](getKey) : object[key],
}
}, {})
}
function mergeExtensions({ extend, ...theme }) {
return mergeWith({}, theme, extend, (_, extensions, key) => {
if (isFunction(theme[key]) || (extend && isFunction(extend[key]))) {
return mergedTheme => ({
...(isFunction(theme[key]) ? theme[key](mergedTheme) : theme[key]),
...(extend && isFunction(extend[key]) ? extend[key](mergedTheme) : extensions),
})
} else {
return {
...theme[key],
...extensions,
}
}
})
}
export default function(configs) {
function resolveConfig(configs) {
return defaults(
{
theme: resolveFunctionKeys(mergeExtensions(defaults(...map(configs, 'theme')))),
@ -40,3 +13,36 @@ export default function(configs) {
...configs
)
}
function mergeExtensions({ extend, ...theme }) {
return mergeWith(theme, extend, (themeValue, extensions, key) => {
if (!isFunction(themeValue) && !(isFunction(extensions))) {
return {
...themeValue,
...extensions,
}
}
return resolveThemePath => ({
...value(themeValue, resolveThemePath),
...value(extensions, resolveThemePath),
})
})
}
function resolveFunctionKeys(object) {
const resolveObjectPath = (key, defaultValue) => get(object, key, defaultValue)
return Object.keys(object).reduce((resolved, key) => {
return {
...resolved,
[key]: isFunction(object[key]) ? object[key](resolveObjectPath) : object[key],
}
}, {})
}
function value(valueToResolve, ...args) {
return isFunction(valueToResolve) ? valueToResolve(...args) : valueToResolve
}
export default resolveConfig