@zohodesk/testinglibrary 0.1.8-eslint-27 → 0.1.8-eslint-28

package/build/lint-ci/eslintLintStage.js

@@ -16,6 +16,7 @@ var _path = _interopRequireDefault(require("path"));
 var _logger = require("../utils/logger");
 var _cliArgsToObject = require("../utils/cliArgsToObject");
 var _fileUtils = require("../utils/fileUtils");
+var _getModifieldLines = require("./getModifieldLines");
 // import { requestJAR } from './requestJarAPI';
 async function runEslintForDiff(cliParams, options = {}) {
   // $(git diff --name-only HEAD HEAD~1 | grep -E '\.(js|jsx)$' | xargs)
@@ -73,15 +74,15 @@ function filterReportBasedDiff(resultJson, diffJson) {
     resultJson = resultJson.filter(result => {
       var _impactLineMap$get;
       const isImpactFile = result.filePath;
-      if (isImpactFile.includes('.feature')) {
+      if (!isImpactFile) {
         return false;
       }
-      if (!isImpactFile) {
+      if (isImpactFile.includes('.feature')) {
         return false;
       }
       if (((_impactLineMap$get = impactLineMap.get(isImpactFile)) === null || _impactLineMap$get === void 0 ? void 0 : _impactLineMap$get.length) !== 0) {
         result.messages = result.messages.filter(errorMsg => {
-          if (impactLineMap.get(isImpactFile).includes(`${errorMsg.line}`)) {
+          if (impactLineMap.get(isImpactFile).includes(errorMsg.line)) {
             return true;
           }
           return false;
@@ -96,18 +97,19 @@ function filterDiffJson(diffJson) {
   var _diffJson$diffs;
   const diffFilesMap = new Map();
   diffJson === null || diffJson === void 0 || (_diffJson$diffs = diffJson.diffs) === null || _diffJson$diffs === void 0 || _diffJson$diffs.forEach(diff => {
-    const diffMatch = [];
-    const regex = /@@(.*?)@@/g;
-    let match;
-    while ((match = regex.exec(diff.diff)) !== null) {
-      diffMatch.push(...splitFilterNumber(match[1]));
-    }
+    // const diffMatch = [];
+    // const regex = /@@(.*?)@@/g;
+    // let match;
+    // console.log('=>', regex.exec(diff.diff));
+    // while ((match = regex.exec(diff.diff)) !== null) {
+    //   diffMatch.push(...splitFilterNumber(match[1]));
+    // }
     const diffPathKey = _path.default.resolve(getRootLintPath(), diff.new_path);
     if (diffPathKey === undefined) {
       return;
     }
     if (diffPathKey) {
-      diffFilesMap.set(diffPathKey, diffMatch);
+      diffFilesMap.set(diffPathKey, (0, _getModifieldLines.getModifiedLines)(diff.diff.toString()).modifiedLines);
     }
   });
   return diffFilesMap;
@@ -115,14 +117,6 @@ function filterDiffJson(diffJson) {
 function getRootDir() {
   return process.cwd();
 }
-function getPathFromTestDir(diffPath) {
-  if (!diffPath.includes('uat')) {
-    return undefined;
-  }
-  const indexOfDiff = diffPath.split('/').indexOf('uat');
-  const diffActualPath = diffPath.split('/').slice(indexOfDiff).join('/');
-  return diffActualPath;
-}
 function splitFilterNumber(numberString) {
   var resultedNum = [];
   numberString.split(' ').join(',').split(',').filter(element => {
@@ -169,12 +163,4 @@ function getRootLintPath() {
     shell: true
   });
   return childProcess.stdout.toString().split('\n').filter(Boolean).pop();
-}
-
-// function validateReport() {
-//   if (1) {
-//   } else {
-//     throw new Error('Report Failed');
-//     process.exit(1);
-//   }
-// }
+}

package/build/lint-ci/getModifieldLines.js

@@ -0,0 +1,46 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getModifiedLines = getModifiedLines;
+var _logger = require("../utils/logger");
+function getModifiedLines(content) {
+  var modifiedLines = [];
+  var removedLines = [];
+  try {
+    const diffLineContentIter = content.split('\n');
+    let addLineFrom = -1;
+    let removeLineFrom = -1;
+    let affectedLineNum = 0;
+    for (const currentDiffLine of diffLineContentIter) {
+      if (currentDiffLine.startsWith('@')) {
+        const lineNos = currentDiffLine.split('@@')[1].trim().split(' ');
+        const removedLineDetail = lineNos[0].replace(/-/g, '').split(',');
+        const addedLineDetail = lineNos[1].replace(/\+/g, '').split(',');
+        addLineFrom = parseInt(addedLineDetail[0]);
+        removeLineFrom = parseInt(removedLineDetail[0]);
+        affectedLineNum = removeLineFrom;
+        continue;
+      }
+      if (currentDiffLine.startsWith('+') || currentDiffLine.startsWith('-')) {
+        const isLineChanged = currentDiffLine.trim().length > 1;
+        if (isLineChanged) {
+          modifiedLines.push(affectedLineNum);
+        }
+        if (currentDiffLine.startsWith('-')) {
+          removedLines.push(affectedLineNum);
+        }
+        if (!currentDiffLine.startsWith('-')) {
+          affectedLineNum++;
+        }
+      }
+    }
+  } catch (exp) {
+    _logger.Logger.log(_logger.Logger.FAILURE_TYPE, 'Exception Occurred');
+  }
+  return {
+    modifiedLines,
+    removedLines
+  };
+}

package/build/lint-ci/sonarReportSummary.js

@@ -20,7 +20,7 @@ function getSummaryOfLint(cliParams) {
   } = (0, _cliArgsToObject.cliArgsToObject)(cliParams);
   var $projectName = `${repo}_${branch}_${username}`;
   if (lintEnv === 'pre-commit') {
-    $projectName = (0, _startSeverSonarQube.getProjectNameFrmGit)();
+    $projectName = `${(0, _startSeverSonarQube.getProjectNameFrmGit)()}_pre-commit`;
   }
   return {
     projectName: $projectName,

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

@@ -107,14 +107,8 @@ function getRepoName() {
   return repoName.pop().split('/').pop().split('.')[0];
 }
 function getBranchName() {
-  var branchName = getSpawnOutput('git', ['branch']); // to get current branch
-  branchName = branchName.filter($branch => {
-    if ($branch.startsWith('*') || $branch.includes('*')) {
-      return true;
-    }
-    return false;
-  }).shift();
-  return branchName.trim();
+  var branchName = getSpawnOutput('git', ["rev-parse", "--abbrev-ref", "HEAD"]); // to get current branch
+  return branchName.shift().trim();
 }
 function getSpawnOutput(command, params = []) {
   const demon_process = (0, _child_process.spawnSync)(command, params, {

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.1.8-eslint-21",
+  "version": "0.1.8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2497,12 +2497,6 @@
       "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz",
       "integrity": "sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA=="
     },
-    "adm-zip": {
-      "version": "0.5.12",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.12.tgz",
-      "integrity": "sha512-6TVU49mK6KZb4qG6xWaaM4C7sA/sgUMLy/JYMOzkcp3BvVLpW0fXDFQiIzAuxFCt/2+xD7fNIiPFAoLZPhVNLQ==",
-      "dev": true
-    },
     "agent-base": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
@@ -2997,12 +2991,6 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
-    "color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "dev": true
-    },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -3445,15 +3433,6 @@
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz",
       "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA=="
     },
-    "fancy-log": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-2.0.0.tgz",
-      "integrity": "sha512-9CzxZbACXMUXW13tS0tI8XsGGmxWzO2DmYrGuBJOJ8k8q2K7hwfJA5qHjuPPe8wtsco33YR9wc+Rlr5wYFvhSA==",
-      "dev": true,
-      "requires": {
-        "color-support": "^1.1.3"
-      }
-    },
     "fast-glob": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
@@ -4746,15 +4725,6 @@
         }
       }
     },
-    "jest-sonar-reporter": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/jest-sonar-reporter/-/jest-sonar-reporter-2.0.0.tgz",
-      "integrity": "sha512-ZervDCgEX5gdUbdtWsjdipLN3bKJwpxbvhkYNXTAYvAckCihobSLr9OT/IuyNIRT1EZMDDwR6DroWtrq+IL64w==",
-      "dev": true,
-      "requires": {
-        "xml": "^1.0.1"
-      }
-    },
     "jest-util": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
@@ -5149,12 +5119,6 @@
         "tslib": "^2.0.3"
       }
     },
-    "node-downloader-helper": {
-      "version": "2.1.9",
-      "resolved": "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-2.1.9.tgz",
-      "integrity": "sha512-FSvAol2Z8UP191sZtsUZwHIN0eGoGue3uEXGdWIH5228e9KH1YHXT7fN8Oa33UGf+FbqGTQg3sJfrRGzmVCaJA==",
-      "dev": true
-    },
     "node-environment-flags": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz",
@@ -5833,12 +5797,6 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
     },
-    "shell-quote": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
-      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
-      "dev": true
-    },
     "side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -5865,56 +5823,6 @@
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
     },
-    "slugify": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.6.tgz",
-      "integrity": "sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw==",
-      "dev": true
-    },
-    "sonarqube-scanner": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/sonarqube-scanner/-/sonarqube-scanner-3.3.0.tgz",
-      "integrity": "sha512-G1A6nXT3GwoK5eRwHfFrR/7ThiDfaRefWPIFQ+ifwFOQ/V9OwziLpZBdWZgmZp21kBRnzAMvjcTzgZMqGBXQKA==",
-      "dev": true,
-      "requires": {
-        "adm-zip": "^0.5.10",
-        "fancy-log": "^2.0.0",
-        "https-proxy-agent": "^7.0.1",
-        "jest-sonar-reporter": "^2.0.0",
-        "mkdirp": "^3.0.1",
-        "node-downloader-helper": "^2.1.9",
-        "progress": "^2.0.3",
-        "shell-quote": "^1.8.1",
-        "slugify": "^1.6.6"
-      },
-      "dependencies": {
-        "agent-base": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
-          "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
-          "dev": true,
-          "requires": {
-            "debug": "^4.3.4"
-          }
-        },
-        "https-proxy-agent": {
-          "version": "7.0.4",
-          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
-          "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
-          "dev": true,
-          "requires": {
-            "agent-base": "^7.0.2",
-            "debug": "4"
-          }
-        },
-        "mkdirp": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
-          "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
-          "dev": true
-        }
-      }
-    },
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -6479,12 +6387,6 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
       "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g=="
     },
-    "xml": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
-      "integrity": "sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==",
-      "dev": true
-    },
     "xml-name-validator": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.1.8-eslint-27",
+  "version": "0.1.8-eslint-28",
   "description": "",
   "main": "./build/index.js",
   "scripts": {
@@ -50,6 +50,7 @@
     "@babel/polyfill": "7.12.1",
     "@babel/preset-env": "7.22.15",
     "@babel/runtime": "7.22.15",
-    "commander": "^11.0.0"
+    "commander": "^11.0.0",
+    "sonarqube-scanner": "^3.3.0"
   }
 }

package/.vscode/settings.json

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