@bestend/confluence-cli 1.15.5 → 1.15.8

package/.github/workflows/publish.yml

@@ -19,14 +19,16 @@ jobs:
           node-version: '24.x'
           registry-url: 'https://registry.npmjs.org'
 
-      - name: Ensure package version matches tag
+      - name: Set package version from tag (idempotent)
         run: |
           TAG="${GITHUB_REF_NAME#v}"
           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
+          if [ "$TAG" = "$PKG_VERSION" ]; then
+            echo "package.json already at $PKG_VERSION (matches tag)"
+          else
+            echo "Setting package.json version to ${TAG}"
+            npm pkg set version="${TAG}"
+            npm install --package-lock-only
           fi
 
       - name: Install dependencies

package/bin/confluence.js

@@ -146,6 +146,8 @@ program
   .option('-f, --file <file>', 'Read content from file')
   .option('-c, --content <content>', 'Page content as string')
   .option('--format <format>', 'Content format (storage, html, markdown)', 'storage')
+  .option('--validate-storage', 'Validate storage content (XML well-formed) before sending')
+  .option('--no-sanitize-storage', 'Disable auto-escaping raw ampersands in storage format')
   .action(async (title, spaceKey, options) => {
     const analytics = new Analytics();
     try {
@@ -166,7 +168,10 @@ program
         throw new Error('Either --file or --content option is required');
       }
       
-      const result = await client.createPage(title, spaceKey, content, options.format);
+      const result = await client.createPage(title, spaceKey, content, options.format, {
+        validateStorage: options.validateStorage,
+        sanitizeStorage: options.sanitizeStorage
+      });
       
       console.log(chalk.green('✅ Page created successfully!'));
       console.log(`Title: ${chalk.blue(result.title)}`);
@@ -189,6 +194,10 @@ program
   .option('-f, --file <file>', 'Read content from file')
   .option('-c, --content <content>', 'Page content as string')
   .option('--format <format>', 'Content format (storage, html, markdown)', 'storage')
+  .option('--validate-storage', 'Validate storage content (XML well-formed) before sending')
+  .option('--no-sanitize-storage', 'Disable auto-escaping raw ampersands in storage format')
+  .option('--validate-storage', 'Validate storage content (XML well-formed) before sending')
+  .option('--no-sanitize-storage', 'Disable auto-escaping raw ampersands in storage format')
   .action(async (title, parentId, options) => {
     const analytics = new Analytics();
     try {
@@ -213,7 +222,10 @@ program
         throw new Error('Either --file or --content option is required');
       }
       
-      const result = await client.createChildPage(title, spaceKey, parentId, content, options.format);
+      const result = await client.createChildPage(title, spaceKey, parentId, content, options.format, {
+        validateStorage: options.validateStorage,
+        sanitizeStorage: options.sanitizeStorage
+      });
       
       console.log(chalk.green('✅ Child page created successfully!'));
       console.log(`Title: ${chalk.blue(result.title)}`);
@@ -238,6 +250,8 @@ program
   .option('-f, --file <file>', 'Read content from file')
   .option('-c, --content <content>', 'Page content as string')
   .option('--format <format>', 'Content format (storage, html, markdown)', 'storage')
+  .option('--validate-storage', 'Validate storage content (XML well-formed) before sending')
+  .option('--no-sanitize-storage', 'Disable auto-escaping raw ampersands in storage format')
   .action(async (pageId, options) => {
     const analytics = new Analytics();
     try {
@@ -261,7 +275,10 @@ program
         content = options.content;
       }
       
-      const result = await client.updatePage(pageId, options.title, content, options.format);
+      const result = await client.updatePage(pageId, options.title, content, options.format, {
+        validateStorage: options.validateStorage,
+        sanitizeStorage: options.sanitizeStorage
+      });
       
       console.log(chalk.green('✅ Page updated successfully!'));
       console.log(`Title: ${chalk.blue(result.title)}`);

package/lib/confluence-client.js

@@ -1,6 +1,7 @@
 const axios = require('axios');
 const { convert } = require('html-to-text');
 const MarkdownIt = require('markdown-it');
+const { XMLValidator } = require('fast-xml-parser');
 
 class ConfluenceClient {
   constructor(config) {
@@ -24,10 +25,32 @@ 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, '&');
+  sanitizeStorageContent(content, options = {}) {
+    const sanitize = options.sanitizeStorage !== false;
+    const validate = options.validateStorage === true;
+
+    let result = content;
+
+    if (sanitize) {
+      // Escape unescaped ampersands that would break XML (except already-escaped entities)
+      result = result.replace(/&(?![a-zA-Z]+;|#\d+;|#x[0-9a-fA-F]+;)/g, '&');
+    }
+
+    if (validate) {
+      const validation = XMLValidator.validate(result, {
+        allowBooleanAttributes: true,
+        suppressEmptyNodeCheck: true,
+        ignoreAttributes: false
+      });
+
+      if (validation !== true) {
+        const { err } = validation;
+        const location = err?.line ? ` (line ${err.line}${err.col ? `, col ${err.col}` : ''})` : '';
+        throw new Error(`Storage content is not well-formed XML: ${err.msg}${location}`);
+      }
+    }
+
+    return result;
   }
 
   sanitizeApiPath(rawPath) {
@@ -860,7 +883,7 @@ class ConfluenceClient {
         .replace(/&lt;/g, '<')
         .replace(/&gt;/g, '>')
         .replace(/&quot;/g, '"')
-        .replace(/&#39;/g, "'");
+        .replace(/&#39;/g, '\'');
       decoded = decoded.replace(/\]\]>/g, ']]]]><![CDATA[>');
       
       return `<ac:structured-macro ac:name="code">
@@ -1352,7 +1375,7 @@ class ConfluenceClient {
   /**
    * Create a new Confluence page
    */
-  async createPage(title, spaceKey, content, format = 'storage') {
+  async createPage(title, spaceKey, content, format = 'storage', options = {}) {
     let storageContent = content;
     
     if (format === 'markdown') {
@@ -1363,7 +1386,7 @@ class ConfluenceClient {
     }
 
     if (format === 'storage') {
-      storageContent = this.sanitizeStorageContent(storageContent);
+      storageContent = this.sanitizeStorageContent(storageContent, options);
     }
 
     const pageData = {
@@ -1387,7 +1410,7 @@ class ConfluenceClient {
   /**
    * Create a new Confluence page as a child of another page
    */
-  async createChildPage(title, spaceKey, parentId, content, format = 'storage') {
+  async createChildPage(title, spaceKey, parentId, content, format = 'storage', options = {}) {
     let storageContent = content;
     
     if (format === 'markdown') {
@@ -1398,7 +1421,7 @@ class ConfluenceClient {
     }
 
     if (format === 'storage') {
-      storageContent = this.sanitizeStorageContent(storageContent);
+      storageContent = this.sanitizeStorageContent(storageContent, options);
     }
 
     const pageData = {
@@ -1427,7 +1450,7 @@ class ConfluenceClient {
   /**
    * Update an existing Confluence page
    */
-  async updatePage(pageId, title, content, format = 'storage') {
+  async updatePage(pageId, title, content, format = 'storage', options = {}) {
     // First, get the current page to get the version number and existing content
     const currentPage = await this.client.get(`/content/${pageId}`, {
       params: {
@@ -1449,7 +1472,7 @@ class ConfluenceClient {
       }
 
       if (format === 'storage') {
-        storageContent = this.sanitizeStorageContent(storageContent);
+        storageContent = this.sanitizeStorageContent(storageContent, options);
       }
     } else {
       // If no new content, use the existing content

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bestend/confluence-cli",
-  "version": "1.15.5",
+  "version": "1.15.8",
   "description": "A command-line interface for Atlassian Confluence with page creation and editing capabilities",
   "main": "index.js",
   "bin": {
@@ -26,6 +26,7 @@
     "axios": "^1.12.0",
     "chalk": "^4.1.2",
     "commander": "^11.1.0",
+    "fast-xml-parser": "^4.5.3",
     "html-to-text": "^9.0.5",
     "inquirer": "^8.2.6",
     "markdown-it": "^14.1.0",