confluence-cli 1.2.0 → 1.3.0

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+# [1.3.0](https://github.com/pchuri/confluence-cli/compare/v1.2.0...v1.3.0) (2025-06-27)
+
+
+### Bug Fixes
+
+* improve format handling based on production testing ([820f9cd](https://github.com/pchuri/confluence-cli/commit/820f9cdc7e59b6aa4b676eda6cff7e22865ec8fb))
+
+
+### Features
+
+* implement page creation and update capabilities ([3c43b19](https://github.com/pchuri/confluence-cli/commit/3c43b19765f94318d01fea3a22b324ada00a77d1))
+
+# [1.2.1](https://github.com/pchuri/confluence-cli/compare/v1.2.0...v1.2.1) (2025-06-27)
+
+
+### Bug Fixes
+
+* **format handling**: improve compatibility across Confluence instances
+  - Switch from 'html' macro to 'markdown' macro for better compatibility
+  - Change HTML processing to direct Storage format (no macro wrapper)
+  - Add markdownToNativeStorage method for alternative conversion
+  - Fix issues discovered during production testing in real Confluence environments
+
 # [1.2.0](https://github.com/pchuri/confluence-cli/compare/v1.1.0...v1.2.0) (2025-06-27)
 
 
@@ -17,8 +40,13 @@
   - Support for reading content from files or inline
   - Markdown to Confluence Storage format conversion
 * **content formats**: support multiple input formats
+<<<<<<< HEAD
+  - Markdown format with automatic conversion using `markdown` macro
+  - HTML format with direct Storage format integration
+=======
   - Markdown format with automatic conversion
   - HTML format with Storage format wrapping
+>>>>>>> origin/main
   - Native Confluence Storage format
 * **examples**: add sample files and demo scripts for new features
 

package/lib/confluence-client.js

@@ -139,15 +139,47 @@ class ConfluenceClient {
    * Convert markdown to Confluence storage format
    */
   markdownToStorage(markdown) {
+    // Use Confluence's markdown macro instead of HTML
+    return `<ac:structured-macro ac:name="markdown">
+      <ac:parameter ac:name="atlassian-macro-output-type">BLOCK</ac:parameter>
+      <ac:plain-text-body><![CDATA[${markdown}]]></ac:plain-text-body>
+    </ac:structured-macro>`;
+  }
+
+  /**
+   * Convert markdown to Confluence storage format using native storage format
+   */
+  markdownToNativeStorage(markdown) {
     // Convert markdown to HTML first
     const html = this.markdown.render(markdown);
     
-    // Basic conversion to Confluence storage format
-    // This is a simplified version - Confluence has a specific storage format
-    return `<ac:structured-macro ac:name="html">
-      <ac:parameter ac:name="atlassian-macro-output-type">BLOCK</ac:parameter>
-      <ac:plain-text-body><![CDATA[${html}]]></ac:plain-text-body>
-    </ac:structured-macro>`;
+    // Simple HTML to Storage format conversion
+    // This is a basic implementation - for full support, we'd need a more sophisticated converter
+    let storage = html
+      .replace(/<h1>/g, '<h1>')
+      .replace(/<\/h1>/g, '</h1>')
+      .replace(/<h2>/g, '<h2>')
+      .replace(/<\/h2>/g, '</h2>')
+      .replace(/<h3>/g, '<h3>')
+      .replace(/<\/h3>/g, '</h3>')
+      .replace(/<p>/g, '<p>')
+      .replace(/<\/p>/g, '</p>')
+      .replace(/<strong>/g, '<strong>')
+      .replace(/<\/strong>/g, '</strong>')
+      .replace(/<em>/g, '<em>')
+      .replace(/<\/em>/g, '</em>')
+      .replace(/<ul>/g, '<ul>')
+      .replace(/<\/ul>/g, '</ul>')
+      .replace(/<ol>/g, '<ol>')
+      .replace(/<\/ol>/g, '</ol>')
+      .replace(/<li>/g, '<li>')
+      .replace(/<\/li>/g, '</li>')
+      .replace(/<code>/g, '<code>')
+      .replace(/<\/code>/g, '</code>')
+      .replace(/<pre><code>/g, '<ac:structured-macro ac:name="code"><ac:plain-text-body><![CDATA[')
+      .replace(/<\/code><\/pre>/g, ']]></ac:plain-text-body></ac:structured-macro>');
+    
+    return storage;
   }
 
   /**
@@ -159,11 +191,8 @@ class ConfluenceClient {
     if (format === 'markdown') {
       storageContent = this.markdownToStorage(content);
     } else if (format === 'html') {
-      // Wrap HTML in storage format
-      storageContent = `<ac:structured-macro ac:name="html">
-        <ac:parameter ac:name="atlassian-macro-output-type">BLOCK</ac:parameter>
-        <ac:plain-text-body><![CDATA[${content}]]></ac:plain-text-body>
-      </ac:structured-macro>`;
+      // Convert HTML directly to storage format (no macro wrapper)
+      storageContent = content;
     }
 
     const pageData = {
@@ -193,11 +222,8 @@ class ConfluenceClient {
     if (format === 'markdown') {
       storageContent = this.markdownToStorage(content);
     } else if (format === 'html') {
-      // Wrap HTML in storage format
-      storageContent = `<ac:structured-macro ac:name="html">
-        <ac:parameter ac:name="atlassian-macro-output-type">BLOCK</ac:parameter>
-        <ac:plain-text-body><![CDATA[${content}]]></ac:plain-text-body>
-      </ac:structured-macro>`;
+      // Convert HTML directly to storage format (no macro wrapper)
+      storageContent = content;
     }
 
     const pageData = {
@@ -236,11 +262,8 @@ class ConfluenceClient {
     if (format === 'markdown') {
       storageContent = this.markdownToStorage(content);
     } else if (format === 'html') {
-      // Wrap HTML in storage format
-      storageContent = `<ac:structured-macro ac:name="html">
-        <ac:parameter ac:name="atlassian-macro-output-type">BLOCK</ac:parameter>
-        <ac:plain-text-body><![CDATA[${content}]]></ac:plain-text-body>
-      </ac:structured-macro>`;
+      // Convert HTML directly to storage format (no macro wrapper)
+      storageContent = content;
     }
 
     const pageData = {

package/package.json

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

package/tests/confluence-client.test.js

@@ -32,9 +32,9 @@ describe('ConfluenceClient', () => {
       const markdown = '# Hello World\n\nThis is a **test** page.';
       const result = client.markdownToStorage(markdown);
       
-      expect(result).toContain('<ac:structured-macro ac:name="html">');
-      expect(result).toContain('<h1>Hello World</h1>');
-      expect(result).toContain('<strong>test</strong>');
+      expect(result).toContain('<ac:structured-macro ac:name="markdown">');
+      expect(result).toContain('Hello World');
+      expect(result).toContain('**test**');
     });
   });