@hesed/conni 0.7.1 → 0.8.0

package/dist/commands/conni/content/comment-delete.js

@@ -1,7 +1,6 @@
+import { createProfileManager, formatAsToon } from '@hesed/plugin-lib';
 import { Args, Command, Flags } from '@oclif/core';
-import { readConfig } from '../../../config.js';
 import { clearClients, deleteComment } from '../../../conni/conni-client.js';
-import { formatAsToon } from '../../../format.js';
 export default class ContentDeleteComment extends Command {
     static args = {
         id: Args.string({ description: 'Comment ID to delete', required: true }),
@@ -14,11 +13,12 @@ export default class ContentDeleteComment extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(ContentDeleteComment);
-        const config = await readConfig(this.config.configDir, this.log.bind(this), flags.profile);
-        if (!config) {
+        const { loadAuthConfig } = createProfileManager(this.config, flags.profile);
+        const auth = await loadAuthConfig();
+        if (!auth) {
             return;
         }
-        const result = await deleteComment(config.auth, args.id);
+        const result = await deleteComment(auth, args.id);
         clearClients();
         if (flags.toon) {
             this.log(formatAsToon(result));

package/dist/commands/conni/content/comment-update.js

@@ -1,7 +1,6 @@
+import { createProfileManager, formatAsToon } from '@hesed/plugin-lib';
 import { Args, Command, Flags } from '@oclif/core';
-import { readConfig } from '../../../config.js';
 import { clearClients, updateComment } from '../../../conni/conni-client.js';
-import { formatAsToon } from '../../../format.js';
 export default class ContentUpdateComment extends Command {
     /* eslint-disable perfectionist/sort-objects */
     static args = {
@@ -20,11 +19,12 @@ export default class ContentUpdateComment extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(ContentUpdateComment);
-        const config = await readConfig(this.config.configDir, this.log.bind(this), flags.profile);
-        if (!config) {
+        const { loadAuthConfig } = createProfileManager(this.config, flags.profile);
+        const auth = await loadAuthConfig();
+        if (!auth) {
             return;
         }
-        const result = await updateComment(config.auth, args.id, args.body);
+        const result = await updateComment(auth, args.id, args.body);
         clearClients();
         if (flags.toon) {
             this.log(formatAsToon(result));

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

@@ -1,7 +1,6 @@
+import { createProfileManager, formatAsToon } from '@hesed/plugin-lib';
 import { Args, Command, Flags } from '@oclif/core';
-import { readConfig } from '../../../config.js';
 import { addComment, clearClients } from '../../../conni/conni-client.js';
-import { formatAsToon } from '../../../format.js';
 export default class ContentAddComment extends Command {
     /* eslint-disable perfectionist/sort-objects */
     static args = {
@@ -20,11 +19,12 @@ export default class ContentAddComment extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(ContentAddComment);
-        const config = await readConfig(this.config.configDir, this.log.bind(this), flags.profile);
-        if (!config) {
+        const { loadAuthConfig } = createProfileManager(this.config, flags.profile);
+        const auth = await loadAuthConfig();
+        if (!auth) {
             return;
         }
-        const result = await addComment(config.auth, args.pageId, args.body);
+        const result = await addComment(auth, args.pageId, args.body);
         clearClients();
         if (flags.toon) {
             this.log(formatAsToon(result));

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

@@ -1,8 +1,7 @@
+import { createProfileManager, formatAsToon } from '@hesed/plugin-lib';
 import { Command, Flags } from '@oclif/core';
 import fs from 'fs-extra';
-import { readConfig } from '../../../config.js';
 import { clearClients, createPage, createPageWithMedia } from '../../../conni/conni-client.js';
-import { formatAsToon } from '../../../format.js';
 export default class ContentCreate extends Command {
     static args = {};
     static description = 'Create a new Confluence page';
@@ -35,8 +34,9 @@ export default class ContentCreate extends Command {
     };
     async run() {
         const { flags } = await this.parse(ContentCreate);
-        const config = await readConfig(this.config.configDir, this.log.bind(this), flags.profile);
-        if (!config) {
+        const { loadAuthConfig } = createProfileManager(this.config, flags.profile);
+        const auth = await loadAuthConfig();
+        if (!auth) {
             return;
         }
         const fields = {};
@@ -61,9 +61,7 @@ export default class ContentCreate extends Command {
         if (flags['full-width']) {
             fields.fullWidth = 'true';
         }
-        const result = flags.attach
-            ? await createPageWithMedia(config.auth, fields, flags.attach)
-            : await createPage(config.auth, fields);
+        const result = flags.attach ? await createPageWithMedia(auth, fields, flags.attach) : await createPage(auth, fields);
         clearClients();
         if (flags.toon) {
             this.log(formatAsToon(result));

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

@@ -1,7 +1,6 @@
+import { createProfileManager, formatAsToon } from '@hesed/plugin-lib';
 import { Args, Command, Flags } from '@oclif/core';
-import { readConfig } from '../../../config.js';
 import { clearClients, deleteContent } from '../../../conni/conni-client.js';
-import { formatAsToon } from '../../../format.js';
 export default class ContentDelete extends Command {
     static args = {
         pageId: Args.string({ description: 'Page ID to delete', required: true }),
@@ -14,11 +13,12 @@ export default class ContentDelete extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(ContentDelete);
-        const config = await readConfig(this.config.configDir, this.log.bind(this), flags.profile);
-        if (!config) {
+        const { loadAuthConfig } = createProfileManager(this.config, flags.profile);
+        const auth = await loadAuthConfig();
+        if (!auth) {
             return;
         }
-        const result = await deleteContent(config.auth, args.pageId);
+        const result = await deleteContent(auth, args.pageId);
         clearClients();
         if (flags.toon) {
             this.log(formatAsToon(result));

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

@@ -1,7 +1,6 @@
+import { createProfileManager, formatAsToon } from '@hesed/plugin-lib';
 import { Args, Command, Flags } from '@oclif/core';
-import { readConfig } from '../../../config.js';
 import { clearClients, getContent } from '../../../conni/conni-client.js';
-import { formatAsToon } from '../../../format.js';
 export default class ContentGet extends Command {
     static args = {
         pageId: Args.string({ description: 'Page ID', required: true }),
@@ -14,11 +13,12 @@ export default class ContentGet extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(ContentGet);
-        const config = await readConfig(this.config.configDir, this.log.bind(this), flags.profile);
-        if (!config) {
+        const { loadAuthConfig } = createProfileManager(this.config, flags.profile);
+        const auth = await loadAuthConfig();
+        if (!auth) {
             return;
         }
-        const result = await getContent(config.auth, args.pageId);
+        const result = await getContent(auth, args.pageId);
         clearClients();
         if (flags.toon) {
             this.log(formatAsToon(result));

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

@@ -1,7 +1,6 @@
+import { createProfileManager, formatAsToon } from '@hesed/plugin-lib';
 import { Args, Command, Flags } from '@oclif/core';
-import { readConfig } from '../../../config.js';
 import { clearClients, searchContents } from '../../../conni/conni-client.js';
-import { formatAsToon } from '../../../format.js';
 export default class ContentSearch extends Command {
     static args = {
         cql: Args.string({ description: 'CQL expression', required: true }),
@@ -19,11 +18,12 @@ export default class ContentSearch extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(ContentSearch);
-        const config = await readConfig(this.config.configDir, this.log.bind(this), flags.profile);
-        if (!config) {
+        const { loadAuthConfig } = createProfileManager(this.config, flags.profile);
+        const auth = await loadAuthConfig();
+        if (!auth) {
             return;
         }
-        const result = await searchContents(config.auth, args.cql, flags.limit, flags.expand ? flags.expand.split(',') : undefined);
+        const result = await searchContents(auth, args.cql, flags.limit, flags.expand ? flags.expand.split(',') : undefined);
         clearClients();
         if (flags.toon) {
             this.log(formatAsToon(result));

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

@@ -1,8 +1,7 @@
+import { createProfileManager, formatAsToon } from '@hesed/plugin-lib';
 import { Args, Command, Flags } from '@oclif/core';
 import fs from 'fs-extra';
-import { readConfig } from '../../../config.js';
 import { clearClients, updateContent } from '../../../conni/conni-client.js';
-import { formatAsToon } from '../../../format.js';
 export default class ContentUpdate extends Command {
     static args = {
         pageId: Args.string({ description: 'Page ID', required: true }),
@@ -29,8 +28,9 @@ export default class ContentUpdate extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(ContentUpdate);
-        const config = await readConfig(this.config.configDir, this.log.bind(this), flags.profile);
-        if (!config) {
+        const { loadAuthConfig } = createProfileManager(this.config, flags.profile);
+        const auth = await loadAuthConfig();
+        if (!auth) {
             return;
         }
         const fields = {};
@@ -48,7 +48,7 @@ export default class ContentUpdate extends Command {
         if (flags['full-width']) {
             fields.fullWidth = 'true';
         }
-        const result = await updateContent(config.auth, args.pageId, fields);
+        const result = await updateContent(auth, args.pageId, fields);
         clearClients();
         if (flags.toon) {
             this.log(formatAsToon(result));

package/dist/commands/conni/space/get.js

@@ -1,7 +1,6 @@
+import { createProfileManager, formatAsToon } from '@hesed/plugin-lib';
 import { Args, Command, Flags } from '@oclif/core';
-import { readConfig } from '../../../config.js';
 import { clearClients, getSpace } from '../../../conni/conni-client.js';
-import { formatAsToon } from '../../../format.js';
 export default class SpaceGet extends Command {
     static args = {
         spaceKey: Args.string({ description: 'Space key', required: true }),
@@ -14,11 +13,12 @@ export default class SpaceGet extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(SpaceGet);
-        const config = await readConfig(this.config.configDir, this.log.bind(this), flags.profile);
-        if (!config) {
+        const { loadAuthConfig } = createProfileManager(this.config, flags.profile);
+        const auth = await loadAuthConfig();
+        if (!auth) {
             return;
         }
-        const result = await getSpace(config.auth, args.spaceKey);
+        const result = await getSpace(auth, args.spaceKey);
         clearClients();
         if (flags.toon) {
             this.log(formatAsToon(result));

package/dist/commands/conni/space/list.js

@@ -1,7 +1,6 @@
+import { createProfileManager, formatAsToon } from '@hesed/plugin-lib';
 import { Command, Flags } from '@oclif/core';
-import { readConfig } from '../../../config.js';
 import { clearClients, listSpaces } from '../../../conni/conni-client.js';
-import { formatAsToon } from '../../../format.js';
 export default class SpaceList extends Command {
     static description = 'List all Confluence spaces';
     static examples = ['<%= config.bin %> <%= command.id %>'];
@@ -11,11 +10,12 @@ export default class SpaceList extends Command {
     };
     async run() {
         const { flags } = await this.parse(SpaceList);
-        const config = await readConfig(this.config.configDir, this.log.bind(this), flags.profile);
-        if (!config) {
+        const { loadAuthConfig } = createProfileManager(this.config, flags.profile);
+        const auth = await loadAuthConfig();
+        if (!auth) {
             return;
         }
-        const result = await listSpaces(config.auth);
+        const result = await listSpaces(auth);
         clearClients();
         if (flags.toon) {
             this.log(formatAsToon(result));

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

@@ -1,17 +1,5 @@
 import { ConfluenceClient } from 'confluence.js';
-/**
- * Generic API result
- */
-export interface ApiResult {
-    data?: unknown;
-    error?: unknown;
-    success: boolean;
-}
-export interface Config {
-    apiToken: string;
-    email?: string;
-    host: string;
-}
+import { type ApiResult, type AuthConfig } from '@hesed/plugin-lib';
 /**
  * Confluence API Utility
  * Provides core Confluence API operations
@@ -19,7 +7,7 @@ export interface Config {
 export declare class ConniApi {
     private client?;
     private config;
-    constructor(config: Config);
+    constructor(config: AuthConfig);
     /**
      * Add an attachment to a page
      */

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

@@ -1,95 +1,17 @@
-import type { ApiResult, Config } from './conni-api.js';
-/**
- * List all spaces
- * @param config - Confluence configuration
- */
-export declare function listSpaces(config: Config): Promise<ApiResult>;
-/**
- * Get space details
- * @param config - Confluence configuration
- * @param spaceKey - Space key
- */
-export declare function getSpace(config: Config, spaceKey: string): Promise<ApiResult>;
-/**
- * Search pages using CQL
- * @param config - Confluence configuration
- * @param cql - CQL query string
- * @param limit - Maximum number of contents per page
- * @param expand - Properties of the content to expand
- */
-export declare function searchContents(config: Config, cql: string, limit?: number, expand?: string[]): Promise<ApiResult>;
-/**
- * Get page details
- * @param config - Confluence configuration
- * @param pageId - Page ID
- */
-export declare function getContent(config: Config, pageId: string): Promise<ApiResult>;
-/**
- * Create a new page
- * @param config - Confluence configuration
- * @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
- * @param pageId - Page ID
- * @param fields - Page fields to update (title, body)
- */
-export declare function updateContent(config: Config, pageId: string, fields: Record<string, unknown>): Promise<ApiResult>;
-/**
- * Add an attachment to a page
- * @param config - Confluence configuration
- * @param pageId - Page ID
- * @param filePath - Path to the file to upload
- */
-export declare function addAttachment(config: Config, pageId: string, filePath: string): Promise<ApiResult>;
-/**
- * Add a comment to a page
- * @param config - Confluence configuration
- * @param pageId - Page ID
- * @param body - Comment body
- */
-export declare function addComment(config: Config, pageId: string, body: string): Promise<ApiResult>;
-/**
- * Delete a comment from a page
- * @param config - Confluence configuration
- * @param id - Comment ID
- */
-export declare function deleteComment(config: Config, id: string): Promise<ApiResult>;
-/**
- * Update a comment on a page
- * @param config - Confluence configuration
- * @param id - Comment ID
- * @param body - Comment body
- */
-export declare function updateComment(config: Config, id: string, body: string): Promise<ApiResult>;
-/**
- * Delete a page
- * @param config - Confluence configuration
- * @param pageId - Page ID
- */
-export declare function deleteContent(config: Config, pageId: string): Promise<ApiResult>;
-/**
- * Test Confluence API connection
- * @param config - Confluence configuration
- */
-export declare function testConnection(config: Config): Promise<ApiResult>;
-/**
- * Clear clients (for cleanup)
- */
-export declare function clearClients(): void;
-/**
- * Download attachment from a page
- * @param config - Confluence configuration
- * @param attachmentId - Attachment ID
- * @param outputPath - Output file path (optional)
- */
-export declare function downloadAttachment(config: Config, attachmentId: string, outputPath?: string): Promise<ApiResult>;
+import { type ApiResult, type AuthConfig } from '@hesed/plugin-lib';
+declare const clearClients: () => void;
+export { clearClients };
+export declare function listSpaces(config: AuthConfig): Promise<ApiResult>;
+export declare function getSpace(config: AuthConfig, spaceKey: string): Promise<ApiResult>;
+export declare function searchContents(config: AuthConfig, cql: string, limit?: number, expand?: string[]): Promise<ApiResult>;
+export declare function getContent(config: AuthConfig, pageId: string): Promise<ApiResult>;
+export declare function createPage(config: AuthConfig, fields: Record<string, unknown>): Promise<ApiResult>;
+export declare function createPageWithMedia(config: AuthConfig, fields: Record<string, unknown>, filePaths: string[]): Promise<ApiResult>;
+export declare function updateContent(config: AuthConfig, pageId: string, fields: Record<string, unknown>): Promise<ApiResult>;
+export declare function addAttachment(config: AuthConfig, pageId: string, filePath: string): Promise<ApiResult>;
+export declare function addComment(config: AuthConfig, pageId: string, body: string): Promise<ApiResult>;
+export declare function deleteComment(config: AuthConfig, id: string): Promise<ApiResult>;
+export declare function updateComment(config: AuthConfig, id: string, body: string): Promise<ApiResult>;
+export declare function deleteContent(config: AuthConfig, pageId: string): Promise<ApiResult>;
+export declare function testConnection(config: AuthConfig): Promise<ApiResult>;
+export declare function downloadAttachment(config: AuthConfig, attachmentId: string, outputPath?: string): Promise<ApiResult>;

package/dist/conni/conni-client.js

@@ -1,158 +1,60 @@
+import { createApiClient } from '@hesed/plugin-lib';
 import { ConniApi } from './conni-api.js';
-let conniApi;
-/**
- * Initialize Confluence API
- */
-async function initConni(config) {
-    if (conniApi)
-        return conniApi;
-    try {
-        conniApi = new ConniApi(config);
-        return conniApi;
-    }
-    catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        throw new Error(`Failed to initialize Confluence client: ${errorMessage}`);
-    }
-}
-/**
- * List all spaces
- * @param config - Confluence configuration
- */
+const { clearClients, getClient } = createApiClient('Confluence', (config) => new ConniApi(config));
+export { clearClients };
 export async function listSpaces(config) {
-    const conni = await initConni(config);
+    const conni = await getClient(config);
     return conni.listSpaces();
 }
-/**
- * Get space details
- * @param config - Confluence configuration
- * @param spaceKey - Space key
- */
 export async function getSpace(config, spaceKey) {
-    const conni = await initConni(config);
+    const conni = await getClient(config);
     return conni.getSpace(spaceKey);
 }
-/**
- * Search pages using CQL
- * @param config - Confluence configuration
- * @param cql - CQL query string
- * @param limit - Maximum number of contents per page
- * @param expand - Properties of the content to expand
- */
 export async function searchContents(config, cql, limit, expand) {
-    const conni = await initConni(config);
+    const conni = await getClient(config);
     return conni.searchContents(cql, limit, expand);
 }
-/**
- * Get page details
- * @param config - Confluence configuration
- * @param pageId - Page ID
- */
 export async function getContent(config, pageId) {
-    const conni = await initConni(config);
+    const conni = await getClient(config);
     return conni.getContent(pageId);
 }
-/**
- * Create a new page
- * @param config - Confluence configuration
- * @param fields - Page fields (spaceKey, title, body, parentId)
- */
 export async function createPage(config, fields) {
-    const conni = await initConni(config);
+    const conni = await getClient(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);
+    const conni = await getClient(config);
     return conni.createPageWithMedia(fields, filePaths);
 }
-/**
- * Update an existing page
- * @param config - Confluence configuration
- * @param pageId - Page ID
- * @param fields - Page fields to update (title, body)
- */
 export async function updateContent(config, pageId, fields) {
-    const conni = await initConni(config);
+    const conni = await getClient(config);
     return conni.updateContent(pageId, fields);
 }
-/**
- * Add an attachment to a page
- * @param config - Confluence configuration
- * @param pageId - Page ID
- * @param filePath - Path to the file to upload
- */
 export async function addAttachment(config, pageId, filePath) {
-    const conni = await initConni(config);
+    const conni = await getClient(config);
     return conni.addAttachment(pageId, filePath);
 }
-/**
- * Add a comment to a page
- * @param config - Confluence configuration
- * @param pageId - Page ID
- * @param body - Comment body
- */
 export async function addComment(config, pageId, body) {
-    const conni = await initConni(config);
+    const conni = await getClient(config);
     return conni.addComment(pageId, body);
 }
-/**
- * Delete a comment from a page
- * @param config - Confluence configuration
- * @param id - Comment ID
- */
 export async function deleteComment(config, id) {
-    const conni = await initConni(config);
+    const conni = await getClient(config);
     return conni.deleteComment(id);
 }
-/**
- * Update a comment on a page
- * @param config - Confluence configuration
- * @param id - Comment ID
- * @param body - Comment body
- */
 export async function updateComment(config, id, body) {
-    const conni = await initConni(config);
+    const conni = await getClient(config);
     return conni.updateComment(id, body);
 }
-/**
- * Delete a page
- * @param config - Confluence configuration
- * @param pageId - Page ID
- */
 export async function deleteContent(config, pageId) {
-    const conni = await initConni(config);
+    const conni = await getClient(config);
     return conni.deleteContent(pageId);
 }
-/**
- * Test Confluence API connection
- * @param config - Confluence configuration
- */
 export async function testConnection(config) {
-    const conni = await initConni(config);
+    const conni = await getClient(config);
     return conni.testConnection();
 }
-/**
- * Clear clients (for cleanup)
- */
-export function clearClients() {
-    if (conniApi) {
-        conniApi.clearClients();
-        conniApi = null;
-    }
-}
-/**
- * Download attachment from a page
- * @param config - Confluence configuration
- * @param attachmentId - Attachment ID
- * @param outputPath - Output file path (optional)
- */
 export async function downloadAttachment(config, attachmentId, outputPath) {
-    const conni = await initConni(config);
+    const conni = await getClient(config);
     return conni.downloadAttachment(attachmentId, outputPath);
 }