Refactoring

ehmicky · Jan 16, 2022 · 4c89d88 · 4c89d88
1 parent 41451b5
commit 4c89d88
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/config/check.js b/src/config/check.js
@@ -57,6 +57,8 @@ export const checkString = function (value, name) {
 }
 
 export const checkDefinedString = function (value, name) {
+  checkString(value, name)
+
   if (value.trim() === '') {
     throw new UserError(`'${name}' must not be empty.`)
   }

diff --git a/src/config/normalize.js b/src/config/normalize.js
@@ -67,24 +67,24 @@ const applyNormalizer = function (value, name, normalizer) {
 
 const NORMALIZERS = {
   colors: [checkBoolean],
-  cwd: [checkString, checkDefinedString],
+  cwd: [checkDefinedString],
   delta: [normalizeDelta],
   force: [checkBoolean],
   inputs: [checkObjectProps.bind(undefined, [checkJson])],
   limit: [checkInteger, normalizeLimit],
-  merge: [checkString, checkDefinedString, validateMerge],
-  output: [checkString, checkDefinedString],
+  merge: [checkDefinedString, validateMerge],
+  output: [checkDefinedString],
   outliers: [checkBoolean],
   precision: [checkInteger, normalizePrecision],
   quiet: [checkBoolean],
   reporter: [
     normalizeOptionalArray,
-    checkArrayItems.bind(undefined, [checkString, checkDefinedString]),
+    checkArrayItems.bind(undefined, [checkDefinedString]),
   ],
   runner: [
     normalizeOptionalArray,
     checkArrayLength,
-    checkArrayItems.bind(undefined, [checkString, checkDefinedString]),
+    checkArrayItems.bind(undefined, [checkDefinedString]),
   ],
   select: [
     normalizeOptionalArray,
@@ -96,10 +96,10 @@ const NORMALIZERS = {
   showSystem: [checkBoolean],
   showTitles: [checkBoolean],
   since: [normalizeDelta],
-  system: [checkObjectProps.bind(undefined, [checkString, checkDefinedString])],
+  system: [checkObjectProps.bind(undefined, [checkDefinedString])],
   tasks: [
     normalizeOptionalArray,
-    checkArrayItems.bind(undefined, [checkString, checkDefinedString]),
+    checkArrayItems.bind(undefined, [checkDefinedString]),
   ],
-  titles: [checkObjectProps.bind(undefined, [checkString, checkDefinedString])],
+  titles: [checkObjectProps.bind(undefined, [checkDefinedString])],
 }