@atlassian-dc-mcp/bitbucket 0.12.0 → 0.12.2

package/src/__tests__/pr-comment-mapper.test.ts

@@ -4,6 +4,83 @@ import {
   type BitbucketPRApiResponse,
   type SimplifiedPRResponse
 } from '../pr-comment-mapper.js';
+import { formatToolResponse } from '@atlassian-dc-mcp/common';
+
+interface TestComment {
+  properties: { repositoryId: number };
+  id: number;
+  version: number;
+  text: string;
+  author: ReturnType<typeof createUser>;
+  createdDate: number;
+  updatedDate: number;
+  comments: TestComment[];
+  anchor?: {
+    fromHash: string;
+    toHash: string;
+    line: number;
+    lineType: string;
+    fileType: string;
+    path: string;
+    diffType: string;
+    orphaned: boolean;
+  };
+  threadResolved: boolean;
+  severity: string;
+  state: string;
+  permittedOperations: {
+    editable: boolean;
+    transitionable: boolean;
+    deletable: boolean;
+  };
+}
+
+function createUser(name: string, id: number, displayName: string) {
+  return {
+    name,
+    emailAddress: `${name}@company.local`,
+    active: true,
+    displayName,
+    id,
+    slug: name,
+    type: "NORMAL",
+    links: {
+      self: [{ href: `https://bitbucket.company.local/users/${name}` }]
+    }
+  };
+}
+
+function createComment(overrides: Partial<TestComment> = {}): TestComment {
+  return {
+    properties: { repositoryId: 1001 },
+    id: 2001,
+    version: 0,
+    text: "This needs review",
+    author: createUser('testuser1', 101, 'User A'),
+    createdDate: 1600000000000,
+    updatedDate: 1600000000000,
+    comments: [],
+    anchor: {
+      fromHash: "abc123def456789012345678901234567890abcd",
+      toHash: "def456abc789012345678901234567890123cdef",
+      line: 6,
+      lineType: "ADDED",
+      fileType: "TO",
+      path: "config.yml",
+      diffType: "EFFECTIVE",
+      orphaned: false
+    },
+    threadResolved: false,
+    severity: "NORMAL",
+    state: "OPEN",
+    permittedOperations: {
+      editable: false,
+      transitionable: true,
+      deletable: false
+    },
+    ...overrides
+  };
+}
 
 describe('PR Comment Mapper', () => {
   // Test data from the original ad-hoc test
@@ -15,75 +92,15 @@ describe('PR Comment Mapper', () => {
       {
         id: 1001,
         createdDate: 1600000000000,
-        user: {
-          name: "testuser1",
-          emailAddress: "testuser1@company.local",
-          active: true,
-          displayName: "User A",
-          id: 101,
-          slug: "testuser1",
-          type: "NORMAL",
-          links: {
-            self: [{ href: "https://bitbucket.company.local/users/testuser1" }]
-          }
-        },
+        user: createUser('testuser1', 101, 'User A'),
         action: "COMMENTED",
         commentAction: "ADDED",
-        comment: {
-          properties: { repositoryId: 1001 },
-          id: 2001,
-          version: 0,
-          text: "This needs review",
-          author: {
-            name: "testuser1",
-            emailAddress: "testuser1@company.local",
-            active: true,
-            displayName: "User A",
-            id: 101,
-            slug: "testuser1",
-            type: "NORMAL",
-            links: {
-              self: [{ href: "https://bitbucket.company.local/users/testuser1" }]
-            }
-          },
-          createdDate: 1600000000000,
-          updatedDate: 1600000000000,
-          comments: [],
-          anchor: {
-            fromHash: "abc123def456789012345678901234567890abcd",
-            toHash: "def456abc789012345678901234567890123cdef",
-            line: 6,
-            lineType: "ADDED",
-            fileType: "TO",
-            path: "config.yml",
-            diffType: "EFFECTIVE",
-            orphaned: false
-          },
-          threadResolved: false,
-          severity: "NORMAL",
-          state: "OPEN",
-          permittedOperations: {
-            editable: false,
-            transitionable: true,
-            deletable: false
-          }
-        }
+        comment: createComment()
       },
       {
         id: 1002,
         createdDate: 1600000001000,
-        user: {
-          name: "testuser2",
-          emailAddress: "testuser2@company.local",
-          active: true,
-          displayName: "User B",
-          id: 102,
-          slug: "testuser2",
-          type: "NORMAL",
-          links: {
-            self: [{ href: "https://bitbucket.company.local/users/testuser2" }]
-          }
-        },
+        user: createUser('testuser2', 102, 'User B'),
         action: "OPENED"
       }
     ],
@@ -119,6 +136,7 @@ describe('PR Comment Mapper', () => {
                 path: "config.yml",
                 fileType: "TO"
               },
+              comments: [],
               threadResolved: false,
               state: "OPEN"
             }
@@ -147,6 +165,157 @@ describe('PR Comment Mapper', () => {
       expect(result).toEqual(expectedResult);
     });
 
+    it('should preserve nested replies recursively', () => {
+      const threadedResponse: BitbucketPRApiResponse = {
+        ...validPRResponse,
+        values: [
+          {
+            id: 1001,
+            createdDate: 1600000000000,
+            user: createUser('testuser1', 101, 'User A'),
+            action: "COMMENTED",
+            commentAction: "ADDED",
+            comment: createComment({
+              comments: [
+                createComment({
+                  id: 2002,
+                  text: "Author reply",
+                  author: createUser('author1', 103, 'Author One'),
+                  anchor: undefined,
+                  comments: [
+                    createComment({
+                      id: 2003,
+                      text: "Reviewer follow-up",
+                      author: createUser('reviewer2', 104, 'Reviewer Two'),
+                      anchor: undefined
+                    })
+                  ]
+                })
+              ]
+            })
+          }
+        ]
+      };
+
+      const result = simplifyBitbucketPRComments(threadedResponse) as SimplifiedPRResponse;
+      expect(result.activities[0].comment?.comments).toEqual([
+        {
+          id: 2002,
+          text: "Author reply",
+          author: {
+            name: "author1",
+            displayName: "Author One"
+          },
+          createdDate: 1600000000000,
+          comments: [
+            {
+              id: 2003,
+              text: "Reviewer follow-up",
+              author: {
+                name: "reviewer2",
+                displayName: "Reviewer Two"
+              },
+              createdDate: 1600000000000,
+              comments: [],
+              threadResolved: false,
+              state: "OPEN"
+            }
+          ],
+          threadResolved: false,
+          state: "OPEN"
+        }
+      ]);
+    });
+
+    it('should skip malformed nested replies', () => {
+      const malformedNestedResponse: BitbucketPRApiResponse = {
+        ...validPRResponse,
+        values: [
+          {
+            id: 1001,
+            createdDate: 1600000000000,
+            user: createUser('testuser1', 101, 'User A'),
+            action: "COMMENTED",
+            commentAction: "ADDED",
+            comment: createComment({
+              comments: [
+                { id: 'bad-comment-id' } as unknown as TestComment,
+                createComment({
+                  id: 2002,
+                  text: "Valid reply",
+                  anchor: undefined
+                })
+              ]
+            })
+          }
+        ]
+      };
+
+      const result = simplifyBitbucketPRComments(malformedNestedResponse) as SimplifiedPRResponse;
+      expect(result.activities[0].comment?.comments).toEqual([
+        {
+          id: 2002,
+          text: "Valid reply",
+          author: {
+            name: "testuser1",
+            displayName: "User A"
+          },
+          createdDate: 1600000000000,
+          comments: [],
+          threadResolved: false,
+          state: "OPEN"
+        }
+      ]);
+    });
+
+    it('should drop cyclic reply branches and remain JSON serializable', () => {
+      const rootComment = createComment();
+      const childComment = createComment({
+        id: 2002,
+        text: "Child reply",
+        anchor: undefined
+      });
+
+      rootComment.comments = [childComment];
+      childComment.comments = [rootComment];
+
+      const cyclicResponse: BitbucketPRApiResponse = {
+        size: 1,
+        limit: 100,
+        isLastPage: true,
+        values: [
+          {
+            id: 1001,
+            createdDate: 1600000000000,
+            user: createUser('testuser1', 101, 'User A'),
+            action: "COMMENTED",
+            commentAction: "ADDED",
+            comment: rootComment
+          }
+        ],
+        start: 0
+      };
+
+      const result = simplifyBitbucketPRComments(cyclicResponse) as SimplifiedPRResponse;
+      expect(result.activities[0].comment?.comments).toEqual([
+        {
+          id: 2002,
+          text: "Child reply",
+          author: {
+            name: "testuser1",
+            displayName: "User A"
+          },
+          createdDate: 1600000000000,
+          comments: [],
+          threadResolved: false,
+          state: "OPEN"
+        }
+      ]);
+
+      expect(() => formatToolResponse(result)).not.toThrow();
+      expect(JSON.parse(formatToolResponse(result).content[0].text)).toBeTruthy();
+    });
+
     it('should handle malformed input gracefully', () => {
       const malformedInput = { invalid: 'data' } as any;
       const result = simplifyBitbucketPRComments(malformedInput) as SimplifiedPRResponse;

package/src/pr-comment-mapper.ts

@@ -139,6 +139,7 @@ interface SimplifiedComment {
   author: SimplifiedUser;
   createdDate: number;
   anchor?: SimplifiedAnchor;
+  comments: SimplifiedComment[];
   threadResolved: boolean;
   state: string;
 }
@@ -239,13 +240,20 @@ function simplifyAnchor(anchor: CommentAnchor): SimplifiedAnchor {
   };
 }
 
-function simplifyComment(comment: Comment): SimplifiedComment {
+function simplifyComment(comment: Comment, ancestorIds: Set<number> = new Set()): SimplifiedComment {
+  const nextAncestorIds = new Set(ancestorIds);
+  nextAncestorIds.add(comment.id);
+
   return {
     id: comment.id,
     text: comment.text,
     author: simplifyUser(comment.author),
     createdDate: comment.createdDate,
     ...(comment.anchor && { anchor: simplifyAnchor(comment.anchor) }),
+    comments: comment.comments
+      .filter(isComment)
+      .filter(childComment => !nextAncestorIds.has(childComment.id))
+      .map(childComment => simplifyComment(childComment, nextAncestorIds)),
     threadResolved: comment.threadResolved,
     state: comment.state
   };
@@ -258,7 +266,9 @@ function simplifyActivity(activity: PRActivity): SimplifiedActivity {
     user: simplifyUser(activity.user),
     action: activity.action,
     ...(activity.commentAction && { commentAction: activity.commentAction }),
-    ...(activity.comment && { comment: simplifyComment(activity.comment) })
+    ...(activity.comment && isComment(activity.comment) && {
+      comment: simplifyComment(activity.comment)
+    })
   };
 }