Skip to content
Snippets Groups Projects
Commit 2611b524 authored by Rhys Arkins's avatar Rhys Arkins
Browse files

refactor: move extends validation inside list validation

parent 37035480
Branches
No related tags found
No related merge requests found
...@@ -96,7 +96,15 @@ function validateConfig(config) { ...@@ -96,7 +96,15 @@ function validateConfig(config) {
depName: 'Configuration Error', depName: 'Configuration Error',
message: `Configuration option \`${key}\` should be a list (Array)`, message: `Configuration option \`${key}\` should be a list (Array)`,
}); });
} else if (key === 'extends') { } else {
for (const subval of val) {
if (isObject(subval)) {
const subValidation = module.exports.validateConfig(subval);
warnings = warnings.concat(subValidation.warnings);
errors = errors.concat(subValidation.errors);
}
}
if (key === 'extends') {
for (const subval of val) { for (const subval of val) {
if (isString(subval) && subval.match(/^:timezone(.+)$/)) { if (isString(subval) && subval.match(/^:timezone(.+)$/)) {
const [, timezone] = subval.match(/^:timezone\((.+)\)$/); const [, timezone] = subval.match(/^:timezone\((.+)\)$/);
...@@ -111,15 +119,7 @@ function validateConfig(config) { ...@@ -111,15 +119,7 @@ function validateConfig(config) {
} }
} }
} }
} else {
// eslint-disable-next-line no-loop-func
val.forEach(subval => {
if (isObject(subval)) {
const subValidation = module.exports.validateConfig(subval);
warnings = warnings.concat(subValidation.warnings);
errors = errors.concat(subValidation.errors);
} }
});
} }
} else if (type === 'string') { } else if (type === 'string') {
if (!isString(val)) { if (!isString(val)) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment