confluence-cli 1.31.0 → 1.32.0

package/lib/html-to-markdown.js

@@ -0,0 +1,150 @@
+const NAMED_ENTITIES = {
+  aring: 'å', auml: 'ä', ouml: 'ö',
+  eacute: 'é', egrave: 'è', ecirc: 'ê', euml: 'ë',
+  aacute: 'á', agrave: 'à', acirc: 'â', atilde: 'ã',
+  oacute: 'ó', ograve: 'ò', ocirc: 'ô', otilde: 'õ',
+  uacute: 'ú', ugrave: 'ù', ucirc: 'û', uuml: 'ü',
+  iacute: 'í', igrave: 'ì', icirc: 'î', iuml: 'ï',
+  ntilde: 'ñ', ccedil: 'ç', szlig: 'ß', yuml: 'ÿ',
+  eth: 'ð', thorn: 'þ',
+  Aring: 'Å', Auml: 'Ä', Ouml: 'Ö',
+  Eacute: 'É', Egrave: 'È', Ecirc: 'Ê', Euml: 'Ë',
+  Aacute: 'Á', Agrave: 'À', Acirc: 'Â', Atilde: 'Ã',
+  Oacute: 'Ó', Ograve: 'Ò', Ocirc: 'Ô', Otilde: 'Õ',
+  Uacute: 'Ú', Ugrave: 'Ù', Ucirc: 'Û', Uuml: 'Ü',
+  Iacute: 'Í', Igrave: 'Ì', Icirc: 'Î', Iuml: 'Ï',
+  Ntilde: 'Ñ', Ccedil: 'Ç', Szlig: 'SS', Yuml: 'Ÿ',
+  Eth: 'Ð', Thorn: 'Þ'
+};
+
+function htmlToMarkdown(html) {
+  let markdown = html;
+
+  markdown = markdown.replace(/<time\s+datetime="([^"]+)"[^>]*(?:\/>|>\s*<\/time>)/g, '$1');
+
+  markdown = markdown.replace(/<strong[^>]*>(.*?)<\/strong>/g, '**$1**');
+
+  markdown = markdown.replace(/<em[^>]*>(.*?)<\/em>/g, '*$1*');
+
+  markdown = markdown.replace(/<code[^>]*>(.*?)<\/code>/g, '`$1`');
+
+  markdown = markdown.replace(/<(\w+)[^>]*>/g, '<$1>');
+  markdown = markdown.replace(/<\/(\w+)[^>]*>/g, '</$1>');
+
+  markdown = markdown.replace(/<h([1-6])>(.*?)<\/h[1-6]>/g, (_, level, text) => {
+    return '\n' + '#'.repeat(parseInt(level)) + ' ' + text.trim() + '\n';
+  });
+
+  markdown = markdown.replace(/<table>(.*?)<\/table>/gs, (_, content) => {
+    const rows = [];
+    let isHeader = true;
+
+    const rowMatches = content.match(/<tr>(.*?)<\/tr>/gs);
+    if (rowMatches) {
+      rowMatches.forEach(rowMatch => {
+        const cells = [];
+        const cellContent = rowMatch.replace(/<tr>(.*?)<\/tr>/s, '$1');
+
+        const cellMatches = cellContent.match(/<t[hd]>(.*?)<\/t[hd]>/gs);
+        if (cellMatches) {
+          cellMatches.forEach(cellMatch => {
+            let cellText = cellMatch.replace(/<t[hd]>(.*?)<\/t[hd]>/s, '$1');
+            cellText = cellText.replace(/<p>/g, '').replace(/<\/p>/g, ' ');
+            cellText = cellText.replace(/<[^>]+>/g, ' ').replace(/\s+/g, ' ').trim();
+            cells.push(cellText || ' ');
+          });
+        }
+
+        if (cells.length > 0) {
+          rows.push('| ' + cells.join(' | ') + ' |');
+
+          if (isHeader) {
+            rows.push('| ' + cells.map(() => '---').join(' | ') + ' |');
+            isHeader = false;
+          }
+        }
+      });
+    }
+
+    return rows.length > 0 ? '\n' + rows.join('\n') + '\n' : '';
+  });
+
+  markdown = markdown.replace(/<ul>(.*?)<\/ul>/gs, (_, content) => {
+    let listItems = '';
+    const itemMatches = content.match(/<li>(.*?)<\/li>/gs);
+    if (itemMatches) {
+      itemMatches.forEach(itemMatch => {
+        let itemText = itemMatch.replace(/<li>(.*?)<\/li>/s, '$1');
+        itemText = itemText.replace(/<p>/g, '').replace(/<\/p>/g, ' ');
+        itemText = itemText.replace(/<[^>]+>/g, ' ').replace(/\s+/g, ' ').trim();
+        if (itemText) {
+          listItems += '- ' + itemText + '\n';
+        }
+      });
+    }
+    return '\n' + listItems;
+  });
+
+  markdown = markdown.replace(/<ol>(.*?)<\/ol>/gs, (_, content) => {
+    let listItems = '';
+    let counter = 1;
+    const itemMatches = content.match(/<li>(.*?)<\/li>/gs);
+    if (itemMatches) {
+      itemMatches.forEach(itemMatch => {
+        let itemText = itemMatch.replace(/<li>(.*?)<\/li>/s, '$1');
+        itemText = itemText.replace(/<p>/g, '').replace(/<\/p>/g, ' ');
+        itemText = itemText.replace(/<[^>]+>/g, ' ').replace(/\s+/g, ' ').trim();
+        if (itemText) {
+          listItems += `${counter++}. ${itemText}\n`;
+        }
+      });
+    }
+    return '\n' + listItems;
+  });
+
+  markdown = markdown.replace(/<p>(.*?)<\/p>/gs, (_, content) => {
+    return '\n' + content.trim() + '\n';
+  });
+
+  markdown = markdown.replace(/<br\s*\/?>/g, '\n');
+
+  markdown = markdown.replace(/<hr\s*\/?>/g, '\n---\n');
+
+  markdown = markdown.replace(/<(?!\/?(details|summary)\b)[^>]+>/g, ' ');
+
+  markdown = markdown.replace(/&nbsp;/g, ' ');
+  markdown = markdown.replace(/&lt;/g, '<');
+  markdown = markdown.replace(/&gt;/g, '>');
+  markdown = markdown.replace(/&amp;/g, '&');
+  markdown = markdown.replace(/&quot;/g, '"');
+  markdown = markdown.replace(/&apos;/g, '\'');
+  markdown = markdown.replace(/&ldquo;/g, '"');
+  markdown = markdown.replace(/&rdquo;/g, '"');
+  markdown = markdown.replace(/&lsquo;/g, '\'');
+  markdown = markdown.replace(/&rsquo;/g, '\'');
+  markdown = markdown.replace(/&mdash;/g, '—');
+  markdown = markdown.replace(/&ndash;/g, '–');
+  markdown = markdown.replace(/&hellip;/g, '...');
+  markdown = markdown.replace(/&bull;/g, '•');
+  markdown = markdown.replace(/&copy;/g, '©');
+  markdown = markdown.replace(/&reg;/g, '®');
+  markdown = markdown.replace(/&trade;/g, '™');
+  markdown = markdown.replace(/&#(\d+);/g, (_, code) => String.fromCharCode(parseInt(code, 10)));
+  markdown = markdown.replace(/&#x([0-9a-fA-F]+);/g, (_, code) => String.fromCharCode(parseInt(code, 16)));
+
+  markdown = markdown.replace(/&([a-zA-Z]+);/g, (match, name) => NAMED_ENTITIES[name] || match);
+
+  markdown = markdown.replace(/[ \t]+$/gm, '');
+  markdown = markdown.replace(/^[ \t]+(?!([`>]|[*+-] |\d+[.)] ))/gm, '');
+  markdown = markdown.replace(/^(#{1,6}[^\n]+)\n(?!\n)/gm, '$1\n\n');
+  markdown = markdown.replace(/\n\s*\n\s*\n+/g, '\n\n');
+  markdown = markdown.replace(/[ \t]+/g, ' ');
+  markdown = markdown.trim();
+
+  return markdown;
+}
+
+module.exports = {
+  htmlToMarkdown,
+  NAMED_ENTITIES
+};

package/lib/macro-converter.js

@@ -0,0 +1,298 @@
+const MarkdownIt = require('markdown-it');
+const { htmlToMarkdown } = require('./html-to-markdown');
+
+class MacroConverter {
+  constructor({ isCloud = false, webUrlPrefix = '', buildUrl = null } = {}) {
+    this._isCloud = isCloud;
+    this.webUrlPrefix = webUrlPrefix;
+    this.buildUrl = buildUrl || ((pathOrUrl) => pathOrUrl);
+    this.markdown = new MarkdownIt();
+    this.setupConfluenceMarkdownExtensions();
+  }
+
+  isCloud() {
+    return this._isCloud;
+  }
+
+  setupConfluenceMarkdownExtensions() {
+    this.markdown.enable(['table', 'strikethrough', 'linkify']);
+
+    this.markdown.core.ruler.before('normalize', 'confluence_macros', (state) => {
+      const src = state.src;
+
+      state.src = src.replace(/\[!info\]\s*([\s\S]*?)(?=\n\s*\n|\n\s*\[!|$)/g, (_, content) => {
+        return `> **INFO**\n> ${content.trim().replace(/\n/g, '\n> ')}`;
+      });
+
+      state.src = state.src.replace(/\[!warning\]\s*([\s\S]*?)(?=\n\s*\n|\n\s*\[!|$)/g, (_, content) => {
+        return `> **WARNING**\n> ${content.trim().replace(/\n/g, '\n> ')}`;
+      });
+
+      state.src = state.src.replace(/\[!note\]\s*([\s\S]*?)(?=\n\s*\n|\n\s*\[!|$)/g, (_, content) => {
+        return `> **NOTE**\n> ${content.trim().replace(/\n/g, '\n> ')}`;
+      });
+
+      state.src = state.src.replace(/^(\s*)- \[([ x])\] (.+)$/gm, (_, indent, checked, text) => {
+        return `${indent}- [${checked}] ${text}`;
+      });
+    });
+  }
+
+  markdownToStorage(markdown) {
+    const html = this.markdown.render(markdown);
+    return this.htmlToConfluenceStorage(html);
+  }
+
+  markdownToNativeStorage(markdown) {
+    const html = this.markdown.render(markdown);
+    return this.htmlToConfluenceStorage(html);
+  }
+
+  htmlToConfluenceStorage(html) {
+    let storage = html;
+
+    storage = storage.replace(/<h([1-6])>(.*?)<\/h[1-6]>/g, '<h$1>$2</h$1>');
+
+    storage = storage.replace(/<p>(.*?)<\/p>/g, '<p>$1</p>');
+
+    storage = storage.replace(/<strong>(.*?)<\/strong>/g, '<strong>$1</strong>');
+
+    storage = storage.replace(/<em>(.*?)<\/em>/g, '<em>$1</em>');
+
+    storage = storage.replace(/<ul>(.*?)<\/ul>/gs, '<ul>$1</ul>');
+    storage = storage.replace(/<li>(.*?)<\/li>/g, '<li><p>$1</p></li>');
+
+    storage = storage.replace(/<ol>(.*?)<\/ol>/gs, '<ol>$1</ol>');
+
+    storage = storage.replace(/<pre><code(?:\s+class="language-(\w+)")?>(.*?)<\/code><\/pre>/gs, (_, lang, code) => {
+      const language = lang || 'text';
+      const decodedCode = code.replace(/\n$/, '')
+        .replace(/&quot;/g, '"')
+        .replace(/&lt;/g, '<')
+        .replace(/&gt;/g, '>')
+        .replace(/&amp;/g, '&');
+      const safeCode = decodedCode.replace(/]]>/g, ']]]]><![CDATA[>');
+      return `<ac:structured-macro ac:name="code"><ac:parameter ac:name="language">${language}</ac:parameter><ac:plain-text-body><![CDATA[${safeCode}]]></ac:plain-text-body></ac:structured-macro>`;
+    });
+
+    storage = storage.replace(/<code>(.*?)<\/code>/g, '<code>$1</code>');
+
+    storage = storage.replace(/<blockquote>(.*?)<\/blockquote>/gs, (_, content) => {
+      if (content.includes('<strong>INFO</strong>')) {
+        const cleanContent = content.replace(/<p><strong>INFO<\/strong><\/p>\s*/, '');
+        return `<ac:structured-macro ac:name="info">
+          <ac:rich-text-body>${cleanContent}</ac:rich-text-body>
+        </ac:structured-macro>`;
+      } else if (content.includes('<strong>WARNING</strong>')) {
+        const cleanContent = content.replace(/<p><strong>WARNING<\/strong><\/p>\s*/, '');
+        return `<ac:structured-macro ac:name="warning">
+          <ac:rich-text-body>${cleanContent}</ac:rich-text-body>
+        </ac:structured-macro>`;
+      } else if (content.includes('<strong>NOTE</strong>')) {
+        const cleanContent = content.replace(/<p><strong>NOTE<\/strong><\/p>\s*/, '');
+        return `<ac:structured-macro ac:name="note">
+          <ac:rich-text-body>${cleanContent}</ac:rich-text-body>
+        </ac:structured-macro>`;
+      } else {
+        return `<ac:structured-macro ac:name="info">
+          <ac:rich-text-body>${content}</ac:rich-text-body>
+        </ac:structured-macro>`;
+      }
+    });
+
+    storage = storage.replace(/<table>(.*?)<\/table>/gs, '<table>$1</table>');
+    storage = storage.replace(/<thead>(.*?)<\/thead>/gs, '<thead>$1</thead>');
+    storage = storage.replace(/<tbody>(.*?)<\/tbody>/gs, '<tbody>$1</tbody>');
+    storage = storage.replace(/<tr>(.*?)<\/tr>/gs, '<tr>$1</tr>');
+    storage = storage.replace(/<th>(.*?)<\/th>/g, '<th><p>$1</p></th>');
+    storage = storage.replace(/<td>(.*?)<\/td>/g, '<td><p>$1</p></td>');
+
+    if (this.isCloud()) {
+      storage = storage.replace(/<a href="(.*?)">(.*?)<\/a>/g, '<a href="$1" data-card-appearance="inline">$2</a>');
+    } else {
+      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>');
+    }
+
+    storage = storage.replace(/<hr\s*\/?>/g, '<hr />');
+
+    return storage;
+  }
+
+  detectLanguageLabels(text) {
+    const labels = {
+      includePage: 'Include Page',
+      sharedBlock: 'Shared Block',
+      includeSharedBlock: 'Include Shared Block',
+      fromPage: 'from page',
+      expandDetails: 'Expand Details'
+    };
+
+    if (/[\u4e00-\u9fa5]/.test(text)) {
+      labels.includePage = '包含页面';
+      labels.sharedBlock = '共享块';
+      labels.includeSharedBlock = '包含共享块';
+      labels.fromPage = '来自页面';
+      labels.expandDetails = '展开详情';
+    } else if (/[\u3040-\u309f\u30a0-\u30ff]/.test(text)) {
+      labels.includePage = 'ページを含む';
+      labels.sharedBlock = '共有ブロック';
+      labels.includeSharedBlock = '共有ブロックを含む';
+      labels.fromPage = 'ページから';
+      labels.expandDetails = '詳細を表示';
+    } else if (/[\uac00-\ud7af]/.test(text)) {
+      labels.includePage = '페이지 포함';
+      labels.sharedBlock = '공유 블록';
+      labels.includeSharedBlock = '공유 블록 포함';
+      labels.fromPage = '페이지에서';
+      labels.expandDetails = '상세 보기';
+    } else if (/[\u0400-\u04ff]/.test(text)) {
+      labels.includePage = 'Включить страницу';
+      labels.sharedBlock = 'Общий блок';
+      labels.includeSharedBlock = 'Включить общий блок';
+      labels.fromPage = 'со страницы';
+      labels.expandDetails = 'Подробнее';
+    } else if ((text.match(/[àâäéèêëïîôùûüÿœæç]/gi) || []).length >= 2) {
+      labels.includePage = 'Inclure la page';
+      labels.sharedBlock = 'Bloc partagé';
+      labels.includeSharedBlock = 'Inclure le bloc partagé';
+      labels.fromPage = 'de la page';
+      labels.expandDetails = 'Détails';
+    } else if ((text.match(/[äöüß]/gi) || []).length >= 2) {
+      labels.includePage = 'Seite einbinden';
+      labels.sharedBlock = 'Gemeinsamer Block';
+      labels.includeSharedBlock = 'Gemeinsamen Block einbinden';
+      labels.fromPage = 'von Seite';
+      labels.expandDetails = 'Details';
+    } else if ((text.match(/[áéíóúñ¿¡]/gi) || []).length >= 2) {
+      labels.includePage = 'Incluir página';
+      labels.sharedBlock = 'Bloque compartido';
+      labels.includeSharedBlock = 'Incluir bloque compartido';
+      labels.fromPage = 'de la página';
+      labels.expandDetails = 'Detalles';
+    }
+
+    return labels;
+  }
+
+  storageToMarkdown(storage, options = {}) {
+    const attachmentsDir = options.attachmentsDir || 'attachments';
+    let markdown = storage;
+
+    const labels = this.detectLanguageLabels(markdown);
+
+    markdown = markdown.replace(/<ac:structured-macro ac:name="toc"[^>]*\s*\/>/g, '');
+    markdown = markdown.replace(/<ac:structured-macro ac:name="toc"[^>]*>[\s\S]*?<\/ac:structured-macro>/g, '');
+
+    markdown = markdown.replace(/<ac:structured-macro ac:name="floatmenu"[^>]*>[\s\S]*?<\/ac:structured-macro>/g, '');
+
+    markdown = markdown.replace(/<ac:image[^>]*>\s*<ri:attachment\s+ri:filename="([^"]+)"[^>]*\s*\/>\s*<\/ac:image>/g, (_, filename) => {
+      return `![${filename}](${attachmentsDir}/${filename})`;
+    });
+
+    markdown = markdown.replace(/<ac:image[^>]*><ri:attachment\s+ri:filename="([^"]+)"[^>]*><\/ri:attachment><\/ac:image>/g, (_, filename) => {
+      return `![${filename}](${attachmentsDir}/${filename})`;
+    });
+
+    markdown = markdown.replace(/<ac:structured-macro ac:name="mermaid-macro"[^>]*>[\s\S]*?<ac:plain-text-body><!\[CDATA\[([\s\S]*?)\]\]><\/ac:plain-text-body>[\s\S]*?<\/ac:structured-macro>/g, (_, code) => {
+      return `\n\`\`\`mermaid\n${code.trim()}\n\`\`\`\n`;
+    });
+
+    markdown = markdown.replace(/<ac:structured-macro ac:name="expand"[^>]*>[\s\S]*?<ac:rich-text-body>([\s\S]*?)<\/ac:rich-text-body>[\s\S]*?<\/ac:structured-macro>/g, (_, content) => {
+      return `\n<details>\n<summary>${labels.expandDetails}</summary>\n\n${content}\n\n</details>\n`;
+    });
+
+    markdown = markdown.replace(/<ac:structured-macro ac:name="code"[^>]*>[\s\S]*?<ac:parameter ac:name="language">([^<]*)<\/ac:parameter>[\s\S]*?<ac:plain-text-body><!\[CDATA\[([\s\S]*?)\]\]><\/ac:plain-text-body>[\s\S]*?<\/ac:structured-macro>/g, (_, lang, code) => {
+      return `\n\`\`\`${lang}\n${code}\n\`\`\`\n`;
+    });
+
+    markdown = markdown.replace(/<ac:structured-macro ac:name="code"[^>]*>[\s\S]*?<ac:plain-text-body><!\[CDATA\[([\s\S]*?)\]\]><\/ac:plain-text-body>[\s\S]*?<\/ac:structured-macro>/g, (_, code) => {
+      return `\n\`\`\`\n${code}\n\`\`\`\n`;
+    });
+
+    markdown = markdown.replace(/<ac:structured-macro ac:name="info"[^>]*>[\s\S]*?<ac:rich-text-body>([\s\S]*?)<\/ac:rich-text-body>[\s\S]*?<\/ac:structured-macro>/g, (_, content) => {
+      const cleanContent = htmlToMarkdown(content);
+      return `[!info]\n${cleanContent}`;
+    });
+
+    markdown = markdown.replace(/<ac:structured-macro ac:name="warning"[^>]*>[\s\S]*?<ac:rich-text-body>([\s\S]*?)<\/ac:rich-text-body>[\s\S]*?<\/ac:structured-macro>/g, (_, content) => {
+      const cleanContent = htmlToMarkdown(content);
+      return `[!warning]\n${cleanContent}`;
+    });
+
+    markdown = markdown.replace(/<ac:structured-macro ac:name="note"[^>]*>[\s\S]*?<ac:rich-text-body>([\s\S]*?)<\/ac:rich-text-body>[\s\S]*?<\/ac:structured-macro>/g, (_, content) => {
+      const cleanContent = htmlToMarkdown(content);
+      return `[!note]\n${cleanContent}`;
+    });
+
+    markdown = markdown.replace(/<ac:task-list>([\s\S]*?)<\/ac:task-list>/g, (_, content) => {
+      const tasks = [];
+      const taskRegex = /<ac:task>[\s\S]*?<ac:task-status>([^<]*)<\/ac:task-status>[\s\S]*?<ac:task-body>([\s\S]*?)<\/ac:task-body>[\s\S]*?<\/ac:task>/g;
+      let match;
+      while ((match = taskRegex.exec(content)) !== null) {
+        const status = match[1];
+        let taskBody = match[2];
+        taskBody = taskBody.replace(/<[^>]+>/g, '').replace(/\s+/g, ' ').trim();
+        const checkbox = status === 'complete' ? '[x]' : '[ ]';
+        if (taskBody) {
+          tasks.push(`- ${checkbox} ${taskBody}`);
+        }
+      }
+      return tasks.length > 0 ? '\n' + tasks.join('\n') + '\n' : '';
+    });
+
+    markdown = markdown.replace(/<ac:structured-macro ac:name="panel"[^>]*>[\s\S]*?<ac:parameter ac:name="title">([^<]*)<\/ac:parameter>[\s\S]*?<ac:rich-text-body>([\s\S]*?)<\/ac:rich-text-body>[\s\S]*?<\/ac:structured-macro>/g, (_, title, content) => {
+      const cleanContent = htmlToMarkdown(content);
+      return `\n> **${title}**\n>\n${cleanContent.split('\n').map(line => line ? `> ${line}` : '>').join('\n')}\n`;
+    });
+
+    markdown = markdown.replace(/<ac:structured-macro ac:name="include"[^>]*>[\s\S]*?<ac:parameter ac:name="">[\s\S]*?<ac:link>[\s\S]*?<ri:page\s+ri:space-key="([^"]+)"\s+ri:content-title="([^"]+)"[^>]*\/>[\s\S]*?<\/ac:link>[\s\S]*?<\/ac:parameter>[\s\S]*?<\/ac:structured-macro>/g, (_, spaceKey, title) => {
+      if (spaceKey.startsWith('~')) {
+        const spacePath = `display/${spaceKey}/${encodeURIComponent(title)}`;
+        return `\n> 📄 **${labels.includePage}**: [${title}](${this.buildUrl(`${this.webUrlPrefix}/${spacePath}`)})\n`;
+      } else {
+        return `\n> 📄 **${labels.includePage}**: [${title}](${this.buildUrl(`${this.webUrlPrefix}/spaces/${spaceKey}/pages/[PAGE_ID_HERE]`)}) _(manual link correction required)_\n`;
+      }
+    });
+
+    markdown = markdown.replace(/<ac:structured-macro ac:name="(shared-block|include-shared-block)"[^>]*>[\s\S]*?<ac:parameter ac:name="shared-block-key">([^<]*)<\/ac:parameter>[\s\S]*?<ac:rich-text-body>([\s\S]*?)<\/ac:rich-text-body>[\s\S]*?<\/ac:structured-macro>/g, (_, macroType, blockKey, content) => {
+      const cleanContent = htmlToMarkdown(content);
+      return `\n> **${labels.sharedBlock}: ${blockKey}**\n>\n${cleanContent.split('\n').map(line => line ? `> ${line}` : '>').join('\n')}\n`;
+    });
+
+    markdown = markdown.replace(/<ac:structured-macro ac:name="include-shared-block"[^>]*>[\s\S]*?<ac:parameter ac:name="shared-block-key">([^<]*)<\/ac:parameter>[\s\S]*?<ac:parameter ac:name="page">[\s\S]*?<ac:link>[\s\S]*?<ri:page\s+ri:space-key="([^"]+)"\s+ri:content-title="([^"]+)"[^>]*\/>[\s\S]*?<\/ac:link>[\s\S]*?<\/ac:parameter>[\s\S]*?<\/ac:structured-macro>/g, (_, blockKey, spaceKey, pageTitle) => {
+      return `\n> 📄 **${labels.includeSharedBlock}**: ${blockKey} (${labels.fromPage}: ${pageTitle} [link needs manual correction])\n`;
+    });
+
+    markdown = markdown.replace(/<ac:structured-macro ac:name="view-file"[^>]*>[\s\S]*?<ac:parameter ac:name="name">[\s\S]*?<ri:attachment\s+ri:filename="([^"]+)"[^>]*\/>[\s\S]*?<\/ac:parameter>[\s\S]*?<\/ac:structured-macro>/g, (_, filename) => {
+      return `\n📎 [${filename}](${attachmentsDir}/${filename})\n`;
+    });
+
+    markdown = markdown.replace(/<ac:structured-macro ac:name="view-file"[^>]*>[\s\S]*?<ac:parameter ac:name="name">[\s\S]*?<ri:attachment\s+ri:filename="([^"]+)"[^>]*\/>[\s\S]*?<\/ac:parameter>[\s\S]*?<ac:parameter ac:name="height">([^<]*)<\/ac:parameter>[\s\S]*?<\/ac:structured-macro>/g, (_, filename, _height) => {
+      return `\n📎 [${filename}](${attachmentsDir}/${filename})\n`;
+    });
+
+    markdown = markdown.replace(/<ac:layout>/g, '');
+    markdown = markdown.replace(/<\/ac:layout>/g, '');
+    markdown = markdown.replace(/<ac:layout-section[^>]*>/g, '');
+    markdown = markdown.replace(/<\/ac:layout-section>/g, '');
+    markdown = markdown.replace(/<ac:layout-cell[^>]*>/g, '');
+    markdown = markdown.replace(/<\/ac:layout-cell>/g, '');
+
+    markdown = markdown.replace(/<ac:structured-macro[^>]*>[\s\S]*?<\/ac:structured-macro>/g, '');
+
+    markdown = markdown.replace(/<ac:link><ri:url ri:value="([^"]*)" \/><ac:plain-text-link-body><!\[CDATA\[([^\]]*)\]\]><\/ac:plain-text-link-body><\/ac:link>/g, '[$2]($1)');
+
+    markdown = markdown.replace(/<ac:link>\s*<ri:page[^>]*ri:content-title="([^"]*)"[^>]*\/>\s*<\/ac:link>/g, '[$1]');
+    markdown = markdown.replace(/<ac:link>\s*<ri:page[^>]*ri:content-title="([^"]*)"[^>]*>\s*<\/ri:page>\s*<\/ac:link>/g, '[$1]');
+
+    markdown = markdown.replace(/<ac:link[^>]*>[\s\S]*?<ac:link-body>([\s\S]*?)<\/ac:link-body>[\s\S]*?<\/ac:link>/g, '$1');
+
+    markdown = markdown.replace(/<ac:link[^>]*>[\s\S]*?<\/ac:link>/g, '');
+
+    markdown = htmlToMarkdown(markdown);
+
+    return markdown;
+  }
+}
+
+module.exports = MacroConverter;

package/npm-shrinkwrap.json

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

package/package.json

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

package/plugins/confluence/skills/confluence/SKILL.md

@@ -149,15 +149,16 @@ confluence --profile staging init --domain "staging.example.com" --auth-type bea
 Read page content. Outputs to stdout.
 
 ```sh
-confluence read <pageId> [--format html|text|markdown]
+confluence read <pageId> [--format html|text|storage|markdown]
 ```
 
 | Option | Default | Description |
 |---|---|---|
-| `--format` | `text` | Output format: `html`, `text`, or `markdown` |
+| `--format` | `text` | Output format: `html`, `text`, `storage`, or `markdown` |
 
 ```sh
 confluence read 123456789
+confluence read 123456789 --format storage
 confluence read 123456789 --format markdown
 ```
 
@@ -165,14 +166,15 @@ confluence read 123456789 --format markdown
 
 ### `info <pageId>`
 
-Get page metadata (title, ID, type, status, space).
+Get page metadata. Use `--format json` for machine-readable output.
 
 ```sh
-confluence info <pageId>
+confluence info <pageId> [--format text|json]
 ```
 
 ```sh
 confluence info 123456789
+confluence info 123456789 --format json
 ```
 
 ---