@zohodesk/testinglibrary 0.1.8-eslint-18 → 0.1.8-eslint-20

package/.vscode/settings.json

@@ -0,0 +1 @@
+{}

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

@@ -17,6 +17,7 @@ var _logger = require("../utils/logger");
 var _cliArgsToObject = require("../utils/cliArgsToObject");
 var _fileUtils = require("../utils/fileUtils");
 var _requestJarAPI = require("./requestJarAPI");
+var _console = require("console");
 async function runEslintForDiff(cliParams, options = {}) {
   // $(git diff --name-only HEAD HEAD~1 | grep -E '\.(js|jsx)$' | xargs)
   // await requestJAR(cliParams);
@@ -35,49 +36,60 @@ async function runEslintForDiff(cliParams, options = {}) {
   return await new Promise(resolve => {
     const command = ['eslint', lintFiles.join(' '), `--format=${format}`, '-o', `${reportPath}`];
     try {
-      const lint_process = (0, _child_process.spawnSync)('npx', command, {
+      const lint_process = (0, _child_process.spawn)('npx', command, {
         shell: true,
         cwd: process.cwd()
       });
-      if (lint_process.stderr) {
-        _logger.Logger.log(_logger.Logger.FAILURE_TYPE, lint_process.stderr.toString());
-      }
-      if (lint_process.error) {
-        throw lintFiles.error;
-      }
+      lint_process.stdout.on('data', data => {
+        _logger.Logger.log(_logger.Logger.INFO_TYPE, data);
+      });
+      lint_process.stderr.on('error', err => {
+        _logger.Logger.log(_logger.Logger.FAILURE_TYPE, err);
+      });
+      lint_process.on('error', errors => {
+        _logger.Logger.log(_logger.Logger.FAILURE_TYPE, errors);
+      });
+      lint_process.on('close', async onclose => {
+        if (diffPath && !(filteredDiffFiles.length === 0)) {
+          const filteredJson = await filterReport_JSON(require(reportPath), diffJSON);
+          (0, _fileUtils.writeFileContents)(reportPath, JSON.stringify(filteredJson));
+        }
+        resolve({
+          status: 'success'
+        });
+      });
     } 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));
-      }
-      resolve({
-        status: 'success'
-      });
     }
   });
 }
 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;
@@ -130,8 +142,9 @@ 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 = {}) {
@@ -142,7 +155,7 @@ function getDiffJsonPath(diffJsonPath) {
   return _path.default.resolve(diffJsonPath);
 }
 function gitDiffFiles() {
-  const command = 'git diff --cached -U0 HEAD';
+  const command = 'git diff --cached -U0 HEAD --name-only';
   const child = (0, _child_process.spawnSync)(command, {
     shell: true
   });

package/build/lint-ci/popUpCli.js

@@ -0,0 +1,5 @@
+"use strict";
+
+const {
+  spawn
+} = require('child_process');

package/build/lint-ci/sonarReportSummary.js

@@ -18,8 +18,8 @@ function getSummaryOfLint(cliParams) {
     lintEnv
   } = (0, _cliArgsToObject.cliArgsToObject)(cliParams);
   return {
-    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`,
+    projectName: lintEnv === 'pre-commit' ? (0, _startSeverSonarQube.getProjectNameFrmGit)() : `${repo}_${branch},${username}`,
+    reportUrl: `https://serverlinter-np.zohodesk.csez.zohocorpin.com/project/issues?id=${repo}_${branch}_${username}&resolve=false`,
     jsonReportPath: (0, _eslintLintStage.getReportPath)().toString()
   };
 }

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

@@ -14,6 +14,7 @@ var _cliArgsToObject = require("../utils/cliArgsToObject");
 var _sonarReportSummary = require("./sonarReportSummary");
 var _logger = require("../utils/logger");
 var _rootPath = require("../utils/rootPath");
+var _fileUtils = require("../utils/fileUtils");
 // Js script to start sonar Server
 
 /**
@@ -22,7 +23,7 @@ var _rootPath = require("../utils/rootPath");
  */
 
 function runSonarAnalysis(cliParams) {
-  var _getFilePathFrmReport, _getFilePathFrmReport2;
+  var _getFilePathFrmReport;
   const {
     diffPath,
     repo,
@@ -42,8 +43,9 @@ 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(',');
+  console.log('&&', (0, _fileUtils.checkIfFileExists)((0, _eslintLintStage.getReportPath)()));
+  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(',');
@@ -88,7 +90,7 @@ function getRepoName() {
   return repoName.pop().split('/').pop().split('.')[0];
 }
 function getBranchName() {
-  const branchName = getSpwanOutput('git', ['branch'])[1];
+  const branchName = getSpwanOutput('git', ['branch']).shift();
   if (branchName.startsWith('*')) {
     return branchName.replace('*', ' ').trim();
   }

package/package.json

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