@croct/eslint-plugin 0.4.0 → 0.6.1

package/configs/index.d.ts

@@ -19,6 +19,10 @@ export declare const configs: {
             '@croct/jsx-attribute-spacing': string;
             'react/jsx-wrap-multilines': string;
             'react/display-name': string;
+            'react/jsx-sort-props': (string | {
+                noSortAlphabetically: boolean;
+                multiline: string;
+            })[];
             'jsx-quotes': string[];
             'react/jsx-newline': (string | {
                 prevent: boolean;
@@ -75,12 +79,6 @@ export declare const configs: {
                 };
             })[];
         };
-        overrides: {
-            files: string[];
-            rules: {
-                'sort-keys-fix/sort-keys-fix': string;
-            };
-        }[];
     };
     typescript: {
         extends: string[];
@@ -151,9 +149,6 @@ export declare const configs: {
                 })[];
                 'no-undef': string;
                 '@typescript-eslint/no-namespace': string;
-                '@typescript-eslint/no-redeclare': (string | {
-                    ignoreDeclarationMerge: boolean;
-                })[];
                 'no-new-object'?: undefined;
             };
             plugins?: undefined;
@@ -192,7 +187,6 @@ export declare const configs: {
                 '@typescript-eslint/member-delimiter-style'?: undefined;
                 'no-undef'?: undefined;
                 '@typescript-eslint/no-namespace'?: undefined;
-                '@typescript-eslint/no-redeclare'?: undefined;
             };
             env: {
                 jest: boolean;

package/configs/javascript.js

@@ -73,7 +73,7 @@ exports.javascript = {
             'error',
             {
                 items: 6,
-                'max-len': 100,
+                'max-len': 120,
             },
         ],
         'no-smart-quotes/no-smart-quotes': 'error',
@@ -112,7 +112,7 @@ exports.javascript = {
         'max-len': [
             'error',
             {
-                code: 100,
+                code: 120,
                 ignoreStrings: false,
                 ignoreComments: false,
                 ignoreTemplateLiterals: false,
@@ -207,6 +207,8 @@ exports.javascript = {
                 blankLine: 'always',
                 prev: '*',
                 next: [
+                    'break',
+                    'continue',
                     'return',
                     'if',
                     'function',

package/configs/react.d.ts

@@ -5,6 +5,10 @@ export declare const react: {
         '@croct/jsx-attribute-spacing': string;
         'react/jsx-wrap-multilines': string;
         'react/display-name': string;
+        'react/jsx-sort-props': (string | {
+            noSortAlphabetically: boolean;
+            multiline: string;
+        })[];
         'jsx-quotes': string[];
         'react/jsx-newline': (string | {
             prevent: boolean;
@@ -61,10 +65,4 @@ export declare const react: {
             };
         })[];
     };
-    overrides: {
-        files: string[];
-        rules: {
-            'sort-keys-fix/sort-keys-fix': string;
-        };
-    }[];
 };

package/configs/react.js

@@ -17,12 +17,18 @@ exports.react = {
         'testing-library',
         'jest-dom',
         '@croct',
-        'sort-keys-fix',
     ],
     rules: {
         '@croct/jsx-attribute-spacing': 'error',
         'react/jsx-wrap-multilines': 'error',
         'react/display-name': 'off',
+        'react/jsx-sort-props': [
+            'error',
+            {
+                noSortAlphabetically: true,
+                multiline: 'last',
+            },
+        ],
         'jsx-quotes': [
             'error',
             'prefer-double',
@@ -125,12 +131,4 @@ exports.react = {
             },
         ],
     },
-    overrides: [
-        {
-            files: ['**/styles.ts'],
-            rules: {
-                'sort-keys-fix/sort-keys-fix': 'error',
-            },
-        },
-    ],
 };

package/configs/typescript.d.ts

@@ -67,9 +67,6 @@ export declare const typescript: {
             })[];
             'no-undef': string;
             '@typescript-eslint/no-namespace': string;
-            '@typescript-eslint/no-redeclare': (string | {
-                ignoreDeclarationMerge: boolean;
-            })[];
             'no-new-object'?: undefined;
         };
         plugins?: undefined;
@@ -108,7 +105,6 @@ export declare const typescript: {
             '@typescript-eslint/member-delimiter-style'?: undefined;
             'no-undef'?: undefined;
             '@typescript-eslint/no-namespace'?: undefined;
-            '@typescript-eslint/no-redeclare'?: undefined;
         };
         env: {
             jest: boolean;

package/configs/typescript.js

@@ -79,9 +79,6 @@ exports.typescript = {
                     }],
                 'no-undef': 'off',
                 '@typescript-eslint/no-namespace': 'off',
-                '@typescript-eslint/no-redeclare': ['error', {
-                        ignoreDeclarationMerge: true,
-                    }],
             },
         },
         {

package/index.d.ts

@@ -12,14 +12,18 @@ declare const configuration: {
             IfStatement: (node: import("@typescript-eslint/types/dist/generated/ast-spec").IfStatement) => void;
         }>;
         'newline-per-chained-call': import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleModule<"expectedLineBreak", {
-            ignoreChainWithDepth: number;
+            ignoreChainDeeperThan: number;
         }[], {
             CallExpression: (node: import("@typescript-eslint/types/dist/generated/ast-spec").CallExpression) => void;
             MemberExpression: (node: import("@typescript-eslint/types/dist/generated/ast-spec").MemberExpression) => void;
         }>;
-        'min-chained-call-depth': import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleModule<"unexpectedLineBreak", {
+        'min-chained-call-depth': import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleModule<"unexpectedLineBreak", ({
             maxLineLength: number;
-        }[], {
+            ignoreChainDeeperThan?: undefined;
+        } | {
+            ignoreChainDeeperThan: number;
+            maxLineLength?: undefined;
+        })[], {
             CallExpression: (node: import("@typescript-eslint/types/dist/generated/ast-spec").CallExpression) => void;
             MemberExpression: (node: import("@typescript-eslint/types/dist/generated/ast-spec").MemberExpression) => void;
         }>;
@@ -48,6 +52,10 @@ declare const configuration: {
                 '@croct/jsx-attribute-spacing': string;
                 'react/jsx-wrap-multilines': string;
                 'react/display-name': string;
+                'react/jsx-sort-props': (string | {
+                    noSortAlphabetically: boolean;
+                    multiline: string;
+                })[];
                 'jsx-quotes': string[];
                 'react/jsx-newline': (string | {
                     prevent: boolean;
@@ -104,12 +112,6 @@ declare const configuration: {
                     };
                 })[];
             };
-            overrides: {
-                files: string[];
-                rules: {
-                    'sort-keys-fix/sort-keys-fix': string;
-                };
-            }[];
         };
         typescript: {
             extends: string[];
@@ -180,9 +182,6 @@ declare const configuration: {
                     })[];
                     'no-undef': string;
                     '@typescript-eslint/no-namespace': string;
-                    '@typescript-eslint/no-redeclare': (string | {
-                        ignoreDeclarationMerge: boolean;
-                    })[];
                     'no-new-object'?: undefined;
                 };
                 plugins?: undefined;
@@ -221,7 +220,6 @@ declare const configuration: {
                     '@typescript-eslint/member-delimiter-style'?: undefined;
                     'no-undef'?: undefined;
                     '@typescript-eslint/no-namespace'?: undefined;
-                    '@typescript-eslint/no-redeclare'?: undefined;
                 };
                 env: {
                     jest: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@croct/eslint-plugin",
-  "version": "0.4.0",
+  "version": "0.6.1",
   "description": "ESLint rules and presets applied to all Croct JavaScript projects.",
   "license": "MIT",
   "author": {
@@ -63,9 +63,8 @@
     "eslint": "^8.8",
     "eslint-plugin-eslint-plugin": "^4.1.0",
     "eslint-plugin-self": "^1.2.1",
-    "eslint-plugin-sort-keys-fix": "^1.1.2",
-    "jest": "^27.5",
-    "ts-jest": "^27.1",
+    "jest": "^28.0.0",
+    "ts-jest": "^28.0.0-next.3",
     "typescript": "^4.5"
   },
   "peerDependencies": {

package/rules/index.d.ts

@@ -11,14 +11,18 @@ export declare const rules: {
         IfStatement: (node: import("@typescript-eslint/types/dist/generated/ast-spec").IfStatement) => void;
     }>;
     'newline-per-chained-call': import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleModule<"expectedLineBreak", {
-        ignoreChainWithDepth: number;
+        ignoreChainDeeperThan: number;
     }[], {
         CallExpression: (node: import("@typescript-eslint/types/dist/generated/ast-spec").CallExpression) => void;
         MemberExpression: (node: import("@typescript-eslint/types/dist/generated/ast-spec").MemberExpression) => void;
     }>;
-    'min-chained-call-depth': import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleModule<"unexpectedLineBreak", {
+    'min-chained-call-depth': import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleModule<"unexpectedLineBreak", ({
         maxLineLength: number;
-    }[], {
+        ignoreChainDeeperThan?: undefined;
+    } | {
+        ignoreChainDeeperThan: number;
+        maxLineLength?: undefined;
+    })[], {
         CallExpression: (node: import("@typescript-eslint/types/dist/generated/ast-spec").CallExpression) => void;
         MemberExpression: (node: import("@typescript-eslint/types/dist/generated/ast-spec").MemberExpression) => void;
     }>;

package/rules/min-chained-call-depth/index.d.ts

@@ -1,7 +1,11 @@
 import { TSESTree } from '@typescript-eslint/experimental-utils';
-export declare const minChainedCallDepth: import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleModule<"unexpectedLineBreak", {
+export declare const minChainedCallDepth: import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleModule<"unexpectedLineBreak", ({
     maxLineLength: number;
-}[], {
+    ignoreChainDeeperThan?: undefined;
+} | {
+    ignoreChainDeeperThan: number;
+    maxLineLength?: undefined;
+})[], {
     CallExpression: (node: TSESTree.CallExpression) => void;
     MemberExpression: (node: TSESTree.MemberExpression) => void;
 }>;

package/rules/min-chained-call-depth/index.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.minChainedCallDepth = void 0;
+/*
+    eslint-disable @typescript-eslint/no-non-null-assertion
+    --
+    Disable the rule to reduce the number of branches
+*/
+const experimental_utils_1 = require("@typescript-eslint/experimental-utils");
 const ast_utils_1 = require("@typescript-eslint/utils/dist/ast-utils");
 const createRule_1 = require("../createRule");
 exports.minChainedCallDepth = (0, createRule_1.createRule)({
@@ -21,6 +27,12 @@ exports.minChainedCallDepth = (0, createRule_1.createRule)({
                         minimum: 1,
                         default: 100,
                     },
+                    ignoreChainDeeperThan: {
+                        type: 'integer',
+                        minimum: 1,
+                        maximum: 10,
+                        default: 2,
+                    },
                 },
                 additionalProperties: false,
             },
@@ -33,19 +45,23 @@ exports.minChainedCallDepth = (0, createRule_1.createRule)({
         {
             maxLineLength: 100,
         },
+        {
+            ignoreChainDeeperThan: 3,
+        },
     ],
     create: context => {
         const sourceCode = context.getSourceCode();
+        let maxDepth = 0;
         function getDepth(node) {
             let depth = 0;
             let currentNode = node;
-            while (currentNode.type === 'CallExpression'
-                || currentNode.type === 'MemberExpression') {
-                if (currentNode.type === 'MemberExpression') {
+            while (currentNode.type === experimental_utils_1.AST_NODE_TYPES.CallExpression
+                || currentNode.type === experimental_utils_1.AST_NODE_TYPES.MemberExpression) {
+                if (currentNode.type === experimental_utils_1.AST_NODE_TYPES.MemberExpression) {
                     currentNode = currentNode.object;
                     depth += 1;
                 }
-                else if (currentNode.type === 'CallExpression') {
+                else if (currentNode.type === experimental_utils_1.AST_NODE_TYPES.CallExpression) {
                     currentNode = currentNode.callee;
                 }
             }
@@ -53,8 +69,8 @@ exports.minChainedCallDepth = (0, createRule_1.createRule)({
         }
         function check(node) {
             var _a, _b;
-            // If the node is a member expression inside a call expression skip, this is to ensure
-            // that we consider the correct line length of the result.
+            // If the node is a member expression inside a call/new expression skip,
+            // this is to ensure that we consider the correct line length of the result.
             //
             // Example:
             //     ```ts
@@ -63,37 +79,61 @@ exports.minChainedCallDepth = (0, createRule_1.createRule)({
             //     ```
             //     The replacement of this input should be `foo.bar();`, which has 10 character.
             //     Without this check it would consider the length up to `r`, which is 7.
-            if (node.type === 'MemberExpression' && ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.type) === 'CallExpression') {
+            if (node.type === experimental_utils_1.AST_NODE_TYPES.MemberExpression
+                && ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.type) === experimental_utils_1.AST_NODE_TYPES.CallExpression) {
                 return;
             }
-            // If the node is a call expression we need to validate it's callee as a member
+            // If the node is a call/new expression we need to validate it's callee as a member
             // expression.
             // If the node itself is already a member expression, like the
             // `property` in `this.property.function()`, we validate the node directly.
-            const callee = node.type === 'CallExpression' ? node.callee : node;
+            const callee = node.type === experimental_utils_1.AST_NODE_TYPES.CallExpression
+                ? node.callee
+                : node;
             if (
-            // If the callee is not a member expression, we can skip.
+            // If the callee is not a member expression, skip.
             // For example, root level calls like `foo();`.
-            callee.type !== 'MemberExpression'
-                // If the callee is a computed member expression, like `foo[bar]()`, we can skip.
+            callee.type !== experimental_utils_1.AST_NODE_TYPES.MemberExpression
+                // If the callee is a computed member expression, like `foo[bar]()`, skip.
                 || callee.computed
-                // If the callee is already in the same line as it's object, we can skip.
+                /* eslint-disable-next-line @typescript-eslint/ban-ts-comment --
+                 * NewExpression is a possible callee object type
+                 */
+                // @ts-ignore
+                || callee.object.type === experimental_utils_1.AST_NODE_TYPES.NewExpression
+                // If the callee is already in the same line as it's object, skip.
                 || callee.object.loc.end.line === callee.property.loc.start.line) {
                 return;
             }
-            // We only inline the first level of chained calls.
-            // If the current call is nested inside another call, we can skip.
-            if (getDepth(callee) > 1) {
+            const currentDepth = getDepth(callee);
+            maxDepth = Math.max(maxDepth, currentDepth);
+            // Only affect the root level as the total depth is must be known.
+            // If the current call is nested inside another call, skip.
+            if (currentDepth > 1) {
+                return;
+            }
+            const { maxLineLength = 100, ignoreChainDeeperThan = 2 } = (_b = context.options[0]) !== null && _b !== void 0 ? _b : {};
+            // If the max depth is greater than ignore threshold, skip
+            //
+            // Example:
+            //     ```ts
+            //     Array(10)
+            //         .fill(0)
+            //         .map(x => x + 1)
+            //         .slice(0, 5);
+            //     ```
+            //     In this case the depth is 3, and the default value of ignoreChainDeeperThan is 2.
+            //     So the check can be skipped.
+            if (maxDepth > ignoreChainDeeperThan) {
                 return;
             }
-            const { maxLineLength = 100 } = (_b = context.options[0]) !== null && _b !== void 0 ? _b : {};
             const { property } = callee;
             const lastToken = sourceCode.getLastToken(node, {
                 filter: token => token.loc.end.line === property.loc.start.line,
             });
             const semicolon = sourceCode.getLastToken(node.parent, {
                 filter: token => (token.loc.start.line === property.loc.start.line
-                    && token.type === 'Punctuator'
+                    && token.type === experimental_utils_1.AST_TOKEN_TYPES.Punctuator
                     && token.value === ';'),
             });
             const lineLength = callee.object.loc.end.column

package/rules/newline-per-chained-call/index.d.ts

@@ -1,6 +1,6 @@
 import { TSESTree } from '@typescript-eslint/experimental-utils';
 export declare const newlinePerChainedCall: import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleModule<"expectedLineBreak", {
-    ignoreChainWithDepth: number;
+    ignoreChainDeeperThan: number;
 }[], {
     CallExpression: (node: TSESTree.CallExpression) => void;
     MemberExpression: (node: TSESTree.MemberExpression) => void;

package/rules/newline-per-chained-call/index.js

@@ -16,7 +16,7 @@ exports.newlinePerChainedCall = (0, createRule_1.createRule)({
             {
                 type: 'object',
                 properties: {
-                    ignoreChainWithDepth: {
+                    ignoreChainDeeperThan: {
                         type: 'integer',
                         minimum: 1,
                         maximum: 10,
@@ -32,13 +32,13 @@ exports.newlinePerChainedCall = (0, createRule_1.createRule)({
     },
     defaultOptions: [
         {
-            ignoreChainWithDepth: 2,
+            ignoreChainDeeperThan: 2,
         },
     ],
     create: context => {
         var _a, _b;
         const options = (_a = context.options[0]) !== null && _a !== void 0 ? _a : {};
-        const ignoreChainWithDepth = (_b = options.ignoreChainWithDepth) !== null && _b !== void 0 ? _b : 2;
+        const ignoreChainWithDepth = (_b = options.ignoreChainDeeperThan) !== null && _b !== void 0 ? _b : 2;
         const sourceCode = context.getSourceCode();
         function getPropertyText(node) {
             const prefix = '.';