confluence-cli 1.34.0 → 2.0.0

package/README.md

@@ -770,6 +770,55 @@ echo "# Hello" | confluence convert --input-format markdown --output-format stor
 confluence convert -i page.xml -o page.md --input-format storage --output-format markdown
 ```
 
+## Markdown Marker Conventions
+
+When converting markdown to Confluence storage format (via `confluence convert`, `create`, or `update`), the following paragraph-level markers produce native Confluence macros. Each marker round-trips back to its markdown form when going storage → markdown.
+
+### Callout macros — `INFO`, `WARNING`, `NOTE`
+
+A blockquote whose first line is `**INFO**`, `**WARNING**`, or `**NOTE**` becomes the corresponding Confluence macro:
+
+```markdown
+> **INFO**
+> Heads up — this is an info box.
+
+> **WARNING**
+> Watch out for this.
+
+> **NOTE**
+> Side note for the reader.
+```
+
+The reverse direction emits the equivalent shorthand (`[!info]` / `[!warning]` / `[!note]` followed by the body), which markdown→storage then re-expands.
+
+A blockquote without one of these markers stays a **plain blockquote** (`<blockquote>…</blockquote>`) — `> …` is treated as a quotation, not an alert. Use the markers above when you want a callout.
+
+### `**TOC**` — Table of Contents
+
+A paragraph containing only `**TOC**` becomes a Confluence Table of Contents macro using the macro's default heading levels:
+
+```markdown
+**TOC**
+```
+
+### `**ANCHOR: id**` — anchor
+
+A paragraph containing only `**ANCHOR: my-section**` becomes a Confluence anchor macro with the given id:
+
+```markdown
+**ANCHOR: my-section**
+```
+
+### `[text](#id)` — same-page anchor link
+
+A standard markdown link whose href starts with `#` becomes an `ac:link` with `ac:anchor`, rendering as an in-page jump in Confluence:
+
+```markdown
+See [the anchor](#my-section) above.
+```
+
+This works under all three `linkStyle` modes (`smart`, `wiki`, `plain`) — the anchor-link conversion runs before the general `<a href>` handling.
+
 ## Development
 
 ```bash

package/lib/macro-converter.js

@@ -105,9 +105,10 @@ class MacroConverter {
           <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>`;
+        // Plain blockquote — `> …` is a quotation, not an alert. Use the
+        // `> **INFO**` / `> **WARNING**` / `> **NOTE**` markers above to
+        // produce a Confluence info / warning / note macro instead.
+        return `<blockquote>${content}</blockquote>`;
       }
     });
 
@@ -261,6 +262,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;
@@ -317,6 +326,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.34.0",
+  "version": "2.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "confluence-cli",
-      "version": "1.34.0",
+      "version": "2.0.0",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.15.0",

package/package.json

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