eslint-plugin-putout 16.3.0 → 16.5.0

package/README.md

@@ -51,6 +51,7 @@ Then configure the rules you want to use under the rules section.
         "putout/newline-function-call-arguments": "error",
         "putout/function-declaration-paren-newline": "error",
         "putout/remove-newline-after-default-import": "error",
+        "putout/remove-newline-between-declarations": "error",
         "putout/remove-newline-from-empty-object": "error",
         "putout/remove-empty-newline-before-first-specifier": "error",
         "putout/remove-empty-newline-after-last-specifier": "error",
@@ -105,6 +106,7 @@ Then configure the rules you want to use under the rules section.
 - ✅ [Keyword spacing](/packages/eslint-plugin-putout/lib/keyword-spacing#readme)
 - ✅ [Newline function call arguments](/packages/eslint-plugin-putout/lib/newline-function-call-arguments#readme)
 - ✅ [Function declaration paren newline](/packages/eslint-plugin-putout/lib/function-declaration-paren-newline#readme)
+- ✅ [Remove newline between declarations](/packages/eslint-plugin-putout/lib/remove-newline-between-declarations#readme)
 - ✅ [Remove newline after default import](/packages/eslint-plugin-putout/lib/remove-newline-after-default-import#readme)
 - ✅ [Remove newline from empty object](/packages/eslint-plugin-putout/lib/remove-newline-from-empty-object#readme)
 - ✅ [Remove empty newline before first specifier](/packages/eslint-plugin-putout/lib/remove-empty-newline-before-first-specifier#readme)

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

@@ -1,7 +1,6 @@
 'use strict';
 
 const {types} = require('putout');
-
 const {
     isBlockStatement,
     isExpressionStatement,

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

@@ -1,7 +1,6 @@
 'use strict';
 
 const {types} = require('putout');
-
 const {
     isBlockStatement,
     isVariableDeclaration,

package/lib/add-newlines-between-types-in-union/index.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const {types} = require('putout');
-
 const {isTSTypeAliasDeclaration} = types;
 
 module.exports.category = 'typescript';

package/lib/array-element-newline/README.md

@@ -1,4 +1,4 @@
-# array-elements-newline
+# array-element-newline
 
 This rule aims to add newlines between array elements.
 It exists because [`array-element-newline`](https://eslint.org/docs/rules/array-element-newline) requires [`array-bracket-newline`](https://eslint.org/docs/rules/array-bracket-newline) which conflicts with [`object-braces-inside-array`](https://github.com/coderaiser/putout/tree/master/packages/eslint-plugin-putout/lib/objects-braces-inside-array#readme).

package/lib/array-element-newline/index.js

@@ -2,15 +2,18 @@
 
 const {types} = require('putout');
 const {
+    isArrayExpression,
     isMemberExpression,
-    isVariableDeclarator,
+    isCallExpression,
 } = types;
 
+const isString = (a) => typeof a === 'string';
+const isBool = (a) => typeof a === 'boolean';
+
 module.exports.category = 'array';
 module.exports.report = () => 'Add newlines between array elements';
 
-const regexp = /['\da-zA-Z]+, ['\da-zA-Z]/;
-
+const regexp = /['"\da-zA-Z]+, ['"\da-zA-Z]/;
 const isSupportedNode = (a) => {
     if (!a)
         return false;
@@ -23,21 +26,34 @@ const isSupportedNode = (a) => {
     
     return false;
 };
-
 module.exports.filter = ({text, node}) => {
     if (isMemberExpression(node.parent))
         return false;
     
-    const supported = node.elements
-        .every(isSupportedNode);
+    const supported = node.elements.every(isSupportedNode);
     
     if (!supported)
         return false;
     
-    if (!isVariableDeclarator(node.parent))
+    if (isCallExpression(node.parent))
+        return false;
+    
+    if (node.parent.parent.type === 'Property')
         return false;
     
-    if (node.elements.length < 5)
+    if (node.parent.type === 'Property' && node.parent.key.value !== 'plugins')
+        return false;
+    
+    if (isArrayExpression(node.parent))
+        return false;
+    
+    if (differentTypes(node))
+        return false;
+    
+    if (/Statement/.test(node.parent.type))
+        return false;
+    
+    if (node.elements.length < 5 && isShortValues(node.elements))
         return false;
     
     if (regexp.test(text))
@@ -45,15 +61,48 @@ module.exports.filter = ({text, node}) => {
     
     return false;
 };
-
 module.exports.fix = ({text}) => {
-    return text
-        .replace(/\[/g, '[\n')
-        .replace(/\]/g, '\n]')
+    return text.replace(/\[/g, '[\n').replace(/\]/g, '\n]')
         .replace(/,/g, ',\n');
 };
+module.exports.include = () => ['ArrayExpression'];
 
-module.exports.include = () => [
-    'ArrayExpression',
-];
+function isShortValues(elements) {
+    for (const {type, value} of elements) {
+        if (type === 'Literal' && value.length > 1)
+            return false;
+    }
+    
+    return true;
+}
+
+function differentTypes({elements}) {
+    let hasLiteral = false;
+    let hasIdentifier = false;
+    let hasBool = false;
+    let hasStr = false;
+    
+    for (const {type, value} of elements) {
+        if (type === 'Literal') {
+            hasLiteral = true;
+            
+            if (isString(value))
+                hasStr = true;
+            
+            if (isBool(value))
+                hasBool = true;
+            
+            if (hasStr && hasBool)
+                return true;
+        }
+        
+        if (type === 'Identifier')
+            hasIdentifier = true;
+        
+        if (hasLiteral && hasIdentifier)
+            return true;
+    }
+    
+    return false;
+}
 

package/lib/index.js

@@ -48,6 +48,7 @@ module.exports.rules = {
     ...getWrapRule('nonblock-statement-body-newline'),
     ...getRule('putout'),
     ...getRule('remove-empty-newline-after-import'),
+    ...getRule('remove-empty-newline-between-declarations'),
 };
 
 const config = require('@putout/eslint-config');
@@ -81,6 +82,7 @@ const recommended = {
         'putout/remove-empty-newline-after-last-specifier': 'error',
         'putout/remove-empty-newline-after-last-element': 'error',
         'putout/remove-empty-newline-after-import': 'error',
+        'putout/remove-empty-newline-between-declarations': 'error',
         'putout/remove-empty-specifiers': 'error',
         'putout/objects-braces-inside-array': 'error',
         'putout/object-property-newline': 'error',

package/lib/remove-empty-newline-between-declarations/README.md

@@ -0,0 +1,17 @@
+# remove-empty-newline-between-declarations
+
+This rule aims to remove empty newline between Variable Declarations. Part of [**eslint-plugin-putout**](https://github.com/coderaiser/putout/tree/master/packages/eslint-plugin-putout#rules).
+
+## ❌ Example of incorrect code
+
+```js
+const {a} = b;
+const {c} = a;
+```
+
+## ✅ Example of correct code
+
+```js
+const {a} = b;
+const {c} = a;
+```

package/lib/remove-empty-newline-between-declarations/index.js

@@ -0,0 +1,60 @@
+'use strict';
+
+const {isObjectPattern} = require('putout').types;
+
+module.exports = {
+    meta: {
+        type: 'suggestion',
+        docs: {
+            description: 'Remove newline between declarations',
+            category: 'putout',
+            recommended: true,
+        },
+        fixable: 'code',
+    },
+    
+    create(context) {
+        return {
+            VariableDeclaration(node) {
+                const source = context.getSourceCode();
+                const text = source.getText(node);
+                const newline = source.getText(node, 0, 2).replace(text, '');
+                
+                if (newline !== '\n\n')
+                    return;
+                
+                const nextNode = context.getNodeByRangeIndex(node.range[1] + 2);
+                
+                if (!nextNode || nextNode.type !== 'VariableDeclaration')
+                    return;
+                
+                const nodeId = node.declarations[0].id;
+                
+                if (!isObjectPattern(nodeId))
+                    return;
+                
+                if (nodeId.properties.length !== 1)
+                    return;
+                
+                const textId = source.getText(nodeId.properties[0].value);
+                
+                const nextNodeInit = nextNode.declarations[0].init;
+                const nextTextInit = source.getText(nextNodeInit);
+                
+                if (textId !== nextTextInit)
+                    return;
+                
+                context.report({
+                    node,
+                    message: 'Remove empty newline between declarations',
+                    
+                    fix(fixer) {
+                        return [
+                            fixer.removeRange([node.range[1], node.range[1] + 1]),
+                        ];
+                    },
+                });
+            },
+        };
+    },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-putout",
-  "version": "16.3.0",
+  "version": "16.5.0",
   "type": "commonjs",
   "description": "ESLint plugin for 🐊Putout",
   "release": false,
@@ -59,7 +59,7 @@
     "@putout/test": "^5.0.0",
     "c8": "^7.5.0",
     "eslint": "^8.0.1",
-    "eslint-plugin-eslint-plugin": "^4.1.0",
+    "eslint-plugin-eslint-plugin": "^5.0.6",
     "madrun": "^9.0.0",
     "mocha": "^10.0.0",
     "montag": "^1.0.0",