@zohodesk/codestandard-validator 0.0.2-exp-10 → 0.0.2-exp-12

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

@@ -28,6 +28,9 @@ const {
   getConfigurationPrecommit,
   getSupportedLanguage
 } = require('../../utils/General/getGeneralInfo');
+const {
+  getRootDirectory
+} = require('../../utils/General/RootDirectoryUtils/getRootDirectory');
 const {
   impactBasedPrecommit,
   shouldWarningsAbortCommit
@@ -62,7 +65,7 @@ async function getStagedFiles() {
       if (error) {
         if (error != null) reject("Couldn't fetch staged files");
       } else if (stderr) {
-        resolve(stderr.trim().split('\n'));
+        resolve(filterDeltedFileFromStagedFiles(stderr.trim().split('\n')));
       } else if (stdout.trim() === '') {
         resolve(stdout.trim());
       }
@@ -70,6 +73,21 @@ async function getStagedFiles() {
   });
 }
 
+/**
+ * @function {filterDeltedFileFromStagedFiles} - filter deleted staged files
+ * @param {Array<string>} files - staged files
+ * @returns 
+ */
+function filterDeltedFileFromStagedFiles(files) {
+  return files.filter(file => {
+    const absolutePath = path.resolve(getRootDirectory(), file);
+    if (fs.existsSync(absolutePath)) {
+      return true;
+    }
+    return false;
+  });
+}
+
 /**
  * @function findEslintErrors - method  Lint given file based on given configuration
  * @param {*} file - path of file to lint
@@ -275,17 +293,9 @@ async function preCommitHook() {
         Logger.log(Logger.INFO_TYPE, 'Error executing pre commit hook');
       }
       if (shouldAbortCommit) {
-        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`);
-          process.exit(1);
-        } else if (!hasEslintErrorsInFiles && !hasEslintErrorsInChangedLines && areFilesStaged) {
-          Logger.log(Logger.SUCCESS_TYPE, `Commit Successful`);
-          process.exit(0);
-        }
-      } else if (!shouldAbortCommit && areFilesStaged) {
+        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 {
         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/build/utils/CloneCommonLinterRepo/cloneViaCdt.js

@@ -16,13 +16,16 @@ const {
 const {
   executeSynchronizedCommands
 } = require('../General/executeSyncCommands');
-const {
+var {
   type,
   endPoint,
   branch,
   cacheDirectory,
   commonLinterRepoName
 } = require('../../../jsonUtils/commonLinterRepoDetails');
+const {
+  cliArgsToObject
+} = require("../General/getGeneralInfo");
 /**
  * @function cloneViaCdt - Using the "clint development tool" clones the common linter_configuration repo into precommit library
  * @returns {boolean} - indicating the success or failure of the cloning process
@@ -30,7 +33,14 @@ const {
 
 function cloneViaCdt() {
   removeFolder(getDeleteDirPath());
-  const commandToCloneCommonConfigRepo = `npx cdt clone --clone:type=${type} --clone:url=${endPoint} --clone:branch=${branch} --clone:cacheDir=${cacheDirectory} --clone:proj:name=${commonLinterRepoName}`;
+  const cliArgs = cliArgsToObject(process.argv);
+  const userName = cliArgs.lintUsername || undefined;
+  const token = cliArgs.lintToken || undefined;
+  var absoluteEndPoint = `https://${endPoint}`;
+  if (userName && token) {
+    absoluteEndPoint = `https://${userName}:${token}@${endPoint}`;
+  }
+  var commandToCloneCommonConfigRepo = `npx cdt clone --clone:type=${type} --clone:url=${absoluteEndPoint} --clone:branch=${branch} --clone:cacheDir=${cacheDirectory} --clone:proj:name=${commonLinterRepoName}`;
   let isCommonConfigurationClonedSuccessfully = executeSynchronizedCommands(execSync, [commandToCloneCommonConfigRepo, {
     cwd: getClonedDirPath()
   }], `Lint Configuration Cloned Successfully - ${getRepoName() || 'common'}`, 'Could not clone the linters common repo', false, true);

package/build/utils/General/getGeneralInfo.js

@@ -58,9 +58,33 @@ function getSupportedLanguage() {
   _language.push('.tsx');
   return _language;
 }
+
+/**
+ * @function cliArgsToObject -  convert cli argument to object
+ * @param {Array<string>} cliArgs - cli argument from enduser
+ * @param {any} isKeyNeedToBeAdded - option
+ * @returns {Object}
+ */
+function cliArgsToObject(cliArgs, isKeyNeedToBeAdded = null) {
+  const processEnv = {};
+  cliArgs.forEach(option => {
+    if (/^--./.test(option)) {
+      const equIndex = option.indexOf('=');
+      let key = option.slice(2, equIndex);
+      let value = option.slice(equIndex + 1);
+      if (equIndex === -1) {
+        key = option.slice(2);
+        value = true;
+      }
+      processEnv[key] = value;
+    }
+  });
+  return processEnv;
+}
 module.exports = {
   getSupportedLanguage,
   getTimeStampInfo,
   getEnv,
-  getConfigurationPrecommit
+  getConfigurationPrecommit,
+  cliArgsToObject
 };

package/jsonUtils/commonLinterRepoDetails.js

@@ -9,9 +9,9 @@
  */
 
 module.exports =  {
-  endPoint: "https://zgit.csez.zohocorpin.com/code_standard/client_linter/linter_configuration.git",
+  endPoint: "zgit.csez.zohocorpin.com/code_standard/client_linter/linter_configuration.git",
   branch: "master",
   cacheDirectory: "./",
   commonLinterRepoName: "configuration",
-  type: "git"
+  type: "git",
 };

package/package.json

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