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

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

@@ -8,7 +8,7 @@ const fs = require('fs');
 const path = require('path');
 const {
   getEslintExecutablePath
-} = require('../../utils/EslintConfigFileUtils/getEslintExecutablePath');
+} = require('../../utils/ConfigFileUtils/getEslintExecutablePath');
 const {
   getNodeModulesPath
 } = require('../../utils/General/getNodeModulesPath');
@@ -152,16 +152,15 @@ function findStyleLintErrors(filePath) {
         cwd: getNodeModulesPath()
       }, (error, stderr, stdout) => {
         if (stdout) {
-          resolve(stderr.trim().split('\n'));
+          resolve(stdout.trim().split('\n'));
         }
-        if (stderr) {
-          resolve(stderr.trim().split('\n'));
-        }
-        // else if(error){
-        //     Logger.log(Logger.FAILURE_TYPE,error)
-        //     reject("Error executing eslint command")
+        // if(stderr){
+        //     resolve(stderr.trim().split('\n'))
         // }
-        else {
+        else if (error) {
+          Logger.log(Logger.FAILURE_TYPE, error);
+          reject("Error executing stylelint command");
+        } else {
           resolve([]);
         }
       });

package/build/hooks/hook.js

@@ -11,7 +11,7 @@ const {
   cloneViaCdt
 } = require("../utils/CloneCommonLinterRepo/cloneViaCdt");
 const {
-  checkIfPluginsAreInstalled
+  getPluginsToInstall
 } = require("../utils/PluginsInstallation/checkIfPluginsAreInstalled");
 const {
   installPlugins
@@ -21,7 +21,7 @@ async function hooks() {
     await executeMethodsThatReturnBooleanValue("Make sure zgit.csez.zohocorpin.com is accessible", cloneViaCdt, null);
     const {
       uninstalledPlugins
-    } = checkIfPluginsAreInstalled();
+    } = getPluginsToInstall();
     await executeMethodsThatReturnBooleanValue("Some issue occurred in installing plugins", installPlugins, uninstalledPlugins);
   }
   require('./Precommit/pre-commit');

package/build/lib/cli.js

@@ -16,7 +16,7 @@ const {
   installPlugins
 } = require("../utils/PluginsInstallation/installPlugins");
 const {
-  checkIfPluginsAreInstalled
+  getPluginsToInstall
 } = require("../utils/PluginsInstallation/checkIfPluginsAreInstalled");
 const [,, action, ...options] = process.argv;
 async function run() {
@@ -35,7 +35,7 @@ async function run() {
       {
         const {
           uninstalledPlugins
-        } = checkIfPluginsAreInstalled();
+        } = getPluginsToInstall();
         await executeMethodsThatReturnBooleanValue("Some issue occurred in installing plugins", installPlugins, uninstalledPlugins);
         break;
       }

package/build/utils/PluginsInstallation/arePluginsInstalled.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const {
-  checkIfPluginsAreInstalled
+  getPluginsToInstall
 } = require('./checkIfPluginsAreInstalled');
 const {
   installPlugins
@@ -10,7 +10,7 @@ function arePluginsInstalled() {
   let {
     uninstalledPlugins,
     noPluginMessage
-  } = checkIfPluginsAreInstalled();
+  } = getPluginsToInstall();
   let areAllPluginsInstalled = uninstalledPlugins.length === 0 ? true : false;
   if (!areAllPluginsInstalled) {
     installPlugins(uninstalledPlugins);

package/build/utils/PluginsInstallation/checkIfPluginsAreInstalled.js

@@ -54,7 +54,7 @@ function checkIfPluginsAreInstalled() {
     const {
       isPluginPresent,
       pluginPath
-    } = checkPluginsPresentInNodemodules(packageName);
+    } = checkPluginsPresentInNodemodules(packageName); // circular installation loop so comment out
     if (isPluginPresent && checkPluginHasProperVersion(packageName, pluginPath, version)) {
       return false;
     }
@@ -71,6 +71,35 @@ function checkIfPluginsAreInstalled() {
   }
 }
 
+/**
+ * @function getPluginsToInstall - plugins need for this repository
+ * @returns {Array<String>}
+ */
+function getPluginsToInstall() {
+  const pluginsForCurrentRepo = getAllPlugins();
+  var uninstalledPlugins = [];
+  var plugin = {
+    noPluginMessage: '',
+    uninstalledPlugins: []
+  };
+  uninstalledPlugins = pluginsForCurrentRepo.map(plugin => {
+    const {
+      packageName,
+      version
+    } = plugin;
+    return `${packageName}@${version}`;
+  }).filter(Boolean);
+  if (uninstalledPlugins.length > 0) {
+    plugin.noPluginMessage = '';
+    plugin.uninstalledPlugins = uninstalledPlugins;
+    return plugin;
+  } else {
+    plugin.noPluginMessage = 'No plugins present for the repository';
+    plugin.uninstalledPlugins = [];
+    return plugin;
+  }
+}
+
 /**
  * @function returnExactPluginVersion - to return the exact plugin version after removing caret or tilde symbol if present
  * @param {string} pluginVersion
@@ -116,5 +145,6 @@ function checkPluginHasProperVersion(rulePluginName, installationPath, remotePlu
   return remotePluginExactVersion == packageJsonPluginExactVersion ? true : false;
 }
 module.exports = {
+  getPluginsToInstall,
   checkIfPluginsAreInstalled
 };

package/build/utils/PluginsInstallation/installPlugins.js

@@ -30,21 +30,12 @@ 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}`);
     let arePluginsInstalledSuccessfully = executeSynchronizedCommands(execSync, [installCommand, {
       stdio: 'inherit',
       cwd: getNodeModulesPath()
     }], '', 'Some issue occured while installing plugins', false, true);
-    const installCommand = ['install', '--save-dev', ...pluginsToBeInstalled, '--legacy-peer-deps'];
-    const result = spawn('npm', installCommand, {
-      stdio: 'inherit',
-      shell: true,
-      cwd: getNodeModulesPath()
-    });
-    if (result.error) {
-      Logger.log('Error running npm install:', result.error);
-      process.exit(1);
-    }
     if (arePluginsInstalledSuccessfully) {
       Logger.log(Logger.SUCCESS_TYPE, 'Plugins installation successful');
       let isPackageJsonRestored = restorePackageJsonContent(packageJsonBeforePluginsInstallation);

package/index.js

@@ -1,4 +1,4 @@
-const { getLintConfigurationUtil } = require("./build/utils/EslintConfigFileUtils/getLintConfiguration");
+const { getLintConfigurationUtil } = require("./build/utils/ConfigFileUtils/getLintConfiguration");
 const { rulesConfig, plugins, extendPlugins } = getLintConfigurationUtil();
 
 module.exports = {

package/package.json

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