feat: add static-private-method group for sort-classes rule

azat-io · Sep 12, 2023 · 37512c9 · 37512c9
1 parent f4d6fac
commit 37512c9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/docs/rules/sort-classes.md b/docs/rules/sort-classes.md
@@ -114,6 +114,7 @@ This rule accepts an options object with the following properties:
 
 ```ts
 type Group =
+  | 'static-private-method'
   | 'private-property'
   | 'static-property'
   | 'index-signature'
@@ -173,6 +174,7 @@ If you use [one of the configs](/configs/) exported by this plugin, you get the
     "constructor",
     "static-method",
     "private-method",
+    "static-private-method",
     "method",
     ["get-method", "set-method"],
     "unknown"

diff --git a/rules/sort-classes.ts b/rules/sort-classes.ts
@@ -18,6 +18,7 @@ import { compare } from '../utils/compare'
 type MESSAGE_ID = 'unexpectedClassesOrder'
 
 type Group =
+  | 'static-private-method'
   | 'private-property'
   | 'static-property'
   | 'index-signature'
@@ -127,11 +128,20 @@ export default createEslintRule<Options, MESSAGE_ID>({
               defineGroup('constructor')
             }
 
-            if (member.accessibility === 'private' || isPrivate) {
+            let isPrivateMethod =
+              member.accessibility === 'private' || isPrivate
+
+            let isStaticMethod = member.static
+
+            if (isPrivateMethod && isStaticMethod) {
+              defineGroup('static-private-method')
+            }
+
+            if (isPrivateMethod) {
               defineGroup('private-method')
             }
 
-            if (member.static) {
+            if (isStaticMethod) {
               defineGroup('static-method')
             }