Improve validation

ehmicky · Feb 6, 2022 · 819e3cd · 819e3cd
1 parent 6881e57
commit 819e3cd
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/src/config/load/normalize.js b/src/config/load/normalize.js
@@ -29,18 +29,22 @@ const getConfigCwd = function (value, { context: { base } }) {
   return base
 }
 
-const transformConfig = async function (value) {
-  const valueA = await useResolvers(value)
-  await validateFileExists(valueA)
-  await validateRegularFile(valueA)
-  return valueA
+const validateConfig = async function (value) {
+  await validateFileExists(value)
+  await validateRegularFile(value)
 }
 
-const configPropAny = {
-  name: 'config.*',
-  path: isConfigFilePath,
-  cwd: getConfigCwd,
-  transform: transformConfig,
-}
+const configPropAny = [
+  {
+    name: 'config.*',
+    path: isConfigFilePath,
+    cwd: getConfigCwd,
+    transform: useResolvers,
+  },
+  {
+    name: 'config.*',
+    validate: validateConfig,
+  },
+]
 
-export const CONFIG_DEFINITIONS = [configProp, configPropAny]
+export const CONFIG_DEFINITIONS = [configProp, ...configPropAny]