@parcel/validator-eslint 2.0.0-nightly.151 → 2.0.0-nightly.1514

package/lib/EslintValidator.js

@@ -4,66 +4,97 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
-var _plugin = require("@parcel/plugin");
-
+function _plugin() {
+  const data = require("@parcel/plugin");
+  _plugin = function () {
+    return data;
+  };
+  return data;
+}
+function _diagnostic() {
+  const data = require("@parcel/diagnostic");
+  _diagnostic = function () {
+    return data;
+  };
+  return data;
+}
+function _eslint() {
+  const data = _interopRequireDefault(require("eslint"));
+  _eslint = function () {
+    return data;
+  };
+  return data;
+}
+function _assert() {
+  const data = _interopRequireDefault(require("assert"));
+  _assert = function () {
+    return data;
+  };
+  return data;
+}
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// For eslint <8.0.0
 let cliEngine = null;
-
-var _default = new _plugin.Validator({
+// For eslint >=8.0.0
+let eslintEngine = null;
+var _default = exports.default = new (_plugin().Validator)({
   async validate({
-    asset,
-    options
+    asset
   }) {
-    let eslint = await options.packageManager.require('eslint', asset.filePath);
-
-    if (!cliEngine) {
-      cliEngine = new eslint.CLIEngine({});
+    if (!cliEngine && !eslintEngine) {
+      if (_eslint().default.ESLint) {
+        eslintEngine = new (_eslint().default.ESLint)({});
+      } else {
+        cliEngine = new (_eslint().default.CLIEngine)({});
+      }
     }
-
     let code = await asset.getCode();
-    let report = cliEngine.executeOnText(code, asset.filePath);
+    let results;
+    if (cliEngine != null) {
+      results = cliEngine.executeOnText(code, asset.filePath).results;
+    } else if (eslintEngine != null) {
+      results = await eslintEngine.lintText(code, {
+        filePath: asset.filePath
+      });
+    } else {
+      (0, _assert().default)(false);
+    }
     let validatorResult = {
       warnings: [],
       errors: []
     };
-
-    if (report.results.length > 0) {
-      for (let result of report.results) {
-        if (!result.errorCount && !result.warningCount) continue;
-        let codeframe = {
-          code: result.source,
-          codeHighlights: result.messages.map(message => {
-            return {
-              start: {
-                line: message.line,
-                column: message.column
-              },
-              end: {
-                line: message.endLine,
-                column: message.endColumn
-              },
-              message: message.message
-            };
-          })
-        };
-        let diagnostic = {
-          origin: '@parcel/validator-eslint',
-          message: `ESLint found **${result.errorCount}** __errors__ and **${result.warningCount}** __warnings__.`,
-          filePath: asset.filePath,
-          codeFrame: codeframe
-        };
-
-        if (result.errorCount > 0) {
-          validatorResult.errors.push(diagnostic);
-        } else {
-          validatorResult.warnings.push(diagnostic);
-        }
+    for (let result of results) {
+      if (!result.errorCount && !result.warningCount) continue;
+      let codeframe = {
+        filePath: asset.filePath,
+        code: result.source,
+        codeHighlights: result.messages.map(message => {
+          let start = {
+            line: message.line,
+            column: message.column
+          };
+          return {
+            start,
+            // Parse errors have no ending
+            end: message.endLine != null ? {
+              line: message.endLine,
+              column: message.endColumn - 1
+            } : start,
+            message: (0, _diagnostic().escapeMarkdown)(message.message)
+          };
+        })
+      };
+      let diagnostic = {
+        origin: '@parcel/validator-eslint',
+        message: `ESLint found **${result.errorCount}** __errors__ and **${result.warningCount}** __warnings__.`,
+        codeFrames: [codeframe]
+      };
+      if (result.errorCount > 0) {
+        validatorResult.errors.push(diagnostic);
+      } else {
+        validatorResult.warnings.push(diagnostic);
       }
     }
-
     return validatorResult;
   }
-
-});
-
-exports.default = _default;
+});

package/package.json

@@ -1,10 +1,14 @@
 {
   "name": "@parcel/validator-eslint",
-  "version": "2.0.0-nightly.151+1af603e1",
+  "version": "2.0.0-nightly.1514+61a89cf80",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
+  "funding": {
+    "type": "opencollective",
+    "url": "https://opencollective.com/parcel"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/parcel-bundler/parcel.git"
@@ -12,13 +16,19 @@
   "main": "lib/EslintValidator.js",
   "source": "src/EslintValidator.js",
   "engines": {
-    "node": ">= 10.0.0",
-    "parcel": "^2.0.0-alpha.1.1"
+    "node": ">= 12.0.0",
+    "parcel": "2.0.0-nightly.1512+61a89cf80"
   },
   "dependencies": {
-    "@parcel/plugin": "2.0.0-nightly.151+1af603e1",
-    "@parcel/utils": "2.0.0-nightly.151+1af603e1",
-    "chalk": "^2.4.2"
+    "@parcel/plugin": "2.0.0-nightly.1514+61a89cf80",
+    "@parcel/utils": "2.0.0-nightly.1514+61a89cf80",
+    "chalk": "^4.1.0"
+  },
+  "devDependencies": {
+    "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+  },
+  "peerDependencies": {
+    "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
   },
-  "gitHead": "1af603e1cfab014585ded8aec4d3dcdb7e685987"
+  "gitHead": "61a89cf8004a831a6c946fba44b51dab84f7639d"
 }

package/src/EslintValidator.js

@@ -1,59 +1,78 @@
 // @flow
 import {Validator} from '@parcel/plugin';
-import type {DiagnosticCodeFrame} from '@parcel/diagnostic';
+import {type DiagnosticCodeFrame, escapeMarkdown} from '@parcel/diagnostic';
+import eslint from 'eslint';
+import invariant from 'assert';
 
+// For eslint <8.0.0
 let cliEngine = null;
+// For eslint >=8.0.0
+let eslintEngine = null;
 
-export default new Validator({
-  async validate({asset, options}) {
-    let eslint = await options.packageManager.require('eslint', asset.filePath);
-    if (!cliEngine) {
-      cliEngine = new eslint.CLIEngine({});
+export default (new Validator({
+  async validate({asset}) {
+    if (!cliEngine && !eslintEngine) {
+      if (eslint.ESLint) {
+        eslintEngine = new eslint.ESLint({});
+      } else {
+        cliEngine = new eslint.CLIEngine({});
+      }
     }
     let code = await asset.getCode();
-    let report = cliEngine.executeOnText(code, asset.filePath);
+
+    let results;
+    if (cliEngine != null) {
+      results = cliEngine.executeOnText(code, asset.filePath).results;
+    } else if (eslintEngine != null) {
+      results = await eslintEngine.lintText(code, {filePath: asset.filePath});
+    } else {
+      invariant(false);
+    }
 
     let validatorResult = {
       warnings: [],
       errors: [],
     };
 
-    if (report.results.length > 0) {
-      for (let result of report.results) {
-        if (!result.errorCount && !result.warningCount) continue;
-
-        let codeframe: DiagnosticCodeFrame = {
-          code: result.source,
-          codeHighlights: result.messages.map(message => {
-            return {
-              start: {
-                line: message.line,
-                column: message.column,
-              },
-              end: {
-                line: message.endLine,
-                column: message.endColumn,
-              },
-              message: message.message,
-            };
-          }),
-        };
-
-        let diagnostic = {
-          origin: '@parcel/validator-eslint',
-          message: `ESLint found **${result.errorCount}** __errors__ and **${result.warningCount}** __warnings__.`,
-          filePath: asset.filePath,
-          codeFrame: codeframe,
-        };
-
-        if (result.errorCount > 0) {
-          validatorResult.errors.push(diagnostic);
-        } else {
-          validatorResult.warnings.push(diagnostic);
-        }
+    for (let result of results) {
+      if (!result.errorCount && !result.warningCount) continue;
+
+      let codeframe: DiagnosticCodeFrame = {
+        filePath: asset.filePath,
+        code: result.source,
+        codeHighlights: result.messages.map(message => {
+          let start = {
+            line: message.line,
+            column: message.column,
+          };
+          return {
+            start,
+            // Parse errors have no ending
+            end:
+              message.endLine != null
+                ? {
+                    line: message.endLine,
+                    column: message.endColumn - 1,
+                  }
+                : start,
+            message: escapeMarkdown(message.message),
+          };
+        }),
+      };
+
+      let diagnostic = {
+        origin: '@parcel/validator-eslint',
+        message: `ESLint found **${result.errorCount}** __errors__ and **${result.warningCount}** __warnings__.`,
+        codeFrames: [codeframe],
+      };
+
+      if (result.errorCount > 0) {
+        validatorResult.errors.push(diagnostic);
+      } else {
+        validatorResult.warnings.push(diagnostic);
       }
     }
 
     return validatorResult;
   },
-});
+}): Validator);

package/.babelrc

@@ -1,4 +0,0 @@
-
-{
-  "presets": ["@parcel/babel-preset"]
-}