0.4.4 1

seed-of-apricot · Oct 15, 2020 · fb3cbe5 · fb3cbe5
1 parent b451253
commit fb3cbe5
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 20 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/getFiles.ts b/src/getFiles.ts
@@ -14,21 +14,25 @@ export const getFiles = async (
   const path = globToRegex(core.getInput('flagPath'), { globstar: true });
   const octokit = github.getOctokit(token);
 
-  const files = commits.flatMap(item =>
-    item.data.files.reduce((prev, file) => {
-      if (file.filename.match(path) !== null && file.status !== 'removed') {
-        return [
-          ...prev,
-          octokit.repos.getContent({
-            ...github.context.repo,
-            path: file.filename,
-            ref: item.data.sha,
-          }),
-        ];
-      } else {
-        return prev;
-      }
-    }, [] as Promise<OctokitResponse<ReposGetContentResponseData>>[]),
-  );
+  const files = commits
+    .sort((a, b) =>
+      a.data.commit.author.date > b.data.commit.author.date ? -1 : 1,
+    )
+    .flatMap(item =>
+      item.data.files.reduce((prev, file) => {
+        if (file.filename.match(path) !== null && file.status !== 'removed') {
+          return [
+            ...prev,
+            octokit.repos.getContent({
+              ...github.context.repo,
+              path: file.filename,
+              ref: item.data.sha,
+            }),
+          ];
+        } else {
+          return prev;
+        }
+      }, [] as Promise<OctokitResponse<ReposGetContentResponseData>>[]),
+    );
   return Promise.all(files);
 };
diff --git a/src/main.ts b/src/main.ts
@@ -30,7 +30,13 @@ const main = async (): Promise<void> => {
 
     console.log('files have been retrieved');
     const summaryData = convertFiles(await summary);
-    const filesData = (await files).map(item => convertFiles(item));
+    const filesData = (await files)
+      .filter(
+        (item, index, array) =>
+          array.map(element => element.data.path).indexOf(item.data.path) ===
+          index,
+      )
+      .map(item => convertFiles(item));
     const newSummary = processFiles(summaryData, filesData);
     console.log('new summary has been compiled');
     writeNewSummary(await newSummary);