@zohodesk/codestandard-validator 1.0.0-exp-7 → 1.0.0-exp-9

package/build/hooks/Precommit/commit.js

@@ -16,8 +16,6 @@ const {
 const {
   runLintWorkflow
 } = require("./lint");
-process.env.DECRYPT_SONARQUBE = 7;
-process.env.DECRYPT_TOKEN = 12;
 global.analytics = {
   status: "SUCCESS",
   sonarQubeStatus: false,

package/build/hooks/Precommit/errorhelpers.js

@@ -6,9 +6,22 @@ const {
 const {
   execSync
 } = require('child_process');
+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);
+  }
+  return path.resolve(p1, p2);
+}
 async function calculateGitDiffForFile(branch, file) {
   try {
-    const stdout = execSync(`git diff -U0 ${branch.trim()} ${file}`);
+    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,9 +56,9 @@ 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.trim().split('\n') : []).catch(err => {
+  }) => stderr ? stderr.toString().trim().split('\n') : []).catch(err => {
     Logger.log(Logger.FAILURE_TYPE, err);
     throw new Error('Error executing eslint command');
   });
@@ -71,7 +70,7 @@ function findStyleLintErrors(filePath) {
     cwd: getNodeModulesPath()
   }).then(({
     stdout
-  }) => stdout ? stdout.trim().split('\n') : []).catch(err => {
+  }) => stdout ? stdout.toString().trim().split('\n') : []).catch(err => {
     Logger.log(Logger.FAILURE_TYPE, err);
     return [];
   });

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

@@ -123,7 +123,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 +156,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 +177,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) {

package/build/hooks/Precommit/utils.js

@@ -9,9 +9,11 @@ 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");
+    const stdout = await execSync("git rev-parse -q --verify MERGE_HEAD").toString();
     return Boolean(stdout.trim());
   } catch {
     return false;
@@ -19,7 +21,7 @@ async function isMergeCommit() {
 }
 async function getStagedFiles() {
   try {
-    const stdout = await execSync("git diff --staged --name-only");
+    const stdout = await execSync("git diff --staged --name-only").toString();
     const files = stdout.trim().split("\n").filter(Boolean);
     return files.filter(file => fs.existsSync(path.resolve(getRootDirectory(), file)));
   } catch {

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/setup/sample.config.js

@@ -25,8 +25,8 @@ module.exports = {
   impactBased: true,
   lintReportPath: path.resolve(process.cwd(), "lint-report", "lintReport.json"),
   metricServerHost: "https://client-linters.zdesk.csez.zohocorpin.com",
-  meticHandler_api_token: "KIDfmI46KIDfmI4kYPU1",
-  metric_token: "zxh_371336m636584i54m662j6495h46228mkj6hihh8",
+  meticHandler_api_token: "YWRtaW46YWRtaW4yMDI1",
+  metric_token: "sqa_371336f636584b54f662c6495a46228fdc6abaa8",
   branchDiffPath: path.resolve(process.cwd(), "diffBranch.json"),
   gitEndPoint: "https://zgit.csez.zohocorpin.com",
   tsConfigurationPath: path.resolve(process.cwd(), 'tsconfig.json'),
@@ -34,7 +34,7 @@ module.exports = {
   impactBasedPrecommit: true,
   shouldWarningsAbortCommit: false,
   pushMetricsOnPreCommit: true,
-  token: "w-OkG3f5OOM1Rkly8phZ",
+  token: "k-CyU3t5CCA1Fyzm8dvN",
   compareBranch: 'release',
   supportedExtensions: ['.js', '.jsx', '.ts', '.tsx', '.properties']
 };

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

@@ -78,7 +78,7 @@ async function fetchProjectIssuesViaCurl(componentKey) {
   _Logger.Logger.log(_Logger.Logger.INFO_TYPE, `\n Fetching issues (curl) for component: ${componentKey}`);
   const url = buildIssuesSearchUrl(componentKey);
   try {
-    const token = 'sqa_1f6675c05f63c4784dc741ce751efa0066d2693c' || decrypt(getAPIToken(), process.env.DECRYPT_TOKEN);
+    const token = process.env.SONARQUBE; //'sqa_1f6675c05f63c4784dc741ce751efa0066d2693c' || decrypt(getAPIToken(), ); // sonarqube
     const command = `curl --tlsv1.2 -s -u "${token}:" "${url}"`;
     const output = execSync(command).toString();
     const json = JSON.parse(output.toString());

package/build/utils/HuskySetup/configurePrecommitHook.js

@@ -14,6 +14,9 @@ const {
 const {
   executeSynchronizedCommands
 } = require("../General/executeSyncCommands");
+const {
+  getNodeModulesPath
+} = require("../General/getNodeModulesPath");
 
 /**
  * @function configurePrecommitHook - creates the link to custom pre commit hook file and husky precommit file 
@@ -26,7 +29,7 @@ function configurePrecommitHook() {
   let huskyPrecommitHookContent = `#!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-"${customPrecomitHookPath}"
+cd "${getNodeModulesPath()}" && "${customPrecomitHookPath}"
 `;
   let isCustomPrecommitConfigurationSuccessful = executeSynchronizedCommands(writeFileSync, [huskyPrecommitPath, huskyPrecommitHookContent, 'utf-8'], '', 'Could not create and write pre-commit.sh inisde husky directory', false, true);
   if (isCustomPrecommitConfigurationSuccessful) {

package/build/utils/PluginsInstallation/installPlugins.js

@@ -14,7 +14,7 @@ const {
 } = require('../General/getNodeModulesPath');
 const path = require('path');
 const {
-  execSync
+  spawnSync
 } = require('child_process');
 
 /**
@@ -25,23 +25,44 @@ async function installPlugins(pluginsToBeInstalled) {
   if (pluginsToBeInstalled.length > 0) {
     let packageJsonBeforePluginsInstallation = getPackageJsonContentBeforeInstallingPlugins();
     Logger.log(Logger.INFO_TYPE, 'Installing plugins ....');
-    const installCommand = `npm install --save-dev ${pluginsToBeInstalled.join(' ')} --legacy-peer-deps`;
-    Logger.log(Logger.INFO_TYPE, `Install command being executed: ${installCommand}`);
-    try {
-      let stdout = await execSync(installCommand, {
-        cwd: getNodeModulesPath(),
-        shell: true
-      });
-      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);
+    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, {
+      cwd: getNodeModulesPath(),
+      shell: false,
+      encoding: 'utf8'
+    });
+    if (result.stdout) {
+      Logger.logger(result.stdout);
+    }
+    if (result.stderr) {
+      Logger.log(Logger.INFO_TYPE, result.stderr);
+    }
+    if (result.error) {
+      Logger.log(Logger.FAILURE_TYPE, 'Unable to install plugins. Spawn error.');
+      Logger.log(Logger.FAILURE_TYPE, result.error);
+      return false;
+    }
+    if (result.status !== 0) {
+      Logger.log(Logger.FAILURE_TYPE, `npm exited with code ${result.status}`);
       return false;
     }
+    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/index.js

@@ -25,7 +25,7 @@ function config() {
 const rule =  {
   meta: {
     type: "problem",
-    docs: {
+    docs:{
       description: "Disallow the use of 'debugger' statements",
       category: "Possible Errors",
       recommended: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/codestandard-validator",
-  "version": "1.0.0-exp-7",
+  "version": "1.0.0-exp-9",
   "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-6",
+    "@zohodesk/codestandard-analytics": "1.0.2-exp-12",
     "@zohodesk-private/client_deployment_tool": "0.0.5",
     "eslint": "8.26.0",
     "stylelint": "16.23.0"