confluence-cli 2.1.0 → 2.1.2

package/lib/macro-converter.js

@@ -2,6 +2,11 @@ const MarkdownIt = require('markdown-it');
 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 } = {}) {
@@ -23,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);
     });
   }
 
@@ -89,27 +103,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>');

package/npm-shrinkwrap.json

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

package/package.json

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