confluence-cli 2.1.9 → 2.1.11

package/lib/storage-walker.js

@@ -250,9 +250,9 @@ class StorageWalker {
 
   handleExpand(node) {
     const titleParam = this.findParamByName(node, 'title');
+    const title = (titleParam ? this.getTextContent(titleParam) : '').trim();
     const body = this.getMacroBody(node);
-    if (titleParam) {
-      const title = this.getTextContent(titleParam);
+    if (title) {
       return `\n**EXPAND: ${title}**\n\n${this.walkNodes(body).trim()}\n\n**EXPAND_END**\n`;
     }
     return `\n<details>\n<summary>${this.labels.expandDetails || 'Expand Details'}</summary>\n\n${this.walkNodes(body).trim()}\n\n</details>\n`;
@@ -281,19 +281,23 @@ class StorageWalker {
 
   handleAnchor(node) {
     const param = this.findParamByName(node, '');
-    const id = param ? this.getTextContent(param) : '';
+    const id = (param ? this.getTextContent(param) : '').trim();
+    if (!id) return '';
     return `\n**ANCHOR: ${id}**\n`;
   }
 
   handlePanel(node) {
     const titleParam = this.findParamByName(node, 'title');
-    const title = titleParam ? this.getTextContent(titleParam) : '';
+    const title = (titleParam ? this.getTextContent(titleParam) : '').trim();
     const body = this.getMacroBody(node);
     // Trim before quoting — walkNodes wraps every <p> with a leading and
     // trailing \n, so untrimmed body splits into ['', 'body', ''] and emits
     // extra `>` blank lines that bracket the real content.
     const cleanContent = this.walkNodes(body).trim();
+    if (!title && !cleanContent) return '';
     const quoted = cleanContent.split('\n').map((line) => (line ? `> ${line}` : '>')).join('\n');
+    if (!title) return `\n${quoted}\n`;
+    if (!cleanContent) return `\n> **${title}**\n`;
     return `\n> **${title}**\n>\n${quoted}\n`;
   }
 
@@ -324,7 +328,7 @@ class StorageWalker {
 
   handleSharedBlock(node, type) {
     const blockKeyParam = this.findParamByName(node, 'shared-block-key');
-    const blockKey = blockKeyParam ? this.getTextContent(blockKeyParam) : '';
+    const blockKey = (blockKeyParam ? this.getTextContent(blockKeyParam) : '').trim();
     const pageParam = this.findParamByName(node, 'page');
     if (pageParam && type === 'include-shared-block') {
       const acLink = this.findChildByName(pageParam, 'ac:link');
@@ -334,7 +338,8 @@ class StorageWalker {
           const pageTitle = this.escapeMarkdownText(decodeEntities(riPage.attribs['ri:content-title'] || ''));
           const includeLabel = this.labels.includeSharedBlock || 'Include Shared Block';
           const fromPageLabel = this.labels.fromPage || 'from page';
-          return `\n> 📄 **${includeLabel}**: ${blockKey} (${fromPageLabel}: ${pageTitle} [link needs manual correction])\n`;
+          const keyPart = blockKey ? `: ${blockKey} ` : ' ';
+          return `\n> 📄 **${includeLabel}**${keyPart}(${fromPageLabel}: ${pageTitle} [link needs manual correction])\n`;
         }
       }
     }
@@ -342,8 +347,11 @@ class StorageWalker {
     // See handlePanel — trim to avoid bracketing `>` blank lines.
     const cleanContent = this.walkNodes(body).trim();
     const sharedLabel = this.labels.sharedBlock || 'Shared Block';
+    if (!blockKey && !cleanContent) return '';
+    const header = blockKey ? `**${sharedLabel}: ${blockKey}**` : `**${sharedLabel}**`;
+    if (!cleanContent) return `\n> ${header}\n`;
     const quoted = cleanContent.split('\n').map((line) => (line ? `> ${line}` : '>')).join('\n');
-    return `\n> **${sharedLabel}: ${blockKey}**\n>\n${quoted}\n`;
+    return `\n> ${header}\n>\n${quoted}\n`;
   }
 
   handleViewFile(node) {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "confluence-cli",
-  "version": "2.1.9",
+  "version": "2.1.11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "confluence-cli",
-      "version": "2.1.9",
+      "version": "2.1.11",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.15.0",

package/package.json

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