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

package/build/hooks/Precommit/commit.js

@@ -26,10 +26,16 @@ global.analytics = {
   totalIssues: 0
 };
 async function preCommitHook() {
-  Logger.log(Logger.INFO_TYPE, "Executing pre commit hook...");
+  Logger.log(Logger.INFO_TYPE, "\n Executing pre commit hook...");
   Logger.log(Logger.INFO_TYPE, `working dir: ${process.cwd()}`);
-  if (await handleMergeCommit()) return;
-  if (!(await ensurePluginsInstalled())) return;
+  if (await handleMergeCommit()) {
+    return;
+  }
+  ;
+  if (!(await ensurePluginsInstalled())) {
+    return;
+  }
+  ;
   const stagedFiles = await safeGetStagedFiles();
   if (stagedFiles.length === 0) {
     Logger.log(Logger.INFO_TYPE, "No staged files. Commit skipped.");

package/build/hooks/Precommit/errorhelpers.js

@@ -4,17 +4,11 @@ const {
   Logger
 } = require("../../utils/Logger/Logger");
 const {
-  exec
+  execSync
 } = require('child_process');
-const {
-  promisify
-} = require('util');
-const execAsync = promisify(exec);
 async function calculateGitDiffForFile(branch, file) {
   try {
-    const {
-      stdout
-    } = await execAsync(`git diff -U0 ${branch.trim()} ${file}`);
+    const stdout = execSync(`git diff -U0 ${branch.trim()} ${file}`);
     return stdout;
   } catch (err) {
     throw err;

package/build/hooks/Precommit/lint.js

@@ -1,11 +1,8 @@
 "use strict";
 
 const {
-  exec
+  execSync
 } = require('child_process');
-const {
-  promisify
-} = require('util');
 const fs = require('fs');
 const path = require('path');
 const {
@@ -37,10 +34,6 @@ const {
 const {
   Logger
 } = require('../../utils/Logger/Logger');
-const {
-  default: fetchProjectIssuesViaCurl
-} = require('../../utils/General/SonarQubeUtil');
-const execAsync = promisify(exec);
 async function lintFiles(filePath) {
   const ext = path.extname(filePath);
   if (['.js', '.ts', '.tsx', '.jsx', '.properties'].includes(ext)) {
@@ -64,7 +57,7 @@ async function findEslintErrors(file) {
     Logger.log(Logger.INFO_TYPE, 'Eslint executable not found. Make sure eslint plugin is installed');
     return [];
   }
-  return execAsync(`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" ${file}`).then(({
     stderr
   }) => stderr ? stderr.trim().split('\n') : []).catch(err => {
     Logger.log(Logger.FAILURE_TYPE, err);
@@ -74,7 +67,7 @@ async function findEslintErrors(file) {
 function findStyleLintErrors(filePath) {
   const configFile = path.resolve(getNodeModulesPath(), '.stylelintrc.js');
   const absolutePath = path.join(getRootDirectory(), filePath);
-  return execAsync(`npx stylelint ${absolutePath} --config ${configFile}`, {
+  return execSync(`npx stylelint ${absolutePath} --config ${configFile}`, {
     cwd: getNodeModulesPath()
   }).then(({
     stdout
@@ -89,7 +82,10 @@ async function runLintWorkflow(files, branch) {
   };
   var branchName = getBranchName();
   for (const file of files) {
-    if (!getSupportedLanguage().includes(path.extname(file))) continue;
+    if (!getSupportedLanguage().includes(path.extname(file))) {
+      continue;
+    }
+    ;
     const changeset = extractDiffHunks(await calculateGitDiffForFile(branchName, file));
     const diff = {
       old_path: file,
@@ -114,7 +110,7 @@ async function runLintWorkflow(files, branch) {
      */
     // const { issues, hasIssue, totalIssues } = fetchProjectIssuesViaCurl("projectName");
   });
-  Logger.log(Logger.INFO_TYPE, global.analytics);
+  // Logger.log(Logger.INFO_TYPE,global.analytics)
   return global.analytics.status == 'FAILURE' ? true : false;
 }
 module.exports = {

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

@@ -222,7 +222,7 @@ function isOnlyWarningsPresentInFile(eslintErrorsPresent) {
  */
 
 async function preCommitHook_default() {
-  Logger.log(Logger.INFO_TYPE, 'Executing pre commit hook...');
+  Logger.log(Logger.INFO_TYPE, '\n Executing pre commit hook...');
   Logger.log(Logger.INFO_TYPE, `working dir  : ${process.cwd()}`);
   try {
     let isMerge = await isMergeCommit();

package/build/hooks/Precommit/utils.js

@@ -1,25 +1,17 @@
 "use strict";
 
 const {
-  exec
+  execSync
 } = require("child_process");
-const {
-  promisify
-} = require("util");
-const fs = require("fs");
-const path = require("path");
 const {
   getRootDirectory
 } = require("../../utils/General/RootDirectoryUtils/getRootDirectory");
 const {
   checkIfPluginsAreInstalled
 } = require("../../utils/PluginsInstallation/checkIfPluginsAreInstalled");
-const execAsync = promisify(exec);
 async function isMergeCommit() {
   try {
-    const {
-      stdout
-    } = await execAsync("git rev-parse -q --verify MERGE_HEAD");
+    const stdout = await execSync("git rev-parse -q --verify MERGE_HEAD");
     return Boolean(stdout.trim());
   } catch {
     return false;
@@ -27,9 +19,7 @@ async function isMergeCommit() {
 }
 async function getStagedFiles() {
   try {
-    const {
-      stdout
-    } = await execAsync("git diff --staged --name-only");
+    const stdout = await execSync("git diff --staged --name-only");
     const files = stdout.trim().split("\n").filter(Boolean);
     return files.filter(file => fs.existsSync(path.resolve(getRootDirectory(), file)));
   } catch {

package/build/hooks/hook.js

@@ -35,8 +35,7 @@ async function hooks() {
     } = getPluginsToInstall();
     await executeMethodsThatReturnBooleanValue('Some issue occurred in installing plugins', installPlugins, uninstalledPlugins);
   }
-  console.log(process.env);
-  if (process.env.defaultprecommit) {
+  if (process.env.CLIPRECOMMIT && Boolean(process.env.CLIPRECOMMIT) == true) {
     require('./Precommit/pre-commit-default');
   } else {
     require('./Precommit/commit');

package/build/utils/General/SonarQubeUtil.js

@@ -7,12 +7,8 @@ exports.default = void 0;
 var _Logger = require("../Logger/Logger");
 var _getGeneralInfo = require("./getGeneralInfo");
 const {
-  exec
+  execSync
 } = require('child_process');
-const {
-  promisify
-} = require('util');
-const execAsync = promisify(exec);
 /**
  * Constructs a URL for searching issues in SonarQube.
  *
@@ -84,9 +80,8 @@ async function fetchProjectIssuesViaCurl(componentKey) {
   try {
     const token = 'sqa_1f6675c05f63c4784dc741ce751efa0066d2693c' || decrypt(getAPIToken(), process.env.DECRYPT_TOKEN);
     const command = `curl --tlsv1.2 -s -u "${token}:" "${url}"`;
-    console.log("command", command);
-    const output = await execAsync(command).toString();
-    const json = JSON.parse(output);
+    const output = execSync(command).toString();
+    const json = JSON.parse(output.toString());
     const {
       issues,
       hasIssue,

package/build/utils/HuskySetup/initializeHusky.js

@@ -12,12 +12,8 @@ const {
   Logger
 } = require('../Logger/Logger');
 const {
-  exec
+  execSync
 } = require('child_process');
-const {
-  promisify
-} = require('util');
-const execAsync = promisify(exec);
 
 /**
  * @function initializeHusky - creates a .husky folder at the root of the project with the husky execution script file
@@ -27,7 +23,7 @@ async function initializeHusky() {
   let isNavigationToRootDirectorySuccessful = navigateToRootDirectory(getRootDirectory());
   if (isNavigationToRootDirectorySuccessful) {
     try {
-      await execAsync('npx husky@7 install');
+      execSync('npx husky@7 install');
       return true;
     } catch (error) {
       Logger.log(Logger.FAILURE_TYPE, error.toString());

package/build/utils/Logger/Logger.js

@@ -22,5 +22,8 @@ class LoggerImpl {
     const color = this.colors[type];
     this.consoleLogger.log(`${color[0]}${message}${color[1]}`);
   }
+  logger(message) {
+    this.consoleLogger.log(message);
+  }
 }
 module.exports.Logger = new LoggerImpl();

package/build/utils/PluginsInstallation/installPlugins.js

@@ -14,12 +14,8 @@ const {
 } = require('../General/getNodeModulesPath');
 const path = require('path');
 const {
-  exec
+  execSync
 } = require('child_process');
-const {
-  promisify
-} = require('util');
-const execAsync = promisify(exec);
 
 /**
  * @function installPlugins - installs uninstalled plugins for the project
@@ -31,15 +27,19 @@ async function installPlugins(pluginsToBeInstalled) {
     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}`);
-    let arePluginsInstalledSuccessfully = await executeSynchronizedCommands(execAsync, [installCommand, {
-      stdio: 'inherit',
-      cwd: getNodeModulesPath()
-    }], '', 'Some issue occured while installing plugins', false, true);
-    if (arePluginsInstalledSuccessfully) {
+    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);
-    } else {
+    } catch (error) {
       Logger.log(Logger.FAILURE_TYPE, "Unable to install plugins. Kindly retry the command");
+      Logger.log(Logger.FAILURE_TYPE, error);
       return false;
     }
   } else {

package/package.json

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