@atlassian-dc-mcp/bitbucket 0.6.0 → 0.7.0

package/build/pr-comment-mapper.js

@@ -0,0 +1,128 @@
+// Type guard functions to validate object structure
+function isBitbucketUser(obj) {
+    return (typeof obj === 'object' &&
+        obj !== null &&
+        typeof obj.name === 'string' &&
+        typeof obj.emailAddress === 'string' &&
+        typeof obj.active === 'boolean' &&
+        typeof obj.displayName === 'string' &&
+        typeof obj.id === 'number' &&
+        typeof obj.slug === 'string' &&
+        typeof obj.type === 'string' &&
+        typeof obj.links === 'object');
+}
+function isCommentAnchor(obj) {
+    return (typeof obj === 'object' &&
+        obj !== null &&
+        typeof obj.fromHash === 'string' &&
+        typeof obj.toHash === 'string' &&
+        typeof obj.line === 'number' &&
+        typeof obj.lineType === 'string' &&
+        typeof obj.fileType === 'string' &&
+        typeof obj.path === 'string' &&
+        typeof obj.diffType === 'string' &&
+        typeof obj.orphaned === 'boolean');
+}
+function isComment(obj) {
+    return (typeof obj === 'object' &&
+        obj !== null &&
+        typeof obj.id === 'number' &&
+        typeof obj.version === 'number' &&
+        typeof obj.text === 'string' &&
+        isBitbucketUser(obj.author) &&
+        typeof obj.createdDate === 'number' &&
+        typeof obj.updatedDate === 'number' &&
+        Array.isArray(obj.comments) &&
+        typeof obj.threadResolved === 'boolean' &&
+        typeof obj.severity === 'string' &&
+        typeof obj.state === 'string' &&
+        typeof obj.properties === 'object' &&
+        typeof obj.permittedOperations === 'object');
+}
+function isPRActivity(obj) {
+    return (typeof obj === 'object' &&
+        obj !== null &&
+        typeof obj.id === 'number' &&
+        typeof obj.createdDate === 'number' &&
+        isBitbucketUser(obj.user) &&
+        typeof obj.action === 'string');
+}
+function simplifyUser(user) {
+    return {
+        name: user.name,
+        displayName: user.displayName
+    };
+}
+function simplifyAnchor(anchor) {
+    return {
+        line: anchor.line,
+        path: anchor.path,
+        fileType: anchor.fileType
+    };
+}
+function simplifyComment(comment) {
+    return {
+        id: comment.id,
+        text: comment.text,
+        author: simplifyUser(comment.author),
+        createdDate: comment.createdDate,
+        ...(comment.anchor && { anchor: simplifyAnchor(comment.anchor) }),
+        threadResolved: comment.threadResolved,
+        state: comment.state
+    };
+}
+function simplifyActivity(activity) {
+    return {
+        id: activity.id,
+        createdDate: activity.createdDate,
+        user: simplifyUser(activity.user),
+        action: activity.action,
+        ...(activity.commentAction && { commentAction: activity.commentAction }),
+        ...(activity.comment && { comment: simplifyComment(activity.comment) })
+    };
+}
+export function simplifyBitbucketPRComments(response) {
+    const activities = [];
+    // Process each activity with type guard validation
+    for (const activity of response.values || []) {
+        if (isPRActivity(activity)) {
+            activities.push(simplifyActivity(activity));
+        }
+        // If type guard fails, we skip the invalid activity but continue processing
+    }
+    // If no valid activities were found, return the original response
+    if (activities.length === 0 && (response.values || []).length > 0) {
+        return response;
+    }
+    // Find PR author (usually the one who OPENED the PR)
+    const prAuthor = activities.find(a => a.action === 'OPENED')?.user;
+    // Count comments and unresolved threads
+    const comments = activities.filter(a => a.action === 'COMMENTED' && a.comment);
+    const unresolvedCount = comments.filter(a => a.comment && !a.comment.threadResolved).length;
+    return {
+        isLastPage: response.isLastPage ?? true,
+        activities,
+        summary: {
+            totalActivities: activities.length,
+            ...(prAuthor && { prAuthor }),
+            commentCount: comments.length,
+            unresolvedCount
+        }
+    };
+}
+export function getCommentSummary(response) {
+    const commentSummaries = [];
+    for (const activity of response.values || []) {
+        // Use type guard to validate activity structure
+        if (isPRActivity(activity) && activity.action === 'COMMENTED' && activity.comment) {
+            // Additional validation for comment structure
+            if (isComment(activity.comment)) {
+                const comment = activity.comment;
+                commentSummaries.push(`${comment.author.displayName} on ${comment.anchor?.path || 'PR'}:${comment.anchor?.line || ''}: ${comment.text}`);
+            }
+        }
+        // If type guard fails, we skip the invalid activity but continue processing
+    }
+    return commentSummaries;
+}
+//# sourceMappingURL=pr-comment-mapper.js.map

package/build/pr-comment-mapper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pr-comment-mapper.js","sourceRoot":"","sources":["../src/pr-comment-mapper.ts"],"names":[],"mappings":"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"}

package/jest.config.js

@@ -0,0 +1,23 @@
+export default {
+  preset: 'ts-jest/presets/default-esm',
+  extensionsToTreatAsEsm: ['.ts'],
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1',
+    '^@atlassian-dc-mcp/common$': '<rootDir>/../common/src/index.ts',
+  },
+  transform: {
+    '^.+\\.ts$': ['ts-jest', {
+      useESM: true,
+    }],
+  },
+  transformIgnorePatterns: [
+    'node_modules/(?!(@atlassian-dc-mcp)/)',
+  ],
+  testEnvironment: 'node',
+  testMatch: ['**/__tests__/**/*.test.ts'],
+  collectCoverageFrom: [
+    'src/**/*.ts',
+    '!src/**/*.d.ts',
+    '!src/**/index.ts',
+  ],
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlassian-dc-mcp/bitbucket",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "main": "build/index.js",
   "type": "module",
   "bin": "./bin/run.js",
@@ -14,7 +14,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@atlassian-dc-mcp/common": "^0.6.0",
+    "@atlassian-dc-mcp/common": "^0.7.0",
     "@modelcontextprotocol/sdk": "^1.5.0",
     "dotenv": "^16.4.7",
     "node-fetch": "^3.3.2",
@@ -22,12 +22,14 @@
   },
   "devDependencies": {
     "@modelcontextprotocol/inspector": "^0.4.1",
+    "@types/jest": "^30.0.0",
     "lerna": "^8.2.0",
     "nodemon": "^3.1.9",
+    "ts-jest": "^29.4.0",
     "ts-node": "^10.9.2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ad8a950dea96c3d90c545bd92fce8f6566fbf31c"
+  "gitHead": "25617f5fb5da84c8bef2ed56fb6464b1a2c84262"
 }

package/src/__tests__/bitbucket-service.test.ts

@@ -0,0 +1,419 @@
+import { BitbucketService } from '../bitbucket-service.js';
+import { PullRequestsService } from '../bitbucket-client/index.js';
+
+// Mock the request function
+jest.mock('../bitbucket-client/core/request.js', () => ({
+  request: jest.fn()
+}));
+
+// Mock the PullRequestsService
+jest.mock('../bitbucket-client/index.js', () => ({
+  PullRequestsService: {
+    streamRawDiff2: jest.fn(),
+    createComment2: jest.fn(),
+    streamChanges1: jest.fn()
+  },
+  OpenAPI: {
+    BASE: '',
+    TOKEN: '',
+    VERSION: ''
+  }
+}));
+
+describe('BitbucketService', () => {
+  let bitbucketService: BitbucketService;
+  const mockProjectKey = 'TEST';
+  const mockRepositorySlug = 'test-repo';
+  const mockPullRequestId = '123';
+
+  beforeEach(() => {
+    bitbucketService = new BitbucketService('test-host', 'test-token');
+    jest.clearAllMocks();
+  });
+
+  describe('getPullRequestChanges', () => {
+    it('should successfully get PR changes', async () => {
+      const mockChangesData = {
+        values: [
+          { path: { toString: 'file.txt' }, type: 'MODIFY' }
+        ],
+        size: 1,
+        isLastPage: true
+      };
+      (PullRequestsService.streamChanges1 as jest.Mock).mockResolvedValue(mockChangesData);
+
+      const result = await bitbucketService.getPullRequestChanges(
+        mockProjectKey,
+        mockRepositorySlug,
+        mockPullRequestId
+      );
+
+      expect(result.success).toBe(true);
+      expect(result.data).toBe(mockChangesData);
+      expect(PullRequestsService.streamChanges1).toHaveBeenCalledWith(
+        mockProjectKey,
+        mockPullRequestId,
+        mockRepositorySlug,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        25
+      );
+    });
+
+    it('should successfully get PR changes with all parameters', async () => {
+      const mockChangesData = {
+        values: [
+          { path: { toString: 'file.txt' }, type: 'MODIFY' }
+        ],
+        size: 1,
+        isLastPage: true
+      };
+      (PullRequestsService.streamChanges1 as jest.Mock).mockResolvedValue(mockChangesData);
+
+      const result = await bitbucketService.getPullRequestChanges(
+        mockProjectKey,
+        mockRepositorySlug,
+        mockPullRequestId,
+        'abc123',
+        'RANGE',
+        'def456',
+        'true',
+        0,
+        50
+      );
+
+      expect(result.success).toBe(true);
+      expect(result.data).toBe(mockChangesData);
+      expect(PullRequestsService.streamChanges1).toHaveBeenCalledWith(
+        mockProjectKey,
+        mockPullRequestId,
+        mockRepositorySlug,
+        'abc123',
+        'RANGE',
+        'def456',
+        'true',
+        0,
+        50
+      );
+    });
+
+    it('should handle API errors gracefully', async () => {
+      const mockError = new Error('API Error');
+      (PullRequestsService.streamChanges1 as jest.Mock).mockRejectedValue(mockError);
+
+      const result = await bitbucketService.getPullRequestChanges(
+        mockProjectKey,
+        mockRepositorySlug,
+        mockPullRequestId
+      );
+
+      expect(result.success).toBe(false);
+      expect(result.error).toBe('API Error');
+    });
+  });
+
+  describe('postPullRequestComment', () => {
+    it('should successfully post a general PR comment', async () => {
+      const mockComment = {
+        id: 12345,
+        text: 'Test comment',
+        author: { displayName: 'Test User' }
+      };
+      (PullRequestsService.createComment2 as jest.Mock).mockResolvedValue(mockComment);
+
+      const result = await bitbucketService.postPullRequestComment(
+        mockProjectKey,
+        mockRepositorySlug,
+        mockPullRequestId,
+        'Test comment'
+      );
+
+      expect(result.success).toBe(true);
+      expect(result.data).toBe(mockComment);
+      expect(PullRequestsService.createComment2).toHaveBeenCalledWith(
+        mockProjectKey,
+        mockPullRequestId,
+        mockRepositorySlug,
+        { text: 'Test comment' }
+      );
+    });
+
+    it('should successfully post a reply comment', async () => {
+      const mockComment = {
+        id: 12346,
+        text: 'Reply comment',
+        author: { displayName: 'Test User' }
+      };
+      (PullRequestsService.createComment2 as jest.Mock).mockResolvedValue(mockComment);
+
+      const result = await bitbucketService.postPullRequestComment(
+        mockProjectKey,
+        mockRepositorySlug,
+        mockPullRequestId,
+        'Reply comment',
+        123 // parentId
+      );
+
+      expect(result.success).toBe(true);
+      expect(result.data).toBe(mockComment);
+      expect(PullRequestsService.createComment2).toHaveBeenCalledWith(
+        mockProjectKey,
+        mockPullRequestId,
+        mockRepositorySlug,
+        {
+          text: 'Reply comment',
+          parent: { id: 123 }
+        }
+      );
+    });
+
+    it('should successfully post a file comment', async () => {
+      const mockComment = {
+        id: 12347,
+        text: 'File comment',
+        author: { displayName: 'Test User' }
+      };
+      (PullRequestsService.createComment2 as jest.Mock).mockResolvedValue(mockComment);
+
+      const result = await bitbucketService.postPullRequestComment(
+        mockProjectKey,
+        mockRepositorySlug,
+        mockPullRequestId,
+        'File comment',
+        undefined, // parentId
+        'src/test.js' // filePath
+      );
+
+      expect(result.success).toBe(true);
+      expect(result.data).toBe(mockComment);
+      expect(PullRequestsService.createComment2).toHaveBeenCalledWith(
+        mockProjectKey,
+        mockPullRequestId,
+        mockRepositorySlug,
+        {
+          text: 'File comment',
+          anchor: {
+            path: 'src/test.js',
+            diffType: 'EFFECTIVE'
+          }
+        }
+      );
+    });
+
+    it('should successfully post a line comment', async () => {
+      const mockComment = {
+        id: 12348,
+        text: 'Line comment',
+        author: { displayName: 'Test User' }
+      };
+      (PullRequestsService.createComment2 as jest.Mock).mockResolvedValue(mockComment);
+
+      const result = await bitbucketService.postPullRequestComment(
+        mockProjectKey,
+        mockRepositorySlug,
+        mockPullRequestId,
+        'Line comment',
+        undefined, // parentId
+        'src/test.js', // filePath
+        42, // line
+        'ADDED' // lineType
+      );
+
+      expect(result.success).toBe(true);
+      expect(result.data).toBe(mockComment);
+      expect(PullRequestsService.createComment2).toHaveBeenCalledWith(
+        mockProjectKey,
+        mockPullRequestId,
+        mockRepositorySlug,
+        {
+          text: 'Line comment',
+          anchor: {
+            path: 'src/test.js',
+            diffType: 'EFFECTIVE',
+            line: 42,
+            lineType: 'ADDED',
+            fileType: 'TO'
+          }
+        }
+      );
+    });
+
+    it('should handle API errors gracefully', async () => {
+      const mockError = new Error('API Error');
+      (PullRequestsService.createComment2 as jest.Mock).mockRejectedValue(mockError);
+
+      const result = await bitbucketService.postPullRequestComment(
+        mockProjectKey,
+        mockRepositorySlug,
+        mockPullRequestId,
+        'Test comment'
+      );
+
+      expect(result.success).toBe(false);
+      expect(result.error).toBe('API Error');
+    });
+  });
+
+  describe('getPullRequestDiff', () => {
+    const { request: mockRequest } = require('../bitbucket-client/core/request.js');
+
+    it('should successfully get raw diff with minimal parameters', async () => {
+      const mockRawDiff = 'diff --git a/file.txt b/file.txt\nindex 1234567..abcdefg 100644\n--- a/file.txt\n+++ b/file.txt\n@@ -1,3 +1,4 @@\n line1\n line2\n+new line\n line3';
+      mockRequest.mockResolvedValue(mockRawDiff);
+
+      const result = await bitbucketService.getPullRequestDiff(
+        mockProjectKey,
+        mockRepositorySlug,
+        mockPullRequestId,
+        'src/file.txt'
+      );
+
+      expect(result.success).toBe(true);
+      expect(result.data).toBe(mockRawDiff);
+      expect(mockRequest).toHaveBeenCalledWith(
+        expect.any(Object), // OpenAPI config
+        {
+          method: 'GET',
+          url: '/api/latest/projects/{projectKey}/repos/{repositorySlug}/pull-requests/{pullRequestId}/diff/{path}',
+          path: {
+            'path': 'src/file.txt',
+            'projectKey': mockProjectKey,
+            'pullRequestId': mockPullRequestId,
+            'repositorySlug': mockRepositorySlug,
+          },
+          query: {
+            'contextLines': undefined,
+            'sinceId': undefined,
+            'srcPath': undefined,
+            'diffType': undefined,
+            'untilId': undefined,
+            'whitespace': undefined,
+          },
+          headers: {
+            'Accept': 'text/plain'
+          },
+          errors: {
+            400: `If the request was malformed.`,
+            401: `The currently authenticated user has insufficient permissions to view the repository or pull request.`,
+            404: `The repository or pull request does not exist.`,
+          },
+        }
+      );
+    });
+
+    it('should successfully get raw diff with all parameters', async () => {
+      const mockRawDiff = 'diff --git a/old/file.txt b/new/file.txt\nindex 1234567..abcdefg 100644\n--- a/old/file.txt\n+++ b/new/file.txt\n@@ -1,5 +1,6 @@\n line1\n line2\n+new line\n line3\n line4\n line5';
+      mockRequest.mockResolvedValue(mockRawDiff);
+
+      const result = await bitbucketService.getPullRequestDiff(
+        mockProjectKey,
+        mockRepositorySlug,
+        mockPullRequestId,
+        'src/file.txt',
+        '5', // contextLines
+        'abc123', // sinceId
+        'old/file.txt', // srcPath
+        'EFFECTIVE', // diffType
+        'def456', // untilId
+        'ignore-all' // whitespace
+      );
+
+      expect(result.success).toBe(true);
+      expect(result.data).toBe(mockRawDiff);
+      expect(mockRequest).toHaveBeenCalledWith(
+        expect.any(Object), // OpenAPI config
+        {
+          method: 'GET',
+          url: '/api/latest/projects/{projectKey}/repos/{repositorySlug}/pull-requests/{pullRequestId}/diff/{path}',
+          path: {
+            'path': 'src/file.txt',
+            'projectKey': mockProjectKey,
+            'pullRequestId': mockPullRequestId,
+            'repositorySlug': mockRepositorySlug,
+          },
+          query: {
+            'contextLines': '5',
+            'sinceId': 'abc123',
+            'srcPath': 'old/file.txt',
+            'diffType': 'EFFECTIVE',
+            'untilId': 'def456',
+            'whitespace': 'ignore-all',
+          },
+          headers: {
+            'Accept': 'text/plain'
+          },
+          errors: {
+            400: `If the request was malformed.`,
+            401: `The currently authenticated user has insufficient permissions to view the repository or pull request.`,
+            404: `The repository or pull request does not exist.`,
+          },
+        }
+      );
+    });
+
+    it('should handle API errors gracefully', async () => {
+      const mockError = new Error('API Error');
+      mockRequest.mockRejectedValue(mockError);
+
+      const result = await bitbucketService.getPullRequestDiff(
+        mockProjectKey,
+        mockRepositorySlug,
+        mockPullRequestId,
+        'src/file.txt'
+      );
+
+      expect(result.success).toBe(false);
+      expect(result.error).toBe('API Error');
+    });
+  });
+
+  describe('validateConfig', () => {
+    const originalEnv = process.env;
+
+    beforeEach(() => {
+      jest.resetModules();
+      process.env = { ...originalEnv };
+    });
+
+    afterAll(() => {
+      process.env = originalEnv;
+    });
+
+    it('should return empty array when all required env vars are present', () => {
+      process.env.BITBUCKET_API_TOKEN = 'test-token';
+      process.env.BITBUCKET_HOST = 'test-host';
+
+      const missingVars = BitbucketService.validateConfig();
+      expect(missingVars).toEqual([]);
+    });
+
+    it('should return missing vars when BITBUCKET_API_TOKEN is missing', () => {
+      delete process.env.BITBUCKET_API_TOKEN;
+      process.env.BITBUCKET_HOST = 'test-host';
+
+      const missingVars = BitbucketService.validateConfig();
+      expect(missingVars).toContain('BITBUCKET_API_TOKEN');
+    });
+
+    it('should return missing vars when both host options are missing', () => {
+      process.env.BITBUCKET_API_TOKEN = 'test-token';
+      delete process.env.BITBUCKET_HOST;
+      delete process.env.BITBUCKET_API_BASE_PATH;
+
+      const missingVars = BitbucketService.validateConfig();
+      expect(missingVars).toContain('BITBUCKET_HOST or BITBUCKET_API_BASE_PATH');
+    });
+
+    it('should accept BITBUCKET_API_BASE_PATH as alternative to BITBUCKET_HOST', () => {
+      process.env.BITBUCKET_API_TOKEN = 'test-token';
+      delete process.env.BITBUCKET_HOST;
+      process.env.BITBUCKET_API_BASE_PATH = 'https://test-host/rest';
+
+      const missingVars = BitbucketService.validateConfig();
+      expect(missingVars).toEqual([]);
+    });
+  });
+});