eslint-plugin-putout 12.9.1 → 12.12.0

package/README.md

@@ -101,22 +101,27 @@ When using 🐊`Putout` in IDE with `--fix` on save, or when you want to disable
 }
 ```
 
+### safe+align
+
+When you want to enable ability to align spaces on empty lines, use `safe+align`.
+
 Disabled `ESLint` rules:
 
-- [no-useless-return](https://eslint.org/docs/rules/no-useless-return)
+- [`no-useless-return`](https://eslint.org/docs/rules/no-useless-return)
+- [`putout/remove-newline-from-empty-object`](https://eslint.org/docs/rules/no-useless-return)
 
 Disabled 🐊`Putout` rules:
 
-- [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-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);
-- [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);
+- [`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-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);
+- [`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/index.js

@@ -10,7 +10,7 @@ const {
     isArrayExpression,
 } = types;
 
-const regExp = /^;?\n( +)?\n +$/;
+const regExp = /^;?\n( +)?\n( +)?/;
 
 module.exports.category = 'layout';
 module.exports.report = () => 'Add newline after function call';

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

@@ -2,7 +2,7 @@
 
 ## Rule Details
 
-This rule aims to add newline before function call.
+This rule aims to add newline before `function call` and `assignment`.
 
 Examples of **incorrect** code for this rule:
 
@@ -12,6 +12,10 @@ export function parse() {
     const b = 2;
     fn();
 }
+
+export function calc() {
+    const b = 2;
+}
 ```
 
 Examples of **correct** code for this rule:
@@ -23,4 +27,8 @@ export function parse() {
     
     fn();
 }
+
+export function calc() {
+    const b = 2;
+}
 ```

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

@@ -11,7 +11,7 @@ const {
 const regExp = /^\n( +)?\n +$/;
 
 module.exports.category = 'typescript';
-module.exports.report = () => 'Add newline before function call';
+module.exports.report = () => 'Add newline before expression';
 
 module.exports.filter = ({text, node, getCommentsBefore, getSpacesBeforeNode}) => {
     if (!isExpressionStatement(node.parent))
@@ -69,5 +69,5 @@ module.exports.fix = ({text}) => {
 
 module.exports.include = () => [
     'CallExpression',
+    'AssignmentExpression',
 ];
-

package/lib/function-declaration-paren-newline/index.js

@@ -10,9 +10,7 @@ module.exports.report = () => {
     return `Unexpected new lines around arguments`;
 };
 
-module.exports.fix = ({text}) => {
-    return fixNewLines(text);
-};
+module.exports.fix = ({text}) => fixNewLines(text);
 
 module.exports.include = () => [
     'FunctionDeclaration',

package/lib/index.js

@@ -99,6 +99,7 @@ const safe = {
         ...recommended.rules,
         'no-useless-return': 'off',
         'putout/align-spaces': 'off',
+        'putout/remove-newline-from-empty-object': 'off',
         'putout/putout': ['error', {
             rules: {
                 'remove-empty': 'off',
@@ -122,5 +123,12 @@ const safe = {
 module.exports.configs = {
     recommended,
     safe,
+    'safe+align': {
+        ...safe,
+        rules: {
+            ...safe.rules,
+            'putout/align-spaces': 'error',
+        },
+    },
 };
 

package/lib/remove-newline-from-empty-object/index.js

@@ -8,7 +8,12 @@ module.exports.report = () => 'Remove newline from empty object';
 
 const regExp = /\n/;
 
-module.exports.filter = ({text, node}) => {
+module.exports.filter = ({text, node, getCommentsInside}) => {
+    const comments = getCommentsInside(node);
+    
+    if (comments.length)
+        return false;
+    
     if (isArrayExpression(node.parent))
         return false;
     

package/lib/wrap.js

@@ -8,6 +8,7 @@ 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 getCommentsInside = source.getCommentsInside.bind(source);
     
     const getSpacesBeforeNode = createGetSpacesBeforeNode({
         getText,
@@ -26,6 +27,7 @@ const prepare = (plugin, context, options) => (node) => {
         getText,
         getCommentsBefore,
         getCommentsAfter,
+        getCommentsInside,
         getSpacesBeforeNode,
         getSpacesAfterNode,
         filename,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-putout",
-  "version": "12.9.1",
+  "version": "12.12.0",
   "type": "commonjs",
   "description": "eslint plugin for putout",
   "release": false,