eslint + clean-up

eslint + clean-up

Author: marinakalyuzhnaya

dist/main.js

@@ -6024,11 +6024,28 @@ function uncovered(file, options) {
         .join(", ");
 }
 
+/**
+ * Compares two arrays of objects and returns with unique lines update
+ * @param {number} pdiff value from diff percentage
+ * @returns {string} emoji string for negative/positive pdiff
+ */
 const renderEmoji = pdiff => {
-	if (pdiff < 0) return "🔴";
-	if (pdiff >= 0) return "🟢";
+    if (pdiff < 0) return "🔴";
+    if (pdiff >= 0) return "🟢";
 };
 
+/**
+ * Compares two arrays of objects and returns with unique lines update
+ * @param {Array} otherArray
+ * @returns {Function} function with filtering non original lines
+ */
+const comparer = otherArray => current =>
+    otherArray.filter(
+        other =>
+            other.lines.found === current.lines.found &&
+            other.lines.hit === current.lines.hit,
+    ).length === 0;
+
 /**
  * Github comment for monorepo
  * @param {Array<{packageName, lcovPath}>} lcovArrayForMonorepo
@@ -6052,6 +6069,13 @@ function commentForMonorepo(
         const arrow = pdiff === 0 ? "" : pdiff < 0 ? "▾" : "▴";
 
         const pdiffHtml = baseLcov ? th(renderEmoji(pdiff), " ", arrow, " ", plus, pdiff.toFixed(2), "%") : "";
+				let report = lcovObj.lcov;
+
+        if (baseLcov) {
+            const onlyInLcov = lcovObj.lcov.filter(comparer(baseLcov));
+            const onlyInBefore = baseLcov.filter(comparer(lcovObj.lcov));
+            report = onlyInBefore.concat(onlyInLcov);
+        }
 
         return `${table(
             tbody(
@@ -6063,7 +6087,7 @@ function commentForMonorepo(
             ),
         )} \n\n ${details(
             summary("Coverage Report"),
-            tabulate(lcovObj.lcov, options),
+            tabulate(report, options),
         )} <br/>`;
     });
 
@@ -6078,7 +6102,7 @@ function commentForMonorepo(
  * @param {raw lcov} lcov
  * @param {*} options
  */
-function comment(lcov, before, options) {
+async function comment(lcov, before, options) {
     const pbefore = before ? percentage(before) : 0;
     const pafter = before ? percentage(lcov) : 0;
     const pdiff = pafter - pbefore;
@@ -6087,14 +6111,13 @@ function comment(lcov, before, options) {
 
 		const pdiffHtml = before ? th(renderEmoji(pdiff), " ", arrow, " ", plus, pdiff.toFixed(2), "%") : "";
 
-		let report = lcov;
-		if (before) {
-			const uniqueResultBase = before.filter(obj => !lcov.some(obj2 => obj.lines === obj2.lines));
-			const uniqueResultLcov = lcov.filter(obj => !before.some(obj2 => obj.lines === obj2.lines));
+    let report = lcov;
 
-			report = uniqueResultBase.concat(uniqueResultLcov);
-			console.log(report);
-		}
+    if (before) {
+        const onlyInLcov = lcov.filter(comparer(before));
+        const onlyInBefore = before.filter(comparer(lcov));
+        report = onlyInBefore.concat(onlyInLcov);
+    }
 
     return fragment(
         `Coverage after merging ${b(options.head)} into ${b(
@@ -6320,7 +6343,7 @@ async function main() {
         commit: context.payload.pull_request.head.sha,
         prefix: `${process.env.GITHUB_WORKSPACE}/`,
         head: context.payload.pull_request.head.ref,
-        base: context.payload.pull_request.base.ref,
+        base: context.payload.pull_request.base.ref
     };
 
     const lcov = !monorepoBasePath && (await parse$1(raw));

src/comment.js

@@ -2,11 +2,28 @@ import { details, summary, b, fragment, table, tbody, tr, th } from "./html";
 import { percentage } from "./lcov";
 import { tabulate } from "./tabulate";
 
+/**
+ * Compares two arrays of objects and returns with unique lines update
+ * @param {number} pdiff value from diff percentage
+ * @returns {string} emoji string for negative/positive pdiff
+ */
 const renderEmoji = pdiff => {
-	if (pdiff < 0) return "🔴";
-	if (pdiff >= 0) return "🟢";
+    if (pdiff < 0) return "🔴";
+    if (pdiff >= 0) return "🟢";
 };
 
+/**
+ * Compares two arrays of objects and returns with unique lines update
+ * @param {Array} otherArray
+ * @returns {Function} function with filtering non original lines
+ */
+const comparer = otherArray => current =>
+    otherArray.filter(
+        other =>
+            other.lines.found === current.lines.found &&
+            other.lines.hit === current.lines.hit,
+    ).length === 0;
+
 /**
  * Github comment for monorepo
  * @param {Array<{packageName, lcovPath}>} lcovArrayForMonorepo
@@ -30,6 +47,13 @@ export function commentForMonorepo(
         const arrow = pdiff === 0 ? "" : pdiff < 0 ? "▾" : "▴";
 
         const pdiffHtml = baseLcov ? th(renderEmoji(pdiff), " ", arrow, " ", plus, pdiff.toFixed(2), "%") : "";
+				let report = lcovObj.lcov;
+
+        if (baseLcov) {
+            const onlyInLcov = lcovObj.lcov.filter(comparer(baseLcov));
+            const onlyInBefore = baseLcov.filter(comparer(lcovObj.lcov));
+            report = onlyInBefore.concat(onlyInLcov);
+        }
 
         return `${table(
             tbody(
@@ -41,7 +65,7 @@ export function commentForMonorepo(
             ),
         )} \n\n ${details(
             summary("Coverage Report"),
-            tabulate(lcovObj.lcov, options),
+            tabulate(report, options),
         )} <br/>`;
     });
 
@@ -56,7 +80,7 @@ export function commentForMonorepo(
  * @param {raw lcov} lcov
  * @param {*} options
  */
-export function comment(lcov, before, options) {
+export async function comment(lcov, before, options) {
     const pbefore = before ? percentage(before) : 0;
     const pafter = before ? percentage(lcov) : 0;
     const pdiff = pafter - pbefore;
@@ -65,14 +89,13 @@ export function comment(lcov, before, options) {
 
 		const pdiffHtml = before ? th(renderEmoji(pdiff), " ", arrow, " ", plus, pdiff.toFixed(2), "%") : "";
 
-		let report = lcov;
-		if (before) {
-			const uniqueResultBase = before.filter(obj => !lcov.some(obj2 => obj.lines === obj2.lines));
-			const uniqueResultLcov = lcov.filter(obj => !before.some(obj2 => obj.lines === obj2.lines));
+    let report = lcov;
 
-			report = uniqueResultBase.concat(uniqueResultLcov);
-			console.log(report);
-		}
+    if (before) {
+        const onlyInLcov = lcov.filter(comparer(before));
+        const onlyInBefore = before.filter(comparer(lcov));
+        report = onlyInBefore.concat(onlyInLcov);
+    }
 
     return fragment(
         `Coverage after merging ${b(options.head)} into ${b(

src/index.js

@@ -108,7 +108,7 @@ async function main() {
         commit: context.payload.pull_request.head.sha,
         prefix: `${process.env.GITHUB_WORKSPACE}/`,
         head: context.payload.pull_request.head.ref,
-        base: context.payload.pull_request.base.ref,
+        base: context.payload.pull_request.base.ref
     };
 
     const lcov = !monorepoBasePath && (await parse(raw));