eslint-plugin-putout 12.0.1 → 12.3.0

package/README.md

@@ -109,6 +109,7 @@ List of disabled 🐊`Putout` rules:
 - [remove-unused-for-of-variables](https://github.com/coderaiser/putout/tree/v22.0.0/packages/remove-unused-for-of-variables);
 - [remove-unused-expressions](https://github.com/coderaiser/putout/tree/v22.0.0/packages);
 - [remove-useless-return](https://github.com/coderaiser/putout/tree/master/remove-useless-return);
+- [remove-useless-arguments](https://github.com/coderaiser/putout/tree/master/remove-useless-arguments);
 - [remove-skip](https://github.com/coderaiser/putout/tree/v22.0.0/packages/remove-skip);
 - [remove-only](https://github.com/coderaiser/putout/tree/v22.0.0/packages/remove-only);
 - [remove-console](https://github.com/coderaiser/putout/tree/v22.0.0/packages/remove-console);

package/lib/add-newline-before-function-call/index.js

@@ -13,7 +13,7 @@ const regExp = /^\n( +)?\n +$/;
 module.exports.category = 'typescript';
 module.exports.report = () => 'Add newline before function call';
 
-module.exports.filter = ({text, node, getText, getCommentsBefore}) => {
+module.exports.filter = ({text, node, getCommentsBefore, getSpacesBeforeNode}) => {
     if (!isExpressionStatement(node.parent))
         return false;
     
@@ -31,7 +31,7 @@ module.exports.filter = ({text, node, getText, getCommentsBefore}) => {
     if (n < 3)
         return false;
     
-    const spaces = getSpacesBeforeNode(node, {text, getText});
+    const spaces = getSpacesBeforeNode(node, text);
     
     if (regExp.test(spaces))
         return false;
@@ -48,7 +48,7 @@ module.exports.filter = ({text, node, getText, getCommentsBefore}) => {
         if (!isVariableDeclaration(prevA))
             return false;
         
-        const spaces = getSpacesBeforeNode(prevA, {getText});
+        const spaces = getSpacesBeforeNode(prevA);
         
         if (regExp.test(spaces))
             return false;
@@ -56,7 +56,7 @@ module.exports.filter = ({text, node, getText, getCommentsBefore}) => {
         if (!nextA)
             return true;
         
-        const nextSpaces = getSpacesBeforeNode(nextA, {getText});
+        const nextSpaces = getSpacesBeforeNode(nextA);
         return !regExp.test(nextSpaces);
     }
     
@@ -71,13 +71,3 @@ module.exports.include = () => [
     'CallExpression',
 ];
 
-function getSpacesBeforeNode(node, {getText, text = getText(node)}) {
-    let spaces = '';
-    let i = 0;
-    
-    while (!spaces || /^[ \n]+$/.test(spaces))
-        spaces = getText(node, ++i)
-            .replace(text, '');
-    
-    return spaces.slice(1);
-}

package/lib/index.js

@@ -107,6 +107,7 @@ const safe = {
                 'remove-unused-for-of-variables': 'off',
                 'remove-unreachable-code': 'off',
                 'remove-useless-return': 'off',
+                'remove-useless-arguments': 'off',
                 'tape/remove-skip': 'off',
                 'tape/remove-only': 'off',
                 'remove-console': 'off',

package/lib/objects-braces-inside-array/index.js

@@ -11,6 +11,7 @@ module.exports.include = () => [
 
 const badStart = /^\[\n(\s+)?{/;
 const badEndReg = /},?\n(\s+)?]/;
+const badMiddle = /\},\n(s+)?\{/;
 
 module.exports.filter = ({node, text}) => {
     const {elements} = node;
@@ -22,8 +23,9 @@ module.exports.filter = ({node, text}) => {
     
     const isStart = badStart.test(text);
     const isEnd = badEndReg.test(text);
+    const isBadMiddle = badMiddle.test(text);
     
-    return isStart || isEnd;
+    return isStart || isEnd || isBadMiddle;
 };
 
 module.exports.fix = ({text}) => {

package/lib/tape-remove-newline-before-t-end/index.js

@@ -1,16 +1,45 @@
 'use strict';
 
+const {
+    operator,
+    types,
+} = require('putout');
+
+const {
+    isCallExpression,
+    isIdentifier,
+} = types;
+
+const {compare} = operator;
+
 module.exports.category = 'tape';
 module.exports.report = () => 'Remove newline before t.end()';
 
 const newlineReg = /\n( +)?\n +t.end\(\)/;
 
-module.exports.filter = ({text}) => {
+module.exports.filter = ({text, node}) => {
     if (!/^test(\.only|\.skip)?\(/.test(text))
         return false;
     
-    if (newlineReg.test(text))
-        return true;
+    if (!newlineReg.test(text))
+        return false;
+    
+    const {body} = node.arguments[1].body;
+    const n = body.length;
+    
+    for (let i = 1; i < n; i++) {
+        const current = body[i];
+        const prev = body[i - 1];
+        
+        if (!compare(current, 't.end()'))
+            continue;
+        
+        if (!isCallExpression(prev.expression))
+            break;
+        
+        const {callee} = prev.expression;
+        return isIdentifier(callee.object, {name: 't'});
+    }
     
     return false;
 };

package/lib/ts.js

@@ -1,5 +1,66 @@
 'use strict';
 
+const {rules} = require('@putout/eslint-config');
+
+const extensionRules = {
+    'no-undef': 'off',
+    'no-var': 'off',
+    
+    'brace-style': 'off',
+    '@typescript-eslint/brace-style': ['error'],
+    
+    'comma-dangle': 'off',
+    '@typescript-eslint/comma-dangle': rules['comma-dangle'],
+    
+    'comma-spacing': 'off',
+    '@typescript-eslint/comma-spacing': 'error',
+    
+    // requires type information
+    '@typescript-eslint/dot-notation': 'off',
+    
+    'func-call-spacing': 'off',
+    '@typescript-eslint/func-call-spacing': 'error',
+    
+    // broken
+    '@typescript-eslint/indent': 'off',
+    
+    'lines-between-class-members': 'off',
+    '@typescript-eslint/lines-between-class-members': 'error',
+    
+    '@typescript-eslint/no-array-constructor': 'off',
+    
+    'no-extra-parens': 'off',
+    '@typescript-eslint/no-extra-parens': 'error',
+    
+    'no-extra-semi': 'off',
+    '@typescript-eslint/no-extra-semi': 'error',
+    
+    '@typescript-eslint/no-implied-eval': 'off',
+    
+    'no-unused-vars': 'off',
+    '@typescript-eslint/no-unused-vars': 'error',
+    
+    'object-curly-spacing': 'off',
+    '@typescript-eslint/object-curly-spacing': 'error',
+    
+    'padding-line-between-statements': 'off',
+    '@typescript-eslint/padding-line-between-statements': rules['padding-line-between-statements'],
+    
+    'quotes': 'off',
+    '@typescript-eslint/quotes': rules.quotes,
+    
+    '@typescript-eslint/require-await': 'off',
+    
+    'semi': 'off',
+    '@typescript-eslint/semi': rules.semi,
+    
+    'space-before-function-paren': 'off',
+    '@typescript-eslint/space-before-function-paren': rules['space-before-function-paren'],
+    
+    'space-infix-ops': 'off',
+    '@typescript-eslint/space-infix-ops': rules[ 'space-infix-ops'],
+};
+
 const ts = {
     files: '*.ts',
     parser: '@typescript-eslint/parser',
@@ -15,21 +76,13 @@ const ts = {
         'plugin:@typescript-eslint/recommended',
     ],
     rules: {
-        'no-undef': 'off',
-        'no-var': 'off',
+        ...extensionRules,
         'putout/no-unresolved': 'off',
-        'semi': 'off',
-        '@typescript-eslint/semi': 'error',
         '@typescript-eslint/array-type': 'error',
-        'space-before-function-paren': 'off',
         '@typescript-eslint/no-explicit-any': 'off',
         '@typescript-eslint/ban-types': 'off',
         '@typescript-eslint/no-empty-function': 'off',
-        '@typescript-eslint/space-before-function-paren': ['error', {
-            anonymous: 'never',
-            named: 'never',
-            asyncArrow: 'always',
-        }],
+        '@typescript-eslint/type-annotation-spacing': 'error',
     },
 };
 

package/lib/wrap.js

@@ -8,6 +8,9 @@ const prepare = (plugin, context, options) => (node) => {
     const getText = source.getText.bind(source);
     const getCommentsBefore = source.getCommentsBefore.bind(source);
     const getCommentsAfter = source.getCommentsAfter.bind(source);
+    const getSpacesBeforeNode = createGetSpacesBeforeNode({
+        getText,
+    });
     
     const text = getText(node);
     
@@ -18,6 +21,7 @@ const prepare = (plugin, context, options) => (node) => {
         getText,
         getCommentsBefore,
         getCommentsAfter,
+        getSpacesBeforeNode,
         filename,
     });
     
@@ -91,3 +95,14 @@ function getTraversers(names, plugin) {
     return traversers;
 }
 
+const createGetSpacesBeforeNode = ({getText}) => (node, text = getText(node)) => {
+    let spaces = '';
+    let i = 0;
+    
+    while (!spaces || /^[ \n]+$/.test(spaces))
+        spaces = getText(node, ++i)
+            .replace(text, '');
+    
+    return spaces.slice(1);
+};
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-putout",
-  "version": "12.0.1",
+  "version": "12.3.0",
   "description": "eslint plugin for putout",
   "release": false,
   "tag": false,