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

package/build/lint-ci/eslintLintStage.js

@@ -50,7 +50,7 @@ async function runEslintForDiff(cliParams, options = {}) {
       });
       lint_process.on('close', async onclose => {
         if (diffPath && !(filteredDiffFiles.length === 0)) {
-          const filteredJson = await filterReport_JSON(require(reportPath), diffJSON);
+          const filteredJson = await filterReportBasedDiff(require(reportPath), diffJSON);
           (0, _fileUtils.writeFileContents)(reportPath, JSON.stringify(filteredJson));
         }
         resolve({
@@ -63,29 +63,28 @@ async function runEslintForDiff(cliParams, options = {}) {
     }
   });
 }
-function filterReport_JSON(resultJson, diffJson) {
+function filterReportBasedDiff(resultJson, diffJson) {
   return new Promise(resolve => {
     if (!diffJson) {
       _logger.Logger.log(_logger.Logger.FAILURE_TYPE, 'git diff json is not given ...');
       resolve(false);
     }
-    const impactLineArray = filterDiffJson(diffJson);
+    const impactLineMap = filterDiffJson(diffJson);
     resultJson = resultJson.filter(result => {
-      var _impactLineArray$get;
-      const isImpactFile = getPathFromTestDir(result.filePath);
+      var _impactLineMap$get;
+      const isImpactFile = result.filePath;
       if (!isImpactFile) {
         return false;
       }
-      if (((_impactLineArray$get = impactLineArray.get(isImpactFile)) === null || _impactLineArray$get === void 0 ? void 0 : _impactLineArray$get.length) !== 0) {
+      if (((_impactLineMap$get = impactLineMap.get(isImpactFile)) === null || _impactLineMap$get === void 0 ? void 0 : _impactLineMap$get.length) !== 0) {
         result.messages = result.messages.filter(errorMsg => {
-          if (impactLineArray.get(isImpactFile).includes(errorMsg.line)) {
+          if (impactLineMap.get(isImpactFile).includes(`${errorMsg.line}`)) {
             return true;
           }
           return false;
         });
         return true;
       }
-      return false;
     });
     resolve(resultJson);
   });
@@ -100,7 +99,7 @@ function filterDiffJson(diffJson) {
     while ((match = regex.exec(diff.diff)) !== null) {
       diffMatch.push(...splitFilterNumber(match[1]));
     }
-    const diffPathKey = getPathFromTestDir(diff.new_path);
+    const diffPathKey = _path.default.resolve(getRootLintPath(), diff.new_path);
     if (diffPathKey === undefined) {
       return;
     }

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

@@ -64,7 +64,7 @@ function runSonarAnalysis(cliParams) {
     _logger.Logger.error(_logger.Logger.FAILURE_TYPE, `Error: ${error.message}`);
   });
   child_process.on('close', code => {
-    _logger.Logger.log(_logger.Logger.SUCCESS_TYPE, `Lint Stage Executed &  Status - ${code === 0 ? 'Success' : 'Failure'}`);
+    _logger.Logger.log(_logger.Logger.SUCCESS_TYPE, `Report to Server  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') {
@@ -72,15 +72,10 @@ function runSonarAnalysis(cliParams) {
       if (!getLintStatus().status && getLintStatus().message == 'failed') {
         _logger.Logger.log(_logger.Logger.FAILURE_TYPE, 'rules violated .. ');
         (0, _popUpCli.showMsgPopUp)('IssueFound');
-        process.exit(0);
+        process.exit(1);
       } 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);
-      }
     }
   });
 }
@@ -97,7 +92,10 @@ function getFilePathFrmReport(resultJson) {
   });
 }
 function getProjectNameFrmGit() {
-  return `${getRepoName()}_${getBranchName()}_${getGitUsername()}`;
+  let $repoName = getRepoName();
+  let $branchName = getBranchName();
+  let $username = getGitUsername();
+  return $repoName && $branchName && $username ? `${$repoName}_${$branchName}_${$username}` : 'desk_default_project';
 }
 function getGitUsername() {
   const userName = getSpawnOutput('git', ['config', 'user.email']);
@@ -108,7 +106,7 @@ function getRepoName() {
   return repoName.pop().split('/').pop().split('.')[0];
 }
 function getBranchName() {
-  const branchName = getSpawnOutput('git', ['branch']).shift();
+  const branchName = getSpawnOutput('git', ['branch'])[1]; // to get current branch
   if (branchName.startsWith('*')) {
     return branchName.replace('*', ' ').trim();
   }
@@ -143,8 +141,8 @@ function getLintStatus() {
     };
   }
   if (report.length != 0) {
-    for (i = 0; i < report.length; i++) {
-      if (fileReport.messages != 0 && fileReport.errorCount != 0) {
+    for (let i = 0; i < report.length; i++) {
+      if (report[i].messages != 0) {
         reportStatus = false;
         break;
       }

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.1.8",
+  "version": "0.1.8-eslint-21",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2497,6 +2497,12 @@
       "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",
@@ -2991,6 +2997,12 @@
       "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",
@@ -3433,6 +3445,15 @@
       "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",
@@ -4725,6 +4746,15 @@
         }
       }
     },
+    "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",
@@ -5119,6 +5149,12 @@
         "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",
@@ -5797,6 +5833,12 @@
       "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",
@@ -5823,6 +5865,56 @@
       "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",
@@ -6387,6 +6479,12 @@
       "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-21",
+  "version": "0.1.8-eslint-24",
   "description": "",
   "main": "./build/index.js",
   "scripts": {