confluence-cli 2.1.1 → 2.1.3

package/README.md

@@ -789,7 +789,7 @@ A blockquote whose first line is `**INFO**`, `**WARNING**`, or `**NOTE**` become
 > 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.
+The reverse direction emits the same `> **INFO**` / `> **WARNING**` / `> **NOTE**` blockquote form, so multi-paragraph bodies round-trip cleanly. The bare `[!info]` / `[!warning]` / `[!note]` shorthand is still accepted on input for backwards compatibility.
 
 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.
 

package/lib/macro-converter.js

@@ -3,6 +3,10 @@ const { htmlToMarkdown } = require('./html-to-markdown');
 
 const VALID_LINK_STYLES = ['smart', 'plain', 'wiki'];
 const CALLOUT_MARKERS = ['info', 'warning', 'note'];
+// U+E000 (Unicode Private Use Area) is used as the stash placeholder
+// delimiter. Declared as an explicit escape so the byte is visible in source
+// and survives editor / formatter / lint passes that strip invisible chars.
+const STASH_DELIM = '\uE000';
 
 class MacroConverter {
   constructor({ isCloud = false, webUrlPrefix = '', buildUrl = null, linkStyle = null } = {}) {
@@ -24,23 +28,32 @@ class MacroConverter {
     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> ')}`;
+      // Stash fenced code blocks and inline code so the admonition rewrite
+      // below cannot transform `[!info]` tokens that the author intended as
+      // literal text inside code.
+      const stash = [];
+      state.src = state.src.replace(/```[\s\S]*?```|~~~[\s\S]*?~~~|`[^`\n]+`/g, (m) => {
+        stash.push(m);
+        return `${STASH_DELIM}${stash.length - 1}${STASH_DELIM}`;
       });
 
-      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> ')}`;
-      });
+      // Anchor `[!info]` to the start of a line (string start or after a
+      // newline) so prose mid-paragraph, headings on the same line, and
+      // `> [!info]` GitHub-style alerts are left alone. The latter would
+      // otherwise expand to a nested blockquote that the storage handler's
+      // lazy regex cannot balance, producing malformed XML.
+      for (const m of CALLOUT_MARKERS) {
+        const re = new RegExp(`(^|\\n)\\[!${m}\\]\\s*([\\s\\S]*?)(?=\\n\\s*\\n|\\n\\s*\\[!|$)`, 'g');
+        state.src = state.src.replace(re, (_, pre, content) =>
+          `${pre}> **${m.toUpperCase()}**\n> ${content.trim().replace(/\n/g, '\n> ')}`
+        );
+      }
 
-      state.src = state.src.replace(/^(\s*)- \[([ x])\] (.+)$/gm, (_, indent, checked, text) => {
-        return `${indent}- [${checked}] ${text}`;
-      });
+      // Fall back to the original match if the index is out of range so a
+      // literal U+E000<digits>U+E000 in user prose survives untouched instead
+      // of becoming the string "undefined".
+      const restoreRe = new RegExp(`${STASH_DELIM}(\\d+)${STASH_DELIM}`, 'g');
+      state.src = state.src.replace(restoreRe, (m, i) => stash[+i] ?? m);
     });
   }
 
@@ -281,20 +294,34 @@ class MacroConverter {
       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}`;
-    });
+    // Emit the README-recommended `> **MARKER**` blockquote form rather than
+    // the bare `[!marker]` shorthand. The bare form has no explicit body
+    // terminator, so a blank line inside a multi-paragraph body is
+    // indistinguishable from the body ending — round-tripping such a body
+    // through markdownToStorage drops every paragraph after the first.
+    // The `>` prefix gives the blockquote-based handler an unambiguous body
+    // boundary, so multi-paragraph callouts survive download → re-upload.
+    // markdownToStorage still accepts the bare `[!marker]` form on input for
+    // backwards compatibility with already-downloaded files.
+    //
+    // Wrap the output with leading + trailing `\n` to combine with the single
+    // `\n` that htmlToMarkdown emits around adjacent `<p>` tags. Without
+    // these, a following `<p>after</p>` lazy-continues into the blockquote
+    // body and lands inside the macro on re-upload (blockquote semantics —
+    // unlike code fences, blockquotes have no closing delimiter).
+    for (const marker of CALLOUT_MARKERS) {
+      const re = new RegExp(`<ac:structured-macro ac:name="${marker}"[^>]*>[\\s\\S]*?<ac:rich-text-body>([\\s\\S]*?)<\\/ac:rich-text-body>[\\s\\S]*?<\\/ac:structured-macro>`, 'g');
+      markdown = markdown.replace(re, (_, content) => {
+        const body = htmlToMarkdown(content).trim();
+        const quotedBody = body
+          .split('\n')
+          .map((line) => (line.length === 0 ? '>' : `> ${line}`))
+          .join('\n');
+        const header = `> **${marker.toUpperCase()}**`;
+        const inner = body.length === 0 ? header : `${header}\n${quotedBody}`;
+        return `\n${inner}\n`;
+      });
+    }
 
     // anchor macro → **ANCHOR: id** marker (round-trip with markdownToStorage).
     // Must run before the generic <ac:structured-macro> catch-all below, which

package/npm-shrinkwrap.json

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

package/package.json

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