@bragduck/cli 2.27.2 → 2.28.1

package/dist/bin/bragduck.js

@@ -3653,32 +3653,6 @@ var JiraService = class {
       return null;
     }
   }
-  /**
-   * Check if a user object matches the given identifier (accountId, email, or username)
-   */
-  isMatchingUser(candidate, userIdentifier) {
-    return candidate.email === userIdentifier || candidate.emailAddress === userIdentifier || candidate.accountId === userIdentifier || candidate.username === userIdentifier || candidate.name === userIdentifier;
-  }
-  /**
-   * Filter issues to only those where the user made contributions within the date range.
-   * Excludes issues where the user's only involvement is a static role (creator/assignee)
-   * with a date outside the scan period.
-   */
-  filterIssuesByUserContribution(issues, userIdentifier, sinceDate) {
-    const results = [];
-    for (const issue of issues) {
-      const userChanges = (issue.changelog?.histories || []).filter(
-        (h) => this.isMatchingUser(h.author, userIdentifier) && new Date(h.created) >= sinceDate
-      );
-      const isCreatorInRange = this.isMatchingUser(issue.fields.creator, userIdentifier) && new Date(issue.fields.created) >= sinceDate;
-      if (userChanges.length > 0 || isCreatorInRange) {
-        results.push({ issue, userChanges });
-      } else {
-        logger.debug(`Excluding issue ${issue.key} - no user contributions in date range`);
-      }
-    }
-    return results;
-  }
   /**
    * Build JQL query from options
    */
@@ -3808,7 +3782,7 @@ var JiraService = class {
         );
         break;
       }
-      const endpoint = `/rest/api/3/search/jql?jql=${encodeURIComponent(jql)}&startAt=${startAt}&maxResults=${maxResults}&fields=${fields.join(",")}&expand=changelog`;
+      const endpoint = `/rest/api/3/search/jql?jql=${encodeURIComponent(jql)}&startAt=${startAt}&maxResults=${maxResults}&fields=${fields.join(",")}`;
       try {
         const response = await this.request(endpoint);
         if (response.issues.length === 0) {
@@ -3834,7 +3808,14 @@ var JiraService = class {
           break;
         }
         if (options.limit && allIssues.length >= options.limit) {
-          break;
+          const email2 = await this.getCurrentUser();
+          const limitedIssues = allIssues.slice(0, options.limit);
+          const commits2 = [];
+          for (const issue of limitedIssues) {
+            const commit = await this.transformIssueToCommit(issue, void 0, email2 || void 0);
+            commits2.push(commit);
+          }
+          return commits2;
         }
         startAt += maxResults;
       } catch (error) {
@@ -3858,23 +3839,9 @@ var JiraService = class {
         throw error;
       }
     }
-    const issuesToProcess = options.limit ? allIssues.slice(0, options.limit) : allIssues;
     const email = await this.getCurrentUser();
-    const sinceDate = options.days ? new Date(Date.now() - options.days * 24 * 60 * 60 * 1e3) : void 0;
-    if (sinceDate && email) {
-      const filtered = this.filterIssuesByUserContribution(issuesToProcess, email, sinceDate);
-      logger.debug(
-        `Date-scoped filtering: ${issuesToProcess.length} issues -> ${filtered.length} with user contributions in range`
-      );
-      const commits2 = [];
-      for (const { issue, userChanges } of filtered) {
-        const commit = await this.transformIssueToCommit(issue, void 0, email, userChanges);
-        commits2.push(commit);
-      }
-      return commits2;
-    }
     const commits = [];
-    for (const issue of issuesToProcess) {
+    for (const issue of allIssues) {
       const commit = await this.transformIssueToCommit(issue, void 0, email || void 0);
       commits.push(commit);
     }
@@ -3896,7 +3863,7 @@ var JiraService = class {
   /**
    * Transform Jira issue to GitCommit format with contribution-specific data
    */
-  async transformIssueToCommit(issue, instanceUrl, userEmail, userChanges) {
+  async transformIssueToCommit(issue, instanceUrl, userEmail) {
     let contribution = null;
     if (userEmail) {
       contribution = await this.determineJiraContributionType(issue, userEmail);
@@ -3938,8 +3905,6 @@ ${truncatedDesc}`;
       date = issue.fields.created;
     } else if (contribution?.type === "assigned-resolved" && issue.fields.resolutiondate) {
       date = issue.fields.resolutiondate;
-    } else if (userChanges && userChanges.length > 0) {
-      date = userChanges[userChanges.length - 1].created;
     } else {
       date = issue.fields.updated;
     }
@@ -4129,59 +4094,6 @@ var ConfluenceService = class {
       return null;
     }
   }
-  /**
-   * Check if a user object matches the given identifier (accountId, email, or username)
-   */
-  isMatchingUser(candidate, userIdentifier) {
-    return candidate.email === userIdentifier || candidate.emailAddress === userIdentifier || candidate.accountId === userIdentifier || candidate.username === userIdentifier || candidate.name === userIdentifier;
-  }
-  /**
-   * Fetch full version history for a page
-   */
-  async getPageVersionHistory(pageId) {
-    const allVersions = [];
-    let start = 0;
-    const limit = 50;
-    while (true) {
-      const response = await this.request(
-        `/wiki/rest/api/content/${pageId}/version?start=${start}&limit=${limit}`
-      );
-      allVersions.push(...response.results);
-      if (response.size < limit) break;
-      start += limit;
-    }
-    return allVersions;
-  }
-  /**
-   * Filter pages to only those where the user made contributions within the date range.
-   * Fetches version history per page and checks if the user has versions in range.
-   */
-  async filterPagesByUserContribution(pages, userIdentifier, sinceDate) {
-    const results = [];
-    for (let i = 0; i < pages.length; i++) {
-      const page = pages[i];
-      if (i > 0) {
-        await new Promise((resolve) => globalThis.setTimeout(resolve, 100));
-      }
-      try {
-        const versions = await this.getPageVersionHistory(page.id);
-        const userVersions = versions.filter(
-          (v) => this.isMatchingUser(v.by, userIdentifier) && new Date(v.when) >= sinceDate
-        );
-        const userCommentsInRange = page.children?.comment?.results?.filter(
-          (comment) => this.isMatchingUser(comment.version?.by || {}, userIdentifier) && new Date(comment.version?.when || 0) >= sinceDate
-        ) || [];
-        if (userVersions.length > 0 || userCommentsInRange.length > 0) {
-          results.push({ page, userVersions });
-        } else {
-          logger.debug(`Excluding page "${page.title}" - no user contributions in date range`);
-        }
-      } catch (error) {
-        logger.debug(`Skipping version history for page ${page.id}: ${error}`);
-      }
-    }
-    return results;
-  }
   /**
    * Build CQL query from options
    * Returns empty string if no filters need CQL (will use simple endpoint instead)
@@ -4217,31 +4129,28 @@ var ConfluenceService = class {
    * Determine the type of contribution the current user made to a page
    * Returns: 'created' | 'edited' | 'commented'
    */
-  async determineContributionType(page, userEmail, userVersions) {
-    const createdByUser = page.history?.createdBy ? this.isMatchingUser(page.history.createdBy, userEmail) : false;
-    if (createdByUser) {
+  async determineContributionType(page, userEmail) {
+    if (page.history?.createdBy?.email === userEmail) {
       return {
         type: "created",
         details: `Created page with ${page.version?.number || 1} version${(page.version?.number || 1) > 1 ? "s" : ""}`
       };
     }
-    const hasEdits = userVersions ? userVersions.some((v) => !v.minorEdit || v.number > 1) : page.version?.by ? this.isMatchingUser(page.version.by, userEmail) && (page.version?.number || 0) > 1 : false;
+    const hasEdits = page.version?.by?.email === userEmail && (page.version?.number || 0) > 1;
     const userComments = page.children?.comment?.results?.filter(
-      (comment) => comment.version?.by ? this.isMatchingUser(comment.version.by, userEmail) : false
+      (comment) => comment.version?.by?.email === userEmail
     ) || [];
     const hasComments = userComments.length > 0;
     if (hasEdits && hasComments) {
-      const editCount = userVersions?.length || 1;
       return {
         type: "edited",
-        details: `Edited page (${editCount} edit${editCount > 1 ? "s" : ""}) and added ${userComments.length} comment${userComments.length > 1 ? "s" : ""}`
+        details: `Edited page (v${page.version?.number || 1}) and added ${userComments.length} comment${userComments.length > 1 ? "s" : ""}`
       };
     }
     if (hasEdits) {
-      const editCount = userVersions?.length || 1;
       return {
         type: "edited",
-        details: `Edited page (${editCount} edit${editCount > 1 ? "s" : ""})`
+        details: `Edited page to version ${page.version?.number || 1}`
       };
     }
     if (hasComments) {
@@ -4339,7 +4248,14 @@ var ConfluenceService = class {
           break;
         }
         if (options.limit && allPages.length >= options.limit) {
-          break;
+          const email2 = await this.getCurrentUser();
+          const limitedPages = allPages.slice(0, options.limit);
+          const commits2 = [];
+          for (const page of limitedPages) {
+            const commit = await this.transformPageToCommit(page, void 0, email2 || void 0);
+            commits2.push(commit);
+          }
+          return commits2;
         }
         start += limit;
       } catch (error) {
@@ -4363,23 +4279,9 @@ var ConfluenceService = class {
         throw error;
       }
     }
-    const pagesToProcess = options.limit ? allPages.slice(0, options.limit) : allPages;
     const email = await this.getCurrentUser();
-    const sinceDate = options.days ? new Date(Date.now() - options.days * 24 * 60 * 60 * 1e3) : void 0;
-    if (sinceDate && email) {
-      const filtered = await this.filterPagesByUserContribution(pagesToProcess, email, sinceDate);
-      logger.debug(
-        `Date-scoped filtering: ${pagesToProcess.length} pages -> ${filtered.length} with user contributions in range`
-      );
-      const commits2 = [];
-      for (const { page, userVersions } of filtered) {
-        const commit = await this.transformPageToCommit(page, void 0, email, userVersions);
-        commits2.push(commit);
-      }
-      return commits2;
-    }
     const commits = [];
-    for (const page of pagesToProcess) {
+    for (const page of allPages) {
       const commit = await this.transformPageToCommit(page, void 0, email || void 0);
       commits.push(commit);
     }
@@ -4401,10 +4303,10 @@ var ConfluenceService = class {
   /**
    * Transform Confluence page to GitCommit format with contribution-specific data
    */
-  async transformPageToCommit(page, instanceUrl, userEmail, userVersions) {
+  async transformPageToCommit(page, instanceUrl, userEmail) {
     let contribution = null;
     if (userEmail) {
-      contribution = await this.determineContributionType(page, userEmail, userVersions);
+      contribution = await this.determineContributionType(page, userEmail);
     }
     let message;
     let contributionPrefix = "";
@@ -4442,14 +4344,7 @@ ${contribution.details}
     const impactScore = contribution ? this.calculateContributionImpact(contribution.type, baseSize) : baseSize;
     const author = page.history?.createdBy?.displayName || page.version?.by?.displayName || "Unknown Author";
     const authorEmail = page.history?.createdBy?.email || page.version?.by?.email || "unknown@example.com";
-    let date;
-    if (contribution?.type === "created") {
-      date = page.history?.createdDate || page.version?.when;
-    } else if (userVersions && userVersions.length > 0) {
-      date = userVersions[userVersions.length - 1].when;
-    } else {
-      date = page.version?.when || (/* @__PURE__ */ new Date()).toISOString();
-    }
+    const date = contribution?.type === "created" ? page.history?.createdDate || page.version?.when : page.version?.when || (/* @__PURE__ */ new Date()).toISOString();
     return {
       sha: page.id,
       message,