@putout/eslint 3.1.0 → 3.3.0

package/lib/create-plugin/index.js

@@ -18,6 +18,7 @@ const prepare = (plugin, context, options) => (node) => {
     });
     
     const text = getText(node);
+    
     const path = {
         text,
         node,

package/lib/eslint.js

@@ -70,8 +70,9 @@ module.exports = async ({name, code, fix, config, putout = false}) => {
         return [code, places];
     }
     
+    // that's right, we disabled "putout" rules in "config"
+    // and now it located in eslint's cache
     !putout && disablePutout(finalConfig);
-    // that's right, we disabled "putout" rules in "config"    // and now it located in eslint's cache
     
     const results = await eslint.lintText(code, {
         filePath: name,

package/lib/get-eslint.mjs

@@ -1,16 +1,20 @@
-import eslint from 'eslint/use-at-your-own-risk';
-import {findUpSync} from 'find-up';
+import {dirname} from 'node:path';
+import {loadESLint} from 'eslint';
+import {findUp} from 'find-up';
+import process from 'node:process';
 
-const {FlatESLint, LegacyESLint} = eslint;
+const CWD = process.cwd();
 
-export const getESLint = ({name, fix, config, overrideConfigFile, ESLintOverride, find = findUpSync}) => {
-    const eslint = chooseESLint({
+export const getESLint = async ({name, fix, config, overrideConfigFile, loadESLintOverride, find = findUp, findFlat = find, findRC = find}) => {
+    const cwd = dirname(name).replace(/^\./, CWD);
+    const eslint = await chooseESLint({
         fix,
-        name,
+        cwd,
         config,
         overrideConfigFile,
-        ESLintOverride,
-        find,
+        loadESLintOverride,
+        findFlat,
+        findRC,
     });
     
     return {
@@ -19,29 +23,30 @@ export const getESLint = ({name, fix, config, overrideConfigFile, ESLintOverride
     };
 };
 
-function chooseESLint({name, config, fix, overrideConfigFile, ESLintOverride, find}) {
-    const flatConfigPath = find('eslint.config.js');
-    
-    if (flatConfigPath)
-        return getFlatESLint({
-            ESLintOverride,
-            name,
-            config,
-            overrideConfigFile: overrideConfigFile || flatConfigPath,
-            fix,
-        });
+async function chooseESLint({cwd, config, fix, overrideConfigFile, loadESLintOverride, findFlat, findRC}) {
+    const runESLint = await getESLintRunner({
+        cwd,
+        overrideConfigFile,
+        findFlat,
+        findRC,
+    });
     
-    return getOldESLint({
-        name,
+    return await runESLint({
+        loadESLintOverride,
+        cwd,
         config,
-        ESLintOverride,
         overrideConfigFile,
         fix,
     });
 }
 
-function getOldESLint({fix, config, overrideConfigFile, ESLintOverride = LegacyESLint}) {
-    const eslint = new ESLintOverride({
+async function getOldESLint({cwd, fix, config, overrideConfigFile, loadESLintOverride = loadESLint}) {
+    const ESLint = await loadESLintOverride({
+        useFlatConfig: false,
+    });
+    
+    const eslint = new ESLint({
+        cwd,
         fix,
         overrideConfig: {
             ignorePatterns: ['!.*'],
@@ -56,8 +61,13 @@ function getOldESLint({fix, config, overrideConfigFile, ESLintOverride = LegacyE
     return eslint;
 }
 
-function getFlatESLint({fix, config, overrideConfigFile, ESLintOverride = FlatESLint}) {
-    const eslint = new ESLintOverride({
+async function getFlatESLint({cwd, fix, config, overrideConfigFile, loadESLintOverride = loadESLint}) {
+    const FlatESLint = await loadESLintOverride({
+        useFlatConfig: true,
+    });
+    
+    const eslint = new FlatESLint({
+        cwd,
         fix,
         overrideConfig: {
             ignores: ['!.*'],
@@ -70,3 +80,24 @@ function getFlatESLint({fix, config, overrideConfigFile, ESLintOverride = FlatES
     
     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,
+        }),
+    ]);
+    
+    if (rcConfig.length > flatConfig.length)
+        return getOldESLint;
+    
+    return getFlatESLint;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/eslint",
-  "version": "3.1.0",
+  "version": "3.3.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",
@@ -38,9 +38,9 @@
   ],
   "devDependencies": {
     "@putout/plugin-eslint-plugin": "*",
-    "c8": "^8.0.0",
-    "eslint": "^9.0.0-alpha.0",
-    "eslint-plugin-n": "^16.0.0",
+    "c8": "^9.0.0",
+    "eslint": "^9.0.0",
+    "eslint-plugin-n": "^17.0.0",
     "eslint-plugin-putout": "^22.0.0",
     "just-camel-case": "^4.0.2",
     "lerna": "^6.0.1",
@@ -49,7 +49,7 @@
     "montag": "^1.0.0",
     "nodemon": "^3.0.1",
     "putout": "*",
-    "supertape": "^9.0.0",
+    "supertape": "^10.0.0",
     "try-catch": "^3.0.0"
   },
   "license": "MIT",