@zohodesk/codestandard-validator 0.0.2-exp-9 → 0.0.2-exp-11

package/build/hooks/Precommit/pre-commit.js

@@ -135,15 +135,14 @@ function areAllPluginsInstalled() {
  * @function {isOnlyWarningsPresentInFile} - method that checks if only eslint warnings are present in a file
  * @returns {Boolean} - returns boolean based on only warnings present or not in file
  */
-function isOnlyWarningsPresentInFile(eslintErrorsPresentInFile) {
+function isOnlyWarningsPresentInFile(eslintErrorsPresent) {
   let severityOfEachErrorInFile = [];
-  let startIndex = 1;
-  let endIndex = eslintErrorsPresentInFile.length - 2;
-  eslintErrorsPresentInFile.slice(startIndex, endIndex).map(error => {
+  eslintErrorsPresent.map(error => {
     let partsInString = error.split(" ");
-    severityOfEachErrorInFile.push(partsInString[1]);
+    let severityOfError = partsInString.find(word => word === 'error' || word === 'warning');
+    severityOfEachErrorInFile.push(severityOfError);
   });
-  return severityOfEachErrorInFile.includes('error');
+  return !severityOfEachErrorInFile.includes('error');
 }
 
 /**
@@ -167,6 +166,7 @@ async function preCommitHook() {
       let hasEslintErrorsInChangedLines = false;
       let hasEslintErrorsInFiles = false;
       let areFilesStaged = false;
+      let shouldAbortCommit = false;
       try {
         current_branch = await getBranchName();
       } catch {
@@ -192,7 +192,6 @@ async function preCommitHook() {
               try {
                 var eslintErrorsInFile = await findEslintErrors(staged_files[file]);
                 // eslintErrorsInFile = impactBasedPrecommit == false ? filterWarningInFile(eslintErrorsInFile) : eslintErrorsInFile
-                isOnlyEslintWarningsPresentInFile = isOnlyWarningsPresentInFile(eslintErrorsInFile);
                 if (staged_files[file] && typeof staged_files[file] == 'string') {
                   if (!eslintErrorsInFile.length == 0) {
                     //Calculating changed lines in a file and storing them in respective arrays
@@ -225,26 +224,39 @@ async function preCommitHook() {
                         }
                       }
                       if (eslintErrorsInChangedLines.length > 0) {
+                        isOnlyEslintWarningsPresentInFile = isOnlyWarningsPresentInFile(eslintErrorsInChangedLines);
                         Logger.log(Logger.FAILURE_TYPE, `\x1b[1m${currentFileName}\x1b[0m`);
                         for (let eslintError of eslintErrorsInChangedLines) {
                           Logger.log(Logger.FAILURE_TYPE, `\x1b[37m${eslintError.trimEnd()}\x1b[0m`);
                         }
                         if (shouldWarningsAbortCommit) {
                           hasEslintErrorsInChangedLines = true;
+                          shouldAbortCommit = true;
                         } else if (!shouldWarningsAbortCommit && isOnlyEslintWarningsPresentInFile) {
                           hasEslintErrorsInChangedLines = false;
+                        } else if (!shouldWarningsAbortCommit && !isOnlyEslintWarningsPresentInFile) {
+                          hasEslintErrorsInChangedLines = true;
+                          shouldAbortCommit = true;
                         }
                       }
                     } else {
                       if (eslintErrorsInFile.length > 0) {
+                        let startIndex = 1;
+                        let endIndex = eslintErrorsInFile.length - 2;
+                        let listOsEslintErrors = eslintErrorsInFile.slice(startIndex, endIndex);
+                        isOnlyEslintWarningsPresentInFile = isOnlyWarningsPresentInFile(listOsEslintErrors);
                         Logger.log(Logger.FAILURE_TYPE, `\x1b[1m${currentFileName}\x1b[0m`);
-                        for (let eslintError of eslintErrorsInFile) {
+                        for (let eslintError of listOsEslintErrors) {
                           Logger.log(Logger.FAILURE_TYPE, `\x1b[37m${eslintError.trimEnd()}\x1b[0m`);
                         }
                         if (shouldWarningsAbortCommit) {
                           hasEslintErrorsInFiles = true;
+                          shouldAbortCommit = true;
                         } else if (!shouldWarningsAbortCommit && isOnlyEslintWarningsPresentInFile) {
                           hasEslintErrorsInFiles = false;
+                        } else if (!shouldWarningsAbortCommit && !isOnlyEslintWarningsPresentInFile) {
+                          hasEslintErrorsInFiles = true;
+                          shouldAbortCommit = true;
                         }
                       }
                     }
@@ -262,13 +274,10 @@ async function preCommitHook() {
       } catch {
         Logger.log(Logger.INFO_TYPE, 'Error executing pre commit hook');
       }
-      if (hasEslintErrorsInChangedLines && areFilesStaged) {
-        Logger.log(Logger.FAILURE_TYPE, `There are eslint errors present. So commit is aborted`);
-        process.exit(1);
-      } else if (hasEslintErrorsInFiles && areFilesStaged) {
-        Logger.log(Logger.FAILURE_TYPE, `There are eslint errors present. So commit is aborted`);
+      if (shouldAbortCommit) {
+        Logger.log(Logger.FAILURE_TYPE, `There are eslint errors present. So commit is aborted. If possible try to fix the eslint warnings also.`);
         process.exit(1);
-      } else if (!hasEslintErrorsInFiles && !hasEslintErrorsInChangedLines && areFilesStaged) {
+      } else {
         Logger.log(Logger.SUCCESS_TYPE, `Commit Successful`);
         process.exit(0);
       }

package/build/setup/sample.config.js

@@ -14,6 +14,7 @@ const path = require("path");
  * @property {string} tsConfigurationPath - The path of the ts configuration Path
  * @property {number} projectId - project id of repository
  * @property {boolean} impactBasedPrecommit - Indicates if the linting is impact-based in pre commit
+ * @property {boolean} shouldWarningsAbortCommit - Indicates if eslint warnings should abort the commit
  * @property {string} token - Encrypted Authentication Token
  * @property {string} compareBranch - Branch to compare diff
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/codestandard-validator",
-  "version": "0.0.2-exp-9",
+  "version": "0.0.2-exp-11",
   "description": "library to enforce code standard using eslint",
   "main": "index.js",
   "scripts": {