confluence-cli 1.35.0 → 2.0.1

package/README.md

@@ -770,6 +770,55 @@ echo "# Hello" | confluence convert --input-format markdown --output-format stor
 confluence convert -i page.xml -o page.md --input-format storage --output-format markdown
 ```
 
+## Markdown Marker Conventions
+
+When converting markdown to Confluence storage format (via `confluence convert`, `create`, or `update`), the following paragraph-level markers produce native Confluence macros. Each marker round-trips back to its markdown form when going storage → markdown.
+
+### Callout macros — `INFO`, `WARNING`, `NOTE`
+
+A blockquote whose first line is `**INFO**`, `**WARNING**`, or `**NOTE**` becomes the corresponding Confluence macro:
+
+```markdown
+> **INFO**
+> Heads up — this is an info box.
+
+> **WARNING**
+> Watch out for this.
+
+> **NOTE**
+> 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.
+
+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.
+
+### `**TOC**` — Table of Contents
+
+A paragraph containing only `**TOC**` becomes a Confluence Table of Contents macro using the macro's default heading levels:
+
+```markdown
+**TOC**
+```
+
+### `**ANCHOR: id**` — anchor
+
+A paragraph containing only `**ANCHOR: my-section**` becomes a Confluence anchor macro with the given id:
+
+```markdown
+**ANCHOR: my-section**
+```
+
+### `[text](#id)` — same-page anchor link
+
+A standard markdown link whose href starts with `#` becomes an `ac:link` with `ac:anchor`, rendering as an in-page jump in Confluence:
+
+```markdown
+See [the anchor](#my-section) above.
+```
+
+This works under all three `linkStyle` modes (`smart`, `wiki`, `plain`) — the anchor-link conversion runs before the general `<a href>` handling.
+
 ## Development
 
 ```bash

package/lib/config.js

@@ -257,7 +257,7 @@ function saveConfigFile(data) {
 const validateCliOptions = (options) => {
   const errors = [];
 
-  if (options.domain && !options.domain.trim()) {
+  if (options.domain && (typeof options.domain !== 'string' || !options.domain.trim())) {
     errors.push('--domain cannot be empty');
   }
 
@@ -265,12 +265,12 @@ const validateCliOptions = (options) => {
     errors.push('--token cannot be empty');
   }
 
-  if (options.email && !options.email.trim()) {
+  if (options.email && (typeof options.email !== 'string' || !options.email.trim())) {
     errors.push('--email cannot be empty');
   }
 
   if (options.apiPath) {
-    if (!options.apiPath.startsWith('/')) {
+    if (typeof options.apiPath !== 'string' || !options.apiPath.startsWith('/')) {
       errors.push('--api-path must start with "/"');
     } else {
       // Validate API path format
@@ -282,16 +282,18 @@ const validateCliOptions = (options) => {
     }
   }
 
-  if (options.protocol && !['http', 'https'].includes(options.protocol.toLowerCase())) {
+  if (options.protocol && (typeof options.protocol !== 'string' || !['http', 'https'].includes(options.protocol.toLowerCase()))) {
     errors.push('--protocol must be "http" or "https"');
   }
 
-  if (options.authType && !AUTH_TYPES.includes(options.authType.toLowerCase())) {
+  if (options.authType && (typeof options.authType !== 'string' || !AUTH_TYPES.includes(options.authType.toLowerCase()))) {
     errors.push('--auth-type must be "basic", "bearer", "mtls", or "cookie"');
   }
 
   // Check if basic auth is provided with email
-  const normAuthType = options.authType ? normalizeAuthType(options.authType, Boolean(options.email)) : null;
+  const normAuthType = (typeof options.authType === 'string' && options.authType)
+    ? normalizeAuthType(options.authType, Boolean(options.email))
+    : null;
   if (normAuthType === 'basic' && !options.email) {
     errors.push('--email is required when using basic authentication (use your username for on-premise)');
   }
@@ -512,7 +514,9 @@ async function initConfig(cliOptions = {}) {
     protocol: cliOptions.protocol,
     domain: cliOptions.domain,
     apiPath: cliOptions.apiPath,
-    authType: cliOptions.authType ? cliOptions.authType.trim().toLowerCase() : undefined,
+    authType: (typeof cliOptions.authType === 'string' && cliOptions.authType)
+      ? cliOptions.authType.trim().toLowerCase()
+      : cliOptions.authType,
     email: cliOptions.email,
     token: cliOptions.token,
     cookie: cliOptions.cookie,

package/lib/macro-converter.js

@@ -105,9 +105,10 @@ class MacroConverter {
           <ac:rich-text-body>${cleanContent}</ac:rich-text-body>
         </ac:structured-macro>`;
       } else {
-        return `<ac:structured-macro ac:name="info">
-          <ac:rich-text-body>${content}</ac:rich-text-body>
-        </ac:structured-macro>`;
+        // 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>`;
       }
     });
 

package/npm-shrinkwrap.json

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

package/package.json

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