confluence-cli 2.1.10 → 2.1.12

package/lib/macro-converter.js

@@ -135,7 +135,11 @@ class MacroConverter {
       buildUrl: this.buildUrl,
       webUrlPrefix: this.webUrlPrefix,
     });
-    return walker.walk(storage);
+    const result = walker.walk(storage);
+    if (typeof options.onWarnings === 'function' && walker.warnings.length > 0) {
+      options.onWarnings(walker.warnings);
+    }
+    return result;
   }
 }
 

package/lib/storage-walker.js

@@ -1,4 +1,4 @@
-const { parseDocument } = require('htmlparser2');
+const { Parser, DomHandler } = require('htmlparser2');
 const { decodeHTML } = require('entities');
 const { fenceLength, cleanupWithFences } = require('./markdown-cleanup');
 
@@ -65,12 +65,57 @@ class StorageWalker {
 
   walk(storage) {
     this._depth = 0;
-    const dom = parseDocument(storage, {
+    this.warnings = [];
+
+    // htmlparser2 in xmlMode is lenient: malformed input (unclosed tags,
+    // crossed nesting) is auto-closed without raising. We need to surface
+    // those events so callers can flag pages that were silently repaired.
+    //
+    // The handler emits onclosetag(name, isImplied) for *every* tag that
+    // wasn't matched by an explicit </tag> — including legitimate XML
+    // self-closing tags like `<br/>` and `<ri:attachment/>`. We
+    // distinguish the two by tracking each open tag's index range: a
+    // self-closing tag's open and close events share the same
+    // (startIndex, endIndex), while a genuinely auto-closed tag's close
+    // event lands at a later position in the source.
+    const handler = new DomHandler(null, { xmlMode: true });
+    const openStack = [];
+    const origOnOpenTag = handler.onopentag.bind(handler);
+    const origOnCloseTag = handler.onclosetag.bind(handler);
+    handler.onopentag = (...args) => {
+      openStack.push({ sIdx: parser.startIndex, eIdx: parser.endIndex });
+      origOnOpenTag(...args);
+    };
+    handler.onclosetag = (...args) => {
+      const [name, isImplied] = args;
+      const opened = openStack.pop();
+      if (isImplied) {
+        const selfClosing =
+          opened
+          && opened.sIdx === parser.startIndex
+          && opened.eIdx === parser.endIndex;
+        if (!selfClosing) {
+          const offset = parser.endIndex;
+          this.warnings.push({ type: 'implicit-close', tag: name, offset });
+          if (process.env.CONFLUENCE_CLI_VERBOSE) {
+            process.stderr.write(
+              `StorageWalker: auto-closed <${name}> at offset ${offset}\n`,
+            );
+          }
+        }
+      }
+      origOnCloseTag(...args);
+    };
+
+    const parser = new Parser(handler, {
       xmlMode: true,
       recognizeSelfClosing: true,
       decodeEntities: true,
     });
-    return this.cleanup(this.walkNodes(dom.children));
+    parser.write(storage);
+    parser.end();
+
+    return this.cleanup(this.walkNodes(handler.dom));
   }
 
   walkNodes(nodes) {
@@ -250,9 +295,9 @@ class StorageWalker {
 
   handleExpand(node) {
     const titleParam = this.findParamByName(node, 'title');
+    const title = (titleParam ? this.getTextContent(titleParam) : '').trim();
     const body = this.getMacroBody(node);
-    if (titleParam) {
-      const title = this.getTextContent(titleParam);
+    if (title) {
       return `\n**EXPAND: ${title}**\n\n${this.walkNodes(body).trim()}\n\n**EXPAND_END**\n`;
     }
     return `\n<details>\n<summary>${this.labels.expandDetails || 'Expand Details'}</summary>\n\n${this.walkNodes(body).trim()}\n\n</details>\n`;
@@ -328,7 +373,7 @@ class StorageWalker {
 
   handleSharedBlock(node, type) {
     const blockKeyParam = this.findParamByName(node, 'shared-block-key');
-    const blockKey = blockKeyParam ? this.getTextContent(blockKeyParam) : '';
+    const blockKey = (blockKeyParam ? this.getTextContent(blockKeyParam) : '').trim();
     const pageParam = this.findParamByName(node, 'page');
     if (pageParam && type === 'include-shared-block') {
       const acLink = this.findChildByName(pageParam, 'ac:link');
@@ -338,7 +383,8 @@ class StorageWalker {
           const pageTitle = this.escapeMarkdownText(decodeEntities(riPage.attribs['ri:content-title'] || ''));
           const includeLabel = this.labels.includeSharedBlock || 'Include Shared Block';
           const fromPageLabel = this.labels.fromPage || 'from page';
-          return `\n> 📄 **${includeLabel}**: ${blockKey} (${fromPageLabel}: ${pageTitle} [link needs manual correction])\n`;
+          const keyPart = blockKey ? `: ${blockKey} ` : ' ';
+          return `\n> 📄 **${includeLabel}**${keyPart}(${fromPageLabel}: ${pageTitle} [link needs manual correction])\n`;
         }
       }
     }
@@ -346,8 +392,11 @@ class StorageWalker {
     // See handlePanel — trim to avoid bracketing `>` blank lines.
     const cleanContent = this.walkNodes(body).trim();
     const sharedLabel = this.labels.sharedBlock || 'Shared Block';
+    if (!blockKey && !cleanContent) return '';
+    const header = blockKey ? `**${sharedLabel}: ${blockKey}**` : `**${sharedLabel}**`;
+    if (!cleanContent) return `\n> ${header}\n`;
     const quoted = cleanContent.split('\n').map((line) => (line ? `> ${line}` : '>')).join('\n');
-    return `\n> **${sharedLabel}: ${blockKey}**\n>\n${quoted}\n`;
+    return `\n> ${header}\n>\n${quoted}\n`;
   }
 
   handleViewFile(node) {

package/npm-shrinkwrap.json

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

package/package.json

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