confluence-cli 1.10.1 → 1.11.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [1.11.0](https://github.com/pchuri/confluence-cli/compare/v1.10.1...v1.11.0) (2025-12-12)
+
+
+### Features
+
+* Support for Confluence display URLs ([#20](https://github.com/pchuri/confluence-cli/issues/20)) ([3bda7c2](https://github.com/pchuri/confluence-cli/commit/3bda7c2aad8ec02dac60f3b7c34c31b549a31cce))
+
 ## [1.10.1](https://github.com/pchuri/confluence-cli/compare/v1.10.0...v1.10.1) (2025-12-08)
 
 

package/lib/confluence-client.js

@@ -49,7 +49,7 @@ class ConfluenceClient {
   /**
    * Extract page ID from URL or return the ID if it's already a number
    */
-  extractPageId(pageIdOrUrl) {
+  async extractPageId(pageIdOrUrl) {
     if (typeof pageIdOrUrl === 'number' || /^\d+$/.test(pageIdOrUrl)) {
       return pageIdOrUrl;
     }
@@ -62,10 +62,37 @@ class ConfluenceClient {
         return pageIdMatch[1];
       }
       
-      // Handle display URLs - would need to search by space and title
+      // Handle display URLs - search by space and title
       const displayMatch = pageIdOrUrl.match(/\/display\/([^/]+)\/(.+)/);
       if (displayMatch) {
-        throw new Error('Display URLs not yet supported. Please use page ID or viewpage URL with pageId parameter.');
+        const spaceKey = displayMatch[1];
+        // Confluence friendly URLs for child pages might look like /display/SPACE/Parent/Child
+        // We only want the last part as the title
+        const urlPath = displayMatch[2];
+        const lastSegment = urlPath.split('/').pop();
+
+        // Confluence uses + for spaces in URL titles, but decodeURIComponent doesn't convert + to space
+        const rawTitle = lastSegment.replace(/\+/g, '%20');
+        const title = decodeURIComponent(rawTitle);
+
+        try {
+          const response = await this.client.get('/content', {
+            params: {
+              spaceKey: spaceKey,
+              title: title,
+              limit: 1
+            }
+          });
+
+          if (response.data.results && response.data.results.length > 0) {
+            return response.data.results[0].id;
+          }
+        } catch (error) {
+          // Ignore error and fall through
+          console.error('Error resolving page ID from display URL:', error);
+        }
+
+        throw new Error(`Could not resolve page ID from display URL: ${pageIdOrUrl}`);
       }
     }
 
@@ -80,7 +107,7 @@ class ConfluenceClient {
    * @param {boolean} options.resolveUsers - Whether to resolve userkeys to display names (default: true for markdown)
    */
   async readPage(pageIdOrUrl, format = 'text', options = {}) {
-    const pageId = this.extractPageId(pageIdOrUrl);
+    const pageId = await this.extractPageId(pageIdOrUrl);
     
     const response = await this.client.get(`/content/${pageId}`, {
       params: {
@@ -127,7 +154,7 @@ class ConfluenceClient {
    * Get page information
    */
   async getPageInfo(pageIdOrUrl) {
-    const pageId = this.extractPageId(pageIdOrUrl);
+    const pageId = await this.extractPageId(pageIdOrUrl);
     
     const response = await this.client.get(`/content/${pageId}`, {
       params: {
@@ -335,7 +362,7 @@ class ConfluenceClient {
    * List attachments for a page with pagination support
    */
   async listAttachments(pageIdOrUrl, options = {}) {
-    const pageId = this.extractPageId(pageIdOrUrl);
+    const pageId = await this.extractPageId(pageIdOrUrl);
     const limit = this.parsePositiveInt(options.limit, 50);
     const start = this.parsePositiveInt(options.start, 0);
     const params = {
@@ -402,7 +429,7 @@ class ConfluenceClient {
       downloadUrl = attachmentIdOrAttachment.downloadLink;
     } else {
       // Otherwise, fetch attachment info to get the download link
-      const pageId = this.extractPageId(pageIdOrUrl);
+      const pageId = await this.extractPageId(pageIdOrUrl);
       const attachmentId = attachmentIdOrAttachment;
       const response = await this.client.get(`/content/${pageId}/child/attachment`, {
         params: { limit: 500 }
@@ -985,7 +1012,7 @@ class ConfluenceClient {
    * Get page content for editing
    */
   async getPageForEdit(pageIdOrUrl) {
-    const pageId = this.extractPageId(pageIdOrUrl);
+    const pageId = await this.extractPageId(pageIdOrUrl);
     
     const response = await this.client.get(`/content/${pageId}`, {
       params: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "confluence-cli",
-  "version": "1.10.1",
+  "version": "1.11.0",
   "description": "A command-line interface for Atlassian Confluence with page creation and editing capabilities",
   "main": "index.js",
   "bin": {
@@ -32,6 +32,7 @@
   },
   "devDependencies": {
     "@types/node": "^20.10.0",
+    "axios-mock-adapter": "^2.1.0",
     "eslint": "^8.55.0",
     "jest": "^29.7.0"
   },

package/tests/confluence-client.test.js

@@ -1,4 +1,5 @@
 const ConfluenceClient = require('../lib/confluence-client');
+const MockAdapter = require('axios-mock-adapter');
 
 describe('ConfluenceClient', () => {
   let client;
@@ -63,19 +64,64 @@ describe('ConfluenceClient', () => {
   });
 
   describe('extractPageId', () => {
-    test('should return numeric page ID as is', () => {
-      expect(client.extractPageId('123456789')).toBe('123456789');
-      expect(client.extractPageId(123456789)).toBe(123456789);
+    test('should return numeric page ID as is', async () => {
+      expect(await client.extractPageId('123456789')).toBe('123456789');
+      expect(await client.extractPageId(123456789)).toBe(123456789);
     });
 
-    test('should extract page ID from URL with pageId parameter', () => {
+    test('should extract page ID from URL with pageId parameter', async () => {
       const url = 'https://test.atlassian.net/wiki/spaces/TEST/pages/123456789/Page+Title';
-      expect(client.extractPageId(url + '?pageId=987654321')).toBe('987654321');
+      expect(await client.extractPageId(url + '?pageId=987654321')).toBe('987654321');
     });
 
-    test('should throw error for display URLs', () => {
+    test('should resolve display URLs', async () => {
+      // Mock the API response for display URL resolution
+      const mock = new MockAdapter(client.client);
+
+      mock.onGet('/content').reply(200, {
+        results: [{
+          id: '12345',
+          title: 'Page Title',
+          _links: { webui: '/display/TEST/Page+Title' }
+        }]
+      });
+
       const displayUrl = 'https://test.atlassian.net/display/TEST/Page+Title';
-      expect(() => client.extractPageId(displayUrl)).toThrow('Display URLs not yet supported');
+      expect(await client.extractPageId(displayUrl)).toBe('12345');
+
+      mock.restore();
+    });
+
+    test('should resolve nested display URLs', async () => {
+      // Mock the API response for display URL resolution
+      const mock = new MockAdapter(client.client);
+
+      mock.onGet('/content').reply(200, {
+        results: [{
+          id: '67890',
+          title: 'Child Page',
+          _links: { webui: '/display/TEST/Parent/Child+Page' }
+        }]
+      });
+
+      const displayUrl = 'https://test.atlassian.net/display/TEST/Parent/Child+Page';
+      expect(await client.extractPageId(displayUrl)).toBe('67890');
+
+      mock.restore();
+    });
+
+    test('should throw error when display URL cannot be resolved', async () => {
+      const mock = new MockAdapter(client.client);
+
+      // Mock empty result
+      mock.onGet('/content').reply(200, {
+        results: []
+      });
+
+      const displayUrl = 'https://test.atlassian.net/display/TEST/NonExistentPage';
+      await expect(client.extractPageId(displayUrl)).rejects.toThrow(/Could not resolve page ID/);
+
+      mock.restore();
     });
   });