Simplify resolveConfig slightly, try to catch more in tests

Author: adamwathan

__tests__/resolveConfig.test.js

@@ -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',

src/util/resolveConfig.js

@@ -4,39 +4,45 @@ 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 resolveConfig(configs) {
+  return defaults(
+    {
+      theme: resolveFunctionKeys(mergeExtensions(defaults(...map(configs, 'theme')))),
+      variants: defaults(...map(configs, 'variants')),
+    },
+    ...configs
+  )
 }
 
 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 mergeWith(theme, extend, (themeValue, extensions, key) => {
+    if (!isFunction(themeValue) && !(isFunction(extensions))) {
       return {
-        ...theme[key],
+        ...themeValue,
         ...extensions,
       }
     }
+
+    return resolveThemePath => ({
+      ...value(themeValue, resolveThemePath),
+      ...value(extensions, resolveThemePath),
+    })
   })
 }
 
-export default function(configs) {
-  return defaults(
-    {
-      theme: resolveFunctionKeys(mergeExtensions(defaults(...map(configs, 'theme')))),
-      variants: defaults(...map(configs, 'variants')),
-    },
-    ...configs
-  )
+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