Improve normalization

ehmicky · Jan 16, 2022 · cd0537f · cd0537f
1 parent 332fdfd
commit cd0537f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/config/check.js b/src/config/check.js
@@ -70,21 +70,18 @@ const checkString = function (value, name) {
 }
 
 export const checkStringsObject = function (value, name) {
-  checkObject(value, name)
   Object.entries(value).forEach(([childName, propValue]) => {
     checkString(propValue, `${name}.${childName}`)
   })
 }
 
 export const checkJsonDeepObject = function (value, name) {
-  checkObject(value, name)
   Object.entries(value).forEach(([childName, propValue]) => {
     checkJsonObject(propValue, `${name}.${childName}`)
   })
 }
 
 export const checkJsonObject = function (value, name) {
-  checkObject(value, name)
   Object.entries(value).forEach(([childName, propValue]) => {
     checkJson(propValue, `${name}.${childName}`)
   })

diff --git a/src/config/normalize.js b/src/config/normalize.js
@@ -7,12 +7,13 @@ import { normalizePrecision } from '../run/precision.js'
 import {
   checkBoolean,
   checkInteger,
-  checkStringsObject,
   normalizeOptionalArray,
   checkArrayLength,
   checkStringArray,
   checkDefinedStringArray,
   checkDefinedString,
+  checkObject,
+  checkStringsObject,
   checkJsonObject,
 } from './check.js'
 import { validateConfigSelector, isConfigSelector } from './select/normalize.js'
@@ -71,7 +72,7 @@ const validateTitles = function (value, name) {
 }
 
 const NORMALIZERS = {
-  inputs: [checkJsonObject],
+  inputs: [checkObject, checkJsonObject],
   limit: [checkInteger, normalizeLimit],
   merge: [validateMerge],
   outliers: [checkBoolean],
@@ -82,7 +83,7 @@ const NORMALIZERS = {
   showDiff: [checkBoolean],
   showPrecision: [checkBoolean],
   showTitles: [checkBoolean],
-  system: [checkStringsObject],
+  system: [checkObject, checkStringsObject],
   tasks: [normalizeOptionalArray, checkDefinedStringArray],
   titles: [validateTitles],
 }
diff --git a/src/config/plugin/config.js b/src/config/plugin/config.js
@@ -1,6 +1,6 @@
 import { cleanObject } from '../../utils/clean.js'
 import { pick } from '../../utils/pick.js'
-import { checkJsonDeepObject } from '../check.js'
+import { checkObject, checkJsonDeepObject } from '../check.js'
 import { mergeConfigs } from '../merge/main.js'
 
 // Retrieve plugin configuration object.
@@ -47,6 +47,7 @@ export const addPluginsConfig = function ({
   topProps,
 }) {
   const pluginsConfig = config[configProp]
+  checkObject(pluginsConfig, configProp)
   checkJsonDeepObject(pluginsConfig, configProp)
   return plugins.map((plugin) =>
     addPluginConfig({ plugin, pluginsConfig, config, topProps }),