confluence-cli 2.5.0 → 2.6.0

package/lib/html-to-storage.js

@@ -21,6 +21,8 @@ class HtmlDepthExceededError extends Error {
 // whatever shape the source had (markdown-it emits them without a slash).
 const VOID_TAGS = new Set(['hr']);
 const CALLOUT_MARKERS = ['info', 'warning', 'note'];
+// these tags are wrapped into Confluence HTML macro
+const HTML_MACRO_TAGS = new Set(['svg', 'div']);
 
 // Phrasing-content tags that trigger the `<li>` / `<th>` / `<td>` `<p>`-wrap
 // quirk: if an item contains only inline children and no text-node newline,
@@ -218,6 +220,36 @@ function convertBlockquote(node, ctx) {
         </ac:structured-macro>`;
 }
 
+// `<details><summary>` becomes expand macro. If no summary child is found,
+// falls through to plain HTML.
+function convertDetails(node, ctx) {
+  const children = node.children || [];
+  let summaryNode = null;
+  let bodyNodes = [];
+
+  for (const child of children) {
+    if (child.type === 'tag' && child.name === 'summary') {
+      summaryNode = child;
+    } else if (!isWhitespaceOnly(child)) {
+      bodyNodes.push(child);
+    }
+  }
+
+  if (!summaryNode) {
+    return `<details${renderAttrs(node.attribs)}>${walkChildren(node, ctx)}</details>`;
+  }
+
+  const titleHtml = walkChildren(summaryNode, ctx);
+  const cleanTitle = titleHtml.replace(/<[^>]+>/g, '').trim();
+
+  const bodyHtml = bodyNodes
+    .map((c) => walkNode(c, ctx))
+    .join('')
+    .trim();
+
+  return `<ac:structured-macro ac:name="expand"><ac:parameter ac:name="title">${cleanTitle}</ac:parameter><ac:rich-text-body>${bodyHtml}</ac:rich-text-body></ac:structured-macro>`;
+}
+
 // Strict `<pre><code>` adjacency only — `<pre>` with whitespace siblings or
 // any other shape falls through as plain `<pre>`. The body needs manual
 // entity decode because the parser keeps entities raw and CDATA is opaque
@@ -243,6 +275,20 @@ function convertCodeBlock(node, ctx) {
   return `<ac:structured-macro ac:name="code"><ac:parameter ac:name="language">${language}</ac:parameter><ac:plain-text-body><![CDATA[${body}]]></ac:plain-text-body></ac:structured-macro>`;
 }
 
+// Wrap allowlisted HTML tags (svg, div) in Confluence HTML macro with CDATA.
+// Used for embedding custom HTML that Confluence doesn't natively support.
+function convertHtmlBlock(node, ctx) {
+  const { randomUUID } = require('crypto');
+  const inner = walkChildren(node, ctx);
+  const attrsStr = renderAttrs(node.attribs);
+  const openTag = `<${node.name}${attrsStr}>`;
+  const closeTag = `</${node.name}>`;
+  const htmlContent = openTag + inner + closeTag;
+  const safeContent = htmlContent.replace(/]]>/g, ']]]]><![CDATA[>');
+  const macroId = randomUUID();
+  return `<ac:structured-macro ac:name="html" ac:schema-version="1" ac:macro-id="${macroId}"><ac:plain-text-body><![CDATA[${safeContent}]]></ac:plain-text-body></ac:structured-macro>`;
+}
+
 // Re-escape literal `"` inside attribute values. htmlparser2 with
 // `decodeEntities: false` keeps source-escaped entities intact, but a
 // single-quoted source attribute (`<a title='he said "hi"'>`) lands a
@@ -359,6 +405,8 @@ function dispatchTag(node, ctx) {
     return convertLink(node, ctx);
   case 'blockquote':
     return convertBlockquote(node, ctx);
+  case 'details':
+    return convertDetails(node, ctx);
   case 'table':
   case 'thead':
   case 'tbody':
@@ -375,6 +423,9 @@ function dispatchTag(node, ctx) {
     if (VOID_TAGS.has(node.name)) {
       return `<${node.name}${renderAttrs(node.attribs)} />`;
     }
+    if (HTML_MACRO_TAGS.has(node.name)) {
+      return convertHtmlBlock(node, ctx);
+    }
     return `<${node.name}${renderAttrs(node.attribs)}>${walkChildren(node, ctx)}</${node.name}>`;
   }
 }

package/lib/macro-converter.js

@@ -21,7 +21,9 @@ const STASH_DELIM = '\uE000';
 // The body alternation `"[^"]*"|'[^']*'|[^>]` makes the match quote-aware
 // so a literal `>` inside a quoted attribute value (e.g.
 // `<mark title="1>0">`) does not terminate the tag prematurely.
-const PASSTHROUGH_TAG_RE = /<\/?(?:u|sub|sup|mark)(?=[\s/>])(?:"[^"]*"|'[^']*'|[^>])*>/gi;
+const PASSTHROUGH_TAG_RE = /<\/?(?:u|sub|sup|mark|details|summary)(?=[\s/>])(?:"[^"]*"|'[^']*'|[^>])*>/gi;
+// Block-level HTML elements that should pass through WITHOUT markdown processing of their content. 
+const PASSTHROUGH_BLOCK_RE = /<(svg|div)(?:\s[^>]*)?>[\s\S]*?<\/\1>/gi;
 // Single-backtick inline code spans. Block-level code (fenced + indented) is
 // detected via MarkdownIt's tokenizer in `_findCodeRanges` because a regex
 // can't reliably distinguish a 4-space-indented code block from a list-item
@@ -92,10 +94,19 @@ class MacroConverter {
   _renderMarkdownToHtml(markdown) {
     const codeRanges = this._findCodeRanges(markdown);
     const htmlStash = [];
-    const stashHtml = (text) => text.replace(PASSTHROUGH_TAG_RE, (m) => {
-      htmlStash.push(m);
-      return `${STASH_DELIM}H${htmlStash.length - 1}${STASH_DELIM}`;
-    });
+    const stashHtml = (text) => {
+      // block-level HTML (svg, div with all content) must be stashed before inline tags to avoid matching the closing tag as inline HTML
+      let result = text.replace(PASSTHROUGH_BLOCK_RE, (m) => {
+        htmlStash.push(m);
+        return `${STASH_DELIM}H${htmlStash.length - 1}${STASH_DELIM}`;
+      });
+      // Then stash inline HTML tags
+      result = result.replace(PASSTHROUGH_TAG_RE, (m) => {
+        htmlStash.push(m);
+        return `${STASH_DELIM}H${htmlStash.length - 1}${STASH_DELIM}`;
+      });
+      return result;
+    };
 
     let src = '';
     let pos = 0;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "confluence-cli",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "confluence-cli",
-      "version": "2.5.0",
+      "version": "2.6.0",
       "license": "MIT",
       "dependencies": {
         "axios": "~1.15.2",

package/package.json

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