fix: execute dynamic configuration in get-configuration

This change contains
* Move execute-rule to own file
* Move resolve-extends to own file
* Move dynamic configuration execution to get-configuration
* Refactory dynamic configuration execution to be more generic

Author: marionebl

source/index.js

@@ -6,13 +6,6 @@ export getMessages from './library/get-messages';
 export getPreset from './library/get-preset';
 export format from './library/format';
 
-async function executeRule(entry) {
-	const [name, config] = entry;
-	return typeof config === 'function' ?
-		[name, await config()] :
-		[name, await config];
-}
-
 export default async (message, options = {}) => {
 	const {
 		preset: {
@@ -24,19 +17,14 @@ export default async (message, options = {}) => {
 		}
 	} = options;
 
+	// parse the commit message
 	const parsed = merge(
 		{raw: message},
 		parse(message, parserOptions)
 	);
 
-	// execute wildcard rules
-	const executedWildcards = await Promise.all(
-		Object.entries(wildcards || {})
-			.map(async entry => await executeRule(entry))
-	);
-
 	// wildcard matches skip the linting
-	const bails = executedWildcards
+	const bails = Object.entries(wildcards)
 		.filter(entry => {
 			const [, pattern] = entry;
 			return Array.isArray(pattern);
@@ -46,8 +34,9 @@ export default async (message, options = {}) => {
 			const expression = new RegExp(...pattern);
 			return parsed.header.match(expression);
 		})
-		.map(entry => entry[0])
+		.map(entry => entry[0]);
 
+	// found a wildcard match, skip
 	if (bails.length > 0) {
 		return {
 			valid: true,
@@ -58,14 +47,8 @@ export default async (message, options = {}) => {
 		};
 	}
 
-	// execute linting rules
-	const executedRules = await Promise.all(
-		Object.entries(rules || {})
-			.map(async entry => await executeRule(entry))
-		);
-
-		// validate against all rules
-	const results = executedRules
+	// validate against all rules
+	const results = Object.entries(rules)
 		.filter(entry => {
 			const [, [level]] = entry;
 			return level > 0;
@@ -89,7 +72,7 @@ export default async (message, options = {}) => {
 				message
 			};
 		})
-		.filter(Boolean)
+		.filter(Boolean);
 
 	const errors = results.filter(result =>
 		result.level > 1 && !result.valid);

source/library/execute-rule.js

@@ -0,0 +1,6 @@
+export default async entry => {
+	const [name, config] = entry;
+	return typeof config === 'function' ?
+		[name, await config()] :
+		[name, await config];
+};

source/library/get-configuration.js

@@ -1,34 +1,54 @@
 import {merge, pick} from 'lodash';
 import rc from 'rc';
 
+import resolveExtends from './resolve-extends';
+import executeRule from './execute-rule';
+
 const defaults = {
 	extends: ['angular']
 };
 
-// Resolve extend configs
-function resolveExtends(config, prefix = '', key = 'extends') {
-	return Object.values(config[key] || [])
-		.reduce((merged, extender) => {
-			const name = [prefix, extender]
-				.filter(String)
-				.join('-');
-			return merge(
-				{},
-				merged,
-				resolveExtends(require(name))
-			);
-		}, config);
-}
+const defaultName = 'conventional-changelog-lint';
 
-// Get linting config
-export default (name = 'conventional-changelog-lint', settings = {
+const defaultSettings = {
 	prefix: 'conventional-changelog-lint-config'
-}, seed = {}) => {
+};
+
+export default async (name = defaultName, settings = defaultSettings, seed = {}) => {
+	// Merge passed config with file based options
 	const config = merge(rc(name, settings.defaults), seed);
 	const opts = merge({}, defaults, pick(config, 'extends'));
-	return merge(
-		{},
-		resolveExtends(opts, settings.prefix),
-		config
-	);
+
+	// Resolve extends key
+	const extended = resolveExtends(opts, settings.prefix);
+	const preset = merge({}, extended, config);
+
+	// Execute rule config functions if needed
+	const executed = await Promise.all(['rules', 'wildcards']
+		.map(key => {
+			return [key, preset[key]];
+		})
+		.map(async item => {
+			const [key, value] = item;
+			const executedValue = await Promise.all(
+				Object.entries(value || {})
+					.map(async entry => await executeRule(entry))
+			);
+			return [key, executedValue.reduce((registry, item) => {
+				const [key, value] = item;
+				return {
+					...registry,
+					[key]: value
+				};
+			}, {})];
+		}));
+
+	// Merge executed config keys into preset
+	return executed.reduce((registry, item) => {
+		const [key, value] = item;
+		return {
+			...registry,
+			[key]: value
+		};
+	}, preset);
 };

source/library/resolve-extends.js

@@ -0,0 +1,16 @@
+import {merge} from 'lodash';
+
+// Resolve extend configs
+export default function resolveExtends(config, prefix = '', key = 'extends') {
+	return Object.values(config[key] || [])
+		.reduce((merged, extender) => {
+			const name = [prefix, extender]
+				.filter(String)
+				.join('-');
+			return merge(
+				{},
+				merged,
+				resolveExtends(require(name))
+			);
+		}, config);
+}