confluence-cli 2.1.4 → 2.1.5

package/lib/html-to-markdown.js

@@ -34,6 +34,26 @@ function htmlToMarkdown(html) {
 
   markdown = markdown.replace(/<em[^>]*>(.*?)<\/em>/g, '*$1*');
 
+  // Multi-line <pre><code> → fenced block. Must run before the inline <code>
+  // rule and before catch-all tag stripping so indentation-sensitive bodies
+  // are wrapped in fences and skipped by the cleanup chain below.
+  markdown = markdown.replace(
+    /<pre[^>]*>\s*<code([^>]*)>([\s\S]*?)<\/code>\s*<\/pre>/g,
+    (_, codeAttrs, body) => {
+      const langMatch = codeAttrs.match(/class="language-([^"]+)"/);
+      const lang = langMatch ? langMatch[1] : '';
+      const trimmed = body.replace(/^\n+|\n+$/g, '');
+      // Size against entity-decoded content: the entity-decode pass runs
+      // after this rule, so `&#96;` / `&#x60;` would otherwise expose
+      // backticks inside the fence post-emission and break it.
+      const decoded = trimmed
+        .replace(/&#(\d+);/g, (_, code) => String.fromCharCode(parseInt(code, 10)))
+        .replace(/&#x([0-9a-fA-F]+);/g, (_, code) => String.fromCharCode(parseInt(code, 16)));
+      const fence = '`'.repeat(fenceLength(decoded));
+      return `\n${fence}${lang}\n${trimmed}\n${fence}\n`;
+    }
+  );
+
   markdown = markdown.replace(/<code[^>]*>(.*?)<\/code>/g, '`$1`');
 
   markdown = markdown.replace(/<(\w+)[^>]*>/g, '<$1>');
@@ -142,16 +162,60 @@ function htmlToMarkdown(html) {
 
   markdown = markdown.replace(/&([a-zA-Z]+);/g, (match, name) => NAMED_ENTITIES[name] || match);
 
-  markdown = markdown.replace(/[ \t]+$/gm, '');
-  markdown = markdown.replace(/^[ \t]+(?!([`>]|[*+-] |\d+[.)] ))/gm, '');
-  markdown = markdown.replace(/^(#{1,6}[^\n]+)\n(?!\n)/gm, '$1\n\n');
-  markdown = markdown.replace(/\n\s*\n\s*\n+/g, '\n\n');
-  markdown = markdown.replace(/[ \t]+/g, ' ');
+  // Split on fenced code boundaries so cleanup rules (indent stripping,
+  // multi-space collapsing) don't mangle indentation-sensitive code.
+  // Backreference matches dynamically-sized fences emitted above when the
+  // body itself contains backticks.
+  const segments = splitOnFences(markdown);
+  markdown = segments
+    .map((seg, i) => (i % 2 === 1 ? seg : cleanupOutsideFence(seg)))
+    .join('');
   markdown = markdown.trim();
 
   return markdown;
 }
 
+// CommonMark allows fenced code with N≥3 backticks where the body contains
+// no run of N+ backticks. Pick the smallest N satisfying both so a code
+// block whose payload itself contains ``` does not close its own fence.
+function fenceLength(body) {
+  let max = 0;
+  const runs = body.match(/`+/g);
+  if (runs) {
+    for (const r of runs) if (r.length > max) max = r.length;
+  }
+  return Math.max(3, max + 1);
+}
+
+function splitOnFences(text) {
+  // CommonMark: a fence opens on a line that starts with up to 3 spaces
+  // followed by 3+ backticks, and closes on a line of equal-length
+  // backticks followed only by whitespace. Anchoring to line boundaries
+  // (^ / $ with m flag) prevents prose backticks (e.g. <p>literal ``` x</p>)
+  // from being mis-paired with real fence boundaries.
+  const result = [];
+  const re = /^ {0,3}(`{3,})[^\n]*\n[\s\S]*?\n {0,3}\1[\t ]*$/gm;
+  let lastIdx = 0;
+  let m;
+  while ((m = re.exec(text)) !== null) {
+    result.push(text.slice(lastIdx, m.index));
+    result.push(m[0]);
+    lastIdx = m.index + m[0].length;
+  }
+  result.push(text.slice(lastIdx));
+  return result;
+}
+
+function cleanupOutsideFence(text) {
+  let out = text;
+  out = out.replace(/[ \t]+$/gm, '');
+  out = out.replace(/^[ \t]+(?!([`>]|[*+-] |\d+[.)] ))/gm, '');
+  out = out.replace(/^(#{1,6}[^\n]+)\n(?!\n)/gm, '$1\n\n');
+  out = out.replace(/\n\s*\n\s*\n+/g, '\n\n');
+  out = out.replace(/[ \t]+/g, ' ');
+  return out;
+}
+
 module.exports = {
   htmlToMarkdown,
   NAMED_ENTITIES

package/npm-shrinkwrap.json

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

package/package.json

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