@zohodesk/testinglibrary 0.1.8-eslint-19 → 0.1.8-eslint-21

package/build/lib/cli.js

@@ -59,9 +59,11 @@ switch (option) {
   case 'lint':
     {
       _logger.Logger.log(_logger.Logger.SUCCESS_TYPE, 'Linting Started ...');
-      (0, _eslintLintStage.runEslintForDiff)(otherOptions).finally(result => {
-        (0, _startSeverSonarQube.runSonarAnalysis)(otherOptions);
-      });
+      (async () => {
+        await (0, _eslintLintStage.runEslintForDiff)(otherOptions).finally(result => {
+          (0, _startSeverSonarQube.runSonarAnalysis)(otherOptions);
+        });
+      })();
       break;
     }
   case 'help':

package/build/lint-ci/eslintLintStage.js

@@ -16,7 +16,7 @@ var _path = _interopRequireDefault(require("path"));
 var _logger = require("../utils/logger");
 var _cliArgsToObject = require("../utils/cliArgsToObject");
 var _fileUtils = require("../utils/fileUtils");
-var _requestJarAPI = require("./requestJarAPI");
+// import { requestJAR } from './requestJarAPI';
 async function runEslintForDiff(cliParams, options = {}) {
   // $(git diff --name-only HEAD HEAD~1 | grep -E '\.(js|jsx)$' | xargs)
   // await requestJAR(cliParams);
@@ -45,9 +45,13 @@ async function runEslintForDiff(cliParams, options = {}) {
       lint_process.stderr.on('error', err => {
         _logger.Logger.log(_logger.Logger.FAILURE_TYPE, err);
       });
-      lint_process.on('close', onclose => {
+      lint_process.on('error', errors => {
+        _logger.Logger.log(_logger.Logger.FAILURE_TYPE, errors);
+      });
+      lint_process.on('close', async onclose => {
         if (diffPath && !(filteredDiffFiles.length === 0)) {
-          (0, _fileUtils.writeFileContents)(reportPath, filterReport_JSON(require(reportPath), diffJSON));
+          const filteredJson = await filterReport_JSON(require(reportPath), diffJSON);
+          (0, _fileUtils.writeFileContents)(reportPath, JSON.stringify(filteredJson));
         }
         resolve({
           status: 'success'
@@ -60,25 +64,31 @@ async function runEslintForDiff(cliParams, options = {}) {
   });
 }
 function filterReport_JSON(resultJson, diffJson) {
-  const impactLineArray = filterDiffJson(diffJson);
-  resultJson = resultJson.filter(result => {
-    var _impactLineArray$get;
-    const isImpactFile = getPathFromTestDir(result.filePath);
-    if (!isImpactFile) {
-      return false;
+  return new Promise(resolve => {
+    if (!diffJson) {
+      _logger.Logger.log(_logger.Logger.FAILURE_TYPE, 'git diff json is not given ...');
+      resolve(false);
     }
-    if (((_impactLineArray$get = impactLineArray.get(isImpactFile)) === null || _impactLineArray$get === void 0 ? void 0 : _impactLineArray$get.length) !== 0) {
-      result.messages = result.messages.filter(errorMsg => {
-        if (impactLineArray.get(isImpactFile).includes(errorMsg.line)) {
-          return true;
-        }
+    const impactLineArray = filterDiffJson(diffJson);
+    resultJson = resultJson.filter(result => {
+      var _impactLineArray$get;
+      const isImpactFile = getPathFromTestDir(result.filePath);
+      if (!isImpactFile) {
         return false;
-      });
-      return true;
-    }
-    return false;
+      }
+      if (((_impactLineArray$get = impactLineArray.get(isImpactFile)) === null || _impactLineArray$get === void 0 ? void 0 : _impactLineArray$get.length) !== 0) {
+        result.messages = result.messages.filter(errorMsg => {
+          if (impactLineArray.get(isImpactFile).includes(errorMsg.line)) {
+            return true;
+          }
+          return false;
+        });
+        return true;
+      }
+      return false;
+    });
+    resolve(resultJson);
   });
-  return JSON.stringify(resultJson);
 }
 function filterDiffJson(diffJson) {
   var _diffJson$diffs;
@@ -131,13 +141,14 @@ function getDiffFiles(diffJson) {
   if (!diffJson) {
     return null;
   }
+  const rootPath = getRootLintPath();
   return diffJson === null || diffJson === void 0 ? void 0 : diffJson.diffs.map(diff => {
-    return diff === null || diff === void 0 ? void 0 : diff.new_path;
+    return _path.default.resolve(rootPath, diff === null || diff === void 0 ? void 0 : diff.new_path);
   });
 }
 function getReportPath(reportPath = null, reportOptions = {}) {
   let jsonReportPath = reportPath || _path.default.resolve(process.cwd(), 'uat', 'lint-report', 'lintReport.json');
-  return reportPath ? reportPath : jsonReportPath;
+  return jsonReportPath;
 }
 function getDiffJsonPath(diffJsonPath) {
   return _path.default.resolve(diffJsonPath);

package/build/lint-ci/popUpCli.js

@@ -1,5 +1,30 @@
 "use strict";
 
-const {
-  spawn
-} = require('child_process');
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.showMsgPopUp = showMsgPopUp;
+var _startSeverSonarQube = require("./startSever-sonarQube");
+var _path = _interopRequireDefault(require("path"));
+function showMsgPopUp(condition) {
+  // java -jar ./IDEMessagePluginRecent.jar project_name "BothStagedAndUnstaged"  server_url java_version_output
+  const command = 'java';
+  const params = ['-jar', `${getPopupJarPath()}`, (0, _startSeverSonarQube.getProjectNameFrmGit)(), condition, 'java version 11'];
+  switch (condition) {
+    case 'NoIssueFound':
+      (0, _startSeverSonarQube.getSpawnOutput)(command, params);
+      break;
+    case 'IssueFound':
+      (0, _startSeverSonarQube.getSpawnOutput)(command, params);
+      break;
+    case 'BothStagedAndUnstaged':
+      (0, _startSeverSonarQube.getSpawnOutput)(command, params);
+      break;
+    default:
+      break;
+  }
+}
+function getPopupJarPath() {
+  return _path.default.resolve('node_modules', '@zohodesk', 'testinglibrary', 'build', 'lint-ci', 'java-jar', 'IDEMessagePluginRecent.jar');
+}

package/build/lint-ci/sonarReportSummary.js

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getSummaryOfLint = getSummaryOfLint;
 exports.writeSummaryOfLint = writeSummaryOfLint;
 var _path = _interopRequireDefault(require("path"));
 var _fileUtils = require("../utils/fileUtils");
@@ -24,5 +25,8 @@ function getSummaryOfLint(cliParams) {
   };
 }
 function writeSummaryOfLint(cliParams) {
-  (0, _fileUtils.writeFileContents)(_path.default.resolve(process.cwd(), 'uat', 'lint-report', 'lint-summary.json'), JSON.stringify(getSummaryOfLint(cliParams)));
+  (0, _fileUtils.writeFileContents)(_path.default.resolve(process.cwd(), 'uat', 'lint-report', 'lint-summary.json'), JSON.stringify({
+    ...getSummaryOfLint(cliParams),
+    ...(0, _startSeverSonarQube.getLintStatus)()
+  }));
 }

package/build/lint-ci/startSever-sonarQube.js

@@ -4,7 +4,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getLintStatus = getLintStatus;
 exports.getProjectNameFrmGit = getProjectNameFrmGit;
+exports.getSpawnOutput = getSpawnOutput;
 exports.runSonarAnalysis = runSonarAnalysis;
 var _path = _interopRequireDefault(require("path"));
 var _fs = _interopRequireDefault(require("fs"));
@@ -14,6 +16,8 @@ var _cliArgsToObject = require("../utils/cliArgsToObject");
 var _sonarReportSummary = require("./sonarReportSummary");
 var _logger = require("../utils/logger");
 var _rootPath = require("../utils/rootPath");
+var _fileUtils = require("../utils/fileUtils");
+var _popUpCli = require("./popUpCli");
 // Js script to start sonar Server
 
 /**
@@ -22,7 +26,7 @@ var _rootPath = require("../utils/rootPath");
  */
 
 function runSonarAnalysis(cliParams) {
-  var _getFilePathFrmReport, _getFilePathFrmReport2;
+  var _getFilePathFrmReport;
   const {
     diffPath,
     repo,
@@ -42,8 +46,8 @@ function runSonarAnalysis(cliParams) {
   if (lintEnv === 'pre-commit') {
     project_name = getProjectNameFrmGit();
   }
-  var resultFilesPath = diffPath && !(lintEnv == 'pre-commit') ? (_getFilePathFrmReport = getFilePathFrmReport(require((0, _eslintLintStage.getReportPath)()))) === null || _getFilePathFrmReport === void 0 ? void 0 : _getFilePathFrmReport.stepFilesPath.join(',') : [`${_path.default.resolve(process.cwd(), 'uat', 'modules')}`].join(',');
-  const source_directories = ((_getFilePathFrmReport2 = getFilePathFrmReport(require((0, _eslintLintStage.getReportPath)()))) === null || _getFilePathFrmReport2 === void 0 ? void 0 : _getFilePathFrmReport2.featureFilesPath) || [' '];
+  var resultFilesPath = diffPath ? (0, _eslintLintStage.getDiffFiles)(require((0, _eslintLintStage.getDiffJsonPath)(diffPath))).join(',') : [`${_path.default.resolve(process.cwd(), 'uat', 'modules')}`].join(',');
+  const source_directories = ((_getFilePathFrmReport = getFilePathFrmReport(require((0, _eslintLintStage.getReportPath)()))) === null || _getFilePathFrmReport === void 0 ? void 0 : _getFilePathFrmReport.featureFilesPath) || [' '];
   const source_directories_str = lintEnv == 'pre-commit' ? ' ' : source_directories.join(',');
   if (lintEnv == 'pre-commit') {
     resultFilesPath = (0, _eslintLintStage.gitDiffFiles)().join(',');
@@ -62,6 +66,22 @@ function runSonarAnalysis(cliParams) {
   child_process.on('close', code => {
     _logger.Logger.log(_logger.Logger.SUCCESS_TYPE, `Lint Stage Executed &  Status - ${code === 0 ? 'Success' : 'Failure'}`);
     (0, _sonarReportSummary.writeSummaryOfLint)(cliParams);
+    _logger.Logger.log(_logger.Logger.INFO_TYPE, `report url - ${(0, _sonarReportSummary.getSummaryOfLint)(cliParams).reportUrl}`);
+    if (lintEnv == 'pre-commit') {
+      _logger.Logger.log(_logger.Logger.SUCCESS_TYPE, 'lint triggered from pre-commit ...');
+      if (!getLintStatus().status && getLintStatus().message == 'failed') {
+        _logger.Logger.log(_logger.Logger.FAILURE_TYPE, 'rules violated .. ');
+        (0, _popUpCli.showMsgPopUp)('IssueFound');
+        process.exit(0);
+      } else {
+        (0, _popUpCli.showMsgPopUp)('NoIssueFound');
+      }
+      if (!getLintStatus().status && getLintStatus().message == 'failed') {
+        _logger.Logger.log(_logger.Logger.FAILURE_TYPE, 'rules violated .. ');
+        (0, _popUpCli.showMsgPopUp)('IssueFound');
+        process.exit(0);
+      }
+    }
   });
 }
 function getFilePathFrmReport(resultJson) {
@@ -80,21 +100,21 @@ function getProjectNameFrmGit() {
   return `${getRepoName()}_${getBranchName()}_${getGitUsername()}`;
 }
 function getGitUsername() {
-  const userName = getSpwanOutput('git', ['config', 'user.email']);
+  const userName = getSpawnOutput('git', ['config', 'user.email']);
   return userName.pop().split('@')[0];
 }
 function getRepoName() {
-  const repoName = getSpwanOutput('git', ['remote', 'get-url', 'origin']);
+  const repoName = getSpawnOutput('git', ['remote', 'get-url', 'origin']);
   return repoName.pop().split('/').pop().split('.')[0];
 }
 function getBranchName() {
-  const branchName = getSpwanOutput('git', ['branch'])[1];
+  const branchName = getSpawnOutput('git', ['branch']).shift();
   if (branchName.startsWith('*')) {
     return branchName.replace('*', ' ').trim();
   }
   return branchName;
 }
-function getSpwanOutput(command, params = []) {
+function getSpawnOutput(command, params = []) {
   const demon_process = (0, _child_process.spawnSync)(command, params, {
     shell: true
   });
@@ -112,6 +132,39 @@ function getCredentials(login, password) {
     Dpassword: 'developer'
   };
 }
+function getLintStatus() {
+  var reportStatus = true;
+  const report = require((0, _eslintLintStage.getReportPath)());
+  if (report.length == 0) {
+    reportStatus = true;
+    return {
+      status: true,
+      message: 'passed'
+    };
+  }
+  if (report.length != 0) {
+    for (i = 0; i < report.length; i++) {
+      if (fileReport.messages != 0 && fileReport.errorCount != 0) {
+        reportStatus = false;
+        break;
+      }
+    }
+    if (reportStatus) {
+      return {
+        status: reportStatus,
+        message: 'passed'
+      };
+    }
+    return {
+      status: reportStatus,
+      message: 'failed'
+    };
+  }
+  return {
+    status: reportStatus,
+    message: 'passed'
+  };
+}
 function getSonarArtifactsDir() {
   return _path.default.resolve(process.cwd(), 'uat', 'lint-report', '.scannerwork');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.1.8-eslint-19",
+  "version": "0.1.8-eslint-21",
   "description": "",
   "main": "./build/index.js",
   "scripts": {