@hesed/conni 0.3.1 → 0.4.0

package/README.md

@@ -26,7 +26,7 @@ $ npm install -g @hesed/conni
 $ conni COMMAND
 running command...
 $ conni (--version)
-@hesed/conni/0.3.1 darwin-arm64 node-v22.14.0
+@hesed/conni/0.4.0 darwin-arm64 node-v22.14.0
 $ conni --help [COMMAND]
 USAGE
   $ conni COMMAND
@@ -76,7 +76,7 @@ EXAMPLES
   $ conni conni auth add
 ```
 
-_See code: [src/commands/conni/auth/add.ts](https://github.com/hesedcasa/conni/blob/v0.3.1/src/commands/conni/auth/add.ts)_
+_See code: [src/commands/conni/auth/add.ts](https://github.com/hesedcasa/conni/blob/v0.4.0/src/commands/conni/auth/add.ts)_
 
 ## `conni conni auth test`
 
@@ -96,7 +96,7 @@ EXAMPLES
   $ conni conni auth test
 ```
 
-_See code: [src/commands/conni/auth/test.ts](https://github.com/hesedcasa/conni/blob/v0.3.1/src/commands/conni/auth/test.ts)_
+_See code: [src/commands/conni/auth/test.ts](https://github.com/hesedcasa/conni/blob/v0.4.0/src/commands/conni/auth/test.ts)_
 
 ## `conni conni auth update`
 
@@ -121,7 +121,7 @@ EXAMPLES
   $ conni conni auth update
 ```
 
-_See code: [src/commands/conni/auth/update.ts](https://github.com/hesedcasa/conni/blob/v0.3.1/src/commands/conni/auth/update.ts)_
+_See code: [src/commands/conni/auth/update.ts](https://github.com/hesedcasa/conni/blob/v0.4.0/src/commands/conni/auth/update.ts)_
 
 ## `conni conni content attachment PAGEID FILE`
 
@@ -145,7 +145,7 @@ EXAMPLES
   $ conni conni content attachment 123456 ./document.pdf
 ```
 
-_See code: [src/commands/conni/content/attachment.ts](https://github.com/hesedcasa/conni/blob/v0.3.1/src/commands/conni/content/attachment.ts)_
+_See code: [src/commands/conni/content/attachment.ts](https://github.com/hesedcasa/conni/blob/v0.4.0/src/commands/conni/content/attachment.ts)_
 
 ## `conni conni content attachment-download ATTACHMENTID [OUTPUTPATH]`
 
@@ -171,7 +171,7 @@ EXAMPLES
   $ conni conni content attachment-download att12345 ./document.pdf
 ```
 
-_See code: [src/commands/conni/content/attachment-download.ts](https://github.com/hesedcasa/conni/blob/v0.3.1/src/commands/conni/content/attachment-download.ts)_
+_See code: [src/commands/conni/content/attachment-download.ts](https://github.com/hesedcasa/conni/blob/v0.4.0/src/commands/conni/content/attachment-download.ts)_
 
 ## `conni conni content comment PAGEID BODY`
 
@@ -204,7 +204,7 @@ EXAMPLES
   $ conni conni content comment 123456 "$(cat content.md)"
 ```
 
-_See code: [src/commands/conni/content/comment.ts](https://github.com/hesedcasa/conni/blob/v0.3.1/src/commands/conni/content/comment.ts)_
+_See code: [src/commands/conni/content/comment.ts](https://github.com/hesedcasa/conni/blob/v0.4.0/src/commands/conni/content/comment.ts)_
 
 ## `conni conni content comment-delete ID`
 
@@ -227,7 +227,7 @@ EXAMPLES
   $ conni conni content comment-delete 1544224770
 ```
 
-_See code: [src/commands/conni/content/comment-delete.ts](https://github.com/hesedcasa/conni/blob/v0.3.1/src/commands/conni/content/comment-delete.ts)_
+_See code: [src/commands/conni/content/comment-delete.ts](https://github.com/hesedcasa/conni/blob/v0.4.0/src/commands/conni/content/comment-delete.ts)_
 
 ## `conni conni content comment-update ID BODY`
 
@@ -260,7 +260,7 @@ EXAMPLES
   $ conni conni content comment-update 1544224770 "$(cat content.md)"
 ```
 
-_See code: [src/commands/conni/content/comment-update.ts](https://github.com/hesedcasa/conni/blob/v0.3.1/src/commands/conni/content/comment-update.ts)_
+_See code: [src/commands/conni/content/comment-update.ts](https://github.com/hesedcasa/conni/blob/v0.4.0/src/commands/conni/content/comment-update.ts)_
 
 ## `conni conni content create`
 
@@ -268,9 +268,10 @@ Create a new Confluence page
 
 ```
 USAGE
-  $ conni conni content create --fields <value>... [--toon]
+  $ conni conni content create --fields <value>... [--attach <value>...] [--toon]
 
 FLAGS
+  --attach=<value>...  Path to a file to upload and embed inline (can be used multiple times)
   --fields=<value>...  (required) Content fields in key=value format
   --toon               Format output as toon
 
@@ -291,13 +292,18 @@ EXAMPLES
 
   $ conni conni content create --fields spaceKey="DEV" title="Child page" body="Content" parentId="123456"
 
+  $ conni conni content create --fields spaceKey="DEV" title="Page with image" body="See the diagram:
+  ![diagram](./diagram.png)" --attach ./diagram.png
+
+  $ conni conni content create --fields spaceKey="DEV" title="Page with files" body="Content" --attach ./image.png --attach ./report.pdf
+
 FLAG DESCRIPTIONS
   --fields=<value>...  Content fields in key=value format
 
     Minimum fields required: spaceKey, title & body
 ```
 
-_See code: [src/commands/conni/content/create.ts](https://github.com/hesedcasa/conni/blob/v0.3.1/src/commands/conni/content/create.ts)_
+_See code: [src/commands/conni/content/create.ts](https://github.com/hesedcasa/conni/blob/v0.4.0/src/commands/conni/content/create.ts)_
 
 ## `conni conni content delete PAGEID`
 
@@ -320,7 +326,7 @@ EXAMPLES
   $ conni conni content delete 1543634992
 ```
 
-_See code: [src/commands/conni/content/delete.ts](https://github.com/hesedcasa/conni/blob/v0.3.1/src/commands/conni/content/delete.ts)_
+_See code: [src/commands/conni/content/delete.ts](https://github.com/hesedcasa/conni/blob/v0.4.0/src/commands/conni/content/delete.ts)_
 
 ## `conni conni content get PAGEID`
 
@@ -343,7 +349,7 @@ EXAMPLES
   $ conni conni content get 1544060948
 ```
 
-_See code: [src/commands/conni/content/get.ts](https://github.com/hesedcasa/conni/blob/v0.3.1/src/commands/conni/content/get.ts)_
+_See code: [src/commands/conni/content/get.ts](https://github.com/hesedcasa/conni/blob/v0.4.0/src/commands/conni/content/get.ts)_
 
 ## `conni conni content search CQL`
 
@@ -370,7 +376,7 @@ EXAMPLES
   $ conni conni content search 'created > startOfMonth()' --limit=5 --expand=body,version
 ```
 
-_See code: [src/commands/conni/content/search.ts](https://github.com/hesedcasa/conni/blob/v0.3.1/src/commands/conni/content/search.ts)_
+_See code: [src/commands/conni/content/search.ts](https://github.com/hesedcasa/conni/blob/v0.4.0/src/commands/conni/content/search.ts)_
 
 ## `conni conni content update PAGEID`
 
@@ -404,7 +410,7 @@ EXAMPLES
   $ conni conni content update 1076199489 --fields body="$(cat content.md)"
 ```
 
-_See code: [src/commands/conni/content/update.ts](https://github.com/hesedcasa/conni/blob/v0.3.1/src/commands/conni/content/update.ts)_
+_See code: [src/commands/conni/content/update.ts](https://github.com/hesedcasa/conni/blob/v0.4.0/src/commands/conni/content/update.ts)_
 
 ## `conni conni space get SPACEKEY`
 
@@ -427,7 +433,7 @@ EXAMPLES
   $ conni conni space get DEV
 ```
 
-_See code: [src/commands/conni/space/get.ts](https://github.com/hesedcasa/conni/blob/v0.3.1/src/commands/conni/space/get.ts)_
+_See code: [src/commands/conni/space/get.ts](https://github.com/hesedcasa/conni/blob/v0.4.0/src/commands/conni/space/get.ts)_
 
 ## `conni conni space list`
 
@@ -447,5 +453,5 @@ EXAMPLES
   $ conni conni space list
 ```
 
-_See code: [src/commands/conni/space/list.ts](https://github.com/hesedcasa/conni/blob/v0.3.1/src/commands/conni/space/list.ts)_
+_See code: [src/commands/conni/space/list.ts](https://github.com/hesedcasa/conni/blob/v0.4.0/src/commands/conni/space/list.ts)_
 <!-- commandsstop -->

package/dist/commands/conni/content/create.d.ts

@@ -4,6 +4,7 @@ export default class ContentCreate extends Command {
     static description: string;
     static examples: string[];
     static flags: {
+        attach: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
         fields: import("@oclif/core/interfaces").OptionFlag<string[], import("@oclif/core/interfaces").CustomOptions>;
         toon: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };

package/dist/commands/conni/content/create.js

@@ -1,6 +1,6 @@
 import { Command, Flags } from '@oclif/core';
 import { readConfig } from '../../../config.js';
-import { clearClients, createPage } from '../../../conni/conni-client.js';
+import { clearClients, createPage, createPageWithMedia } from '../../../conni/conni-client.js';
 import { formatAsToon } from '../../../format.js';
 export default class ContentCreate extends Command {
     static args = {};
@@ -9,8 +9,15 @@ export default class ContentCreate extends Command {
         '<%= config.bin %> <%= command.id %> --fields spaceKey="DEV" title="New title" body="New description" status="draft"',
         '<%= config.bin %> <%= command.id %> --fields spaceKey="DEV" title="New title" body=\'\n# Header\n## Sub-header\n- Item 1\n- Item 2\n```bash\nls -a\n```\'',
         '<%= config.bin %> <%= command.id %> --fields spaceKey="DEV" title="Child page" body="Content" parentId="123456"',
+        '<%= config.bin %> <%= command.id %> --fields spaceKey="DEV" title="Page with image" body="See the diagram:\n![diagram](./diagram.png)" --attach ./diagram.png',
+        '<%= config.bin %> <%= command.id %> --fields spaceKey="DEV" title="Page with files" body="Content" --attach ./image.png --attach ./report.pdf',
     ];
     static flags = {
+        attach: Flags.string({
+            description: 'Path to a file to upload and embed inline (can be used multiple times)',
+            multiple: true,
+            required: false,
+        }),
         fields: Flags.string({
             description: 'Minimum fields required: spaceKey, title & body',
             multiple: true,
@@ -39,7 +46,9 @@ export default class ContentCreate extends Command {
                 this.error(`Required field "${required}" is missing`);
             }
         }
-        const result = await createPage(config.auth, fields);
+        const result = flags.attach
+            ? await createPageWithMedia(config.auth, fields, flags.attach)
+            : await createPage(config.auth, fields);
         clearClients();
         if (flags.toon) {
             this.log(formatAsToon(result));

package/dist/conni/conni-api.d.ts

@@ -36,6 +36,12 @@ export declare class ConniApi {
      * Create a new page
      */
     createPage(fields: Record<string, unknown>): Promise<ApiResult>;
+    /**
+     * Create a new page with inline media attachments.
+     * Creates the page first to obtain a page ID, then uploads attachments and
+     * patches the ADF body to embed them by file ID before updating the page.
+     */
+    createPageWithMedia(fields: Record<string, unknown>, filePaths: string[]): Promise<ApiResult>;
     /**
      * Delete a comment from a page
      */
@@ -80,4 +86,7 @@ export declare class ConniApi {
      * Update an existing page
      */
     updateContent(pageId: string, fields: Record<string, unknown>): Promise<ApiResult>;
+    private buildPageBody;
+    private collectExternalMedia;
+    private patchMediaNodes;
 }

package/dist/conni/conni-api.js

@@ -106,38 +106,70 @@ export class ConniApi {
     async createPage(fields) {
         try {
             const client = this.getClient();
-            // Convert Markdown body to Confluence ADF
-            // eslint-disable-next-line unicorn/prefer-string-replace-all
-            const bodyContent = markdownToAdf(fields.body.replace(/\\n/g, '\n'));
-            const spaceKey = fields.spaceKey;
-            const title = fields.title;
-            const parentId = fields.parentId;
-            const status = fields.status;
-            const contentBody = {
-                ancestors: parentId ? [{ id: parentId }] : undefined,
-                body: {
-                    storage: {
-                        representation: 'atlas_doc_format',
-                        value: JSON.stringify(bodyContent),
-                    },
-                },
-                space: { key: spaceKey },
-                status,
+            const { contentPayload } = this.buildPageBody(fields);
+            const response = await client.content.createContent(contentPayload);
+            return { data: response, success: true };
+        }
+        catch (error) {
+            const errorMessage = typeof error === 'object' ? String(error.message) : String(error);
+            return { error: errorMessage, success: false };
+        }
+    }
+    /**
+     * Create a new page with inline media attachments.
+     * Creates the page first to obtain a page ID, then uploads attachments and
+     * patches the ADF body to embed them by file ID before updating the page.
+     */
+    async createPageWithMedia(fields, filePaths) {
+        try {
+            const client = this.getClient();
+            const { bodyContent, contentPayload } = this.buildPageBody(fields);
+            const { title } = contentPayload;
+            const externalMediaByBasename = new Map();
+            this.collectExternalMedia(bodyContent.content, externalMediaByBasename);
+            const inlinePaths = [];
+            const trailingPaths = [];
+            for (const f of filePaths) {
+                if (externalMediaByBasename.has(path.basename(f))) {
+                    inlinePaths.push(f);
+                }
+                else {
+                    trailingPaths.push(f);
+                }
+            }
+            // Create the page first to get a page ID for attachment uploads.
+            const page = await client.content.createContent(contentPayload);
+            const pageId = page.id;
+            if (!pageId) {
+                return { error: 'Failed to get page ID from creation response', success: false };
+            }
+            const uploadResults = await Promise.all(filePaths.map((filePath) => this.addAttachment(pageId, filePath)));
+            const firstFailure = uploadResults.find((r) => !r.success);
+            if (firstFailure)
+                return firstFailure;
+            const fileInfoByPath = new Map();
+            for (const [i, filePath] of filePaths.entries()) {
+                const uploadData = uploadResults[i].data;
+                const att = uploadData?.results?.[0];
+                const fileId = att?.extensions?.fileId;
+                const collectionName = att?.extensions?.collectionName ?? '';
+                if (fileId) {
+                    fileInfoByPath.set(filePath, { collection: collectionName, id: fileId });
+                }
+            }
+            this.patchMediaNodes(bodyContent.content, inlinePaths, trailingPaths, fileInfoByPath, externalMediaByBasename);
+            const updatedPage = await client.content.updateContent({
+                body: { storage: { representation: 'atlas_doc_format', value: JSON.stringify(bodyContent) } },
+                id: pageId,
                 title,
                 type: 'page',
-            };
-            const response = await client.content.createContent(contentBody);
-            return {
-                data: response,
-                success: true,
-            };
+                version: { number: 2 },
+            });
+            return { data: updatedPage, success: true };
         }
         catch (error) {
             const errorMessage = typeof error === 'object' ? String(error.message) : String(error);
-            return {
-                error: errorMessage,
-                success: false,
-            };
+            return { error: errorMessage, success: false };
         }
     }
     /**
@@ -444,4 +476,64 @@ export class ConniApi {
             };
         }
     }
+    buildPageBody(fields) {
+        // eslint-disable-next-line unicorn/prefer-string-replace-all
+        const bodyContent = markdownToAdf(fields.body.replace(/\\n/g, '\n'));
+        const spaceKey = fields.spaceKey;
+        const title = fields.title;
+        const parentId = fields.parentId;
+        const status = fields.status;
+        return {
+            bodyContent,
+            contentPayload: {
+                ancestors: parentId ? [{ id: parentId }] : undefined,
+                body: { storage: { representation: 'atlas_doc_format', value: JSON.stringify(bodyContent) } },
+                space: { key: spaceKey },
+                status,
+                title,
+                type: 'page',
+            },
+        };
+    }
+    collectExternalMedia(nodes, map) {
+        for (const node of nodes) {
+            const content = node.content;
+            const media = node.type === 'mediaSingle' ? content?.[0] : undefined;
+            const attrs = media?.type === 'media' ? media.attrs : undefined;
+            if (attrs?.type === 'external' && typeof attrs.url === 'string') {
+                const base = path.basename(attrs.url);
+                if (!map.has(base))
+                    map.set(base, []);
+                map.get(base).push(attrs);
+                continue;
+            }
+            if (content)
+                this.collectExternalMedia(content, map);
+        }
+    }
+    /* eslint-disable max-params */
+    patchMediaNodes(bodyNodes, inlinePaths, trailingPaths, fileInfoByPath, externalMediaByBasename) {
+        for (const filePath of inlinePaths) {
+            const info = fileInfoByPath.get(filePath);
+            if (!info)
+                continue;
+            for (const attrs of externalMediaByBasename.get(path.basename(filePath)) ?? []) {
+                delete attrs.url;
+                delete attrs.alt;
+                attrs.collection = info.collection;
+                attrs.id = info.id;
+                attrs.type = 'file';
+            }
+        }
+        for (const filePath of trailingPaths) {
+            const info = fileInfoByPath.get(filePath);
+            if (!info)
+                continue;
+            bodyNodes.push({
+                attrs: { layout: 'center' },
+                content: [{ attrs: { collection: info.collection, id: info.id, type: 'file' }, type: 'media' }],
+                type: 'mediaSingle',
+            });
+        }
+    }
 }

package/dist/conni/conni-client.d.ts

@@ -30,6 +30,13 @@ export declare function getContent(config: Config, pageId: string): Promise<ApiR
  * @param fields - Page fields (spaceKey, title, body, parentId)
  */
 export declare function createPage(config: Config, fields: Record<string, unknown>): Promise<ApiResult>;
+/**
+ * Create a new page with inline media attachments
+ * @param config - Confluence configuration
+ * @param fields - Page fields (spaceKey, title, body, parentId)
+ * @param filePaths - Local file paths to upload and embed inline
+ */
+export declare function createPageWithMedia(config: Config, fields: Record<string, unknown>, filePaths: string[]): Promise<ApiResult>;
 /**
  * Update an existing page
  * @param config - Confluence configuration

package/dist/conni/conni-client.js

@@ -61,6 +61,16 @@ export async function createPage(config, fields) {
     const conni = await initConni(config);
     return conni.createPage(fields);
 }
+/**
+ * Create a new page with inline media attachments
+ * @param config - Confluence configuration
+ * @param fields - Page fields (spaceKey, title, body, parentId)
+ * @param filePaths - Local file paths to upload and embed inline
+ */
+export async function createPageWithMedia(config, fields, filePaths) {
+    const conni = await initConni(config);
+    return conni.createPageWithMedia(fields, filePaths);
+}
 /**
  * Update an existing page
  * @param config - Confluence configuration

package/oclif.manifest.json

@@ -378,9 +378,19 @@
       "examples": [
         "<%= config.bin %> <%= command.id %> --fields spaceKey=\"DEV\" title=\"New title\" body=\"New description\" status=\"draft\"",
         "<%= config.bin %> <%= command.id %> --fields spaceKey=\"DEV\" title=\"New title\" body='\n# Header\n## Sub-header\n- Item 1\n- Item 2\n```bash\nls -a\n```'",
-        "<%= config.bin %> <%= command.id %> --fields spaceKey=\"DEV\" title=\"Child page\" body=\"Content\" parentId=\"123456\""
+        "<%= config.bin %> <%= command.id %> --fields spaceKey=\"DEV\" title=\"Child page\" body=\"Content\" parentId=\"123456\"",
+        "<%= config.bin %> <%= command.id %> --fields spaceKey=\"DEV\" title=\"Page with image\" body=\"See the diagram:\n![diagram](./diagram.png)\" --attach ./diagram.png",
+        "<%= config.bin %> <%= command.id %> --fields spaceKey=\"DEV\" title=\"Page with files\" body=\"Content\" --attach ./image.png --attach ./report.pdf"
       ],
       "flags": {
+        "attach": {
+          "description": "Path to a file to upload and embed inline (can be used multiple times)",
+          "name": "attach",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
         "fields": {
           "description": "Minimum fields required: spaceKey, title & body",
           "name": "fields",
@@ -664,5 +674,5 @@
       ]
     }
   },
-  "version": "0.3.1"
+  "version": "0.4.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hesed/conni",
   "description": "CLI for Confluence API interaction",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "author": "Hesed",
   "bin": {
     "conni": "./bin/run.js"