@zohodesk/codestandard-validator 1.2.4-exp-2 → 1.2.4-exp-4

package/bin/cliCI.js

@@ -5,4 +5,9 @@
  *  @fileoverview This script is a Node.js executable that imports and runs the module `runner` from the `../build/lib/` directory.
  */
 
-require("@zohodesk/codestandard-analytics/build/lib/runner")
+(async function () {
+  const { initConfig, getConfigPathExecute } = require('../build/utils/General/Config');
+  await initConfig(getConfigPathExecute());
+  await require('../build/chunk/chunk_Restriction');
+  require('@zohodesk/codestandard-analytics/build/lib/runner');
+})();

package/build/chunk/chunk_Restriction.js

@@ -185,6 +185,7 @@ if (shouldEnable) {
       };
       try {
         await getGitChangesets(myCurrentBranch, targetRelease, remoteName);
+        process.env.CHUNK_SIZE = JSON.stringify(chunkSize);
         if (chunkSize.$modifieldLines <= chunk_size_env) {
           Logger.log(`${GREEN}Your Chunk was ${chunkSize.$modifieldLines} and remaining size ${chunk_size_env - chunkSize.$modifieldLines}${RESET}`);
         } else {

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

@@ -131,10 +131,7 @@ function findEslintErrors(file) {
             resolve([]);
           }
         }, {
-          env: {
-            ...process.env,
-            CHUNK_SIZE: (globalThis === null || globalThis === void 0 ? void 0 : globalThis.chunkSize) ?? ''
-          }
+          env: process.env
         });
       });
     } else {

package/build/hooks/hook.js

@@ -28,8 +28,6 @@ const {
   initConfig,
   getConfigPathExecute
 } = require('../utils/General/Config');
-require("../chunk/chunk_Restriction");
-initConfig(getConfigPathExecute());
 async function hooks() {
   var jsonFilePath = path.join(__dirname, '..', '..', 'jsonUtils', 'fsUtils.json');
   let latestCommit = getLastCommitHash();
@@ -54,4 +52,8 @@ async function hooks() {
     require('./Precommit/pre-commit-default');
   }
 }
-hooks();
+(async function () {
+  await initConfig(getConfigPathExecute());
+  await require("../chunk/chunk_Restriction");
+  hooks();
+})();

package/build/utils/ConfigFileUtils/getLintConfiguration.js

@@ -18,23 +18,35 @@ const {
   executeMethodsThatMayThrowException
 } = require("../General/wrapperFunctionToExecuteAFunction.js");
 
+/**
+ * Resolve a file from service-specific dir if it exists, otherwise fall back to common dir.
+ * @param {string} baseDir
+ * @param {string|undefined} repoName
+ * @param {string} fileName
+ * @param {*} [fallback] - fallback value if no common path desired (e.g. undefined for pluginVersion)
+ * @returns {string|undefined}
+ */
+function resolveServiceOrCommon(baseDir, repoName, fileName, fallback) {
+  if (repoName) {
+    const servicePath = path.join(baseDir, 'services', repoName, fileName);
+    if (existsSync(servicePath)) return servicePath;
+  }
+  return fallback !== undefined ? fallback : path.join(baseDir, 'common', fileName);
+}
+
 /**
  * @function getLintConfiguration - returns eslint configuration file from common linters repo
  * @returns {object} - containing properties of the eslint configuration file
  */
 function getServicePathElseCommon() {
   const repoName = getRepoName();
-  const libraryInstalledLocation = getLibraryInstalledLocation();
-  let commonConfigPath = path.join(libraryInstalledLocation, commonLinterRepoName, 'common', 'index.js');
-  const _configurationPath = repoName && existsSync(path.join(libraryInstalledLocation, commonLinterRepoName, 'services', repoName, 'index.js')) ? path.join(libraryInstalledLocation, commonLinterRepoName, 'services', repoName, 'index.js') : commonConfigPath;
-  let _pathOfServiceSpecificEslintConfigFile = repoName && existsSync(path.join(libraryInstalledLocation, commonLinterRepoName, 'services', repoName, '.eslintrc.js')) ? path.join(libraryInstalledLocation, commonLinterRepoName, 'services', repoName, '.eslintrc.js') : path.join(libraryInstalledLocation, commonLinterRepoName, 'common', '.eslintrc.js');
-  let _pluginVersionPath = repoName && existsSync(path.join(libraryInstalledLocation, commonLinterRepoName, 'services', repoName, 'pluginVersion.js')) ? path.join(libraryInstalledLocation, commonLinterRepoName, 'services', repoName, 'pluginVersion.js') : undefined;
-  let _cssLintConfig = repoName && existsSync(path.join(libraryInstalledLocation, commonLinterRepoName, 'services', repoName, '.stylelintrc.js')) ? path.join(libraryInstalledLocation, commonLinterRepoName, 'services', repoName, '.stylelintrc.js') : path.join(libraryInstalledLocation, commonLinterRepoName, 'common', '.stylelintrc.js');
+  const baseDir = path.join(getLibraryInstalledLocation(), commonLinterRepoName);
   return {
-    configurationPath: _configurationPath,
-    pathOfServiceSpecificEslintConfigFile: _pathOfServiceSpecificEslintConfigFile,
-    pluginVersionPath: _pluginVersionPath,
-    pathOfServiceSpecificCssConfigFile: _cssLintConfig
+    configurationPath: resolveServiceOrCommon(baseDir, repoName, 'index.js'),
+    pathOfServiceSpecificEslintConfigFile: resolveServiceOrCommon(baseDir, repoName, '.eslintrc.js'),
+    pluginVersionPath: resolveServiceOrCommon(baseDir, repoName, 'pluginVersion.js', null) || undefined,
+    pathOfServiceSpecificCssConfigFile: resolveServiceOrCommon(baseDir, repoName, '.stylelintrc.js'),
+    initializationPath: resolveServiceOrCommon(baseDir, repoName, 'initializeScript.js')
   };
 }
 function getLintConfigurationUtil() {

package/build/utils/General/Config.js

@@ -1,12 +1,29 @@
 "use strict";
 
 const path = require('path');
+const {
+  getServicePathElseCommon
+} = require('../ConfigFileUtils/getLintConfiguration');
+const {
+  Logger
+} = require('../Logger/Logger');
 function initConfig(actualConfigPath) {
   const config = getConfigObject(actualConfigPath);
   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 {
+    const {
+      initializationPath
+    } = getServicePathElseCommon();
+    const {
+      intialize
+    } = require(initializationPath);
+    intialize();
+  } catch (error) {
+    Logger.log(Logger.FAILURE_TYPE, `Error while initialize configuration: ${error}`);
+  }
 }
 function getConfigPathPostInstall() {
   return path.resolve(process.cwd(), '..', '..', '..');

package/build/utils/PluginsInstallation/checkIfPluginsAreInstalled.js

@@ -32,7 +32,10 @@ function getAllPlugins() {
   } else {
     serviceSpecificPlugins = [];
   }
-  return [...commonPlugins, ...serviceSpecificPlugins];
+  if (!Array.isArray(commonPlugins) || !Array.isArray(serviceSpecificPlugins)) {
+    Logger.log(Logger.FAILURE_TYPE, 'Plugin details should be in an array format in pluginVersion.js file');
+  }
+  return Object.assign([], commonPlugins, serviceSpecificPlugins);
 }
 
 /**

package/changeLog.md

@@ -47,3 +47,7 @@
 
 1. ProjectId api revamp
 2. code standard analytics bin bind to code standard validator bin
+
+# 1.1.5 
+
+1. Refactor configuration loading and linting process, update mandatory rules handling, and improve pre-commit hook functionality

package/jsonUtils/MandatoryListRules.js

@@ -1,3 +1,3 @@
-const MandatoryListRules = ["@zohodesk/fitnessfunction/chunk-size"]
+const MandatoryListRules = JSON.parse(process.env.MANDARORY_RULES || '[]')
 
 module.exports = MandatoryListRules

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/codestandard-validator",
-  "version": "1.2.4-exp-2",
+  "version": "1.2.4-exp-4",
   "description": "library to enforce code standard using eslint",
   "main": "index.js",
   "scripts": {
@@ -17,7 +17,7 @@
   "type": "commonjs",
   "dependencies": {
     "@zohodesk-private/client_deployment_tool": "0.0.5",
-    "@zohodesk/codestandard-analytics": "1.1.4-exp-2",
+    "@zohodesk/codestandard-analytics": "1.1.5",
     "@stryker-mutator/core": "5.0.0",
     "eslint": "8.26.0",
     "marked": "9.1.6",