eslint-plugin-putout 11.15.2 → 11.18.0

package/README.md

@@ -35,6 +35,9 @@ Then configure the rules you want to use under the rules section.
 ```json
 {
     "rules": {
+        "putout/add-newlines-between-types-in-union": "error",
+        "putout/add-newline-before-function-call": "error",
+        "putout/add-newline-after-function-call": "error",
         "putout/putout": "error",
         "putout/array-element-newline": "error",
         "putout/single-property-destructuring": "error",
@@ -45,7 +48,6 @@ Then configure the rules you want to use under the rules section.
         "putout/keyword-spacing": "error",
         "putout/newline-function-call-arguments": "error",
         "putout/function-declaration-paren-newline": "error",
-        "putout/add-newlines-between-types-in-union": "error",
         "putout/remove-newline-after-default-import": "error",
         "putout/remove-newline-from-empty-object": "error",
         "putout/remove-empty-newline-before-first-specifier": "error",
@@ -58,18 +60,21 @@ Then configure the rules you want to use under the rules section.
 
 ## Supported Rules
 
-- [Putout](lib/putout)
+- [Add newlines between types in union](/packages/eslint-plugin-putout/lib/add-newlines-between-types-in-union)
+- [Add newline before function call](/packages/eslint-plugin-putout/lib/add-newline-before-function-call)
+- [Add newline after function call](/packages/eslint-plugin-putout/lib/add-newline-after-function-call)
+- [Align spaces](/packages/eslint-plugin-putout/lib/align-spaces)
 - [Array element newline](/packages/eslint-plugin-putout/lib/array-element-newline)
+- [Evaluate](/packages/eslint-plugin-putout/lib/evaluate)
+- [Putout](lib/putout)
 - [Single property destructuring](/packages/eslint-plugin-putout/lib/single-property-destructuring)
 - [Multiple properties destructuring](/packages/eslint-plugin-putout/lib/multiple-properties-destructuring)
 - [For-of multiple properties destructuring](/packages/eslint-plugin-putout/lib/for-of-multiple-properties-destructuring)
 - [Long properties destructuring](/packages/eslint-plugin-putout/lib/long-properties-destructuring)
 - [Destructuring as function argument](/packages/eslint-plugin-putout/lib/destructuring-as-function-argument)
-- [Align spaces](/packages/eslint-plugin-putout/lib/align-spaces)
 - [Keyword spacing](/packages/eslint-plugin-putout/lib/keyword-spacing)
 - [Newline function call arguments](/packages/eslint-plugin-putout/lib/newline-function-call-arguments)
 - [Function declaration paren newline](/packages/eslint-plugin-putout/lib/function-declaration-paren-newline)
-- [Add newlines between types in union](/packages/eslint-plugin-putout/lib/add-newlines-between-types-in-union)
 - [Remove newline after default import](/packages/eslint-plugin-putout/lib/remove-newline-after-default-import)
 - [Remove newline from empty object](/packages/eslint-plugin-putout/lib/remove-newline-from-empty-object)
 - [Remove empty newline before first specifier](/packages/eslint-plugin-putout/lib/remove-empty-newline-before-first-specifier)
@@ -77,7 +82,6 @@ Then configure the rules you want to use under the rules section.
 - [Objects braces inside array](/packages/eslint-plugin-putout/lib/objects-braces-inside-array)
 - [Object init](/packages/eslint-plugin-putout/lib/object-init)
 - [No unresolved](/packages/eslint-plugin-putout/lib/no-unresolved)
-- [Evaluate](/packages/eslint-plugin-putout/lib/evaluate)
 - [Tape: add newline before assertion]('/packages/eslint-plugin-putout/lib/tape-add-new-line-before-assertion)
 - [Tape: add newline between tests]('/packages/eslint-plugin-putout/lib/tape-add-new-line-between-tests)
 - [Tape: remove newline before t.end()]('/packages/eslint-plugin-putout/lib/tape-remove-newline-before-t-end)
@@ -99,14 +103,15 @@ When using `putout` in IDE with `--fix` on save, or when you want to disable the
 
 List of disabled `putout` rules:
 
-- [remove-empty](https://github.com/coderaiser/putout/tree/v20.0.0/packages/plugin-remove-empty);
-- [remove-unused-variables](https://github.com/coderaiser/putout/tree/v20.0.0/packages/remove-unused-variables);
-- [remove-unused-types](https://github.com/coderaiser/putout/tree/v20.0.0/packages/remove-unused-types);
-- [remove-unused-for-of-variables](https://github.com/coderaiser/putout/tree/v20.0.0/packages/remove-unused-for-of-variables);
-- [remove-unused-expressions](https://github.com/coderaiser/putout/tree/v20.0.0/packages);
+- [remove-empty](https://github.com/coderaiser/putout/tree/v22.0.0/packages/plugin-remove-empty);
+- [remove-unused-variables](https://github.com/coderaiser/putout/tree/v22.0.0/packages/remove-unused-variables);
+- [remove-unused-types](https://github.com/coderaiser/putout/tree/v22.0.0/packages/remove-unused-types);
+- [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-skip](https://github.com/coderaiser/putout/tree/v20.0.0/packages/remove-skip);
-- [remove-only](https://github.com/coderaiser/putout/tree/v20.0.0/packages/remove-only);
-- [remove-console](https://github.com/coderaiser/putout/tree/v20.0.0/packages/remove-console);
-- [remove-debugger](https://github.com/coderaiser/putout/tree/v20.0.0/packages/remove-debugger);
-- [convert-for-to-for-of](https://github.com/coderaiser/putout/tree/v20.0.0/packages/convert-for-to-for-of);
+- [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);
+- [remove-debugger](https://github.com/coderaiser/putout/tree/v22.0.0/packages/remove-debugger);
+- [remove-unreachable-code](https://github.com/coderaiser/putout/tree/v22.0.0/packages/remove-unreachable-code);
+- [convert-for-to-for-of](https://github.com/coderaiser/putout/tree/v22.0.0/packages/convert-for-to-for-of);

package/lib/add-newline-after-function-call/README.md

@@ -0,0 +1,28 @@
+# Add new line after function call (add-newline-after-function-call)
+
+## Rule Details
+
+This rule aims to add newline after function call.
+
+Examples of **incorrect** code for this rule:
+
+```js
+export function parse() {
+    const a = 1;
+    
+    fn();
+    const b = 2;
+}
+```
+
+Examples of **correct** code for this rule:
+
+```js
+export function parse() {
+    const a = 1;
+    
+    fn();
+    
+    const b = 2;
+}
+```

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

@@ -0,0 +1,90 @@
+'use strict';
+
+const {types} = require('putout');
+
+const {
+    isBlockStatement,
+    isExpressionStatement,
+    isVariableDeclaration,
+    isObjectExpression,
+    isArrayExpression,
+} = types;
+
+const regExp = /^;?\n( +)?\n +$/;
+
+module.exports.category = 'typescript';
+module.exports.report = () => 'Add newline after function call';
+
+module.exports.filter = ({text, node, getText, getCommentsAfter}) => {
+    if (!isExpressionStatement(node.parent))
+        return false;
+    
+    if (getCommentsAfter(node.parent).length)
+        return false;
+    
+    const {parent} = node.parent;
+    
+    if (!isBlockStatement(parent))
+        return false;
+    
+    const {body} = parent;
+    const n = body.length;
+    
+    if (n < 3)
+        return false;
+    
+    const spaces = getSpacesAfterNode(node, {text, getText});
+    
+    if (regExp.test(spaces))
+        return false;
+    
+    for (let i = 0; i < n; i++) {
+        const current = body[i];
+        
+        if (current !== node.parent)
+            continue;
+        
+        if (i === n - 1)
+            break;
+        
+        const next = body[i + 1];
+        
+        if (!isVariableDeclaration(next))
+            break;
+        
+        const {init} = next.declarations[0];
+        
+        if (isObjectExpression(init) && init.properties.length)
+            return true;
+        
+        if (isArrayExpression(init) && init.elements.length)
+            return true;
+        
+        const spacesAfterNext = getSpacesAfterNode(next, {getText});
+        
+        if (!regExp.test(spacesAfterNext))
+            return true;
+    }
+    
+    return false;
+};
+
+module.exports.fix = ({text}) => {
+    return `${text};\n`;
+};
+
+module.exports.include = () => [
+    'CallExpression',
+];
+
+function getSpacesAfterNode(node, {getText, text = getText(node)}) {
+    let spaces = '';
+    let i = 0;
+    
+    while (!spaces || /^[ \n;]+$/.test(spaces))
+        spaces = getText(node, 0, ++i)
+            .replace(text, '');
+    
+    return spaces.slice(0, -1);
+}
+

package/lib/index.js

@@ -28,6 +28,7 @@ module.exports.rules = {
     ...getWrapRule('function-declaration-paren-newline'),
     ...getWrapRule('add-newlines-between-types-in-union'),
     ...getWrapRule('add-newline-before-function-call'),
+    ...getWrapRule('add-newline-after-function-call'),
     ...getWrapRule('remove-newline-after-default-import'),
     ...getWrapRule('remove-newline-from-empty-object'),
     ...getWrapRule('remove-empty-newline-before-first-specifier'),
@@ -64,6 +65,7 @@ const recommended = {
         'putout/function-declaration-paren-newline': 'error',
         'putout/add-newlines-between-types-in-union': 'error',
         'putout/add-newline-before-function-call': 'error',
+        'putout/add-newline-after-function-call': 'error',
         'putout/remove-newline-after-default-import': 'error',
         'putout/remove-newline-from-empty-object': 'error',
         'putout/remove-empty-newline-before-first-specifier': 'error',
@@ -103,6 +105,7 @@ const safe = {
                 'remove-unused-variables': 'off',
                 'remove-unused-expressions': 'off',
                 'remove-unused-for-of-variables': 'off',
+                'remove-unreachable-code': 'off',
                 'remove-useless-return': 'off',
                 'tape/remove-skip': 'off',
                 'tape/remove-only': 'off',

package/lib/putout/index.js

@@ -5,6 +5,7 @@ const {
     findPlaces,
     transform,
     print,
+    parse,
 } = require('putout');
 
 const v8 = require('v8');
@@ -47,7 +48,12 @@ module.exports = {
                 const source = context.getSourceCode();
                 const {text} = source;
                 
-                const ast = toBabel(copyAST(node));
+                const ast = parse(text, {
+                    parser: {
+                        parse: () => toBabel(copyAST(node)),
+                    },
+                });
+                
                 const places = findPlaces(ast, text, resultOptions);
                 
                 for (const {rule, message, position} of places) {
@@ -77,9 +83,9 @@ const fix = ({ast, text, node, source, resultOptions}) => (fixer) => {
         includeComments,
     });
     
-    const [, last] = lastToken.range;
-    
     transform(ast, text, resultOptions);
+    
+    const [, last] = lastToken.range;
     const code = print(ast);
     
     return fixer.replaceTextRange([0, last], code);

package/lib/wrap.js

@@ -7,6 +7,7 @@ const prepare = (plugin, context, options) => (node) => {
     const filename = context.getFilename();
     const getText = source.getText.bind(source);
     const getCommentsBefore = source.getCommentsBefore.bind(source);
+    const getCommentsAfter = source.getCommentsAfter.bind(source);
     
     const text = getText(node);
     
@@ -16,6 +17,7 @@ const prepare = (plugin, context, options) => (node) => {
         options,
         getText,
         getCommentsBefore,
+        getCommentsAfter,
         filename,
     });
     

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-putout",
-  "version": "11.15.2",
+  "version": "11.18.0",
   "description": "eslint plugin for putout",
   "release": false,
   "tag": false,
@@ -46,6 +46,7 @@
     "try-catch": "^3.0.0"
   },
   "devDependencies": {
+    "@typescript-eslint/parser": "^5.4.0",
     "c8": "^7.5.0",
     "eslint": "^8.0.1",
     "eslint-plugin-eslint-plugin": "^3.2.0",
@@ -54,7 +55,8 @@
     "montag": "^1.0.0",
     "simport": "^1.2.0",
     "supertape": "^6.6.0",
-    "try-to-catch": "^3.0.0"
+    "try-to-catch": "^3.0.0",
+    "typescript": "^4.5.2"
   },
   "engines": {
     "node": ">=14"