confluence-cli 2.0.2 → 2.1.1

package/README.md

@@ -809,6 +809,24 @@ A paragraph containing only `**ANCHOR: my-section**` becomes a Confluence anchor
 **ANCHOR: my-section**
 ```
 
+### `**EXPAND: title** … **EXPAND_END**` — collapsible expand macro
+
+Wrap a block of content between `**EXPAND: title**` and `**EXPAND_END**` markers (each on its own paragraph) to render it as a Confluence expand macro with a collapsible body:
+
+````markdown
+**EXPAND: Show generated code**
+
+```js
+const x = 1;
+```
+
+**EXPAND_END**
+````
+
+The body may contain any content that is converted earlier in the pipeline (code blocks, tables, callout blockquotes). The reverse direction emits the same `**EXPAND: title**` / `**EXPAND_END**` markers so the conversion round-trips.
+
+Inline markdown inside the title (`*em*`, backtick code, links, `~~strike~~`) is stripped at capture time — Confluence's storage normalizer treats macro titles as plain text and will silently truncate or reject HTML in a `<ac:parameter>`. Title-less expand macros created in the Confluence UI still convert to `<details>/<summary>` blocks.
+
 ### `[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:

package/lib/macro-converter.js

@@ -2,6 +2,7 @@ const MarkdownIt = require('markdown-it');
 const { htmlToMarkdown } = require('./html-to-markdown');
 
 const VALID_LINK_STYLES = ['smart', 'plain', 'wiki'];
+const CALLOUT_MARKERS = ['info', 'warning', 'note'];
 
 class MacroConverter {
   constructor({ isCloud = false, webUrlPrefix = '', buildUrl = null, linkStyle = null } = {}) {
@@ -89,27 +90,36 @@ class MacroConverter {
     );
 
     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 {
+      // Detect the marker only when it sits at the very start of the first
+      // paragraph, immediately followed by a `</p>` close (separated form) or
+      // a `\n` (same-line body form). This is the same anchor condition the
+      // strip step uses below, so detection and stripping stay in sync.
+      // Without this anchor, a quotation that merely *mentions* `**INFO**` —
+      // e.g. `> Use **INFO** at the start.` — would be silently wrapped in an
+      // info macro, surprising the author.
+      const marker = CALLOUT_MARKERS.find((m) =>
+        new RegExp(`<p><strong>${m.toUpperCase()}<\\/strong>(<\\/p>|\\s*\\n)`).test(content)
+      );
+      if (!marker) {
         // 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>`;
       }
+      // Strip the leading `<strong>MARKER</strong>`. markdown-it produces two
+      // shapes depending on whether a blank `>` line separates marker and body:
+      //   case A (separated):  `<p><strong>MARKER</strong></p>\n<p>body</p>`
+      //   case B (same-line):  `<p><strong>MARKER</strong>\nbody</p>`
+      // The original cleanup only handled case A, so case B leaked the marker
+      // into the rendered macro body. README's recommended `> **INFO**\n> body`
+      // form parses as case B — exactly the form that broke.
+      const cleanContent = content.replace(
+        new RegExp(`<p><strong>${marker.toUpperCase()}<\\/strong>(<\\/p>\\s*|\\s*\\n)`),
+        (_, tail) => tail.startsWith('</p>') ? '' : '<p>'
+      );
+      return `<ac:structured-macro ac:name="${marker}">
+          <ac:rich-text-body>${cleanContent}</ac:rich-text-body>
+        </ac:structured-macro>`;
     });
 
     storage = storage.replace(/<table>(.*?)<\/table>/gs, '<table>$1</table>');
@@ -125,6 +135,20 @@ class MacroConverter {
       '<ac:structured-macro ac:name="anchor"><ac:parameter ac:name="">$1</ac:parameter></ac:structured-macro>'
     );
 
+    // **EXPAND: title** … **EXPAND_END** → Confluence expand macro. Runs
+    // after code/blockquote/table conversion so the body can contain those
+    // macros. Strips inline HTML from the title because Confluence's storage
+    // normalizer treats <ac:parameter> as text-only — it silently truncates
+    // at the first '<' and rejects <s> outright with HTTP 500. Entities
+    // (&amp;, &lt;) survive because the regex requires a literal '<'.
+    storage = storage.replace(
+      /<p><strong>EXPAND: (.*?)<\/strong><\/p>\s*([\s\S]*?)\s*<p><strong>EXPAND_END<\/strong><\/p>/g,
+      (_, title, body) => {
+        const cleanTitle = title.replace(/<[^>]+>/g, '').trim();
+        return `<ac:structured-macro ac:name="expand"><ac:parameter ac:name="title">${cleanTitle}</ac:parameter><ac:rich-text-body>${body.trim()}</ac:rich-text-body></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
@@ -235,6 +259,16 @@ class MacroConverter {
       return `\n\`\`\`mermaid\n${code.trim()}\n\`\`\`\n`;
     });
 
+    // Titled expand macros → **EXPAND: title** / **EXPAND_END** markers
+    // (round-trip with markdownToStorage). Must run before the generic
+    // <details> fallback below, which would otherwise drop the title.
+    markdown = markdown.replace(
+      /<ac:structured-macro ac:name="expand"[^>]*>[\s\S]*?<ac:parameter ac:name="title">([\s\S]*?)<\/ac:parameter>[\s\S]*?<ac:rich-text-body>([\s\S]*?)<\/ac:rich-text-body>[\s\S]*?<\/ac:structured-macro>/g,
+      '\n**EXPAND: $1**\n\n$2\n\n**EXPAND_END**\n'
+    );
+
+    // Title-less expand macros (e.g. created in the Confluence UI without a
+    // title) fall back to <details>/<summary> with a localized default label.
     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`;
     });

package/npm-shrinkwrap.json

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

package/package.json

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