Skip to content

fix(load): resolve nested parser preset factories #831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 16, 2019
Merged

fix(load): resolve nested parser preset factories #831

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85773d2
test: add failing testcase for nested parser preset factories
byCedric Oct 16, 2019
1be3c1f
fix(load): resolve nested parser preset factories
byCedric Oct 16, 2019
a328771
refactor(load): remove old console log statement
byCedric Oct 16, 2019
4ea976b
refactor(load): remove extraneous white line
byCedric Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(load): resolve nested parser preset factories
  • Loading branch information
@byCedric
byCedric committed Oct 16, 2019
commit 1be3c1f3bcea6d334d010e37fedea23191c22f33
15 changes: 11 additions & 4 deletions @commitlint/load/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ export default async (seed = {}, options = {cwd: process.cwd()}) => {
pick(config, 'extends', 'plugins', 'ignores', 'defaultIgnores')
);

// Resolve parserPreset key
// Resolve parserPreset key from flat-non-extended config
if (typeof config.parserPreset === 'string') {
const resolvedParserPreset = resolveFrom(base, config.parserPreset);
let resolvedParserConfig = await require(resolvedParserPreset);

// Resolve loaded parser preset if its a factory
// Resolve loaded parser preset factory
if (typeof resolvedParserConfig === 'function') {
resolvedParserConfig = await resolvedParserConfig();
}
Expand All @@ -55,14 +55,21 @@ export default async (seed = {}, options = {cwd: process.cwd()}) => {
});

const preset = valid(mergeWith(extended, config, w));

// Await parser-preset if applicable
if (
typeof preset.parserPreset === 'object' &&
typeof preset.parserPreset.parserOpts === 'object' &&
typeof preset.parserPreset.parserOpts.then === 'function'
) {
preset.parserPreset.parserOpts = (await preset.parserPreset
.parserOpts).parserOpts;
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;
}

// Resolve config-relative formatter module
Expand Down