@zohodesk/codestandard-validator 1.1.1 → 1.1.3

package/build/hooks/Precommit/commit.js

@@ -9,7 +9,6 @@ const {
 } = require("../../utils/Logger/Logger");
 const {
   handleMergeCommit,
-  ensurePluginsInstalled,
   safeGetStagedFiles,
   safeGetBranch
 } = require("./guard");
@@ -30,10 +29,6 @@ async function preCommitHook() {
     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/guard.js

@@ -21,9 +21,6 @@ async function handleMergeCommit() {
 }
 async function ensurePluginsInstalled() {
   if (areAllPluginsInstalled()) return true;
-  Logger.log(Logger.FAILURE_TYPE, "Commit failed since some lint plugins are not installed");
-  Logger.log(Logger.INFO_TYPE, `Run \x1b[37mnpx ZDPrecommit setupPlugins \x1b[33m in the project root to install them.`);
-  process.exit(1);
   return false;
 }
 async function safeGetStagedFiles() {

package/build/hooks/hook.js

@@ -21,6 +21,9 @@ const path = require('path');
 const {
   Logger
 } = require('../utils/Logger/Logger');
+const {
+  ensurePluginsInstalled
+} = require('./Precommit/guard');
 const config = require(path.join(process.cwd(), 'lint.config.js'));
 process.env.SONARQUBE_EXTERNAL = config.metric_token;
 process.env.SONARQUBE = config.meticHandler_api_token;
@@ -28,11 +31,15 @@ process.env.ZGIT_TOKEN = config.token;
 process.env.TOOL_TOKEN = config.toolToken;
 async function hooks() {
   var jsonFilePath = path.join(__dirname, '..', '..', 'jsonUtils', 'fsUtils.json');
-  if (!(getLastCommitHash() == getStoredCommitHash())) {
-    updateJsonFile(jsonFilePath, data => {
-      data.commitHash = getLastCommitHash();
-      return data;
-    });
+  let latestCommit = getLastCommitHash();
+  let storedCommit = getStoredCommitHash();
+  if (!(latestCommit == storedCommit) || !(await ensurePluginsInstalled())) {
+    if (storedCommit != latestCommit) {
+      updateJsonFile(jsonFilePath, data => {
+        data.commitHash = latestCommit;
+        return data;
+      });
+    }
     Logger.log(Logger.INFO_TYPE, `Some rules and plugins are being fetched from a remote source and installed...`);
     await executeMethodsThatReturnBooleanValue('Make sure zgit.csez.zohocorpin.com is accessible', cloneViaCdt, null);
     const {

package/build/lib/postinstall.js

@@ -30,17 +30,14 @@ const path = require('path');
  *  @returns {void}
  */
 async function postInstall() {
+  var actualNodeMoulesPath = path.resolve(process.cwd(), '..', '..', '..');
+  const config = require(path.join(actualNodeMoulesPath, 'lint.config.js'));
+  process.env.SONARQUBE_EXTERNAL = config.metric_token;
+  process.env.SONARQUBE = config.meticHandler_api_token;
+  process.env.ZGIT_TOKEN = config.token;
+  process.env.TOOL_TOKEN = config.toolToken;
   try {
-    await executeMethodsThatReturnBooleanValue('Some issue in writing node_modules path to json', writeFsPaths, null).then(() => {
-      const {
-        getNodeModulesPath
-      } = require('../utils/General/getNodeModulesPath');
-      const config = require(path.join(getNodeModulesPath(), 'lint.config.js'));
-      process.env.SONARQUBE_EXTERNAL = config.metric_token;
-      process.env.SONARQUBE = config.meticHandler_api_token;
-      process.env.ZGIT_TOKEN = config.token;
-      process.env.TOOL_TOKEN = config.toolToken;
-    });
+    await executeMethodsThatReturnBooleanValue('Some issue in writing node_modules path to json', writeFsPaths, null);
     isGitInitialized() ? await executeMethodsThatReturnBooleanValue('Some issue occurred in setting up husky.', setupHusky, null) : null;
     await executeMethodsThatReturnBooleanValue('Make sure zgit.csez.zohocorpin.com is accessible', cloneViaCdt, null);
     await executeMethodsThatReturnBooleanValue('Some issue occurred in creating eslint config file.', createConfigFile, null);

package/build/utils/CloneCommonLinterRepo/cloneViaCdt.js

@@ -17,12 +17,8 @@ const {
   executeSynchronizedCommands
 } = require('../General/executeSyncCommands');
 const {
-  getConfigurationPrecommit,
   getRunningEnv
 } = require("../General/getGeneralInfo");
-const {
-  decrypt
-} = require("../General/Hash");
 const {
   Logger
 } = require("../Logger/Logger");
@@ -42,9 +38,6 @@ const {
  */
 function cloneViaCdt() {
   try {
-    const {
-      token
-    } = getConfigurationPrecommit();
     const currentEnv = getRunningEnv();
     Logger.log(Logger.INFO_TYPE, `Application is running in the following environment:${currentEnv || "Development"}`);
 

package/build/utils/General/getGeneralInfo.js

@@ -131,5 +131,6 @@ module.exports = {
   getLastCommitHash,
   getStoredCommitHash,
   getJsonUtilsPath,
-  updateJsonFile
+  updateJsonFile,
+  getConfigPath
 };

package/build/utils/PluginsInstallation/installPlugins.js

@@ -14,8 +14,7 @@ const {
 } = require('../General/getNodeModulesPath');
 const path = require('path');
 const {
-  spawnSync,
-  spawn
+  spawnSync
 } = require('child_process');
 
 /**

package/changeLog.md

@@ -1,11 +1,8 @@
 # Code standard library
 
-# 0.0.0
+# 0.0.0 - Initial Setup
  1. Testing version of the library
 
-# 0.0.1
- 1. This version was mistakenly published without the build folder which will be corrected in the next release
-
 # 0.0.2 - first stable release of the library
  1. Sets up a custom precommit hook using husky
  2. clones the common linter configuration repository in developer branch 
@@ -40,4 +37,8 @@
 
 # 1.1.0 - SonarQube Enable
 
-1. Enable sonarqube with flag with backward compactibility
+1. Enable sonarqube with flag with backward compactibility
+
+# 1.1.3 - SonarQube Enable
+
+1. Remote Installtion flow moved to before and handled process.exit removed

package/jest.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  testEnvironment: 'node',
+  clearMocks: true,
+  setupFilesAfterEnv: ['<rootDir>/jest.setup.js'],
+};

package/jest.setup.js

@@ -0,0 +1 @@
+// Intentionally empty. Tests use local mocks for dependencies like Logger, fs, etc.

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@zohodesk/codestandard-validator",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "library to enforce code standard using eslint",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "jest",
     "postinstall": "node bin/postinstall.js",
     "build": "babel -d ./build ./src --copy-files"
   },
@@ -15,8 +15,8 @@
   },
   "type": "commonjs",
   "dependencies": {
-    "@zohodesk/codestandard-analytics": "1.1.3",
     "@zohodesk-private/client_deployment_tool": "0.0.5",
+    "@zohodesk/codestandard-analytics": "1.1.4",
     "eslint": "8.26.0",
     "stylelint": "16.23.0"
   },
@@ -24,6 +24,7 @@
     "@babel/core": "7.24.7",
     "@babel/plugin-transform-runtime": "7.24.7",
     "@babel/preset-env": "7.24.7",
-    "husky": "7.0.4"
+    "husky": "7.0.4",
+    "jest": "29.7.0"
   }
 }