@croct/eslint-plugin 0.5.0 → 0.6.0

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;
         }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@croct/eslint-plugin",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "ESLint rules and presets applied to all Croct JavaScript projects.",
   "license": "MIT",
   "author": {

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

@@ -27,6 +27,12 @@ exports.minChainedCallDepth = (0, createRule_1.createRule)({
                         minimum: 1,
                         default: 100,
                     },
+                    ignoreChainDeeperThan: {
+                        type: 'integer',
+                        minimum: 1,
+                        maximum: 10,
+                        default: 2,
+                    },
                 },
                 additionalProperties: false,
             },
@@ -39,9 +45,13 @@ 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;
@@ -81,26 +91,42 @@ exports.minChainedCallDepth = (0, createRule_1.createRule)({
                 ? 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 !== experimental_utils_1.AST_NODE_TYPES.MemberExpression
-                // If the callee is a computed member expression, like `foo[bar]()`, we can skip.
+                // If the callee is a computed member expression, like `foo[bar]()`, skip.
                 || callee.computed
                 /* eslint-disable-next-line @typescript-eslint/ban-ts-comment --
-                * NewExpression is a possible callee object type
-                */
+                 * 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, we can skip.
+                // 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,

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 = '.';