diff --git a/packages/typescript-eslint/src/config-helper.ts b/packages/typescript-eslint/src/config-helper.ts index 691ffdbab4d8..dd366b70cdbf 100644 --- a/packages/typescript-eslint/src/config-helper.ts +++ b/packages/typescript-eslint/src/config-helper.ts @@ -91,14 +91,17 @@ export function config( return config; } - if (config.files) { - const files = config.files; - return [ - ...extendsArr.map(conf => ({ ...conf, files: [...files] })), - config, - ]; - } + const extension = { + ...(config.files && { files: config.files }), + ...(config.ignores && { ignores: config.ignores }), + }; - return [...extendsArr, config]; + return [ + ...extendsArr.map(conf => ({ + ...conf, + ...extension, + })), + config, + ]; }); } diff --git a/packages/typescript-eslint/tests/configs.test.ts b/packages/typescript-eslint/tests/configs.test.ts index 1b88f58b6e98..f66b638bf1a6 100644 --- a/packages/typescript-eslint/tests/configs.test.ts +++ b/packages/typescript-eslint/tests/configs.test.ts @@ -211,3 +211,61 @@ describe('stylistic-type-checked.ts', () => { itHasBaseRulesOverriden(unfilteredConfigRules); }); + +describe('config helper', () => { + it('works without extends', () => { + expect( + plugin.config({ + files: ['file'], + rules: { rule: 'error' }, + ignores: ['ignored'], + }), + ).toEqual([ + { + files: ['file'], + rules: { rule: 'error' }, + ignores: ['ignored'], + }, + ]); + }); + + it('flattens extended configs', () => { + expect( + plugin.config({ + rules: { rule: 'error' }, + extends: [{ rules: { rule1: 'error' } }, { rules: { rule2: 'error' } }], + }), + ).toEqual([ + { rules: { rule1: 'error' } }, + { rules: { rule2: 'error' } }, + { rules: { rule: 'error' } }, + ]); + }); + + it('flattens extended configs with files and ignores', () => { + expect( + plugin.config({ + files: ['common-file'], + ignores: ['common-ignored'], + rules: { rule: 'error' }, + extends: [{ rules: { rule1: 'error' } }, { rules: { rule2: 'error' } }], + }), + ).toEqual([ + { + files: ['common-file'], + ignores: ['common-ignored'], + rules: { rule1: 'error' }, + }, + { + files: ['common-file'], + ignores: ['common-ignored'], + rules: { rule2: 'error' }, + }, + { + files: ['common-file'], + ignores: ['common-ignored'], + rules: { rule: 'error' }, + }, + ]); + }); +});
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies: