@bestend/confluence-cli 1.15.3 → 1.15.5

package/.github/workflows/publish.yml

@@ -19,11 +19,15 @@ jobs:
           node-version: '24.x'
           registry-url: 'https://registry.npmjs.org'
 
-      - name: Set package version from tag
+      - name: Ensure package version matches tag
         run: |
           TAG="${GITHUB_REF_NAME#v}"
-          echo "Setting package version to ${TAG}"
-          npm version "$TAG" --no-git-tag-version
+          PKG_VERSION=$(node -p "require('./package.json').version")
+          echo "Tag: $TAG / package.json: $PKG_VERSION"
+          if [ "$TAG" != "$PKG_VERSION" ]; then
+            echo "package.json version mismatch: $PKG_VERSION (expected $TAG)" >&2
+            exit 1
+          fi
 
       - name: Install dependencies
         run: npm ci

package/lib/confluence-client.js

@@ -24,6 +24,12 @@ class ConfluenceClient {
     });
   }
 
+  sanitizeStorageContent(content) {
+    // Escape unescaped ampersands that would break XML (except already-escaped entities)
+    // This is a best-effort sanitizer; users should still provide valid XHTML when using --format storage.
+    return content.replace(/&(?![a-zA-Z]+;|#\d+;|#x[0-9a-fA-F]+;)/g, '&');
+  }
+
   sanitizeApiPath(rawPath) {
     const fallback = '/rest/api';
     const value = (rawPath || '').trim();
@@ -61,6 +67,12 @@ class ConfluenceClient {
       if (pageIdMatch) {
         return pageIdMatch[1];
       }
+
+      // Handle /spaces/SPACEKEY/pages/PAGEID/Title format
+      const spacesMatch = pageIdOrUrl.match(/\/spaces\/[^/]+\/pages\/(\d+)/);
+      if (spacesMatch) {
+        return spacesMatch[1];
+      }
       
       // Handle display URLs - search by space and title
       const displayMatch = pageIdOrUrl.match(/\/display\/([^/]+)\/(.+)/);
@@ -842,9 +854,18 @@ class ConfluenceClient {
     // Convert code blocks to Confluence code macro
     storage = storage.replace(/<pre><code(?:\s+class="language-(\w+)")?>(.*?)<\/code><\/pre>/gs, (_, lang, code) => {
       const language = lang || 'text';
+      // Decode HTML entities inside code blocks before wrapping in CDATA
+      let decoded = code
+        .replace(/&amp;/g, '&')
+        .replace(/&lt;/g, '<')
+        .replace(/&gt;/g, '>')
+        .replace(/&quot;/g, '"')
+        .replace(/&#39;/g, "'");
+      decoded = decoded.replace(/\]\]>/g, ']]]]><![CDATA[>');
+      
       return `<ac:structured-macro ac:name="code">
         <ac:parameter ac:name="language">${language}</ac:parameter>
-        <ac:plain-text-body><![CDATA[${code}]]></ac:plain-text-body>
+        <ac:plain-text-body><![CDATA[${decoded}]]></ac:plain-text-body>
       </ac:structured-macro>`;
     });
     
@@ -885,8 +906,7 @@ class ConfluenceClient {
     storage = storage.replace(/<th>(.*?)<\/th>/g, '<th><p>$1</p></th>');
     storage = storage.replace(/<td>(.*?)<\/td>/g, '<td><p>$1</p></td>');
     
-    // Convert links
-    storage = storage.replace(/<a href="(.*?)">(.*?)<\/a>/g, '<ac:link><ri:url ri:value="$1" /><ac:plain-text-link-body><![CDATA[$2]]></ac:plain-text-link-body></ac:link>');
+    // Links: keep <a href> as-is (compatible with both Cloud and Server/Data Center)
     
     // Convert horizontal rules
     storage = storage.replace(/<hr\s*\/?>/g, '<hr />');
@@ -1342,6 +1362,10 @@ class ConfluenceClient {
       storageContent = content;
     }
 
+    if (format === 'storage') {
+      storageContent = this.sanitizeStorageContent(storageContent);
+    }
+
     const pageData = {
       type: 'page',
       title: title,
@@ -1373,6 +1397,10 @@ class ConfluenceClient {
       storageContent = content;
     }
 
+    if (format === 'storage') {
+      storageContent = this.sanitizeStorageContent(storageContent);
+    }
+
     const pageData = {
       type: 'page',
       title: title,
@@ -1419,6 +1447,10 @@ class ConfluenceClient {
       } else { // 'storage' format
         storageContent = content;
       }
+
+      if (format === 'storage') {
+        storageContent = this.sanitizeStorageContent(storageContent);
+      }
     } else {
       // If no new content, use the existing content
       storageContent = currentPage.data.body.storage.value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bestend/confluence-cli",
-  "version": "1.15.3",
+  "version": "1.15.5",
   "description": "A command-line interface for Atlassian Confluence with page creation and editing capabilities",
   "main": "index.js",
   "bin": {

package/tests/confluence-client.test.js

@@ -141,7 +141,7 @@ describe('ConfluenceClient', () => {
       
       expect(result).toContain('<ac:structured-macro ac:name="code">');
       expect(result).toContain('<ac:parameter ac:name="language">javascript</ac:parameter>');
-      expect(result).toContain('console.log(&quot;Hello World&quot;);');
+      expect(result).toContain('console.log("Hello World");');
     });
 
     test('should convert lists to native Confluence format', () => {
@@ -171,12 +171,11 @@ describe('ConfluenceClient', () => {
       expect(result).toContain('<td><p>Cell 1</p></td>');
     });
 
-    test('should convert links to Confluence link format', () => {
+    test('should keep links as standard HTML anchors', () => {
       const markdown = '[Example Link](https://example.com)';
       const result = client.markdownToStorage(markdown);
       
-      expect(result).toContain('<ac:link>');
-      expect(result).toContain('ri:value="https://example.com"');
+      expect(result).toContain('<a href="https://example.com">');
       expect(result).toContain('Example Link');
     });
   });