reverting changes to index.js and applying them to index.ts

Author: vikram-sharma-vik

dist/index.js

@@ -19197,7 +19197,6 @@ const minimatch = __nccwpck_require__(3973);
 const { readFileSync } = __nccwpck_require__(5747);
 const header = core.getInput("comment-header");
 const footer = core.getInput("comment-footer");
-const mergeComment = core.getInput("merge-comment") === 'true';
 const minimatchOptions = {
     dot: core.getInput('include-hidden-files') === 'true'
 };
@@ -19206,46 +19205,15 @@ function getChecklistPaths() {
     const parsedFile = YAML.parse(readFileSync(inputFile, { encoding: "utf8" }));
     return parsedFile.paths;
 }
-function formatItemsForPath(previousComment, mergeComment, [path, items]) {
-    const showPaths = core.getInput("show-paths") === "true";
-    
-    if (!!previousComment && mergeComment) {
-        const existingCheckedItems = previousComment
-            .split("\n")
-            .filter((line) => line !== "" && line.startsWith("- [x]"))
-            .map((line) => line.substring(5).trim());
-        const preservedItems = items.filter((item) => {
-            return !!existingCheckedItems.find((existingItem) =>
-                    existingItem.includes(item)
-                );
-            });
-        const newItems = items.filter((item) => {
-            return !existingCheckedItems.find((existingItem) =>
-                    existingItem.includes(item)
-                );
-            });
-        
-        return showPaths
-        ? [
-            `__Files matching \`${path}\`:__\n`,
-            ...preservedItems.map((item) => `- [x] ${item}\n`),
-            ...newItems.map((item) => `- [ ] ${item}\n`),
-            "\n",
-            ].join("")
-        : [
-            ...preservedItems.map((item) => `- [x] ${item}\n`),
-            ...newItems.map((item) => `- [ ] ${item}\n`),
-            ].join("");
-    }
-
+function formatItemsForPath([path, items]) {
+    const showPaths = core.getInput("show-paths") === 'true';
     return showPaths
         ? [
             `__Files matching \`${path}\`:__\n`,
             ...items.map((item) => `- [ ] ${item}\n`),
             "\n",
         ].join("")
         : [...items.map((item) => `- [ ] ${item}\n`)].join("");
-
 }
 function run() {
     var _a, _b;
@@ -19277,7 +19245,7 @@ function run() {
         if (applicableChecklistPaths.length > 0) {
             const body = [
                 `${header}\n\n`,
-                ...applicableChecklistPaths.map(([path, items]) => formatItemsForPath(existingComment.body, mergeComment, [path, items])),
+                ...applicableChecklistPaths.map(formatItemsForPath),
                 `\n${footer}`
             ].join("");
             if (existingComment) {

index.ts

@@ -5,10 +5,10 @@ const minimatch = require("minimatch");
 const { readFileSync } = require("fs");
 
 const header = core.getInput("comment-header");
-const footer = core.getInput("comment-footer")
+const footer = core.getInput("comment-footer");
 
 const minimatchOptions = {
-  dot: core.getInput('include-hidden-files') === 'true'
+  dot: core.getInput("include-hidden-files") === "true",
 };
 
 function getChecklistPaths(): Record<string, string[]> {
@@ -17,22 +17,56 @@ function getChecklistPaths(): Record<string, string[]> {
   return parsedFile.paths;
 }
 
-function formatItemsForPath([path, items]): string {
-  const showPaths = core.getInput("show-paths") === 'true';
+function formatItemsForPath(previousComment, [path, items]) {
+  const showPaths = core.getInput("show-paths") === "true";
+  const mergeComment = core.getInput("merge-comment") === "true";
+
+  if (!!previousComment && mergeComment) {
+    const existingCheckedItems = previousComment
+      .split("\n")
+      .filter((line) => line !== "" && line.startsWith("- [x]"))
+      .map((line) => line.substring(5).trim());
+    const preservedItems = items.filter((item) => {
+      return !!existingCheckedItems.find((existingItem) =>
+        existingItem.includes(item)
+      );
+    });
+    const newItems = items.filter((item) => {
+      return !existingCheckedItems.find((existingItem) =>
+        existingItem.includes(item)
+      );
+    });
+
+    return showPaths
+      ? [
+          `__Files matching \`${path}\`:__\n`,
+          ...preservedItems.map((item) => `- [x] ${item}\n`),
+          ...newItems.map((item) => `- [ ] ${item}\n`),
+          "\n",
+        ].join("")
+      : [
+          ...preservedItems.map((item) => `- [x] ${item}\n`),
+          ...newItems.map((item) => `- [ ] ${item}\n`),
+        ].join("");
+  }
 
   return showPaths
-  ? [
-      `__Files matching \`${path}\`:__\n`,
-      ...items.map((item) => `- [ ] ${item}\n`),
-      "\n",
-    ].join("")
-  : [...items.map((item) => `- [ ] ${item}\n`)].join("");
+    ? [
+        `__Files matching \`${path}\`:__\n`,
+        ...items.map((item) => `- [ ] ${item}\n`),
+        "\n",
+      ].join("")
+    : [...items.map((item) => `- [ ] ${item}\n`)].join("");
 }
 
 async function run() {
   const context = github.context;
   const { owner, repo } = context.repo;
-  const number = (context.payload.issue ?? context.payload.pull_request ?? context.payload).number;
+  const number = (
+    context.payload.issue ??
+    context.payload.pull_request ??
+    context.payload
+  ).number;
 
   const ghToken = core.getInput("gh-token");
   const client = github.getOctokit(ghToken);
@@ -42,9 +76,9 @@ async function run() {
     await client.rest.pulls.listFiles({
       owner: owner,
       repo: repo,
-      pull_number: number
+      pull_number: number,
     })
-  ).data.map(file => file.filename);
+  ).data.map((file) => file.filename);
 
   const applicableChecklistPaths = Object.entries(checklistPaths).filter(
     ([key, _]) => {
@@ -61,42 +95,44 @@ async function run() {
     await client.rest.issues.listComments({
       owner: owner,
       repo: repo,
-      issue_number: number
+      issue_number: number,
     })
-  ).data.find(comment => comment.body.includes(footer));
+  ).data.find((comment) => comment.body.includes(footer));
 
   if (applicableChecklistPaths.length > 0) {
     const body = [
       `${header}\n\n`,
-      ...applicableChecklistPaths.map(formatItemsForPath),
-      `\n${footer}`
+      ...applicableChecklistPaths.map(([path, items]) =>
+        formatItemsForPath(existingComment.body, [path, items])
+      ),
+      `\n${footer}`,
     ].join("");
 
     if (existingComment) {
       await client.rest.issues.updateComment({
         owner: owner,
         repo: repo,
         comment_id: existingComment.id,
-        body
+        body,
       });
     } else {
       await client.rest.issues.createComment({
         owner: owner,
         repo: repo,
         issue_number: number,
-        body
+        body,
       });
     }
   } else {
     if (existingComment) {
       await client.rest.issues.deleteComment({
         owner: owner,
         repo: repo,
-        comment_id: existingComment.id
+        comment_id: existingComment.id,
       });
     }
     console.log("No paths were modified that match checklist paths");
   }
 }
 
-run().catch(err => core.setFailed(err.message));
+run().catch((err) => core.setFailed(err.message));