confluence-cli 1.33.3 → 1.35.0

package/lib/macro-converter.js

@@ -82,6 +82,12 @@ class MacroConverter {
 
     storage = storage.replace(/<code>(.*?)<\/code>/g, '<code>$1</code>');
 
+    // **TOC** paragraph → Confluence Table of Contents macro (uses macro defaults)
+    storage = storage.replace(
+      /<p><strong>TOC<\/strong><\/p>/g,
+      '<ac:structured-macro ac:name="toc" />'
+    );
+
     storage = storage.replace(/<blockquote>(.*?)<\/blockquote>/gs, (_, content) => {
       if (content.includes('<strong>INFO</strong>')) {
         const cleanContent = content.replace(/<p><strong>INFO<\/strong><\/p>\s*/, '');
@@ -112,6 +118,26 @@ class MacroConverter {
     storage = storage.replace(/<th>(.*?)<\/th>/g, '<th><p>$1</p></th>');
     storage = storage.replace(/<td>(.*?)<\/td>/g, '<td><p>$1</p></td>');
 
+    // **ANCHOR: id** paragraph → Confluence anchor macro
+    storage = storage.replace(
+      /<p><strong>ANCHOR: (.*?)<\/strong><\/p>/g,
+      '<ac:structured-macro ac:name="anchor"><ac:parameter ac:name="">$1</ac:parameter></ac:structured-macro>'
+    );
+
+    // Same-page anchor links (href="#id") → ac:link with ac:anchor. Must run
+    // before the general link conversion below so the #id pattern is not
+    // consumed by the generic <a href> replacement (and so it works under
+    // all linkStyle modes, including "plain" which leaves <a> tags as-is).
+    storage = storage.replace(/<a href="#(.*?)">(.*?)<\/a>/gs, (_, anchor, body) => {
+      const text = body
+        .replace(/&amp;/g, '&')
+        .replace(/&lt;/g, '<')
+        .replace(/&gt;/g, '>')
+        .replace(/&quot;/g, '"')
+        .replace(/&#39;/g, '\'');
+      return `<ac:link ac:anchor="${anchor}"><ac:plain-text-link-body><![CDATA[${text}]]></ac:plain-text-link-body></ac:link>`;
+    });
+
     // Convert links based on linkStyle:
     //   "smart" — Cloud smart links (<a data-card-appearance="inline">)
     //   "plain" — simple <a href>; workaround for "Cannot handle: DefaultLink"
@@ -235,6 +261,14 @@ class MacroConverter {
       return `[!note]\n${cleanContent}`;
     });
 
+    // anchor macro → **ANCHOR: id** marker (round-trip with markdownToStorage).
+    // Must run before the generic <ac:structured-macro> catch-all below, which
+    // would otherwise drop the anchor entirely.
+    markdown = markdown.replace(
+      /<ac:structured-macro ac:name="anchor"[^>]*>[\s\S]*?<ac:parameter ac:name="">([\s\S]*?)<\/ac:parameter>[\s\S]*?<\/ac:structured-macro>/g,
+      '\n**ANCHOR: $1**\n'
+    );
+
     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;
@@ -291,6 +325,14 @@ class MacroConverter {
 
     markdown = markdown.replace(/<ac:structured-macro[^>]*>[\s\S]*?<\/ac:structured-macro>/g, '');
 
+    // ac:link with ac:anchor → [text](#id) (round-trip with markdownToStorage).
+    // Must run before the <ac:link[^>]*>…</ac:link> catch-all below, which
+    // would otherwise drop the anchor link entirely.
+    markdown = markdown.replace(
+      /<ac:link ac:anchor="([^"]*)">\s*<ac:plain-text-link-body><!\[CDATA\[([\s\S]*?)\]\]><\/ac:plain-text-link-body>\s*<\/ac:link>/g,
+      '[$2](#$1)'
+    );
+
     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]');

package/npm-shrinkwrap.json

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

package/package.json

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