fix(eslint-plugin): [member-ordering] check order when optionalityOrd…

…er is present with no optional members (typescript-eslint#6619) fix: check order when optionalityOrder present with no optional members
hasparus · Mar 22, 2023 · 16523e5 · 16523e5
1 parent 989aa57
commit 16523e5
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/packages/eslint-plugin/src/rules/member-ordering.ts b/packages/eslint-plugin/src/rules/member-ordering.ts
@@ -952,6 +952,8 @@ export default util.createRule<Options, MessageIds>({
         }
         checkOrder(members.slice(0, switchIndex));
         checkOrder(members.slice(switchIndex));
+      } else {
+        checkOrder(members);
       }
     }
 

diff --git a/packages/eslint-plugin/tests/rules/member-ordering/member-ordering-optionalMembers.test.ts b/packages/eslint-plugin/tests/rules/member-ordering/member-ordering-optionalMembers.test.ts
@@ -105,8 +105,8 @@ class X {
       code: `
 class X {
   a: string;
-  static {}
   b: string;
+  static {}
 }
       `,
       options: [
@@ -337,6 +337,35 @@ class X {
         },
       ],
     },
+    {
+      code: `
+class X {
+  b: string;
+  a: string;
+}
+      `,
+      options: [
+        {
+          default: {
+            memberTypes: 'never',
+            order: 'natural-case-insensitive',
+            optionalityOrder: 'required-first',
+          },
+        },
+      ],
+      errors: [
+        {
+          messageId: 'incorrectOrder',
+          line: 4,
+          column: 3,
+          data: {
+            member: 'a',
+            beforeMember: 'b',
+            optionalOrRequired: 'required',
+          },
+        },
+      ],
+    },
     // optionalityOrder - optional-first
     {
       code: `