@putout/eslint 3.9.0 → 4.1.0

package/README.md

@@ -50,27 +50,27 @@ Isn't it looks similar to 🐊**Putout** way? It definitely is! But... It has a
 And you can even override any of **ESLint** ⚙️ options with help of `config` property:
 
 ```js
+import {safeAlign} from 'eslint-plugin-putout';
+
 const [source, places] = await eslint({
     name: 'hello.js',
     code: `const t = 'hi'\n`,
     fix: false,
-    config: {
-        extends: ['plugin:putout/recommended'],
-    },
+    config: [safeAlign],
 });
 ```
 
 If you want to apply 🐊**Putout** transformations using [`putout/putout`](https://github.com/coderaiser/putout/tree/master/packages/eslint-plugin-putout#readme) **ESLint** rule, enable 🐊**Putout** with the same called but lowercased flag:
 
 ```js
+import {safeAlign} from 'eslint-plugin-putout';
+
 const [source, places] = await eslint({
     name: 'hello.js',
     code: `const t = 'hi'\n`,
     fix: true,
     putout: true,
-    config: {
-        extends: ['plugin:putout/recommended'],
-    },
+    config: [safeAlign],
 });
 ```
 

package/lib/eslint.js

@@ -40,10 +40,6 @@ const noConfigFound = (config, configError) => {
     return !keys(config.rules).length;
 };
 
-const cutNewLine = ({message}) => ({
-    message: message.replace(/\n.*/, ''),
-});
-
 module.exports = async ({name, code, fix, config, putout = false}) => {
     const noChanges = [
         code,
@@ -60,21 +56,13 @@ module.exports = async ({name, code, fix, config, putout = false}) => {
     
     const {getESLint} = ESLint;
     
-    const [eslintError, eslint] = await tryToCatch(getESLint, {
+    const eslint = await getESLint({
         name,
         fix,
         config,
         overrideConfigFile,
     });
     
-    if (eslintError) {
-        const places = [
-            convertToPlace(cutNewLine(eslintError)),
-        ];
-        
-        return [code, places];
-    }
-    
     const [configError, finalConfig] = await tryToCatch(eslint.calculateConfigForFile, name);
     
     if (noConfigFound(finalConfig, configError))

package/lib/get-eslint.mjs

@@ -1,67 +1,14 @@
 import {dirname} from 'node:path';
 import process from 'node:process';
 import {loadESLint} from 'eslint';
-import {findUp} from 'find-up';
 
+const {isArray} = Array;
+const maybeArray = (a) => isArray(a) ? a : [a];
 const CWD = process.cwd();
 
-export const getESLint = async ({name, fix, config, overrideConfigFile, loadESLintOverride, find = findUp, findFlat = find, findRC = find}) => {
+export const getESLint = async ({name, fix, config = [], overrideConfigFile, loadESLintOverride = loadESLint}) => {
     const cwd = dirname(name).replace(/^\./, CWD);
-    const eslint = await chooseESLint({
-        fix,
-        cwd,
-        config,
-        overrideConfigFile,
-        loadESLintOverride,
-        findFlat,
-        findRC,
-    });
-    
-    return {
-        calculateConfigForFile: eslint.calculateConfigForFile.bind(eslint),
-        lintText: eslint.lintText.bind(eslint),
-    };
-};
-
-async function chooseESLint({cwd, config, fix, overrideConfigFile, loadESLintOverride, findFlat, findRC}) {
-    const runESLint = await getESLintRunner({
-        cwd,
-        overrideConfigFile,
-        findFlat,
-        findRC,
-    });
-    
-    return await runESLint({
-        loadESLintOverride,
-        cwd,
-        config,
-        overrideConfigFile,
-        fix,
-    });
-}
-
-async function getOldESLint({cwd, fix, config, overrideConfigFile, loadESLintOverride = loadESLint}) {
-    const ESLint = await loadESLintOverride({
-        useFlatConfig: false,
-    });
     
-    const eslint = new ESLint({
-        cwd,
-        fix,
-        overrideConfig: {
-            ignorePatterns: ['!.*'],
-            ...config,
-        },
-        ...overrideConfigFile && {
-            overrideConfigFile,
-            useEslintrc: false,
-        },
-    });
-    
-    return eslint;
-}
-
-async function getFlatESLint({cwd, fix, config, overrideConfigFile, loadESLintOverride = loadESLint}) {
     const FlatESLint = await loadESLintOverride({
         useFlatConfig: true,
     });
@@ -69,38 +16,19 @@ async function getFlatESLint({cwd, fix, config, overrideConfigFile, loadESLintOv
     const eslint = new FlatESLint({
         cwd,
         fix,
-        overrideConfig: {
-            ignores: ['!.*'],
-            ...config,
-        },
+        overrideConfig: [
+            ...maybeArray(config), {
+                ignores: ['!.*'],
+            }
+            ,
+        ],
         ...overrideConfigFile && {
             overrideConfigFile,
         },
     });
     
-    return eslint;
-}
-
-const isFlat = (a) => a?.includes('config');
-
-async function getESLintRunner({cwd, findFlat, findRC, overrideConfigFile}) {
-    if (overrideConfigFile)
-        return isFlat(overrideConfigFile) ? getFlatESLint : getOldESLint;
-    
-    const [rcConfig = '', flatConfig = ''] = await Promise.all([
-        findRC(['.eslintrc.json', '.eslintrc.js'], {
-            cwd,
-        }),
-        findFlat(['eslint.config.js', 'eslint.config.mjs', 'eslint.config.cjs'], {
-            cwd,
-        }),
-    ]);
-    
-    const noConfigFound = !rcConfig && !flatConfig;
-    const foundRConfig = rcConfig.length > flatConfig.length;
-    
-    if (noConfigFound || foundRConfig)
-        return getOldESLint;
-    
-    return getFlatESLint;
-}
+    return {
+        calculateConfigForFile: eslint.calculateConfigForFile.bind(eslint),
+        lintText: eslint.lintText.bind(eslint),
+    };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/eslint",
-  "version": "3.9.0",
+  "version": "4.1.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Wrapper that simplifies ESLint API and makes it compatible with 🐊Putout",
@@ -29,7 +29,6 @@
     "report": "madrun report"
   },
   "dependencies": {
-    "find-up": "^7.0.0",
     "once": "^1.4.0",
     "try-to-catch": "^3.0.1"
   },
@@ -38,12 +37,12 @@
     "eslint"
   ],
   "devDependencies": {
+    "@putout/eslint-flat": "^2.0.0",
     "@putout/plugin-eslint-plugin": "*",
     "c8": "^10.0.0",
     "eslint": "^9.0.0",
     "eslint-plugin-n": "^17.0.0",
-    "eslint-plugin-putout": "^24.0.0",
-    "lerna": "^6.0.1",
+    "eslint-plugin-putout": "^25.0.1",
     "madrun": "^10.0.0",
     "mock-require": "^3.0.3",
     "montag": "^1.0.0",