refactor(load): remove custom parser preset factory code

Author: byCedric

@commitlint/load/fixtures/parser-preset-factory/commitlint.config.js

@@ -30,20 +30,14 @@ export default async (seed = {}, options = {cwd: process.cwd()}) => {
 		pick(config, 'extends', 'plugins', 'ignores', 'defaultIgnores')
 	);
 
-	// Resolve parserPreset key from flat-non-extended config
+	// Resolve parserPreset key
 	if (typeof config.parserPreset === 'string') {
 		const resolvedParserPreset = resolveFrom(base, config.parserPreset);
-		let resolvedParserConfig = await require(resolvedParserPreset);
-
-		// Resolve loaded parser preset factory
-		if (typeof resolvedParserConfig === 'function') {
-			resolvedParserConfig = await resolvedParserConfig();
-		}
 
 		config.parserPreset = {
 			name: config.parserPreset,
 			path: resolvedParserPreset,
-			parserOpts: resolvedParserConfig.parserOpts
+			parserOpts: (await require(resolvedParserPreset)).parserOpts
 		};
 	}
 
@@ -61,14 +55,8 @@ export default async (seed = {}, options = {cwd: process.cwd()}) => {
 		typeof preset.parserPreset.parserOpts === 'object' &&
 		typeof preset.parserPreset.parserOpts.then === 'function'
 	) {
-		let parserPreset = await preset.parserPreset.parserOpts;
-
-		// Resolve loaded parser preset factory from extended config
-		if (typeof parserPreset === 'function') {
-			parserPreset = await parserPreset();
-		}
-
-		preset.parserPreset.parserOpts = parserPreset.parserOpts;
+		preset.parserPreset.parserOpts = (await preset.parserPreset
+			.parserOpts).parserOpts;
 	}
 
 	// Resolve config-relative formatter module

@commitlint/load/fixtures/parser-preset-factory/conventional-changelog-factory.js

@@ -84,20 +84,6 @@ test('uses seed with parserPreset', async t => {
 	});
 });
 
-test('uses seed with parserPreset factory', async t => {
-	const cwd = await git.bootstrap('fixtures/parser-preset-factory');
-	const {parserPreset: actual} = await load(
-		{
-			parserPreset: './conventional-changelog-factory'
-		},
-		{cwd}
-	);
-	t.is(actual.name, './conventional-changelog-factory');
-	t.deepEqual(actual.parserOpts, {
-		headerPattern: /^(\w*)(?:\((.*)\))?-(.*)$/
-	});
-});
-
 test('invalid extend should throw', async t => {
 	const cwd = await git.bootstrap('fixtures/extends-invalid');
 	await t.throws(load({}, {cwd}));
@@ -228,16 +214,6 @@ test('recursive extends with parserPreset', async t => {
 	);
 });
 
-test('recursive extends with parserPreset factory', async t => {
-	const cwd = await git.bootstrap('fixtures/recursive-parser-preset-factory');
-	const actual = await load({}, {cwd});
-
-	t.is(actual.parserPreset.name, './conventional-changelog-factory');
-	t.deepEqual(actual.parserPreset.parserOpts, {
-		headerPattern: /^(\w*)(?:\((.*)\))?-(.*)$/
-	});
-});
-
 test('ignores unknow keys', async t => {
 	const cwd = await git.bootstrap('fixtures/trash-file');
 	const actual = await load({}, {cwd});