bananareporter 0.3.0 → 0.3.2

package/README.md

@@ -9,7 +9,7 @@
   <a href="https://oclif.io"><img src="https://img.shields.io/badge/cli-oclif-brightgreen.svg" alt="oclif"/></a>
   <a href="https://npmjs.org/package/bananareporter"><img src="https://img.shields.io/npm/v/bananareporter.svg" alt="Version"/></a>
   <a href="https://github.com/nya1/bananareporter/actions/workflows/test.yml"><img src="https://github.com/nya1/bananareporter/actions/workflows/test.yml/badge.svg" alt="Github"/></a>
-  <a href="https://npmjs.org/package/bananareporter"><img src="https://img.shields.io/npm/dw/bananareporter.svg" alt="Downloads/week"/></a>
+  <a href="https://npmjs.org/package/bananareporter"><img src="https://img.shields.io/npm/dt/bananareporter.svg" alt="Total Downloads"/></a>
   <a href="https://github.com/nya1/bananareporter/blob/main/package.json"><img src="https://img.shields.io/npm/l/bananareporter.svg" alt="License"/></a>
 </p>
 
@@ -102,7 +102,7 @@ $ npm install -g bananareporter
 $ bananareporter COMMAND
 running command...
 $ bananareporter (--version)
-bananareporter/0.3.0 linux-x64 node-v18.15.0
+bananareporter/0.3.2 linux-x64 node-v18.15.0
 $ bananareporter --help [COMMAND]
 USAGE
   $ bananareporter COMMAND
@@ -161,5 +161,5 @@ EXAMPLES
   report with 138 entries saved to ./bananareporter.json
 ```
 
-_See code: [dist/commands/run/index.ts](https://github.com/nya1/bananareporter/blob/v0.3.0/dist/commands/run/index.ts)_
+_See code: [dist/commands/run/index.ts](https://github.com/nya1/bananareporter/blob/v0.3.2/dist/commands/run/index.ts)_
 <!-- commandsstop -->

package/dist/commands/run/index.js

@@ -70,6 +70,8 @@ class Run extends core_1.Command {
             // eslint-disable-next-line unicorn/prefer-spread
             reportList = reportList.concat(res);
         }
+        // remove any duplicates (based on "id")
+        reportList = [...new Map(reportList.map(v => [v.id, v])).values()];
         if (reportList.length === 0) {
             this.warn('no entries found, make sure the date range provided and the sources are correct');
             return;

package/dist/integrations/github.js

@@ -65,7 +65,6 @@ class GithubIntegration extends base_1.IntegrationBase {
     async fetchData() {
         let page = 1;
         let commitList = [];
-        const commitShaList = new Set();
         while (page > 0) {
             logger_1.logger.debug(`github integration working on ${page}`);
             /* eslint-disable no-await-in-loop */
@@ -80,12 +79,7 @@ class GithubIntegration extends base_1.IntegrationBase {
                 break;
             }
             // eslint-disable-next-line unicorn/prefer-spread
-            commitList = commitList.concat(
-            // remove duplicate items
-            commits.items.filter(c => !commitShaList.has(c.sha)));
-            for (const c of commits.items) {
-                commitShaList.add(c.sha);
-            }
+            commitList = commitList.concat(commits.items);
             logger_1.logger.debug(`github integration commitList ${commitList.length} (added ${commits.items.length} commits)`);
             page += 1;
             await (0, common_1.delay)(this.delayToUse);

package/dist/integrations/gitlab.js

@@ -88,7 +88,6 @@ class GitlabIntegration extends base_1.IntegrationBase {
         let page = 1;
         let eventList = [];
         const projectIds = new Set();
-        const commitShaList = new Set();
         while (page > 0) {
             logger_1.logger.debug(`gitlab integration working on ${page}`);
             /* eslint-disable no-await-in-loop */
@@ -103,11 +102,8 @@ class GitlabIntegration extends base_1.IntegrationBase {
                 break;
             }
             // eslint-disable-next-line unicorn/prefer-spread
-            eventList = eventList.concat(
-            // remove duplicated commits
-            events.filter(e => !commitShaList.has(e.push_data.commit_to)));
+            eventList = eventList.concat(events);
             for (const e of events) {
-                commitShaList.add(e.push_data.commit_to);
                 projectIds.add(e.project_id);
             }
             logger_1.logger.debug(`gitlab integration eventList ${eventList.length} (added ${events.length} events)`);

package/dist/integrations/todotxt.js

@@ -81,7 +81,7 @@ class TodoTxtIntegration extends base_1.IntegrationBase {
         const projectName = (_a = rawData.projects) === null || _a === void 0 ? void 0 : _a.map(p => p.replace('+', '')).join(',');
         const description = `${rawData.description}`;
         return {
-            id: `${index}`,
+            id: `${this.config.file}_${index}`,
             date: rawData.completion || rawData.creation || '',
             description,
             projectName,

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.3.0",
+  "version": "0.3.2",
   "commands": {
     "run": {
       "id": "run",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bananareporter",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Easily generate a report from multiple sources",
   "author": "nya1",
   "bin": {