fix(eslint): fix "@tinkoff/member-ordering" rule failing (#29)

tramvaijs · Nov 27, 2019 · a2964c0 · a2964c0
1 parent 7b1fd1d
commit a2964c0
Show file tree

Hide file tree

Showing 6 changed files with 3,870 additions and 3,834 deletions.
diff --git a/.huskyrc b/.huskyrc
@@ -1,5 +1,6 @@
 {
     "hooks": {
-        "pre-commit": "npm run lint"
+        "pre-commit": "npm run lint",
+        "pre-push": "npm run test:ci"
     }
 }
diff --git a/eslint/angular/conventions.js b/eslint/angular/conventions.js
@@ -8,7 +8,7 @@ module.exports = {
         '@tinkoff/member-ordering': [
             breaking({since: 2}),
             {
-                classes: [
+                default: [
                     'private-instance-field',
                     'private-static-field',
                     'protected-static-field',

diff --git a/eslint/rules/member-ordering.js b/eslint/rules/member-ordering.js
@@ -165,7 +165,11 @@ module.exports = {
     },
     defaultOptions,
     create(context) {
-        const options = (context.options && context.options[0]) || defaultOptions[0];
+        const options = Object.assign(
+            {},
+            defaultOptions[0],
+            context.options ? context.options[0] : null,
+        );
 
         const sourceCode = context.getSourceCode();
         const functionExpressions = [