eslint-plugin-putout 11.4.0 → 11.8.0

package/README.md

@@ -1,11 +1,7 @@
-# eslint-plugin-putout [![NPM version][NPMIMGURL]][NPMURL] [![Dependency Status][DependencyStatusIMGURL]][DependencyStatusURL] [![Build Status][BuildStatusIMGURL]][BuildStatusURL] [![Coverage Status][CoverageIMGURL]][CoverageURL]
+# eslint-plugin-putout [![NPM version][NPMIMGURL]][NPMURL] [![Coverage Status][CoverageIMGURL]][CoverageURL]
 
 [NPMIMGURL]: https://img.shields.io/npm/v/eslint-plugin-putout.svg?style=flat&longCache=true
-[BuildStatusIMGURL]: https://img.shields.io/travis/coderaiser/eslint-plugin-putout/master.svg?style=flat&longCache=true
-[DependencyStatusIMGURL]: https://david-dm.org/coderaiser/eslint-plugin-putout.svg?path=packages/eslint-plugin-putout
 [NPMURL]: https://npmjs.org/package/eslint-plugin-putout "npm"
-[BuildStatusURL]: https://travis-ci.org/coderaiser/eslint-plugin-putout "Build Status"
-[DependencyStatusURL]: https://david-dm.org/coderaiser/eslint-plugin-putout?path=packages/eslint-plugin-putout "Dependency Status"
 [CoverageURL]: https://coveralls.io/github/coderaiser/putout?branch=master
 [CoverageIMGURL]: https://coveralls.io/repos/coderaiser/putout/badge.svg?branch=master&service=github
 
@@ -48,8 +44,10 @@ 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",
         "putout/remove-empty-newline-after-last-specifier": "error",
         "putout/objects-braces-inside-array": "error",
         "putout/object-init": "error"
@@ -69,8 +67,10 @@ Then configure the rules you want to use under the rules section.
 - [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)
 - [Remove empty newline after last specifier](/packages/eslint-plugin-putout/lib/remove-empty-newline-after-last-specifier)
 - [Objects braces inside array](/packages/eslint-plugin-putout/lib/objects-braces-inside-array)
 - [Object init](/packages/eslint-plugin-putout/lib/object-init)

package/lib/add-newlines-between-types-in-union/README.md

@@ -0,0 +1,20 @@
+# Add new lines between types in union (add-newlines-between-types-in-union)
+
+## Rule Details
+
+This rule aims to add newlines between types in union.
+
+Examples of **incorrect** code for this rule:
+
+```js
+const a = string | number | object | boolean;
+```
+
+Examples of **correct** code for this rule:
+
+```js
+const a = string
+    | number
+    | object
+    | boolean;
+```

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

@@ -0,0 +1,32 @@
+'use strict';
+
+const {types} = require('putout');
+
+const {isTSTypeAliasDeclaration} = types;
+
+module.exports.category = 'typescript';
+module.exports.report = () => 'Add newlines between types in union';
+
+const regExp = /[^\n]\|\s[A-Za-z]/;
+
+module.exports.filter = ({text, node}) => {
+    if (!isTSTypeAliasDeclaration(node.parent))
+        return false;
+    
+    if (text.includes('\n'))
+        return false;
+    
+    if (node.types.length <= 3)
+        return false;
+    
+    return regExp.test(text);
+};
+
+module.exports.fix = ({text}) => {
+    return text.replace(/\s\|/g, '\n    |');
+};
+
+module.exports.include = () => [
+    'TSUnionType',
+];
+

package/lib/index.js

@@ -25,8 +25,10 @@ module.exports.rules = {
     ...getWrapRule('keyword-spacing'),
     ...getWrapRule('newline-function-call-arguments'),
     ...getWrapRule('function-declaration-paren-newline'),
+    ...getWrapRule('add-newlines-between-types-in-union'),
     ...getWrapRule('remove-newline-after-default-import'),
     ...getWrapRule('remove-newline-from-empty-object'),
+    ...getWrapRule('remove-empty-newline-before-first-specifier'),
     ...getWrapRule('remove-empty-newline-after-last-specifier'),
     ...getWrapRule('objects-braces-inside-array'),
     ...getWrapRule('object-init'),
@@ -56,8 +58,10 @@ const recommended = {
         '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',
         'putout/remove-empty-newline-after-last-specifier': 'error',
         'putout/objects-braces-inside-array': 'error',
         'putout/object-init': 'error',

package/lib/markdown.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const parserOpts = require('@putout/engine-parser/babel/options');
 const [ts] = require('./ts');
 
 const commonRules = {
@@ -29,6 +30,7 @@ module.exports = [{
         requireConfigFile: false,
         babelOptions: {
             sourceType: 'module',
+            parserOpts,
             plugins: [
                 '@babel/plugin-syntax-class-properties',
                 '@babel/plugin-syntax-top-level-await',

package/lib/no-unresolved/README.md

@@ -1,7 +1,7 @@
 # check if path can be resolved and fix if cannot (no-unresolved)
 
-Similar to [`no-unresolved`](https://github.com/import-js/eslint-plugin-import/blob/HEAD/docs/rules/no-unresolved.md) from 
- [`eslint-plugin-putout`](https://github.com/import-js/eslint-plugin-import). But supports only `ESM` and have `autofix`.
+Similar to [`no-unresolved`](https://github.com/import-js/eslint-plugin-import/blob/HEAD/docs/rules/no-unresolved.md) from
+[`eslint-plugin-putout`](https://github.com/import-js/eslint-plugin-import). But supports only `ESM` and have `autofix`.
 
 ## Rule Details
 
@@ -27,4 +27,3 @@ Examples of **correct** code for this rule:
 import x from './y.js';
 import dir from './dir/index.js';
 ```
-

package/lib/remove-empty-newline-after-last-specifier/README.md

@@ -12,6 +12,12 @@ import {
     b,
 
 } from 'y';
+
+push({
+    a,
+    b,
+
+});
 ```
 
 Examples of **correct** code for this rule:
@@ -21,4 +27,9 @@ import {
     a,
     b,
 } from 'y';
+
+push({
+    a,
+    b,
+});
 ```

package/lib/remove-empty-newline-after-last-specifier/index.js

@@ -3,7 +3,7 @@
 module.exports.category = 'import';
 module.exports.report = () => 'Remove newline after last specifier';
 
-const regExp = /\n\s+}/;
+const regExp = /\n\n(\s+)?}/;
 
 module.exports.filter = ({text}) => {
     return regExp.test(text);
@@ -16,5 +16,6 @@ module.exports.fix = ({text}) => {
 
 module.exports.include = () => [
     'ImportDeclaration',
+    'ObjectExpression',
 ];
 

package/lib/remove-empty-newline-before-first-specifier/README.md

@@ -0,0 +1,35 @@
+# Remove empty new line before first specifier(remove-empty-newline-before-first-specifier)
+
+## Rule Details
+
+This rule aims to remove empty newline before first specifier.
+
+Examples of **incorrect** code for this rule:
+
+```js
+import {
+    
+    a,
+    b,
+} from 'y';
+
+push({
+    
+    a,
+    b,
+});
+```
+
+Examples of **correct** code for this rule:
+
+```js
+import {
+    a,
+    b,
+} from 'y';
+
+push({
+    a,
+    b,
+});
+```

package/lib/remove-empty-newline-before-first-specifier/index.js

@@ -0,0 +1,21 @@
+'use strict';
+
+module.exports.category = 'import';
+module.exports.report = () => 'Remove newline before first specifier';
+
+const regExp = /{\n(\s+)?\n/;
+
+module.exports.filter = ({text}) => {
+    return regExp.test(text);
+};
+
+module.exports.fix = ({text}) => {
+    return text
+        .replace(regExp, '{\n');
+};
+
+module.exports.include = () => [
+    'ImportDeclaration',
+    'ObjectExpression',
+];
+

package/lib/remove-newline-from-empty-object/README.md

@@ -8,7 +8,6 @@ Examples of **incorrect** code for this rule:
 
 ```js
 const a = {
-
 };
 ```
 

package/lib/single-property-destructuring/README.md

@@ -23,4 +23,8 @@ Examples of **correct** code for this rule:
 ```js
 const {username} = user;
 import {password} from './user.js';
+
+import {
+    helloWorld as simpleHello,
+} from './hello.js';
 ```

package/lib/single-property-destructuring/index.js

@@ -1,6 +1,10 @@
 'use strict';
 
-const {types} = require('putout');
+const {
+    operator,
+    types,
+} = require('putout');
+
 const {
     isRestElement,
     isImportDeclaration,
@@ -10,6 +14,10 @@ const {
 const NewLinesReg = /([\s,]+)?\n(\s+)?/g;
 const AssignRegExp = /{\n?.*=.*\n?.*}/;
 
+const {
+    compare,
+} = operator;
+
 module.exports.category = 'destructuring';
 module.exports.report = () => 'Keep curly braces on one line when you have one destructuring property';
 
@@ -18,16 +26,19 @@ module.exports.include = () => [
     'ImportDeclaration[specifiers.length=1]',
 ];
 
-module.exports.filter = ({node, getText}) => {
-    const text = getText(node.parent);
+module.exports.filter = ({node, text, getText}) => {
+    const parentText = getText(node.parent);
+    
+    if (isImportDeclaration(node) && !compare(node.specifiers[0].local, node.specifiers[0].imported))
+        return false;
     
-    if (isImportDeclaration(node) && /import {\n/.test(getText(node)))
+    if (isImportDeclaration(node) && /import {\n/.test(text))
         return true;
     
-    if (AssignRegExp.test(text))
+    if (AssignRegExp.test(parentText))
         return false;
     
-    if (isVariableDeclarator(node) && /(const|let|var) {\n/.test(text))
+    if (isVariableDeclarator(node) && /(const|let|var) {\n/.test(parentText))
         return true;
     
     return false;

package/lib/ts.js

@@ -1,11 +1,14 @@
 'use strict';
 
+const parserOpts = require('@putout/engine-parser/babel/options');
+
 module.exports = [{
     files: '*.ts',
     parser: '@babel/eslint-parser/experimental-worker',
     parserOptions: {
         requireConfigFile: false,
         babelOptions: {
+            parserOpts,
             plugins: ['@babel/plugin-syntax-typescript'],
         },
     },

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "eslint-plugin-putout",
-  "version": "11.4.0",
+  "version": "11.8.0",
   "description": "eslint plugin for putout",
   "release": false,
   "tag": false,
+  "homepage": "https://github.com/coderaiser/putout/tree/master/packages/eslint-plugin-putout",
   "changelog": false,
   "repository": {
     "type": "git",
@@ -37,6 +38,7 @@
     "@babel/plugin-syntax-class-properties": "^7.12.1",
     "@babel/plugin-syntax-top-level-await": "^7.12.1",
     "@babel/plugin-syntax-typescript": "^7.12.1",
+    "@putout/engine-parser": "^4.6.0",
     "@putout/eslint-config": "^6.0.0",
     "align-spaces": "^1.0.0",
     "eslint-plugin-node": "^11.0.0",