From f4a0e25f3c3f763ab1105b7bfa884dde1bd831e2 Mon Sep 17 00:00:00 2001 From: Azat S Date: Fri, 28 Jul 2023 20:01:49 +0300 Subject: [PATCH] fix: disable sorting enums with implicit values --- rules/sort-enums.ts | 2 +- test/sort-enums.test.ts | 115 +++------------------------------------- 2 files changed, 7 insertions(+), 110 deletions(-) diff --git a/rules/sort-enums.ts b/rules/sort-enums.ts index 89153b9b6..d4ad13808 100644 --- a/rules/sort-enums.ts +++ b/rules/sort-enums.ts @@ -71,7 +71,7 @@ export default createEslintRule({ TSEnumDeclaration: node => { if ( node.members.length > 1 && - node.members.some(({ initializer }) => initializer) + node.members.every(({ initializer }) => initializer) ) { let options = complete(context.options.at(0), { type: SortType.alphabetical, diff --git a/test/sort-enums.test.ts b/test/sort-enums.test.ts index b23153bad..3666b2d1d 100644 --- a/test/sort-enums.test.ts +++ b/test/sort-enums.test.ts @@ -129,7 +129,7 @@ describe(RULE_NAME, () => { }) }) - it(`${RULE_NAME}(${type}): sorts enum members without initializer`, () => { + it(`${RULE_NAME}(${type}): doesn't sorts enum members without initializer`, () => { ruleTester.run(RULE_NAME, rule, { valid: [ { @@ -148,39 +148,7 @@ describe(RULE_NAME, () => { ], }, ], - invalid: [ - { - code: dedent` - enum TokyoGodfathers { - Gin, - Miyuki, - Hana = 'Hana', - } - `, - output: dedent` - enum TokyoGodfathers { - Gin, - Hana = 'Hana', - Miyuki, - } - `, - options: [ - { - type: SortType.alphabetical, - order: SortOrder.asc, - }, - ], - errors: [ - { - messageId: 'unexpectedEnumsOrder', - data: { - left: 'Miyuki', - right: 'Hana', - }, - }, - ], - }, - ], + invalid: [], }) }) @@ -429,7 +397,7 @@ describe(RULE_NAME, () => { }) }) - it(`${RULE_NAME}(${type}): sorts enum members without initializer`, () => { + it(`${RULE_NAME}(${type}): doesn't sorts enum members without initializer`, () => { ruleTester.run(RULE_NAME, rule, { valid: [ { @@ -448,39 +416,7 @@ describe(RULE_NAME, () => { ], }, ], - invalid: [ - { - code: dedent` - enum TokyoGodfathers { - Gin, - Miyuki, - Hana = 'Hana', - } - `, - output: dedent` - enum TokyoGodfathers { - Gin, - Hana = 'Hana', - Miyuki, - } - `, - options: [ - { - type: SortType.natural, - order: SortOrder.asc, - }, - ], - errors: [ - { - messageId: 'unexpectedEnumsOrder', - data: { - left: 'Miyuki', - right: 'Hana', - }, - }, - ], - }, - ], + invalid: [], }) }) @@ -736,7 +672,7 @@ describe(RULE_NAME, () => { }) }) - it(`${RULE_NAME}(${type}): sorts enum members without initializer`, () => { + it(`${RULE_NAME}(${type}): doesn't sorts enum members without initializer`, () => { ruleTester.run(RULE_NAME, rule, { valid: [ { @@ -755,46 +691,7 @@ describe(RULE_NAME, () => { ], }, ], - invalid: [ - { - code: dedent` - enum TokyoGodfathers { - Gin, - Miyuki, - Hana = 'Hana', - } - `, - output: dedent` - enum TokyoGodfathers { - Hana = 'Hana', - Miyuki, - Gin, - } - `, - options: [ - { - type: SortType['line-length'], - order: SortOrder.desc, - }, - ], - errors: [ - { - messageId: 'unexpectedEnumsOrder', - data: { - left: 'Gin', - right: 'Miyuki', - }, - }, - { - messageId: 'unexpectedEnumsOrder', - data: { - left: 'Miyuki', - right: 'Hana', - }, - }, - ], - }, - ], + invalid: [], }) })