@putout/eslint 1.2.0 → 1.5.0

package/README.md

@@ -5,6 +5,8 @@
 
 Wrapper that simplifies [**ESLint**](https://eslint.org/) API and makes it compatible with 🐊[**Putout**](https://github.com/coderaiser/putout).
 
+☝️ *[FlatConfig](https://eslint.org/blog/2022/08/new-config-system-part-2/) supported from the box.*
+
 ## Install
 
 ```
@@ -92,6 +94,12 @@ module.exports.filter = (path) => {
 };
 ```
 
+The main difference with [Includer](https://github.com/coderaiser/putout/tree/master/packages/engine-runner#includer) is:
+
+- `fix` works with text;
+- `include` does not support 🦎[PutoutScript](https://github.com/coderaiser/putout/blob/master/docs/putout-script.md#-putoutscript);
+- there is no `exclude`;
+
 Take a look at more sophisticated example, rule [`remove-duplicate-extensions`](https://github.com/coderaiser/putout/tree/master/packages/eslint-plugin-putout/lib/remove-duplicate-extensions#readme):
 
 ```js
@@ -139,7 +147,9 @@ module.exports.rules = {
 };
 ```
 
-### `lint(code, {fix, plugins})`
+### `lint(source, {fix, plugins, options, filename})`
+
+When you need to run **ESLint** with one plugin (*rule*), just use `lint` it will do the thing.
 
 ```js
 const lint = require('@putout/eslint/lint');
@@ -153,6 +163,21 @@ const [code, places] = lint('debugger', {
 });
 ```
 
+When you want to skip plugins, and just provide `options` and `filename` you can:
+
+```js
+const lint = require('@putout/eslint/lint');
+
+const [code, places] = lint('debugger', {
+    filename: 'index.js',
+    options: [{
+        rules: {
+            semi: 'error',
+        },
+    }],
+});
+```
+
 ## License
 
 MIT

package/lib/eslint.js

@@ -37,6 +37,7 @@ module.exports = async ({name, code, fix, config, putout = false}) => {
     
     const {getESLint} = ESLint;
     const [eslintError, eslint] = await tryToCatch(getESLint, {
+        name,
         fix,
         config,
         overrideConfigFile,

package/lib/get-eslint.mjs

@@ -1,6 +1,47 @@
 import {ESLint} from 'eslint';
+import FlatESLintExports from 'eslint/use-at-your-own-risk';
+import {findUpSync} from 'find-up';
 
-export const getESLint = ({fix, config, overrideConfigFile, ESLintOverride = ESLint}) => {
+const {FlatESLint} = FlatESLintExports;
+
+export const getESLint = ({name, fix, config, overrideConfigFile, ESLintOverride, find = findUpSync}) => {
+    const eslint = chooseESLint({
+        fix,
+        name,
+        config,
+        overrideConfigFile,
+        ESLintOverride,
+        find,
+    });
+    
+    return {
+        calculateConfigForFile: eslint.calculateConfigForFile.bind(eslint),
+        lintText: eslint.lintText.bind(eslint),
+    };
+};
+
+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,
+        });
+    
+    return getOldESLint({
+        name,
+        config,
+        ESLintOverride,
+        overrideConfigFile,
+        fix,
+    });
+}
+
+function getOldESLint({fix, config, overrideConfigFile, ESLintOverride = ESLint}) {
     const eslint = new ESLintOverride({
         fix,
         overrideConfig: {
@@ -15,9 +56,23 @@ export const getESLint = ({fix, config, overrideConfigFile, ESLintOverride = ESL
         },
     });
     
-    return {
-        calculateConfigForFile: eslint.calculateConfigForFile.bind(eslint),
-        lintText: eslint.lintText.bind(eslint),
-    };
-};
+    return eslint;
+}
+
+function getFlatESLint({fix, config, overrideConfigFile, ESLintOverride = FlatESLint}) {
+    const eslint = new ESLintOverride({
+        fix,
+        overrideConfig: {
+            ignores: [
+                '!.*',
+            ],
+            ...config,
+        },
+        ...overrideConfigFile && {
+            overrideConfigFile,
+        },
+    });
+    
+    return eslint;
+}
 

package/lib/lint/index.js

@@ -3,31 +3,42 @@
 const {Linter} = require('eslint');
 const {convertToPlace} = require('../eslint.js');
 
-module.exports.lint = (source, {fix = true, plugins}) => {
-    const [name, plugin] = plugins[0];
+module.exports.lint = (source, {fix = true, plugins, filename, options = []}) => {
     const linter = new Linter({
         configType: 'flat',
     });
     
-    const options = {
-        rules: {
-            [`${name}/plugin`]: 'error',
-        },
-        plugins: {
-            [name]: {
-                rules: {
-                    plugin,
+    const allOptions = [];
+    
+    if (plugins) {
+        const [name, plugin] = plugins[0];
+        allOptions.push({
+            rules: {
+                [`${name}/plugin`]: 'error',
+            },
+            plugins: {
+                [name]: {
+                    rules: {
+                        plugin,
+                    },
                 },
             },
-        },
-    };
+        });
+    }
+    
+    allOptions.push(...options);
+    
+    const mainOptions = {};
+    
+    if (filename)
+        mainOptions.filename = filename;
     
     if (!fix) {
-        const places = linter.verify(source, options).map(convertToPlace);
+        const places = linter.verify(source, allOptions, mainOptions).map(convertToPlace);
         return [source, places];
     }
     
-    const {output, messages} = linter.verifyAndFix(source, options);
+    const {output, messages} = linter.verifyAndFix(source, allOptions, mainOptions);
     
     return [output, messages.map(convertToPlace)];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/eslint",
-  "version": "1.2.0",
+  "version": "1.5.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",
@@ -30,6 +30,7 @@
     "report": "madrun report"
   },
   "dependencies": {
+    "find-up": "^6.3.0",
     "try-to-catch": "^3.0.1"
   },
   "keywords": [