@zohodesk/testinglibrary 0.1.8-eslint-13 → 0.1.8-eslint-15

package/build/lint-ci/eslintLintStage.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.getDiffFiles = getDiffFiles;
 exports.getDiffJsonPath = getDiffJsonPath;
 exports.getReportPath = getReportPath;
+exports.getRootDir = getRootDir;
+exports.gitDiffFiles = gitDiffFiles;
 exports.runEslintForDiff = runEslintForDiff;
 var _getFilePath = require("../utils/getFilePath");
 var _child_process = require("child_process");
@@ -17,46 +19,42 @@ var _fileUtils = require("../utils/fileUtils");
 var _requestJarAPI = require("./requestJarAPI");
 async function runEslintForDiff(cliParams, options = {}) {
   // $(git diff --name-only HEAD HEAD~1 | grep -E '\.(js|jsx)$' | xargs)
-  await (0, _requestJarAPI.requestJAR)(cliParams);
+  // await requestJAR(cliParams);
   const {
-    diffPath = null
+    diffPath = null,
+    lintEnv = null
   } = (0, _cliArgsToObject.cliArgsToObject)(cliParams);
   const format = 'json';
   const reportPath = getReportPath();
   const diffJSON = diffPath ? require(getDiffJsonPath(diffPath)) : null;
   const filteredDiffFiles = getDiffFiles(diffJSON);
-  const lintFiles = !filteredDiffFiles ? [_path.default.resolve(process.cwd(), 'uat', 'modules')] : filteredDiffFiles;
+  console.log(filterDiffJson);
+  var lintFiles = !filteredDiffFiles ? [_path.default.resolve(process.cwd(), 'uat', 'modules')] : filteredDiffFiles;
+  if (lintEnv === 'pre-commit') {
+    lintFiles = gitDiffFiles();
+  }
   return await new Promise(resolve => {
-    const command = ['eslint', `${lintFiles.join(' ')}`, `--format=${format}`, '-o', `${reportPath}`];
-    const lint_process = (0, _child_process.spawn)('npx', command);
-    lint_process.stdout.on('data', data => {
-      _logger.Logger.log(_logger.Logger.INFO_TYPE, data);
-    });
-    lint_process.stderr.on('data', errorOutput => {
-      _logger.Logger.log(_logger.Logger.FAILURE_TYPE, errorOutput);
-    });
-    lint_process.on('error', error => {
-      _logger.Logger.log(_logger.Logger.FAILURE_TYPE, error);
-    });
-    lint_process.on('close', onClose => {
+    const command = ['eslint', lintFiles.join(' '), `--format=${format}`, '-o', `${reportPath}`];
+    try {
+      const lint_process = (0, _child_process.spawnSync)('npx', command, {
+        shell: true,
+        cwd: process.cwd()
+      });
+      if (lint_process.error) {
+        throw lintFiles.error;
+      }
+    } catch (error) {
+      _logger.Logger.log(_logger.Logger.INFO_TYPE, error);
+      _logger.Logger.log(_logger.Logger.FAILURE_TYPE, 'Execution Failed');
+    } finally {
       if (diffPath && !(filteredDiffFiles.length === 0)) {
         (0, _fileUtils.writeFileContents)(reportPath, filterReport_JSON(require(reportPath), diffJSON));
       }
-      _logger.Logger.log(_logger.Logger.SUCCESS_TYPE, `Lint Executed ...`);
       resolve({
         status: 'success'
       });
-    });
+    }
   });
-
-  // .finally(() => {
-  //   if (diffPath && !(filteredDiffFiles.length === 0)) {
-  //     writeFileContents(
-  //       reportPath,
-  //       filterReport_JSON(require(reportPath), diffJSON)
-  //     );
-  //   }
-  // });
 }
 function filterReport_JSON(resultJson, diffJson) {
   const impactLineArray = filterDiffJson(diffJson);
@@ -99,6 +97,9 @@ function filterDiffJson(diffJson) {
   });
   return diffFilesMap;
 }
+function getRootDir() {
+  return _path.default.resolve(process.cwd());
+}
 function getPathFromTestDir(diffPath) {
   if (!diffPath.includes('uat')) {
     return undefined;
@@ -131,44 +132,31 @@ function getDiffFiles(diffJson) {
     return diff === null || diff === void 0 ? void 0 : diff.new_path;
   });
 }
-function validateReport() {
-  if (1) {} else {
-    throw new Error('Report Failed');
-    process.exit(1);
-  }
-}
 function getReportPath(reportPath = null, reportOptions = {}) {
   let jsonReportPath = reportPath || _path.default.resolve(process.cwd(), 'uat', 'lint-report', 'lintReport.json');
-  if (!(0, _fileUtils.checkIfFileExists)(jsonReportPath)) {
-    _logger.Logger.log(_logger.Logger.FAILURE_TYPE, 'Cannot Find JSON Report ...');
-    process.exit(0);
-  }
   return reportPath ? reportPath : jsonReportPath;
 }
 function getDiffJsonPath(diffJsonPath) {
   return _path.default.resolve(diffJsonPath);
 }
+function gitDiffFiles() {
+  const command = 'git diff HEAD HEAD~1 --name-only';
+  const child = (0, _child_process.spawnSync)(command, {
+    shell: true
+  });
+  return child.stdout.toString().split('\n').map(filePath => _path.default.resolve(getRootLintPath(), filePath));
+}
+function getRootLintPath() {
+  const childProcess = (0, _child_process.spawnSync)('git', ['rev-parse', '--show-toplevel'], {
+    shell: true
+  });
+  return childProcess.stdout.toString().split('\n').filter(Boolean).pop();
+}
 
-// function gitDiffFiles() {
-//   const childProcess = spawnSync('git', [
-//     'diff',
-//     'HEAD',
-//     'HEAD~1',
-//     '--name-only'
-//   ]);
-//   const diff_Files = childProcess.stdout.toString().split('\n').filter(Boolean);
-//   var actualDiff_Files = diff_Files.map(filePath => {
-//     var fileName = path.basename(filePath);
-//     if (
-//       filePath.includes('/page-object-model/') ||
-//       filePath.includes('/assertions/')
-//     ) {
-//       return path.resolve(process.cwd(), '../', '../', filePath);
-//     }
-//     if (fileName.includes('.spec.js')) {
-//       return path.resolve(process.cwd(), '../', '../', filePath);
-//     }
-//     return false;
-//   });
-//   return actualDiff_Files;
+// function validateReport() {
+//   if (1) {
+//   } else {
+//     throw new Error('Report Failed');
+//     process.exit(1);
+//   }
 // }

package/build/lint-ci/sonarReportSummary.js

@@ -9,14 +9,16 @@ var _path = _interopRequireDefault(require("path"));
 var _fileUtils = require("../utils/fileUtils");
 var _cliArgsToObject = require("../utils/cliArgsToObject");
 var _eslintLintStage = require("./eslintLintStage");
+var _startSeverSonarQube = require("./startSever-sonarQube");
 function getSummaryOfLint(cliParams) {
   const {
     repo,
     branch,
-    username
+    username,
+    lintEnv
   } = (0, _cliArgsToObject.cliArgsToObject)(cliParams);
   return {
-    projectNameL: `${repo}_${branch},${username}`,
+    projectNameL: lintEnv === 'pre-commit' ? (0, _startSeverSonarQube.getProjectNameFrmGit)() : `${repo}_${branch},${username}`,
     reportUrl: `https://serverlinter.zohodesk.csez.zohocorpin.com/project/issues?id=${repo}_${branch}_${username}&resolve=false`,
     jsonReportPath: (0, _eslintLintStage.getReportPath)().toString()
   };

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

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getProjectNameFrmGit = getProjectNameFrmGit;
 exports.runSonarAnalysis = runSonarAnalysis;
 var _path = _interopRequireDefault(require("path"));
 var _fs = _interopRequireDefault(require("fs"));
@@ -22,13 +23,15 @@ var _rootPath = require("../utils/rootPath");
 
 function runSonarAnalysis(cliParams) {
   var _getFilePathFrmReport, _getFilePathFrmReport2;
+  _logger.Logger.log(_logger.Logger.INFO_TYPE, 'sending report to server  ...');
   const {
     diffPath,
     repo,
     branch,
     username,
     login = null,
-    password = null
+    password = null,
+    lintEnv = null
   } = (0, _cliArgsToObject.cliArgsToObject)(cliParams);
   const sonarqube_host_url = 'https://serverlinter-np.zohodesk.csez.zohocorpin.com/';
   const sonar_scanner_path = (0, _rootPath.getSonarJarPath)();
@@ -36,10 +39,16 @@ function runSonarAnalysis(cliParams) {
     Dlogin,
     Dpassword
   } = getCredentials(login, password);
-  const project_name = repo && branch && branch ? `${repo}_${branch}_${username}` : 'UAT_Testing';
-  const resultFilesPath = diffPath ? (_getFilePathFrmReport = getFilePathFrmReport(require((0, _eslintLintStage.getReportPath)()))) === null || _getFilePathFrmReport === void 0 ? void 0 : _getFilePathFrmReport.stepFilesPath.join(',') : [' '].join('');
+  var project_name = repo && branch && branch ? `${repo}_${branch}_${username}` : 'UAT_Testing';
+  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) || [' '];
-  const source_directories_str = source_directories.join(',');
+  const source_directories_str = lintEnv == 'pre-commit' ? ' ' : source_directories.join(',');
+  if (lintEnv == 'pre-commit') {
+    resultFilesPath = (0, _eslintLintStage.gitDiffFiles)().join(',');
+  }
   const command = ['-jar', sonar_scanner_path, `-Dsonar.host.url=${sonarqube_host_url}`, `-Dsonar.projectKey=${project_name}`, `-Dsonar.login=${Dlogin}`, `-Dsonar.password=${Dpassword}`, `-Dsonar.sources=${source_directories_str}`, `-Dsonar.tests=${resultFilesPath}`, '-Dsonar.language=js', `-Dsonar.eslint.reportPaths=${(0, _eslintLintStage.getReportPath)()}`, '-Dsonar.javascript.lcov.reportPaths=coverage/lcov-report/lcov.info'];
   const child_process = (0, _child_process.spawn)('java', command);
   child_process.stdout.on('data', data => {
@@ -68,6 +77,30 @@ function getFilePathFrmReport(resultJson) {
     featureFilesPath: []
   });
 }
+function getProjectNameFrmGit() {
+  return `${getRepoName()}_${getBranchName()}_${getGitUsername()}`;
+}
+function getGitUsername() {
+  const userName = getSpwanOutput('git', ['config', 'user.email']);
+  return userName.pop().split('@')[0];
+}
+function getRepoName() {
+  const repoName = getSpwanOutput('git', ['remote', 'get-url', 'origin']);
+  return repoName.pop().split('/').pop().split('.')[0];
+}
+function getBranchName() {
+  const branchName = getSpwanOutput('git', ['branch'])[1];
+  if (branchName.startsWith('*')) {
+    return branchName.replace('*', ' ').trim();
+  }
+  return branchName;
+}
+function getSpwanOutput(command, params = []) {
+  const demon_process = (0, _child_process.spawnSync)(command, {
+    shell: true
+  });
+  return demon_process.stdout.toString().split('\n').filter(Boolean);
+}
 function getCredentials(login, password) {
   if (login && password) {
     return {

package/build/utils/rootPath.js

@@ -48,5 +48,9 @@ function getExecutableBinaryPath(command) {
 }
 function getSonarJarPath() {
   const jarPath = _path.default.resolve('node_modules', '@zohodesk', 'testinglibrary', 'build', 'lint-ci', 'java-jar', 'sonar-scanner-cli-4.8.0.2856.jar');
-  return jarPath;
+  if ((0, _fileUtils.checkIfFileExists)(jarPath)) {
+    return jarPath;
+  }
+  _logger.Logger.log(_logger.Logger.FAILURE_TYPE, 'cannot find -  Java-Jar');
+  process.exit(0);
 }

package/package.json

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