eslint-plugin-putout 24.1.0 → 25.0.1

package/README.md

@@ -17,13 +17,12 @@ npm i putout eslint eslint-plugin-putout -D
 
 ## Usage
 
-Add `putout` to the plugins section of your `.eslintrc.json` configuration file. You can omit the `eslint-plugin-` prefix:
+Update `eslint.config.js` with:
 
-```json
-{
-    "extends": ["plugin:putout/recommended"],
-    "plugins": ["putout"]
-}
+```js
+import {recommended} from 'eslint-plugin-putout';
+
+export default recommended;
 ```
 
 Then configure the rules you want to use under the rules section.
@@ -117,11 +116,10 @@ Then configure the rules you want to use under the rules section.
 
 When using 🐊**Putout** in IDE with `--fix` on save, or when you want to disable the most dangerous rules, use:
 
-```json
-{
-    "extends": ["plugin:putout/safe"],
-    "plugins": ["putout"]
-}
+```js
+import {safe} from 'eslint-plugin-putout';
+
+export default safe;
 ```
 
 Disabled **ESLint** rules:
@@ -155,23 +153,18 @@ Disabled 🐊**Putout** rules:
 - ❌ [`maybe/noop`](https://github.com/coderaiser/putout/tree/29.2.4/packages/plugin-maybe#noop);
 - ❌ [`remove-useless-push`](https://github.com/coderaiser/putout/tree/38.1.2/packages/plugin-remove-useless-push#readme);
 
-### safe+align
+### safeAlign
 
-When you want to enable ability to align spaces on empty lines, while have all benefits of `safe` preset: use `safe+align`.
+When you want to enable ability to align spaces on empty lines, while have all benefits of `safe` preset: use `safeAlign`.
 
 ### jsx
 
 When you need to support `jsx` in files using `js` extension,  use:
 
-```json
-{
-    "extends": [
-        "plugin:putout/jsx"
-    ],
-    "plugins": [
-        "putout"
-    ]
-}
+```js
+import {jsx} from 'eslint-plugin-putout;
+
+export default jsx;
 ```
 
 ### esm
@@ -179,31 +172,11 @@ When you need to support `jsx` in files using `js` extension,  use:
 If you want to use **ESM** plugins of 🐊**Putout** you need to use `esm` preset:
 
 ```json
-{
-    "extends": [
-        "plugin:putout/esm"
-    ],
-    "plugins": [
-        "putout"
-    ]
-}
-```
+import {esm} from 'eslint-plugin-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,
-    {},
-];
+export default esm;
 ```
 
-`safe` and `safeAlign` supported as well.
-
 ## License
 
 MIT

package/lib/html.mjs

@@ -0,0 +1,11 @@
+import globals from 'globals';
+
+export default [{
+    name: 'putout: html: js',
+    files: ['**/*.html{js}'],
+    languageOptions: {
+        globals: {
+            ...globals.browser,
+        },
+    },
+}];

package/lib/{index.js → index.mjs}

@@ -1,65 +1,21 @@
-'use strict';
+import config from '@putout/eslint-config';
+import nPlugin from 'eslint-plugin-n';
+import markdown from './markdown.mjs';
+import json from './json.mjs';
+import html from './html.mjs';
+import ts from './ts.mjs';
+import jsxConfig, {jsx} from './jsx.mjs';
+import putout from './plugin.js';
 
-const {createPlugin} = require('@putout/eslint/create-plugin');
+const n = nPlugin.configs['flat/mixed-esm-and-cjs'];
 
-const config = require('@putout/eslint-config');
-const markdown = require('./markdown');
-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}`)),
-});
-
-module.exports.rules = {
-    ...getWrapRule('array-element-newline'),
-    ...getWrapRule('single-property-destructuring'),
-    ...getWrapRule('multiple-properties-destructuring'),
-    ...getWrapRule('for-of-multiple-properties-destructuring'),
-    ...getWrapRule('long-properties-destructuring'),
-    ...getWrapRule('destructuring-as-function-argument'),
-    ...getWrapRule('align-spaces'),
-    ...getWrapRule('keyword-spacing'),
-    ...getWrapRule('newline-function-call-arguments'),
-    ...getWrapRule('function-declaration-paren-newline'),
-    ...getWrapRule('add-newlines-between-types-in-union'),
-    ...getWrapRule('add-newlines-between-specifiers'),
-    ...getWrapRule('add-newline-before-return'),
-    ...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'),
-    ...getWrapRule('remove-empty-newline-after-last-specifier'),
-    ...getWrapRule('remove-empty-newline-after-last-element'),
-    ...getWrapRule('remove-empty-specifiers'),
-    ...getWrapRule('objects-braces-inside-array'),
-    ...getWrapRule('object-property-newline'),
-    ...getWrapRule('no-unresolved'),
-    ...getWrapRule('remove-duplicate-extensions'),
-    ...getWrapRule('evaluate'),
-    ...getWrapRule('tape-add-newline-before-assertion'),
-    ...getWrapRule('tape-add-newline-between-tests'),
-    ...getWrapRule('tape-remove-newline-before-t-end'),
-    ...getWrapRule('nonblock-statement-body-newline'),
-    ...getRule('putout'),
-    ...getRule('remove-empty-newline-after-import'),
-    ...getRule('remove-empty-newline-between-declarations'),
-};
-
-const {rules} = config;
-
-const recommended = {
-    ...config,
+const putoutConfig = [{
+    name: 'putout: js',
+    plugins: {
+        putout,
+    },
     rules: {
-        ...rules,
+        ...config.rules,
         'no-debugger': 'off',
         'no-unused-vars': 'off',
         'putout/array-element-newline': 'error',
@@ -100,17 +56,20 @@ const recommended = {
         'n/no-missing-require': 'off',
         'n/no-process-exit': 'off',
     },
-    overrides: [
-        ...markdown,
-        ...json,
-        ...yaml,
-        ...html,
-        ...ts,
-        ...jsx,
-    ],
-};
+}];
 
-const safeRules = {
+export const recommended = [
+    ...n,
+    ...config,
+    ...putoutConfig,
+    ...markdown,
+    ...html,
+    ...ts,
+    ...jsxConfig,
+    ...json,
+];
+
+export const safeRules = {
     'apply-template-literals': 'off',
     'remove-empty': 'off',
     'merge-duplicate-functions': 'off',
@@ -135,32 +94,33 @@ const safeRules = {
     'remove-useless-push': 'off',
 };
 
-module.exports.safeRules = safeRules;
-
-const safe = {
-    ...recommended,
-    rules: {
-        ...recommended.rules,
-        'no-implicit-coercion': 'off',
-        'no-useless-return': 'off',
-        'putout/align-spaces': 'off',
-        'putout/remove-newline-from-empty-object': 'off',
-        'putout/putout': ['error', {
-            esm: false,
-            rules: safeRules,
-        }],
-    },
-};
+export const safe = [
+    ...n,
+    ...recommended, {
+        rules: {
+            ...recommended.rules,
+            'no-implicit-coercion': 'off',
+            'no-useless-return': 'off',
+            'putout/align-spaces': 'off',
+            'putout/remove-newline-from-empty-object': 'off',
+            'putout/putout': ['error', {
+                esm: false,
+                rules: safeRules,
+            }],
+        },
+    }];
 
-const safeAlign = {
-    ...safe,
-    rules: {
-        ...safe.rules,
-        'putout/align-spaces': 'error',
-    },
-};
+export const safeAlign = [
+    ...n,
+    ...safe, {
+        rules: {
+            ...safe.rules,
+            'putout/align-spaces': 'error',
+        },
+    }];
 
-const esm = {
+export const esm = {
+    ...n,
     ...safeAlign,
     rules: {
         ...safeAlign.rules,
@@ -171,10 +131,15 @@ const esm = {
     },
 };
 
-module.exports.configs = {
+export const configs = {
     recommended,
-    'jsx': jsx.jsx,
+    jsx,
     safe,
-    'safe+align': safeAlign,
+    safeAlign,
     esm,
 };
+
+export default {
+    rules: putout.rules,
+    configs,
+};

package/lib/{json.js → json.mjs}

@@ -1,9 +1,11 @@
-'use strict';
+import stylisticJs from '@stylistic/eslint-plugin-js';
+import putout from './plugin.js';
 
-module.exports = [{
+export default [{
+    name: 'putout: json',
     files: [
-        '*.json',
-        '*{json}',
+        '**/*.json',
+        '**/*{json}',
     ],
     rules: {
         'no-undef': 'off',
@@ -28,7 +30,8 @@ module.exports = [{
         '@stylistic/js/no-multi-spaces': 'off',
     },
 }, {
-    files: 'package.json',
+    name: 'putout: json: package.json',
+    files: ['**/package.json'],
     rules: {
         '@stylistic/js/indent': [
             'error',
@@ -36,13 +39,21 @@ module.exports = [{
         ],
     },
 }, {
-    files: '*ignore{json}',
+    name: 'putout: json: ignore',
+    files: ['**/*ignore{json}'],
     rules: {
         '@stylistic/js/comma-dangle': 'off',
     },
 }, {
-    files: '*.yml{json}',
+    name: 'putout: json: yaml',
+    files: ['**/*.{yml,yaml}{json}'],
+    plugins: {
+        '@stylistic': stylisticJs,
+        putout,
+    },
     rules: {
+        'putout/objects-braces-inside-array': 'off',
         '@stylistic/js/indent': 'off',
+        'comma-spacing': 'off',
     },
 }];

package/lib/{jsx.js → jsx.mjs}

@@ -1,6 +1,8 @@
-'use strict';
+import stylisticJsx from '@stylistic/eslint-plugin-jsx';
+import react from 'eslint-plugin-react';
 
-const jsx = {
+export const jsx = {
+    name: 'putout: jsx',
     rules: {
         '@stylistic/js/no-extra-parens': 'off',
         '@stylistic/jsx/jsx-indent': 'error',
@@ -10,7 +12,10 @@ const jsx = {
             declaration: 'parens-new-line',
         }],
     },
-    plugins: ['react', '@stylistic/jsx'],
+    plugins: {
+        react,
+        '@stylistic/jsx': stylisticJsx,
+    },
     settings: {
         react: {
             version: 'latest',
@@ -18,9 +23,7 @@ const jsx = {
     },
 };
 
-module.exports = [{
-    files: ['*.jsx'],
+export default [{
+    files: ['**/*.jsx'],
     ...jsx,
 }];
-
-module.exports.jsx = jsx;

package/lib/{markdown.js → markdown.mjs}

@@ -1,9 +1,10 @@
-'use strict';
+import parserOpts from '@putout/engine-parser/babel/options';
+import parserPlugins from '@putout/engine-parser/babel/plugins';
+import babel from '@babel/eslint-parser/experimental-worker';
+import tsConfig from './ts.mjs';
+import {jsx} from './jsx.mjs';
 
-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 [ts, tsx] = tsConfig;
 
 const commonRules = {
     '@stylistic/js/eol-last': [
@@ -41,48 +42,59 @@ const parserOptions = {
     },
 };
 
-module.exports = [{
-    files: ['*.md{js}'],
+const mdTsCommonRules = {
+    '@typescript-eslint/no-unused-vars': 'off',
+    '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/no-inferrable-types': 'off',
+};
+
+export default [{
+    name: 'putout: md: js',
+    files: ['**/*.md{js}'],
     rules: commonRules,
-    parser: '@babel/eslint-parser/experimental-worker',
-    parserOptions,
+    languageOptions: {
+        parser: babel,
+        parserOptions,
+    },
 }, {
-    files: ['*.md{jsx}'],
+    name: 'putout: md: jsx',
+    files: ['**/*.md{jsx}'],
     rules: {
         ...commonRules,
         ...jsx.rules,
     },
     plugins: jsx.plugins,
-    parser: '@babel/eslint-parser/experimental-worker',
-    parserOptions,
+    languageOptions: {
+        parser: babel,
+        parserOptions,
+    },
 }, {
     ...tsx,
     ...jsx,
-    files: '*.md{tsx}',
+    name: 'putout: md: tsx',
+    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',
+        ...mdTsCommonRules,
     },
-    plugins: [
+    plugins: {
         ...tsx.plugins,
         ...jsx.plugins,
-    ],
+    },
 }, {
     ...ts,
-    files: '*.md{ts}',
+    name: 'putout: md: ts',
+    files: ['**/*.md{ts}'],
     rules: {
         ...commonRules,
         ...ts.rules,
-        '@typescript-eslint/no-unused-vars': 'off',
-        '@typescript-eslint/no-explicit-any': 'off',
-        '@typescript-eslint/no-inferrable-types': 'off',
+        ...mdTsCommonRules,
     },
 }, {
-    files: '*.md{json}',
+    name: 'putout: md: json',
+    files: ['**/*.md{json}'],
     rules: {
         '@stylistic/js/eol-last': [
             'error',

package/lib/plugin.js

@@ -0,0 +1,47 @@
+'use strict';
+
+const {createPlugin} = require('@putout/eslint/create-plugin');
+
+const getRule = (a) => ({
+    [a]: require(`./${a}`),
+});
+
+const getWrapRule = (a) => ({
+    [a]: createPlugin(require(`./${a}`)),
+});
+
+module.exports.rules = {
+    ...getWrapRule('array-element-newline'),
+    ...getWrapRule('single-property-destructuring'),
+    ...getWrapRule('multiple-properties-destructuring'),
+    ...getWrapRule('for-of-multiple-properties-destructuring'),
+    ...getWrapRule('long-properties-destructuring'),
+    ...getWrapRule('destructuring-as-function-argument'),
+    ...getWrapRule('align-spaces'),
+    ...getWrapRule('keyword-spacing'),
+    ...getWrapRule('newline-function-call-arguments'),
+    ...getWrapRule('function-declaration-paren-newline'),
+    ...getWrapRule('add-newlines-between-types-in-union'),
+    ...getWrapRule('add-newlines-between-specifiers'),
+    ...getWrapRule('add-newline-before-return'),
+    ...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'),
+    ...getWrapRule('remove-empty-newline-after-last-specifier'),
+    ...getWrapRule('remove-empty-newline-after-last-element'),
+    ...getWrapRule('remove-empty-specifiers'),
+    ...getWrapRule('objects-braces-inside-array'),
+    ...getWrapRule('object-property-newline'),
+    ...getWrapRule('no-unresolved'),
+    ...getWrapRule('remove-duplicate-extensions'),
+    ...getWrapRule('evaluate'),
+    ...getWrapRule('tape-add-newline-before-assertion'),
+    ...getWrapRule('tape-add-newline-between-tests'),
+    ...getWrapRule('tape-remove-newline-before-t-end'),
+    ...getWrapRule('nonblock-statement-body-newline'),
+    ...getRule('putout'),
+    ...getRule('remove-empty-newline-after-import'),
+    ...getRule('remove-empty-newline-between-declarations'),
+};

package/lib/putout/sync/index.js

@@ -37,7 +37,7 @@ module.exports = ({context, options}) => {
     
     if (errorParser) {
         context.report({
-            message: `${parseError(errorParser)} (putout)`,
+            message: `${parseError(errorParser)} (parser)`,
             node,
         });
         

package/lib/{ts.js → ts.mjs}

@@ -1,7 +1,12 @@
-'use strict';
+import {rules} from '@putout/eslint-config';
+import parser from '@typescript-eslint/parser';
+import tseslint from 'typescript-eslint';
+import tsPlugin from '@typescript-eslint/eslint-plugin';
+import stylisticTs from '@stylistic/eslint-plugin-ts';
+import {jsx} from './jsx.mjs';
+import plugin from './plugin.js';
 
-const {rules} = require('@putout/eslint-config');
-const {jsx} = require('./jsx');
+const {assign} = Object;
 
 const reEnable = (rule) => ({
     [`@stylistic/ts/${rule}`]: 'error',
@@ -70,18 +75,35 @@ const extensionRules = {
     '@typescript-eslint/no-unsafe-declaration-merging': 'error',
 };
 
+const getTSESLintConfigs = (configs) => {
+    const result = {};
+    
+    for (const config of configs) {
+        assign(result, config);
+    }
+    
+    return result;
+};
+
 const ts = {
-    files: '*.ts',
-    parser: '@typescript-eslint/parser',
-    parserOptions: {
-        warnOnUnsupportedTypeScriptVersion,
-        ecmaFeatures: {
-            jsx: false,
+    name: 'putout: ts',
+    files: ['**/*.ts'],
+    languageOptions: {
+        parser,
+        parserOptions: {
+            warnOnUnsupportedTypeScriptVersion,
+            ecmaFeatures: {
+                jsx: false,
+            },
         },
     },
-    plugins: ['@typescript-eslint', '@stylistic/ts'],
-    extends: ['plugin:@typescript-eslint/recommended'],
+    plugins: {
+        '@typescript-eslint': tsPlugin,
+        '@stylistic/ts': stylisticTs,
+        'putout': plugin,
+    },
     rules: {
+        ...getTSESLintConfigs(tseslint.configs.recommended).rules,
         ...extensionRules,
         'putout/no-unresolved': 'off',
         '@typescript-eslint/no-explicit-any': 'off',
@@ -91,23 +113,27 @@ const ts = {
     },
 };
 
-module.exports = [
+export default [
     ts, {
         ...ts,
         ...jsx,
+        name: 'putout: tsx',
+        files: ['**/*.tsx'],
         rules: {
-            ...ts.rules,
             ...jsx.rules,
+            ...ts.rules,
         },
-        plugins: [
-            ...ts.plugins,
+        plugins: {
             ...jsx.plugins,
-        ],
-        files: '*.tsx',
-        parserOptions: {
-            warnOnUnsupportedTypeScriptVersion,
-            ecmaFeatures: {
-                jsx: true,
+            ...ts.plugins,
+        },
+        languageOptions: {
+            parser,
+            parserOptions: {
+                warnOnUnsupportedTypeScriptVersion,
+                ecmaFeatures: {
+                    jsx: true,
+                },
             },
         },
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-putout",
-  "version": "24.1.0",
+  "version": "25.0.1",
   "type": "commonjs",
   "description": "ESLint plugin for 🐊Putout",
   "release": false,
@@ -12,8 +12,7 @@
     "url": "git+https://github.com/coderaiser/putout.git"
   },
   "exports": {
-    ".": "./lib/index.js",
-    "./config": "./lib/config/index.js"
+    ".": "./lib/index.mjs"
   },
   "keywords": [
     "putout",
@@ -42,20 +41,25 @@
     "@babel/eslint-parser": "^8.0.0-alpha.1",
     "@eslint/eslintrc": "^3.0.0",
     "@putout/engine-parser": "^12.0.0",
-    "@putout/eslint": "^3.0.0",
-    "@putout/eslint-config": "^9.0.0",
-    "@stylistic/eslint-plugin-jsx": "^3.0.0",
-    "@stylistic/eslint-plugin-ts": "^3.0.0",
+    "@putout/eslint": "^4.0.0",
+    "@putout/eslint-config": "^10.0.0",
+    "@putout/eslint-flat": "^2.0.0",
+    "@stylistic/eslint-plugin-js": "^4.0.1",
+    "@stylistic/eslint-plugin-jsx": "^4.0.1",
+    "@stylistic/eslint-plugin-ts": "^4.0.1",
     "@typescript-eslint/eslint-plugin": "^8.3.0",
     "@typescript-eslint/parser": "^8.3.0",
     "align-spaces": "^2.0.0",
     "eslint-plugin-n": "^17.0.0",
+    "eslint-plugin-putout": "^24.1.0",
     "eslint-plugin-react": "^7.32.2",
+    "globals": "^16.0.0",
     "parse-import-specifiers": "^1.0.1",
     "synckit": "^0.9.0",
     "try-catch": "^3.0.0",
     "try-to-catch": "^3.0.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.0.4",
+    "typescript-eslint": "^8.24.1"
   },
   "devDependencies": {
     "@babel/plugin-syntax-typescript": "^8.0.0-alpha.1",
@@ -74,7 +78,7 @@
     "node": ">=18"
   },
   "peerDependencies": {
-    "eslint": ">=8.0.0",
+    "eslint": ">=9",
     "putout": ">=38"
   },
   "license": "MIT",

package/lib/config/index.js

@@ -1,39 +0,0 @@
-'use strict';
-
-const nPlugin = require('eslint-plugin-n');
-const {FlatCompat} = require('@eslint/eslintrc');
-const putoutPlugin = require('..');
-
-const getPutoutConfig = (name) => compat.config(putoutPlugin.configs[name]);
-
-const compat = new FlatCompat({
-    languageOptions: {
-        baseDirectory: __dirname,
-    },
-});
-
-const n = nPlugin.configs['flat/mixed-esm-and-cjs'];
-
-const plugins = [{
-    plugins: {
-        putout: putoutPlugin,
-    },
-}];
-
-module.exports.recommended = [
-    ...n,
-    ...getPutoutConfig('recommended'),
-    ...plugins,
-];
-
-module.exports.safe = [
-    ...n,
-    ...getPutoutConfig('safe'),
-    ...plugins,
-];
-
-module.exports.safeAlign = [
-    ...n,
-    ...getPutoutConfig('safe+align'),
-    ...plugins,
-];

package/lib/html.js

@@ -1,8 +0,0 @@
-'use strict';
-
-module.exports = [{
-    files: ['*.html{js}'],
-    env: {
-        browser: true,
-    },
-}];

package/lib/yaml.js

@@ -1,9 +0,0 @@
-'use strict';
-
-module.exports = [{
-    files: '*.{yml,yaml}{json}',
-    rules: {
-        'comma-spacing': 'off',
-        'putout/objects-braces-inside-array': 'off',
-    },
-}];