eslint-plugin-putout 11.10.0 → 11.14.0

package/README.md

@@ -5,7 +5,7 @@
 [CoverageURL]: https://coveralls.io/github/coderaiser/putout?branch=master
 [CoverageIMGURL]: https://coveralls.io/repos/coderaiser/putout/badge.svg?branch=master&service=github
 
-[`ESLint`](https://eslint.org) plugin for [🐊`Putout`](https://github.com/coderaiser/putout) with built-in rules from [@putout/eslint-config](https://github.com/coderaiser/eslint-plugin-putout/tree/master/packages/eslint-config).
+[`ESLint`](https://eslint.org) plugin for 🐊[`Putout`](https://github.com/coderaiser/putout) with built-in rules from [@putout/eslint-config](https://github.com/coderaiser/eslint-plugin-putout/tree/master/packages/eslint-config).
 
 ## Installation
 
@@ -58,7 +58,7 @@ Then configure the rules you want to use under the rules section.
 
 ## Supported Rules
 
-- [putout](lib/putout)
+- [Putout](lib/putout)
 - [Array element newline](/packages/eslint-plugin-putout/lib/array-element-newline)
 - [Single property destructuring](/packages/eslint-plugin-putout/lib/single-property-destructuring)
 - [Multiple properties destructuring](/packages/eslint-plugin-putout/lib/multiple-properties-destructuring)
@@ -78,8 +78,9 @@ Then configure the rules you want to use under the rules section.
 - [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 new line before assertion]('/packages/eslint-plugin-putout/lib/tape-add-new-line-before-assertion)
-- [Tape: add new line between tests]('/packages/eslint-plugin-putout/lib/tape-add-new-line-between-tests)
+- [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)
 
 ### Safe mode
 

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

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

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

@@ -0,0 +1,74 @@
+'use strict';
+
+const {types} = require('putout');
+
+const {
+    isBlockStatement,
+    isVariableDeclaration,
+    isExpressionStatement,
+} = types;
+
+module.exports.category = 'typescript';
+module.exports.report = () => 'Add newline before function call';
+
+module.exports.filter = ({text, node, getText}) => {
+    if (!isExpressionStatement(node.parent))
+        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 = getSpacesBeforeNode(node, {text, getText});
+    
+    if (/^\n +\n +$/.test(spaces))
+        return false;
+    
+    for (let i = 2; i < n; i++) {
+        const current = body[i];
+        
+        if (current !== node.parent)
+            continue;
+        
+        const prevA = body[i - 1];
+        
+        if (!isVariableDeclaration(prevA))
+            continue;
+        
+        const spaces = getSpacesBeforeNode(prevA, {getText});
+        
+        if (/^\n +\n +$/.test(spaces))
+            return false;
+        
+        return true;
+    }
+    
+    return false;
+};
+
+module.exports.fix = ({text}) => {
+    return `\n${text}`;
+};
+
+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/array-element-newline/index.js

@@ -11,16 +11,24 @@ module.exports.report = () => 'Add newlines between array elements';
 
 const regexp = /['\da-zA-Z]+, ['\da-zA-Z]/;
 
-const isESTreeLiteral = (a) => a.type === 'Literal';
+const isSupportedNode = (a) => {
+    if (a.type === 'Literal')
+        return true;
+    
+    if (a.type === 'Identifier')
+        return true;
+    
+    return false;
+};
 
 module.exports.filter = ({text, node}) => {
     if (isMemberExpression(node.parent))
         return false;
     
-    const isAllPrimitives = node.elements
-        .every(isESTreeLiteral);
+    const supported = node.elements
+        .every(isSupportedNode);
     
-    if (!isAllPrimitives )
+    if (!supported)
         return false;
     
     if (!isVariableDeclarator(node.parent))

package/lib/index.js

@@ -27,6 +27,7 @@ module.exports.rules = {
     ...getWrapRule('newline-function-call-arguments'),
     ...getWrapRule('function-declaration-paren-newline'),
     ...getWrapRule('add-newlines-between-types-in-union'),
+    ...getWrapRule('add-newline-before-function-call'),
     ...getWrapRule('remove-newline-after-default-import'),
     ...getWrapRule('remove-newline-from-empty-object'),
     ...getWrapRule('remove-empty-newline-before-first-specifier'),
@@ -37,6 +38,7 @@ module.exports.rules = {
     ...getWrapRule('evaluate'),
     ...getWrapRule('tape-add-newline-before-assertion'),
     ...getWrapRule('tape-add-newline-between-tests'),
+    ...getWrapRule('tape-remove-newline-before-t-end'),
     ...getRule('putout'),
 };
 
@@ -61,6 +63,7 @@ const recommended = {
         'putout/newline-function-call-arguments': 'error',
         'putout/function-declaration-paren-newline': 'error',
         'putout/add-newlines-between-types-in-union': 'error',
+        'putout/add-newline-before-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',
@@ -71,6 +74,7 @@ const recommended = {
         'putout/evaluate': 'error',
         'putout/tape-add-newline-before-assertion': 'error',
         'putout/tape-add-newline-between-tests': 'error',
+        'putout/tape-remove-newline-before-t-end': 'error',
         'putout/putout': 'error',
         
         'node/no-unsupported-features/es-syntax': 'off',

package/lib/putout/README.md

@@ -1,6 +1,6 @@
 # Putout (putout)
 
-[Putout](https://github.com/coderaiser/putout) used as eslint plugin.
+🐊[`Putout`](https://github.com/coderaiser/putout) used as eslint plugin.
 
 ## Rule Details
 

package/lib/tape-add-newline-before-assertion/README.md

@@ -1,16 +1,18 @@
-# Add new line before assertion (add-newline-before-assertion)
+# Add newline before assertion (add-newline-before-assertion)
 
-Add new line before `t.equal()` etc, for [supertape](https://github.com/coderaiser/supertape).
+Add newline before `t.equal()` etc, for [supertape](https://github.com/coderaiser/supertape).
 
 ## Rule Details
 
-This rule aims to add new line before assertion.
+This rule aims to add newline before assertion.
 
 Examples of **incorrect** code for this rule:
 
 ```js
 test('lint: do some check', (t) => {
-    const result = 1 + 2;
+    const expected = 1 + 2;
+    
+    fn();
     t.equal(result, 3);
     t.end();
 });
@@ -22,6 +24,8 @@ Examples of **correct** code for this rule:
 test('lint: do some check', (t) => {
     const result = 1 + 2;
     
+    fn();
+    
     t.equal(result, 3);
     t.end();
 });

package/lib/tape-add-newline-before-assertion/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports.category = 'tape';
-module.exports.report = () => 'Add new line before assertion';
+module.exports.report = () => 'Add newline before assertion';
 
 const regexp = /;\n +?t\..*;\n +?t.end\(\);/;
 

package/lib/tape-add-newline-between-tests/README.md

@@ -1,10 +1,10 @@
-# Add new line between tests (add-newline-between-tests)
+# Add newline between tests (add-newline-between-tests)
 
-Add new line between tests, for [supertape](https://github.com/coderaiser/supertape).
+Add newline between tests, for [supertape](https://github.com/coderaiser/supertape).
 
 ## Rule Details
 
-This rule aims to add new line between tests.
+This rule aims to add newline between tests.
 
 Examples of **incorrect** code for this rule:
 

package/lib/tape-add-newline-between-tests/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports.category = 'tape';
-module.exports.report = () => 'Add new line between tests';
+module.exports.report = () => 'Add newline between tests';
 
 module.exports.filter = ({text, node, getText, getCommentsBefore}) => {
     if (!/^test(\.only|\.skip)?\(/.test(text))

package/lib/tape-remove-newline-before-t-end/README.md

@@ -0,0 +1,30 @@
+# Remove newline before `t.end()` (remove-newline-before-t-end)
+
+Remove newline before `t.end()`, for [supertape](https://github.com/coderaiser/supertape).
+
+## Rule Details
+
+This rule aims to remove newline before `t.end()`.
+
+Examples of **incorrect** code for this rule:
+
+```js
+test('lint: do some check', (t) => {
+    const result = 1 + 2;
+    
+    t.equal(result, 3);
+    
+    t.end();
+});
+```
+
+Examples of **correct** code for this rule:
+
+```js
+test('lint: do some check', (t) => {
+    const result = 1 + 2;
+    
+    t.equal(result, 3);
+    t.end();
+});
+```

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

@@ -0,0 +1,25 @@
+'use strict';
+
+module.exports.category = 'tape';
+module.exports.report = () => 'Remove newline before t.end()';
+
+const newlineReg = /\n( +)?\n +t.end\(\)/;
+
+module.exports.filter = ({text}) => {
+    if (!/^test(\.only|\.skip)?\(/.test(text))
+        return false;
+    
+    if (newlineReg.test(text))
+        return true;
+    
+    return false;
+};
+
+module.exports.fix = ({text}) => {
+    return text.replace(newlineReg, '\n    t.end()');
+};
+
+module.exports.include = () => [
+    'CallExpression',
+];
+

package/package.json

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