@putout/eslint 2.0.1 → 2.2.0

package/lib/create-plugin/index.js

@@ -1,10 +1,13 @@
 'use strict';
 
 const prepare = (plugin, context, options) => (node) => {
-    const {filter, report} = plugin;
+    const {
+        filter,
+        report,
+    } = plugin;
     
-    const source = context.getSourceCode();
-    const filename = context.getFilename();
+    const source = context.sourceCode;
+    const {filename} = context;
     const getText = source.getText.bind(source);
     const getCommentsBefore = source.getCommentsBefore.bind(source);
     const getCommentsAfter = source.getCommentsAfter.bind(source);
@@ -31,7 +34,7 @@ const prepare = (plugin, context, options) => (node) => {
         getSpacesBeforeNode,
         getSpacesAfterNode,
         filename,
-    });
+    }, options);
     
     if (!result)
         return;
@@ -71,7 +74,10 @@ module.exports.createPlugin = (plugin) => {
         create(context) {
             const {options} = context;
             const prepared = prepare(plugin, context, options);
-            const names = plugin.include({options});
+            
+            const names = plugin.include({
+                options,
+            });
             
             return getTraversers(names, prepared);
         },
@@ -112,11 +118,11 @@ const createGetSpacesBeforeNode = ({getText}) => (node, text = getText(node)) =>
         return '';
     
     while (!spaces || /^[ \n]+$/.test(spaces))
-        spaces = getText(node, ++i)
-            .replace(text, '');
+        spaces = getText(node, ++i).replace(text, '');
     
     return spaces.slice(1);
 };
+
 module.exports.createGetSpacesBeforeNode = createGetSpacesBeforeNode;
 
 const createGetSpacesAfterNode = ({getText}) => (node, text = getText(node)) => {
@@ -129,8 +135,7 @@ const createGetSpacesAfterNode = ({getText}) => (node, text = getText(node)) =>
     let i = 0;
     
     while (!spaces || reg.test(spaces))
-        spaces = getText(node, 0, ++i)
-            .replace(text, '');
+        spaces = getText(node, 0, ++i).replace(text, '');
     
     return spaces.slice(0, -1);
 };
@@ -149,4 +154,3 @@ function isLastNodeInBody(node) {
     
     return false;
 }
-

package/lib/eslint.js

@@ -43,6 +43,7 @@ module.exports = async ({name, code, fix, config, putout = false}) => {
         return noChanges;
     
     const {getESLint} = ESLint;
+    
     const [eslintError, eslint] = await tryToCatch(getESLint, {
         name,
         fix,
@@ -50,11 +51,13 @@ module.exports = async ({name, code, fix, config, putout = false}) => {
         overrideConfigFile,
     });
     
-    if (eslintError)
-        return [
-            code,
-            [convertToPlace(cutNewLine(eslintError))],
+    if (eslintError) {
+        const places = [
+            convertToPlace(cutNewLine(eslintError)),
         ];
+        
+        return [code, places];
+    }
     
     const [configError, finalConfig] = await tryToCatch(eslint.calculateConfigForFile, name);
     
@@ -62,16 +65,17 @@ module.exports = async ({name, code, fix, config, putout = false}) => {
         return noChanges;
     
     if (configError) {
-        return [
-            code,
-            [convertToPlace(parseError(configError))],
+        const places = [
+            convertToPlace(parseError(configError)),
         ];
+        
+        return [code, places];
     }
     
     !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,
     });
@@ -81,7 +85,9 @@ module.exports = async ({name, code, fix, config, putout = false}) => {
     
     const [report] = results;
     const {output} = report;
-    const places = report.messages
+    
+    const places = report
+        .messages
         .map(convertToPlace)
         .filter(Boolean);
     
@@ -141,4 +147,3 @@ function parseError(e) {
         message: `Plugin missing: ${messageData.pluginName}`,
     };
 }
-

package/lib/get-eslint.mjs

@@ -75,4 +75,3 @@ function getFlatESLint({fix, config, overrideConfigFile, ESLintOverride = FlatES
     
     return eslint;
 }
-

package/lib/lint/index.js

@@ -12,6 +12,7 @@ module.exports.lint = (source, {fix = true, plugins, filename, options = []}) =>
     
     if (plugins) {
         const [name, plugin] = plugins[0];
+        
         allOptions.push({
             rules: {
                 [`${name}/plugin`]: 'error',
@@ -34,12 +35,17 @@ module.exports.lint = (source, {fix = true, plugins, filename, options = []}) =>
         mainOptions.filename = filename;
     
     if (!fix) {
-        const places = linter.verify(source, allOptions, mainOptions).map(convertToPlace);
+        const places = linter
+            .verify(source, allOptions, mainOptions)
+            .map(convertToPlace);
+        
         return [source, places];
     }
     
-    const {output, messages} = linter.verifyAndFix(source, allOptions, mainOptions);
+    const {
+        output,
+        messages,
+    } = linter.verifyAndFix(source, allOptions, mainOptions);
     
     return [output, messages.map(convertToPlace)];
 };
-

package/lib/simple-import.js

@@ -4,4 +4,3 @@ module.exports.simpleImport = async (url) => {
     const result = await import(url);
     return result.default || result;
 };
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/eslint",
-  "version": "2.0.1",
+  "version": "2.2.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",
@@ -37,9 +37,10 @@
     "eslint"
   ],
   "devDependencies": {
+    "@putout/plugin-eslint-plugin": "*",
     "c8": "^7.5.0",
     "eslint": "^8.0.1",
-    "eslint-plugin-n": "^15.2.4",
+    "eslint-plugin-n": "^16.0.0",
     "eslint-plugin-putout": "^17.0.0",
     "just-camel-case": "^4.0.2",
     "lerna": "^6.0.1",