@pi-r/eslint 0.7.1 → 0.7.3

package/index.js

@@ -1,25 +1,53 @@
 "use strict";
+const path = require("path");
+const Types = require("@e-mc/types");
 const Document = require("@e-mc/document");
 module.exports = async function transform(context, value, options) {
     context = options.upgrade(context, __dirname);
     const { pathname, filename } = options;
     const timeStamp = Date.now();
-    const report = (await new context.ESLint(options.toBaseConfig()).lintText(value))[0];
-    if (report?.messages.length) {
-        const fatal = report.messages.filter(item => item.fatal).map(item => item.message);
-        if (fatal.length) {
-            throw new Error(fatal.join('\n\n'));
+    const baseConfig = options.toBaseConfig();
+    const instance = new context.ESLint(baseConfig);
+    const result = await instance.lintText(value);
+    if (result.length) {
+        if (baseConfig.fix) {
+            await context.ESLint.outputFixes(result);
+        }
+        const report = result[0];
+        if (report) {
+            if (report.messages.length) {
+                const fatal = report.messages.filter(item => item.fatal);
+                if (fatal.length) {
+                    throw new Error(fatal.map(item => item.message).join('\n\n'));
+                }
+                const attr = Document.hasLogType(options.logType.STDOUT) ? 'logQueued' : 'logAppend';
+                if (process.env.ESLINT_FORMATTER_NAME) {
+                    const formatter = await instance.loadFormatter(process.env.ESLINT_FORMATTER_NAME);
+                    const output = await formatter.format(result);
+                    options.out[attr] = [{
+                            type: Types.STATUS_TYPE.INFO,
+                            value: output.replace('<text>', pathname && filename ? path.join(pathname, filename) : 'File location: Unknown'),
+                            timeStamp, duration: Date.now() - timeStamp,
+                            from: 'eslint', source: process.env.ESLINT_FORMATTER_NAME
+                        }];
+                }
+                else {
+                    options.out[attr] = Document.generateLintTable(report.messages.map(item => ({
+                        ruleId: item.ruleId || 'unknown',
+                        line: item.line,
+                        column: item.column,
+                        message: item.message,
+                        severity: item.severity
+                    })), { leadingText: 'eslint', pathname, filename, errorCount: report.errorCount, warningCount: report.warningCount, trailingText: 'https://eslint.org/docs/latest/rules', timeStamp });
+                }
+            }
+            else {
+                options.out.messageAppend = ` -> valid(${!report || report.errorCount || report.warningCount ? 'NO' : 'YES'})`;
+            }
+            if (baseConfig.fix && report.output) {
+                return report.output;
+            }
         }
-        options.out[Document.hasLogType(options.logType.STDOUT) ? 'logQueued' : 'logAppend'] = Document.generateLintTable(report.messages.map(item => ({
-            ruleId: item.ruleId || 'unknown',
-            line: item.line,
-            column: item.column,
-            message: item.message,
-            severity: item.severity
-        })), { leadingText: 'eslint', pathname, filename, errorCount: report.errorCount, warningCount: report.warningCount, trailingText: 'https://eslint.org/docs/rules', timeStamp });
-    }
-    else {
-        options.out.messageAppend = ` -> valid(${!report || report.errorCount || report.warningCount ? 'NO' : 'YES'})`;
     }
     return value;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/eslint",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "eslint transform function for E-mc.",
   "main": "index.js",
   "publishConfig": {
@@ -20,7 +20,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/document": "^0.9.2",
+    "@e-mc/document": "^0.9.6",
+    "@eslint/js": "^8.57.0",
     "eslint": "^8.57.0"
   }
 }