@croct/eslint-plugin 0.1.3 → 0.2.0

package/README.md

@@ -25,7 +25,7 @@
 
 ## Installation
 
-The recommended way to install the SDK is via [NPM](https://npmjs.com). It pairs nicely with module bundlers such as
+The recommended way to install the package is via [NPM](https://npmjs.com). It pairs nicely with module bundlers such as
 Webpack or Browserify:
 
 ```sh

package/configs/index.d.ts

@@ -95,7 +95,6 @@ export declare const configs: {
                     allowNumber: boolean;
                     allowNullableObject: boolean;
                 })[];
-                '@typescript-eslint/prefer-regexp-exec': string;
                 '@typescript-eslint/prefer-optional-chain': string;
                 'no-shadow': string;
                 '@typescript-eslint/no-shadow': (string | {
@@ -114,7 +113,10 @@ export declare const configs: {
                 indent: (string | number | {
                     SwitchCase: number;
                 })[];
-                '@typescript-eslint/no-unused-vars': string;
+                '@typescript-eslint/no-unused-vars': (string | {
+                    args: string;
+                    ignoreRestSiblings: boolean;
+                })[];
                 'no-unused-vars': string;
                 '@typescript-eslint/no-non-null-assertion': string;
                 'object-curly-spacing': string;
@@ -156,7 +158,6 @@ export declare const configs: {
                 '@typescript-eslint/type-annotation-spacing'?: undefined;
                 '@typescript-eslint/semi'?: undefined;
                 '@typescript-eslint/strict-boolean-expressions'?: undefined;
-                '@typescript-eslint/prefer-regexp-exec'?: undefined;
                 '@typescript-eslint/prefer-optional-chain'?: undefined;
                 'no-shadow'?: undefined;
                 '@typescript-eslint/no-shadow'?: undefined;
@@ -190,6 +191,9 @@ export declare const configs: {
         rules: {
             '@croct/argument-spacing': string;
             '@croct/complex-expression-spacing': string;
+            '@croct/newline-per-chained-call': string;
+            'newline-per-chained-call': string;
+            'no-plusplus': string;
             'array-bracket-newline': string[];
             'multiline-ternary': string[];
             'no-undef-init': string;
@@ -237,6 +241,10 @@ export declare const configs: {
             'max-len': (string | {
                 code: number;
                 ignoreStrings: boolean;
+                ignoreComments: boolean;
+                ignoreTemplateLiterals: boolean;
+                ignoreTrailingComments: boolean;
+                ignoreUrls: boolean;
             })[];
             'no-await-in-loop': string;
             'no-bitwise': string;
@@ -246,11 +254,11 @@ export declare const configs: {
                 maxEOF: number;
                 maxBOF: number;
             })[];
-            'no-plusplus': (string | {
-                allowForLoopAfterthoughts: boolean;
-            })[];
             'no-unused-expressions': string;
-            'no-unused-vars': string;
+            'no-unused-vars': (string | {
+                args: string;
+                ignoreRestSiblings: boolean;
+            })[];
             'no-restricted-syntax': string[];
             'object-curly-newline': (string | {
                 multiline: boolean;

package/configs/javascript.d.ts

@@ -4,6 +4,9 @@ export declare const javascript: {
     rules: {
         '@croct/argument-spacing': string;
         '@croct/complex-expression-spacing': string;
+        '@croct/newline-per-chained-call': string;
+        'newline-per-chained-call': string;
+        'no-plusplus': string;
         'array-bracket-newline': string[];
         'multiline-ternary': string[];
         'no-undef-init': string;
@@ -51,6 +54,10 @@ export declare const javascript: {
         'max-len': (string | {
             code: number;
             ignoreStrings: boolean;
+            ignoreComments: boolean;
+            ignoreTemplateLiterals: boolean;
+            ignoreTrailingComments: boolean;
+            ignoreUrls: boolean;
         })[];
         'no-await-in-loop': string;
         'no-bitwise': string;
@@ -60,11 +67,11 @@ export declare const javascript: {
             maxEOF: number;
             maxBOF: number;
         })[];
-        'no-plusplus': (string | {
-            allowForLoopAfterthoughts: boolean;
-        })[];
         'no-unused-expressions': string;
-        'no-unused-vars': string;
+        'no-unused-vars': (string | {
+            args: string;
+            ignoreRestSiblings: boolean;
+        })[];
         'no-restricted-syntax': string[];
         'object-curly-newline': (string | {
             multiline: boolean;

package/configs/javascript.js

@@ -16,6 +16,9 @@ exports.javascript = {
     rules: {
         '@croct/argument-spacing': 'error',
         '@croct/complex-expression-spacing': 'error',
+        '@croct/newline-per-chained-call': 'error',
+        'newline-per-chained-call': 'off',
+        'no-plusplus': 'off',
         'array-bracket-newline': [
             'error',
             'consistent',
@@ -99,7 +102,11 @@ exports.javascript = {
             'error',
             {
                 code: 100,
-                ignoreStrings: true,
+                ignoreStrings: false,
+                ignoreComments: false,
+                ignoreTemplateLiterals: false,
+                ignoreTrailingComments: false,
+                ignoreUrls: false,
             },
         ],
         'no-await-in-loop': 'off',
@@ -113,14 +120,14 @@ exports.javascript = {
                 maxBOF: 0,
             },
         ],
-        'no-plusplus': [
+        'no-unused-expressions': 'error',
+        'no-unused-vars': [
             'error',
             {
-                allowForLoopAfterthoughts: true,
+                args: 'after-used',
+                ignoreRestSiblings: true,
             },
         ],
-        'no-unused-expressions': 'error',
-        'no-unused-vars': 'error',
         'no-restricted-syntax': [
             'error',
             'ForInStatement',

package/configs/typescript.d.ts

@@ -18,7 +18,6 @@ export declare const typescript: {
                 allowNumber: boolean;
                 allowNullableObject: boolean;
             })[];
-            '@typescript-eslint/prefer-regexp-exec': string;
             '@typescript-eslint/prefer-optional-chain': string;
             'no-shadow': string;
             '@typescript-eslint/no-shadow': (string | {
@@ -37,7 +36,10 @@ export declare const typescript: {
             indent: (string | number | {
                 SwitchCase: number;
             })[];
-            '@typescript-eslint/no-unused-vars': string;
+            '@typescript-eslint/no-unused-vars': (string | {
+                args: string;
+                ignoreRestSiblings: boolean;
+            })[];
             'no-unused-vars': string;
             '@typescript-eslint/no-non-null-assertion': string;
             'object-curly-spacing': string;
@@ -79,7 +81,6 @@ export declare const typescript: {
             '@typescript-eslint/type-annotation-spacing'?: undefined;
             '@typescript-eslint/semi'?: undefined;
             '@typescript-eslint/strict-boolean-expressions'?: undefined;
-            '@typescript-eslint/prefer-regexp-exec'?: undefined;
             '@typescript-eslint/prefer-optional-chain'?: undefined;
             'no-shadow'?: undefined;
             '@typescript-eslint/no-shadow'?: undefined;

package/configs/typescript.js

@@ -25,7 +25,6 @@ exports.typescript = {
                         allowNumber: false,
                         allowNullableObject: false,
                     }],
-                '@typescript-eslint/prefer-regexp-exec': 'error',
                 '@typescript-eslint/prefer-optional-chain': 'error',
                 'no-shadow': 'off',
                 '@typescript-eslint/no-shadow': ['error', {
@@ -46,7 +45,13 @@ exports.typescript = {
                 indent: ['error', 4, {
                         SwitchCase: 1,
                     }],
-                '@typescript-eslint/no-unused-vars': 'error',
+                '@typescript-eslint/no-unused-vars': [
+                    'error',
+                    {
+                        args: 'after-used',
+                        ignoreRestSiblings: true,
+                    },
+                ],
                 'no-unused-vars': 'off',
                 '@typescript-eslint/no-non-null-assertion': 'off',
                 'object-curly-spacing': 'off',

package/index.d.ts

@@ -11,6 +11,12 @@ declare const configuration: {
             ArrowFunctionExpression: (node: import("@typescript-eslint/types/dist/ast-spec").ArrowFunctionExpression) => void;
             IfStatement: (node: import("@typescript-eslint/types/dist/ast-spec").IfStatement) => void;
         }>;
+        'newline-per-chained-call': import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleModule<"expectedLineBreak", {
+            ignoreChainWithDepth: number;
+        }[], {
+            CallExpression: (node: import("@typescript-eslint/types/dist/ast-spec").CallExpression) => void;
+            MemberExpression: (node: import("@typescript-eslint/types/dist/ast-spec").MemberExpression) => void;
+        }>;
     };
     configs: {
         cypress: {
@@ -109,7 +115,6 @@ declare const configuration: {
                         allowNumber: boolean;
                         allowNullableObject: boolean;
                     })[];
-                    '@typescript-eslint/prefer-regexp-exec': string;
                     '@typescript-eslint/prefer-optional-chain': string;
                     'no-shadow': string;
                     '@typescript-eslint/no-shadow': (string | {
@@ -128,7 +133,10 @@ declare const configuration: {
                     indent: (string | number | {
                         SwitchCase: number;
                     })[];
-                    '@typescript-eslint/no-unused-vars': string;
+                    '@typescript-eslint/no-unused-vars': (string | {
+                        args: string;
+                        ignoreRestSiblings: boolean;
+                    })[];
                     'no-unused-vars': string;
                     '@typescript-eslint/no-non-null-assertion': string;
                     'object-curly-spacing': string;
@@ -170,7 +178,6 @@ declare const configuration: {
                     '@typescript-eslint/type-annotation-spacing'?: undefined;
                     '@typescript-eslint/semi'?: undefined;
                     '@typescript-eslint/strict-boolean-expressions'?: undefined;
-                    '@typescript-eslint/prefer-regexp-exec'?: undefined;
                     '@typescript-eslint/prefer-optional-chain'?: undefined;
                     'no-shadow'?: undefined;
                     '@typescript-eslint/no-shadow'?: undefined;
@@ -204,6 +211,9 @@ declare const configuration: {
             rules: {
                 '@croct/argument-spacing': string;
                 '@croct/complex-expression-spacing': string;
+                '@croct/newline-per-chained-call': string;
+                'newline-per-chained-call': string;
+                'no-plusplus': string;
                 'array-bracket-newline': string[];
                 'multiline-ternary': string[];
                 'no-undef-init': string;
@@ -251,6 +261,10 @@ declare const configuration: {
                 'max-len': (string | {
                     code: number;
                     ignoreStrings: boolean;
+                    ignoreComments: boolean;
+                    ignoreTemplateLiterals: boolean;
+                    ignoreTrailingComments: boolean;
+                    ignoreUrls: boolean;
                 })[];
                 'no-await-in-loop': string;
                 'no-bitwise': string;
@@ -260,11 +274,11 @@ declare const configuration: {
                     maxEOF: number;
                     maxBOF: number;
                 })[];
-                'no-plusplus': (string | {
-                    allowForLoopAfterthoughts: boolean;
-                })[];
                 'no-unused-expressions': string;
-                'no-unused-vars': string;
+                'no-unused-vars': (string | {
+                    args: string;
+                    ignoreRestSiblings: boolean;
+                })[];
                 'no-restricted-syntax': string[];
                 'object-curly-newline': (string | {
                     multiline: boolean;

package/package.json

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

package/rules/argument-spacing/index.js

@@ -7,7 +7,8 @@ exports.argumentSpacing = (0, createRule_1.createRule)({
     meta: {
         type: 'suggestion',
         docs: {
-            description: 'Enforces a surrounding line break before and after the argument list in multiline functional calls.',
+            description: 'Enforces a surrounding line break before and after '
+                + 'the argument list in multiline functional calls.',
             recommended: 'error',
         },
         fixable: 'whitespace',
@@ -34,7 +35,8 @@ exports.argumentSpacing = (0, createRule_1.createRule)({
                 return;
             }
             const lastArgumentFirstToken = sourceCode.getFirstToken(lastArgument);
-            if ((lastArgument.type !== 'ArrowFunctionExpression' || lastArgument.body.type === 'BlockStatement')
+            if ((lastArgument.type !== 'ArrowFunctionExpression'
+                || lastArgument.body.type === 'BlockStatement')
                 && firstToken.loc.start.line === lastArgumentFirstToken.loc.start.line) {
                 return;
             }

package/rules/index.d.ts

@@ -10,4 +10,10 @@ export declare const rules: {
         ArrowFunctionExpression: (node: import("@typescript-eslint/types/dist/ast-spec").ArrowFunctionExpression) => void;
         IfStatement: (node: import("@typescript-eslint/types/dist/ast-spec").IfStatement) => void;
     }>;
+    'newline-per-chained-call': import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleModule<"expectedLineBreak", {
+        ignoreChainWithDepth: number;
+    }[], {
+        CallExpression: (node: import("@typescript-eslint/types/dist/ast-spec").CallExpression) => void;
+        MemberExpression: (node: import("@typescript-eslint/types/dist/ast-spec").MemberExpression) => void;
+    }>;
 };

package/rules/index.js

@@ -4,8 +4,10 @@ exports.rules = void 0;
 const argument_spacing_1 = require("./argument-spacing");
 const jsx_attribute_spacing_1 = require("./jsx-attribute-spacing");
 const complex_expression_spacing_1 = require("./complex-expression-spacing");
+const newline_per_chained_call_1 = require("./newline-per-chained-call");
 exports.rules = {
     'argument-spacing': argument_spacing_1.argumentSpacing,
     'jsx-attribute-spacing': jsx_attribute_spacing_1.jsxAttributeSpacing,
     'complex-expression-spacing': complex_expression_spacing_1.complexExpressionSpacing,
+    'newline-per-chained-call': newline_per_chained_call_1.newlinePerChainedCall,
 };

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

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

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

@@ -0,0 +1,114 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.newlinePerChainedCall = void 0;
+const createRule_1 = require("../createRule");
+const LINEBREAK_MATCHER = /\r\n|[\r\n\u2028\u2029]/u;
+exports.newlinePerChainedCall = (0, createRule_1.createRule)({
+    name: 'newline-per-chained-call',
+    meta: {
+        type: 'layout',
+        docs: {
+            description: 'Require a newline after each call in a method chain',
+            recommended: 'error',
+        },
+        fixable: 'whitespace',
+        schema: [
+            {
+                type: 'object',
+                properties: {
+                    ignoreChainWithDepth: {
+                        type: 'integer',
+                        minimum: 1,
+                        maximum: 10,
+                        default: 2,
+                    },
+                },
+                additionalProperties: false,
+            },
+        ],
+        messages: {
+            expectedLineBreak: 'Expected line break before `{{propertyName}}`.',
+        },
+    },
+    defaultOptions: [
+        {
+            ignoreChainWithDepth: 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 sourceCode = context.getSourceCode();
+        function getPropertyText(node) {
+            const prefix = '.';
+            const lines = sourceCode.getText(node.property)
+                .split(LINEBREAK_MATCHER);
+            return prefix + lines[0];
+        }
+        function hasObjectAndPropertyOnSameLine(node) {
+            return node.object.loc.end.line === node.property.loc.start.line;
+        }
+        function isNotClosingParenToken(token) {
+            return token.value !== ')' || token.type !== 'Punctuator';
+        }
+        function validateCallExpressionIgnoreDepth(node) {
+            let hasCallExpression = false;
+            if (node.type === 'CallExpression') {
+                hasCallExpression = true;
+            }
+            if ((node.parent !== undefined)
+                && node.parent.type !== 'CallExpression'
+                && node.parent.type !== 'MemberExpression') {
+                const memberExpressions = [];
+                let currentNode = (node.type === 'CallExpression'
+                    ? node.callee
+                    : node);
+                while (currentNode.type === 'CallExpression'
+                    || currentNode.type === 'MemberExpression') {
+                    if (currentNode.type === 'MemberExpression') {
+                        if (currentNode.property.type === 'Identifier'
+                            && !currentNode.computed) {
+                            memberExpressions.push(currentNode);
+                        }
+                        currentNode = currentNode.object;
+                    }
+                    else if (currentNode.type === 'CallExpression') {
+                        currentNode = currentNode.callee;
+                    }
+                }
+                if (memberExpressions.length > ignoreChainWithDepth
+                    && hasCallExpression
+                    && memberExpressions.some(hasObjectAndPropertyOnSameLine)) {
+                    memberExpressions
+                        .filter(hasObjectAndPropertyOnSameLine)
+                        .forEach(memberExpression => {
+                        context.report({
+                            node: memberExpression.property,
+                            loc: memberExpression.property.loc.start,
+                            messageId: 'expectedLineBreak',
+                            data: {
+                                propertyName: getPropertyText(memberExpression),
+                            },
+                            fix: fixer => {
+                                const firstTokenAfterObject = sourceCode.getTokenAfter(memberExpression.object, isNotClosingParenToken);
+                                return fixer.insertTextBefore(firstTokenAfterObject, '\n');
+                            },
+                        });
+                    });
+                }
+            }
+        }
+        return {
+            CallExpression: (node) => {
+                var _a;
+                if (((_a = node.callee) === null || _a === void 0 ? void 0 : _a.type) === 'MemberExpression') {
+                    validateCallExpressionIgnoreDepth(node);
+                }
+            },
+            MemberExpression: (node) => {
+                validateCallExpressionIgnoreDepth(node);
+            },
+        };
+    },
+});