@zohodesk/codestandard-validator 1.0.0-exp-8 → 1.0.0-exp-10

package/build/hooks/Precommit/commit.js

@@ -16,10 +16,6 @@ const {
 const {
   runLintWorkflow
 } = require("./lint");
-process.env.SONARQUBE_EXTERNAL = 7; // sonarqube_external
-process.env.SONARQUBE = 12;
-process.env.ZGIT_TOKEN = 12; // sonarqube & zgit
-
 global.analytics = {
   status: "SUCCESS",
   sonarQubeStatus: false,

package/build/hooks/Precommit/errorhelpers.js

@@ -10,6 +10,9 @@ const path = require("path");
 const {
   getNodeModulesPath
 } = require("../../utils/General/getNodeModulesPath");
+const {
+  getRootDirectory
+} = require("../../utils/General/RootDirectoryUtils/getRootDirectory");
 function getAbsolutePath(p1, p2) {
   if (path.isAbsolute(p2)) {
     return path.normalize(p2);
@@ -18,7 +21,7 @@ function getAbsolutePath(p1, p2) {
 }
 async function calculateGitDiffForFile(branch, file) {
   try {
-    const stdout = execSync(`git diff -U0 ${branch.trim()} -- ${getAbsolutePath(getNodeModulesPath(), file)}`).toString();
+    const stdout = execSync(`git diff -U0 ${branch.trim()} -- ${getAbsolutePath(getNodeModulesPath(), path.resolve(getRootDirectory(), file))}`).toString();
     return stdout;
   } catch (err) {
     throw err;

package/build/hooks/Precommit/lint.js

@@ -48,7 +48,6 @@ async function findEslintErrors(file) {
   const nodeModulesPath = getNodeModulesPath();
   const eslintPath = getEslintExecutablePath();
   const eslintConfig = `${nodeModulesPath}/.eslintrc.js`;
-  var rulesArrayReport = [];
   if (!fs.existsSync(nodeModulesPath)) {
     Logger.log(Logger.INFO_TYPE, 'node_modules not found');
     return [];
@@ -57,7 +56,7 @@ async function findEslintErrors(file) {
     Logger.log(Logger.INFO_TYPE, 'Eslint executable not found. Make sure eslint plugin is installed');
     return [];
   }
-  return execSync(`npx --ignore-existing "${eslintPath}" --config "${eslintConfig}" --no-inline-config --resolve-plugins-relative-to="${nodeModulesPath}/node_modules" ${file}`).then(({
+  return execSync(`npx --ignore-existing "${eslintPath}" --config "${eslintConfig}" --no-inline-config --resolve-plugins-relative-to="${nodeModulesPath}/node_modules" ${path.resolve(getRootDirectory(), file)}`).then(({
     stderr
   }) => stderr ? stderr.toString().trim().split('\n') : []).catch(err => {
     Logger.log(Logger.FAILURE_TYPE, err);

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

@@ -30,6 +30,7 @@ const {
 const {
   getRootDirectory
 } = require('../../utils/General/RootDirectoryUtils/getRootDirectory');
+const MandatoryListRules = require('../../../jsonUtils/MandatoryListRules');
 const {
   impactBasedPrecommit,
   shouldWarningsAbortCommit
@@ -123,7 +124,7 @@ function findEslintErrors(file) {
   if (isNodeModulesPresent) {
     if (isEslintExecutablePresent) {
       return new Promise((resolve, reject) => {
-        exec(`npx --ignore-existing "${eslintExecutablePath}" --config "${eslintConfigurationFilePath}" --no-inline-config --resolve-plugins-relative-to="${nodeModulesPathOfProject}/node_modules" ${file}`, (error, stderr, stdout) => {
+        exec(`npx --ignore-existing "${eslintExecutablePath}" --config "${eslintConfigurationFilePath}" --no-inline-config --resolve-plugins-relative-to="${nodeModulesPathOfProject}/node_modules" ${path.resolve(getRootDirectory(), file)}`, (error, stderr, stdout) => {
           if (stderr) {
             resolve(stderr.trim().split('\n'));
           } else if (error) {
@@ -156,11 +157,7 @@ function findStyleLintErrors(filePath) {
       }, (error, stderr, stdout) => {
         if (stdout) {
           resolve(stdout.trim().split('\n'));
-        }
-        // if(stderr){
-        //     resolve(stderr.trim().split('\n'))
-        // }
-        else if (error) {
+        } else if (error) {
           Logger.log(Logger.FAILURE_TYPE, error);
           reject("Error executing stylelint command");
         } else {
@@ -181,7 +178,7 @@ function findStyleLintErrors(filePath) {
  * @returns {Promise<Array<string>>} - array of command line report as a string 
  */
 async function calculateGitDiffForFile(branch_name, file) {
-  let gitDiffCommand = `git diff -U0 ${branch_name.trim()} ${file}`;
+  let gitDiffCommand = `git diff -U0 ${branch_name.trim()} ${path.resolve(getRootDirectory(), file)}`;
   return new Promise((resolve, reject) => {
     exec(gitDiffCommand, (error, stderr) => {
       if (stderr) {
@@ -263,7 +260,7 @@ async function preCommitHook_default() {
           for (let file in stagedFiles) {
             let currentFileName = stagedFiles[file];
             let changedLinesArray = [];
-            let eslintErrorsInChangedLines = [];
+            let eslintErrorsInChangedLines = new Set();
             let isOnlyEslintWarningsPresentInFile = false;
             if (getSupportedLanguage().includes(path.extname(stagedFiles[file]))) {
               try {
@@ -294,16 +291,19 @@ async function preCommitHook_default() {
                         //errorsInFile[error].trim().split(' ')[0].split(':')[0] => 69
 
                         let eslintErrorLineNumber = errorsInFile[error].trim().split(' ')[0].split(':')[0];
+                        if (MandatoryListRules.some(ruleId => errorsInFile[error].trim().includes(ruleId))) {
+                          eslintErrorsInChangedLines.add(errorsInFile[error]);
+                        }
                         for (let lineNumber in changedLinesStartArray) {
                           if (eslintErrorLineNumber >= changedLinesStartArray[lineNumber] && eslintErrorLineNumber <= changedLinesEndArray[lineNumber]) {
-                            eslintErrorsInChangedLines.push(errorsInFile[error]);
+                            eslintErrorsInChangedLines.add(errorsInFile[error]);
                           }
                         }
                       }
-                      if (eslintErrorsInChangedLines.length > 0) {
-                        isOnlyEslintWarningsPresentInFile = isOnlyWarningsPresentInFile(eslintErrorsInChangedLines);
+                      if (eslintErrorsInChangedLines.size > 0) {
+                        isOnlyEslintWarningsPresentInFile = isOnlyWarningsPresentInFile(Array.from(eslintErrorsInChangedLines));
                         Logger.log(Logger.FAILURE_TYPE, `\x1b[1m${currentFileName}\x1b[0m`);
-                        for (let eslintError of eslintErrorsInChangedLines) {
+                        for (let eslintError of Array.from(eslintErrorsInChangedLines)) {
                           Logger.log(Logger.FAILURE_TYPE, `\x1b[37m${eslintError.trimEnd()}\x1b[0m`);
                         }
                         if (shouldWarningsAbortCommit) {

package/build/hooks/Precommit/utils.js

@@ -9,6 +9,8 @@ const {
 const {
   checkIfPluginsAreInstalled
 } = require("../../utils/PluginsInstallation/checkIfPluginsAreInstalled");
+const fs = require("fs");
+const path = require("path");
 async function isMergeCommit() {
   try {
     const stdout = await execSync("git rev-parse -q --verify MERGE_HEAD").toString();

package/build/hooks/hook.js

@@ -21,6 +21,10 @@ const path = require('path');
 const {
   Logger
 } = require('../utils/Logger/Logger');
+const config = require(path.join(process.cwd(), 'lint.config.js'));
+process.env.SONARQUBE_EXTERNAL = config.metric_token;
+process.env.SONARQUBE = config.meticHandler_api_token;
+process.env.ZGIT_TOKEN = config.token;
 async function hooks() {
   var jsonFilePath = path.join(__dirname, '..', '..', 'jsonUtils', 'fsUtils.json');
   if (!(getLastCommitHash() == getStoredCommitHash())) {

package/build/lib/cli.js

@@ -18,13 +18,7 @@ const {
 const {
   getPluginsToInstall
 } = require("../utils/PluginsInstallation/checkIfPluginsAreInstalled");
-const path = require("path");
 const [,, action, ...options] = process.argv;
-const config = require(path.resolve(process.cwd(), 'lint.config.js'))(function () {
-  process.env.SONARQUBE_EXTERNAL = config.metric_token;
-  process.env.SONARQUBE = config.meticHandler_api_token;
-  process.env.ZGIT_TOKEN = config.token;
-})();
 async function run() {
   switch (action) {
     case "setup":

package/build/lib/postinstall.js

@@ -36,7 +36,7 @@ async function postInstall() {
     await executeMethodsThatReturnBooleanValue("Make sure zgit.csez.zohocorpin.com is accessible", cloneViaCdt, null);
     await executeMethodsThatReturnBooleanValue("Some issue occurred in creating eslint config file.", createConfigFile, null);
     Logger.log(Logger.SUCCESS_TYPE, "Pre commit setup successfull");
-    arePluginsInstalled();
+    // arePluginsInstalled();
   } catch (error) {
     Logger.log(Logger.FAILURE_TYPE, `Kindly retry npm install. & ${error.message}`);
   }

package/build/setup/sample.config.js

@@ -25,7 +25,7 @@ module.exports = {
   impactBased: true,
   lintReportPath: path.resolve(process.cwd(), "lint-report", "lintReport.json"),
   metricServerHost: "https://client-linters.zdesk.csez.zohocorpin.com",
-  meticHandler_api_token: "DBWyfB46DBWyfB4dRIN1",
+  meticHandler_api_token: "YWRtaW46YWRtaW4yMDI1",
   metric_token: "sqa_371336f636584b54f662c6495a46228fdc6abaa8",
   branchDiffPath: path.resolve(process.cwd(), "diffBranch.json"),
   gitEndPoint: "https://zgit.csez.zohocorpin.com",

package/build/utils/CloneCommonLinterRepo/cloneViaCdt.js

@@ -54,7 +54,7 @@ function cloneViaCdt() {
 
     // Construct endpoint with credentials if in CI or automation
     const isAutomatedEnv = currentEnv === "CI" || currentEnv === "DEVAUTOMATION";
-    const authenticatedEndpoint = isAutomatedEnv ? `https://${user}:${decrypt(token, 12)}@${endPoint}` : `https://${endPoint}`;
+    const authenticatedEndpoint = isAutomatedEnv ? `https://${user}:${process.env.ZGIT_TOKEN}@${endPoint}` : `https://${endPoint}`;
     const cloneCommand = ['npx cdt clone', `--clone:type=${type}`, `--clone:url=${authenticatedEndpoint}`, `--clone:branch=${branch}`, `--clone:cacheDir=${cacheDirectory}`, `--clone:proj:name=${commonLinterRepoName}`].join(' ');
 
     // Execute the CDT command

package/build/utils/General/SonarQubeUtil.js

@@ -18,9 +18,9 @@ const {
 
 function buildIssuesSearchUrl(componentKey) {
   const {
-    metricServerHost
+    metricServerHost = "https://client-linters.zdesk.csez.zohocorpin.com"
   } = (0, _getGeneralInfo.getConfigurationPrecommit)();
-  const base = `${"https://client-linters.zdesk.csez.zohocorpin.com" || metricServerHost}/api/issues/search`;
+  const base = `${metricServerHost}/api/issues/search`;
   const params = new URLSearchParams({
     componentKeys: componentKey,
     s: 'FILE_LINE',

package/build/utils/PluginsInstallation/installPlugins.js

@@ -14,7 +14,8 @@ const {
 } = require('../General/getNodeModulesPath');
 const path = require('path');
 const {
-  spawnSync
+  spawnSync,
+  spawn
 } = require('child_process');
 
 /**
@@ -24,7 +25,7 @@ const {
 async function installPlugins(pluginsToBeInstalled) {
   if (pluginsToBeInstalled.length > 0) {
     let packageJsonBeforePluginsInstallation = getPackageJsonContentBeforeInstallingPlugins();
-    Logger.log(Logger.INFO_TYPE, 'Installing plugins ....');
+    Logger.log(Logger.SUCCESS_TYPE, 'Installing rule plugins; this may take some time.');
     const args = ['install', '--save-dev', ...pluginsToBeInstalled, '--legacy-peer-deps'];
     Logger.log(Logger.INFO_TYPE, `Install command being executed: npm ${args.join(' ')}`);
     const result = spawnSync('npm', args, {
@@ -49,20 +50,6 @@ async function installPlugins(pluginsToBeInstalled) {
     }
     Logger.log(Logger.SUCCESS_TYPE, 'Plugins installation successful');
     return restorePackageJsonContent(packageJsonBeforePluginsInstallation);
-    // const installCommand = `npm install --save-dev ${pluginsToBeInstalled.join(' ')} --legacy-peer-deps`
-    // Logger.log(Logger.INFO_TYPE,`Install command being executed: ${installCommand}`)
-    // try{ 
-    //     let stdout = execSync(installCommand,{cwd:getNodeModulesPath(),shell:true}).toString()
-    //     if(stdout){
-    //         Logger.logger(stdout)
-    //     }
-    //     Logger.log(Logger.SUCCESS_TYPE,'Plugins installation successful')
-    //     return restorePackageJsonContent(packageJsonBeforePluginsInstallation)
-    // } catch(error) {
-    //     Logger.log(Logger.FAILURE_TYPE,"Unable to install plugins. Kindly retry the command")
-    //     Logger.log(Logger.FAILURE_TYPE,error)
-    //     return false
-    // }
   } else {
     Logger.log(Logger.INFO_TYPE, 'Plugins are already installed');
     return true;

package/jsonUtils/MandatoryListRules.js

@@ -0,0 +1,3 @@
+const MandatoryListRules = [ "@zohodesk/fitnessfunction/chunk-size"]
+
+module.exports = MandatoryListRules

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/codestandard-validator",
-  "version": "1.0.0-exp-8",
+  "version": "1.0.0-exp-10",
   "description": "library to enforce code standard using eslint",
   "main": "index.js",
   "scripts": {
@@ -15,7 +15,7 @@
   },
   "type": "commonjs",
   "dependencies": {
-    "@zohodesk/codestandard-analytics": "1.0.2-exp-12",
+    "@zohodesk/codestandard-analytics": "1.0.2-exp-13",
     "@zohodesk-private/client_deployment_tool": "0.0.5",
     "eslint": "8.26.0",
     "stylelint": "16.23.0"

package/hash.js

@@ -1,30 +0,0 @@
-const caesarCipher = (str, shift) => {
-    return str
-      .split("")
-      .map((char) => {
-        let code = char.charCodeAt();
-        if (code >= 65 && code <= 90) {
-          return String.fromCharCode(((code - 65 + shift) % 26) + 65);
-        } else if (code >= 97 && code <= 122) {
-          return String.fromCharCode(((code - 97 + shift) % 26) + 97);
-        }
-        return char;
-      })
-      .join("");
-  };
-  
-  const encrypt = (plaintext, shift) => caesarCipher(plaintext, shift);
-  
-  const decrypt = (ciphertext, shift) => caesarCipher(ciphertext, 26 - shift);
-  
-  
-  const encode = (data) => btoa(data)
-  
-  
-  const decode = (encode_data) => atob(encode_data)
-  
-  export { encrypt, decrypt,encode ,decode };
-  
- console.log(decrypt("KIDfmI46KIDfmI4kYPU1",7))
- console.log(decrypt("zxh_371336m636584i54m662j6495h46228mkj6hihh8",7))
- console.log(decrypt("w-OkG3f5OOM1Rkly8phZ",12))