Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix(typescript-eslint): propagate name field to extended configs in config helper #10094

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 2 commits into from
Oct 15, 2024
Merged

fix(typescript-eslint): propagate name field to extended configs in config helper #10094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b419fd8
fix(typescript-eslint): propagate `name` field to extended configs in…
auvred Oct 3, 2024
97f2dbf
merge base and extension names
auvred Oct 13, 2024
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
18 changes: 9 additions & 9 deletions packages/typescript-eslint/src/config-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,16 @@ export function config(
return config;
}

const extension = {
...(config.files && { files: config.files }),
...(config.ignores && { ignores: config.ignores }),
};

return [
...extendsArr.map(conf => ({
...conf,
...extension,
})),
...extendsArr.map(extension => {
const name = [config.name, extension.name].filter(Boolean).join('__');
return {
...extension,
...(config.files && { files: config.files }),
...(config.ignores && { ignores: config.ignores }),
...(name && { name }),
};
}),
config,
];
});
Expand Down
96 changes: 96 additions & 0 deletions packages/typescript-eslint/tests/configs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,4 +367,100 @@ describe('config helper', () => {
},
]);
});

it('flattens extended configs with config name', () => {
expect(
plugin.config({
extends: [{ rules: { rule1: 'error' } }, { rules: { rule2: 'error' } }],
files: ['common-file'],
ignores: ['common-ignored'],
name: 'my-config',
rules: { rule: 'error' },
}),
).toEqual([
{
files: ['common-file'],
ignores: ['common-ignored'],
name: 'my-config',
rules: { rule1: 'error' },
},
{
files: ['common-file'],
ignores: ['common-ignored'],
name: 'my-config',
rules: { rule2: 'error' },
},
{
files: ['common-file'],
ignores: ['common-ignored'],
name: 'my-config',
rules: { rule: 'error' },
},
]);
});

it('flattens extended configs with names if base config is unnamed', () => {
expect(
plugin.config({
extends: [
{ name: 'extension-1', rules: { rule1: 'error' } },
{ rules: { rule2: 'error' } },
],
files: ['common-file'],
ignores: ['common-ignored'],
rules: { rule: 'error' },
}),
).toEqual([
{
files: ['common-file'],
ignores: ['common-ignored'],
name: 'extension-1',
rules: { rule1: 'error' },
},
{
files: ['common-file'],
ignores: ['common-ignored'],
rules: { rule2: 'error' },
},
{
files: ['common-file'],
ignores: ['common-ignored'],
rules: { rule: 'error' },
},
]);
});

it('merges config items names', () => {
expect(
plugin.config({
extends: [
{ name: 'extension-1', rules: { rule1: 'error' } },
{ rules: { rule2: 'error' } },
],
files: ['common-file'],
ignores: ['common-ignored'],
name: 'my-config',
rules: { rule: 'error' },
}),
).toEqual([
{
files: ['common-file'],
ignores: ['common-ignored'],
name: 'my-config__extension-1',
rules: { rule1: 'error' },
},
{
files: ['common-file'],
ignores: ['common-ignored'],
name: 'my-config',
rules: { rule2: 'error' },
},
{
files: ['common-file'],
ignores: ['common-ignored'],
name: 'my-config',
rules: { rule: 'error' },
},
]);
});
});
Loading