eslint-plugin-putout 16.5.0 → 16.7.0

package/README.md

@@ -21,12 +21,8 @@ Add `putout` to the plugins section of your `.eslintrc.json` configuration file.
 
 ```json
 {
-    "extends": [
-        "plugin:putout/recommended"
-    ],
-    "plugins": [
-        "putout"
-    ]
+    "extends": ["plugin:putout/recommended"],
+    "plugins": ["putout"]
 }
 ```
 
@@ -123,12 +119,8 @@ When using 🐊**Putout** in IDE with `--fix` on save, or when you want to disab
 
 ```json
 {
-    "extends": [
-        "plugin:putout/safe"
-    ],
-    "plugins": [
-        "putout"
-    ]
+    "extends": ["plugin:putout/safe"],
+    "plugins": ["putout"]
 }
 ```
 
@@ -162,16 +154,28 @@ Disabled 🐊**Putout** rules:
 
 When you want to enable ability to align spaces on empty lines, while have all benefits of `safe` preset: use `safe+align`.
 
+### jsx
+
+When you need to support `jsx` in files using `js` extension,  use:
+
+```json
+{
+    "extends": [
+        "plugin:putout/jsx"
+    ],
+    "plugins": [
+        "putout"
+    ]
+}
+```
+
 ## Flat
 
 The time is came for a [FlatConfig](https://eslint.org/blog/2022/08/new-config-system-part-2/). To use it with `eslint-plugin-putout` add to `eslint.config.js`:
 
 ```js
 const {recommended} = require('eslint-plugin-putout/config');
-module.exports = [
-    ...recommended, {
-    },
-];
+module.exports = [...recommended, {}];
 ```
 
 `safe` and `safeAlign` supported as well.

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

@@ -5,9 +5,10 @@ const {
     isBlockStatement,
     isVariableDeclaration,
     isExpressionStatement,
+    isProgram,
 } = types;
 
-const regExp = /^\n( +)?\n +$/;
+const regExp = /^\n( +)?\n( +)?$/;
 
 module.exports.report = () => 'Add newline before expression';
 
@@ -20,7 +21,7 @@ module.exports.filter = ({text, node, getCommentsBefore, getSpacesBeforeNode}) =
     
     const {parent} = node.parent;
     
-    if (!isBlockStatement(parent))
+    if (!isBlockStatement(parent) && !isProgram(parent))
         return false;
     
     const {body} = parent;
@@ -29,6 +30,9 @@ module.exports.filter = ({text, node, getCommentsBefore, getSpacesBeforeNode}) =
     if (n < 3)
         return false;
     
+    if (body[0].expression === node)
+        return false;
+    
     const spaces = getSpacesBeforeNode(node, text);
     
     if (!spaces)
@@ -55,6 +59,8 @@ module.exports.filter = ({text, node, getCommentsBefore, getSpacesBeforeNode}) =
         
         return true;
     }
+    
+    return false;
 };
 
 module.exports.fix = ({text}) => {
@@ -64,5 +70,4 @@ module.exports.fix = ({text}) => {
 module.exports.include = () => [
     'CallExpression',
     'AssignmentExpression',
-    'ReturnStatement',
 ];

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

@@ -26,6 +26,7 @@ const isSupportedNode = (a) => {
     
     return false;
 };
+
 module.exports.filter = ({text, node}) => {
     if (isMemberExpression(node.parent))
         return false;

package/lib/index.js

@@ -6,11 +6,10 @@ const json = require('./json');
 const yaml = require('./yaml');
 const html = require('./html');
 const ts = require('./ts');
-
+const jsx = require('./jsx');
 const getRule = (a) => ({
     [a]: require(`./${a}`),
 });
-
 const getWrapRule = (a) => ({
     [a]: createPlugin(require(`./${a}`)),
 });
@@ -50,17 +49,14 @@ module.exports.rules = {
     ...getRule('remove-empty-newline-after-import'),
     ...getRule('remove-empty-newline-between-declarations'),
 };
-
 const config = require('@putout/eslint-config');
 const {rules} = config;
-
 const recommended = {
     ...config,
     rules: {
         ...rules,
         'no-debugger': 'off',
         'no-unused-vars': 'off',
-        
         'putout/array-element-newline': 'error',
         'putout/single-property-destructuring': 'error',
         'putout/multiple-properties-destructuring': 'error',
@@ -94,24 +90,14 @@ const recommended = {
         'putout/tape-remove-newline-before-t-end': 'error',
         'putout/nonblock-statement-body-newline': 'error',
         'putout/putout': 'error',
-        
         'n/no-unsupported-features/es-syntax': 'off',
         'n/no-missing-import': 'off',
         'n/no-missing-require': 'off',
         'n/no-process-exit': 'off',
     },
-    overrides: [
-        ...markdown,
-        ...json,
-        ...yaml,
-        ...html,
-        ...ts,
-    ],
-    plugins: [
-        'n',
-    ],
+    overrides: [...markdown, ...json, ...yaml, ...html, ...ts, ...jsx],
+    plugins: ['n'],
 };
-
 const safe = {
     ...recommended,
     rules: {
@@ -146,6 +132,7 @@ const safe = {
 
 module.exports.configs = {
     recommended,
+    'jsx': jsx.jsx,
     safe,
     'safe+align': {
         ...safe,
@@ -155,4 +142,3 @@ module.exports.configs = {
         },
     },
 };
-

package/lib/jsx.js

@@ -0,0 +1,26 @@
+'use strict';
+
+const jsx = {
+    rules: {
+        'react/jsx-indent': 'error',
+        'react/jsx-wrap-multilines': ['error', {
+            arrow: 'ignore',
+            return: 'parens-new-line',
+            declaration: 'ignore',
+        }],
+    },
+    plugins: ['react'],
+    settings: {
+        react: {
+            version: 'latest',
+        },
+    },
+};
+
+module.exports = [{
+    files: ['*.jsx'],
+    ...jsx,
+}];
+
+module.exports.jsx = jsx;
+

package/lib/markdown.js

@@ -3,6 +3,7 @@
 const parserOpts = require('@putout/engine-parser/babel/options');
 const parserPlugins = require('@putout/engine-parser/babel/plugins');
 const [ts, tsx] = require('./ts');
+const {jsx} = require('./jsx');
 
 const commonRules = {
     'no-undef': 'off',
@@ -38,20 +39,35 @@ const parserOptions = {
 };
 
 module.exports = [{
-    files: ['*.md{js}', '*.md{jsx}'],
+    files: ['*.md{js}'],
     rules: commonRules,
     parser: '@babel/eslint-parser/experimental-worker',
     parserOptions,
+}, {
+    files: ['*.md{jsx}'],
+    rules: {
+        ...commonRules,
+        ...jsx.rules,
+    },
+    plugins: jsx.plugins,
+    parser: '@babel/eslint-parser/experimental-worker',
+    parserOptions,
 }, {
     ...tsx,
+    ...jsx,
     files: '*.md{tsx}',
     rules: {
         ...commonRules,
         ...ts.rules,
+        ...jsx.rules,
         '@typescript-eslint/no-unused-vars': 'off',
         '@typescript-eslint/no-explicit-any': 'off',
         '@typescript-eslint/no-inferrable-types': 'off',
     },
+    plugins: [
+        ...tsx.plugins,
+        ...jsx.plugins,
+    ],
 }, {
     ...ts,
     files: '*.md{ts}',

package/lib/ts.js

@@ -1,6 +1,8 @@
 'use strict';
 
 const {rules} = require('@putout/eslint-config');
+const jsx = require('./jsx');
+
 const warnOnUnsupportedTypeScriptVersion = false;
 
 const extensionRules = {
@@ -91,6 +93,7 @@ const ts = {
 module.exports = [
     ts, {
         ...ts,
+        ...jsx.jsx,
         files: '*.tsx',
         parserOptions: {
             warnOnUnsupportedTypeScriptVersion,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-putout",
-  "version": "16.5.0",
+  "version": "16.7.0",
   "type": "commonjs",
   "description": "ESLint plugin for 🐊Putout",
   "release": false,
@@ -51,6 +51,7 @@
     "@typescript-eslint/parser": "^5.4.0",
     "align-spaces": "^1.0.0",
     "eslint-plugin-n": "^15.2.4",
+    "eslint-plugin-react": "^7.32.2",
     "try-catch": "^3.0.0",
     "typescript": "^4.5.2"
   },