@mittwald/cli 1.0.0-alpha.46 → 1.0.0-alpha.47

package/dist/commands/backup/delete.d.ts

@@ -1,4 +1,4 @@
-import { DeleteBaseCommand } from "../../DeleteBaseCommand.js";
+import { DeleteBaseCommand } from "../../lib/basecommands/DeleteBaseCommand.js";
 export declare class Delete extends DeleteBaseCommand<typeof Delete> {
     static description: string;
     static resourceName: string;
@@ -7,7 +7,7 @@ export declare class Delete extends DeleteBaseCommand<typeof Delete> {
         quiet: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     static args: {
-        "backup-id": import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
+        "backup-id": import("@oclif/core/lib/interfaces/parser.js").Arg<string>;
     };
     static aliases: string[];
     static deprecateAliases: boolean;

package/dist/commands/backup/delete.js

@@ -1,20 +1,15 @@
-import { DeleteBaseCommand } from "../../DeleteBaseCommand.js";
+import { DeleteBaseCommand } from "../../lib/basecommands/DeleteBaseCommand.js";
 import { assertStatus } from "@mittwald/api-client-commons";
-import { Args } from "@oclif/core";
+import { backupArgs, withBackupId } from "../../lib/resources/backup/flags.js";
 export class Delete extends DeleteBaseCommand {
     static description = "Delete a backup";
     static resourceName = "backup";
     static flags = { ...DeleteBaseCommand.baseFlags };
-    static args = {
-        "backup-id": Args.string({
-            required: true,
-            description: "The ID of the Backup to show.",
-        }),
-    };
+    static args = { ...backupArgs };
     static aliases = ["project:backup:delete"];
     static deprecateAliases = true;
     async deleteResource() {
-        const projectBackupId = this.args["backup-id"];
+        const projectBackupId = await withBackupId(this.apiClient, Delete, this.flags, this.args, this.config);
         const response = await this.apiClient.backup.deleteProjectBackup({
             projectBackupId,
         });

package/dist/commands/backup/download.d.ts

@@ -1,4 +1,4 @@
-import { ExecRenderBaseCommand } from "../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../lib/basecommands/ExecRenderBaseCommand.js";
 import { ReactNode } from "react";
 import { ProcessRenderer } from "../../rendering/process/process.js";
 import { AxiosResponseHeaders, RawAxiosResponseHeaders } from "@mittwald/api-client-commons";
@@ -8,11 +8,11 @@ type Result = {
 export declare class Download extends ExecRenderBaseCommand<typeof Download, Result> {
     static description: string;
     static args: {
-        "backup-id": import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
+        "backup-id": import("@oclif/core/lib/interfaces/parser.js").Arg<string>;
     };
     static flags: {
         output: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        format: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        format: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<"tar" | "zip", import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         password: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         "generate-password": import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         "prompt-password": import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;

package/dist/commands/backup/download.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { ExecRenderBaseCommand } from "../../rendering/react/ExecRenderBaseCommand.js";
-import { Args, Flags } from "@oclif/core";
+import { ExecRenderBaseCommand } from "../../lib/basecommands/ExecRenderBaseCommand.js";
+import { Flags } from "@oclif/core";
 import { makeProcessRenderer, processFlags, } from "../../rendering/process/process_flags.js";
 import crypto from "crypto";
 import { Text } from "ink";
@@ -9,26 +9,23 @@ import { assertStatus, } from "@mittwald/api-client-commons";
 import { waitUntil } from "../../lib/wait.js";
 import axios from "axios";
 import * as fs from "fs";
-import { formatBytes } from "../../lib/viewhelpers/size.js";
 import { Success } from "../../rendering/react/components/Success.js";
+import ByteQuantity from "../../lib/units/ByteQuantity.js";
+import Duration from "../../lib/units/Duration.js";
+import { backupArgs, withBackupId } from "../../lib/resources/backup/flags.js";
 export class Download extends ExecRenderBaseCommand {
     static description = "Download a backup to your local disk";
-    static args = {
-        "backup-id": Args.string({
-            required: true,
-            description: "the ID of the Backup to download.",
-        }),
-    };
+    static args = { ...backupArgs };
     static flags = {
         ...processFlags,
         output: Flags.string({
             description: "the file to write the backup to; if omitted, the filename will be determined by the server.",
         }),
-        format: Flags.string({
+        format: Flags.custom({
             description: "the file format to download the backup in.",
             options: ["tar", "zip"],
             default: "tar",
-        }),
+        })(),
         password: Flags.string({
             summary: "the password to encrypt the backup with.",
             description: `\
@@ -71,7 +68,7 @@ export class Download extends ExecRenderBaseCommand {
     }
     async exec() {
         const p = makeProcessRenderer(this.flags, "Downloading backup");
-        const projectBackupId = this.args["backup-id"];
+        const projectBackupId = await withBackupId(this.apiClient, Download, this.flags, this.args, this.config);
         const { format } = this.flags;
         const password = await this.getPassword(p);
         const backup = await p.runStep("fetching backup", async () => {
@@ -89,7 +86,7 @@ export class Download extends ExecRenderBaseCommand {
                 const r = await this.apiClient.backup.createProjectBackupExport({
                     projectBackupId,
                     data: {
-                        format: format,
+                        format,
                         password,
                     },
                 });
@@ -106,7 +103,7 @@ export class Download extends ExecRenderBaseCommand {
                     return r.data.export;
                 }
                 return null;
-            }, 3600);
+            }, Duration.fromString("1h"));
         });
         if (!backupExport.downloadURL) {
             throw new Error("backup download is not ready");
@@ -122,23 +119,21 @@ export class Download extends ExecRenderBaseCommand {
         }
         const downloadStep = p.addStep("downloading backup");
         const resp = await axios(backupExport.downloadURL, reqConfig);
-        const size = parseInt(resp.headers["content-length"] || "0", 10);
-        let downloaded = 0;
+        const size = ByteQuantity.fromBytes(parseInt(resp.headers["content-length"] || "0", 10));
+        let downloaded = ByteQuantity.fromBytes(0);
         const outputFilename = this.getFilename(resp.headers);
         const outputStream = fs.createWriteStream(outputFilename, {
             flags: this.flags.resume ? "a" : undefined,
         });
+        const byteFormattingOpts = {
+            maximumFractionDigits: 2,
+            minimumFractionDigits: 2,
+        };
         resp.data.on("data", (chunk) => {
-            downloaded += chunk.length;
-            downloadStep.progress(formatBytes(downloaded, {
-                minimumFractionDigits: 2,
-                maximumFractionDigits: 2,
-            }) +
+            downloaded = downloaded.add(ByteQuantity.fromBytes(chunk.length));
+            downloadStep.progress(downloaded.format(byteFormattingOpts) +
                 " of " +
-                formatBytes(size, {
-                    minimumFractionDigits: 2,
-                    maximumFractionDigits: 2,
-                }));
+                size.format(byteFormattingOpts));
             outputStream.write(chunk);
         });
         await new Promise((res) => {

package/dist/commands/backup/get.d.ts

@@ -1,9 +1,9 @@
-import { RenderBaseCommand } from "../../rendering/react/RenderBaseCommand.js";
+import { RenderBaseCommand } from "../../lib/basecommands/RenderBaseCommand.js";
 import { ReactNode } from "react";
 export default class Get extends RenderBaseCommand<typeof Get> {
     static description: string;
     static args: {
-        "backup-id": import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
+        "backup-id": import("@oclif/core/lib/interfaces/parser.js").Arg<string>;
     };
     static flags: {
         [x: string]: import("@oclif/core/lib/interfaces/parser.js").Flag<any>;

package/dist/commands/backup/get.js

@@ -1,26 +1,23 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { RenderBaseCommand } from "../../rendering/react/RenderBaseCommand.js";
-import { useProjectBackup } from "../../lib/projectbackup/hooks.js";
-import { Args } from "@oclif/core";
+import { RenderBaseCommand } from "../../lib/basecommands/RenderBaseCommand.js";
+import { useProjectBackup } from "../../lib/resources/projectbackup/hooks.js";
 import { ProjectBackupDetails } from "../../rendering/react/components/ProjectBackup/ProjectBackupDetails.js";
 import { RenderJson } from "../../rendering/react/json/RenderJson.js";
-import { GetBaseCommand } from "../../GetBaseCommand.js";
+import { GetBaseCommand } from "../../lib/basecommands/GetBaseCommand.js";
 import { Box } from "ink";
+import { backupArgs, withBackupId } from "../../lib/resources/backup/flags.js";
+import { usePromise } from "@mittwald/react-use-promise";
 export default class Get extends RenderBaseCommand {
-    static description = "show details of a backup.";
-    static args = {
-        "backup-id": Args.string({
-            required: true,
-            description: "The ID of the Backup to show.",
-        }),
-    };
+    static description = "Show details of a backup.";
+    static args = { ...backupArgs };
     static flags = {
         ...GetBaseCommand.baseFlags,
     };
     static aliases = ["project:backup:get"];
     static deprecateAliases = true;
     render() {
-        const projectBackup = useProjectBackup(this.args["backup-id"]);
+        const backupId = usePromise(() => withBackupId(this.apiClient, Get, this.flags, this.args, this.config), []);
+        const projectBackup = useProjectBackup(backupId);
         if (this.flags.output === "json") {
             return _jsx(RenderJson, { name: "projectBackup", data: projectBackup });
         }

package/dist/commands/backup/list.d.ts

@@ -1,8 +1,7 @@
 import { Response, Simplify } from "@mittwald/api-client-commons";
 import type { MittwaldAPIV2 } from "@mittwald/api-client";
-import { SuccessfulResponse } from "../../types.js";
-import { ListBaseCommand } from "../../ListBaseCommand.js";
-import { ListColumns } from "../../Formatter.js";
+import { ListBaseCommand } from "../../lib/basecommands/ListBaseCommand.js";
+import { ListColumns } from "../../rendering/formatter/ListFormatter.js";
 type BackupProjectBackup = MittwaldAPIV2.Components.Schemas.BackupProjectBackup;
 type ListResponse = Response<BackupProjectBackup[]>;
 type ListItem = Simplify<BackupProjectBackup>;
@@ -36,7 +35,6 @@ export declare class List extends ListBaseCommand<typeof List, ListItem, ListRes
     };
     static aliases: string[];
     static deprecateAliases: boolean;
-    protected mapData(data: SuccessfulResponse<ListResponse, 200>["data"]): ListItem[] | Promise<ListItem[]>;
     getData(): Promise<ListResponse>;
     protected getColumns(data: ListItem[]): ListColumns<ListItem>;
 }

package/dist/commands/backup/list.js

@@ -1,7 +1,6 @@
-import { ListBaseCommand } from "../../ListBaseCommand.js";
-import { projectFlags } from "../../lib/project/flags.js";
-import { optionalDateRenderer } from "../../lib/viewhelpers/date.js";
-import { makeDateRendererForFlags } from "../../lib/viewhelpers/list_column_date.js";
+import { ListBaseCommand } from "../../lib/basecommands/ListBaseCommand.js";
+import { projectFlags } from "../../lib/resources/project/flags.js";
+import ListDateColumnFormatter from "../../rendering/formatter/ListDateColumnFormatter.js";
 export class List extends ListBaseCommand {
     static description = "List Backups for a given Project.";
     static args = {};
@@ -11,9 +10,6 @@ export class List extends ListBaseCommand {
     };
     static aliases = ["project:backup:list"];
     static deprecateAliases = true;
-    mapData(data) {
-        return data;
-    }
     async getData() {
         const projectId = await this.withProjectId(List);
         return await this.apiClient.backup.listProjectBackups({
@@ -22,15 +18,16 @@ export class List extends ListBaseCommand {
     }
     getColumns(data) {
         const { id, createdAt } = super.getColumns(data);
-        const dateRenderer = optionalDateRenderer(makeDateRendererForFlags(this.flags));
+        const dateColumnBuilder = new ListDateColumnFormatter(this.flags);
         return {
             id,
             status: {},
             createdAt,
-            expiresIn: {
+            expiresIn: dateColumnBuilder.buildColumn({
                 header: "Expires in",
-                get: (r) => dateRenderer(r.expiresAt),
-            },
+                column: "expiresAt",
+                fallback: "never",
+            }),
         };
     }
 }

package/dist/commands/backup/schedule/list.d.ts

@@ -1,8 +1,7 @@
 import { Simplify } from "@mittwald/api-client-commons";
 import { MittwaldAPIV2, MittwaldAPIV2Client } from "@mittwald/api-client";
-import { SuccessfulResponse } from "../../../types.js";
-import { ListColumns } from "../../../Formatter.js";
-import { ListBaseCommand } from "../../../ListBaseCommand.js";
+import { ListColumns } from "../../../rendering/formatter/ListFormatter.js";
+import { ListBaseCommand } from "../../../lib/basecommands/ListBaseCommand.js";
 type BackupProjectBackupSchedule = MittwaldAPIV2.Components.Schemas.BackupProjectBackupSchedule;
 type ResponseItem = Simplify<BackupProjectBackupSchedule>;
 type Response = Awaited<ReturnType<MittwaldAPIV2Client["backup"]["listProjectBackupSchedules"]>>;
@@ -37,7 +36,6 @@ export declare class List extends ListBaseCommand<typeof List, ResponseItem, Res
     static aliases: string[];
     static deprecateAliases: boolean;
     getData(): Promise<Response>;
-    protected mapData(data: SuccessfulResponse<Response, 200>["data"]): MittwaldAPIV2.Components.Schemas.BackupProjectBackupSchedule[];
     protected getColumns(data: ResponseItem[]): ListColumns<ResponseItem>;
 }
 export {};

package/dist/commands/backup/schedule/list.js

@@ -1,5 +1,5 @@
-import { ListBaseCommand } from "../../../ListBaseCommand.js";
-import { projectFlags, withProjectId } from "../../../lib/project/flags.js";
+import { ListBaseCommand } from "../../../lib/basecommands/ListBaseCommand.js";
+import { projectFlags, withProjectId, } from "../../../lib/resources/project/flags.js";
 export class List extends ListBaseCommand {
     static description = "List backup schedules belonging to a given project.";
     static args = {};
@@ -15,9 +15,6 @@ export class List extends ListBaseCommand {
             projectId,
         });
     }
-    mapData(data) {
-        return data;
-    }
     getColumns(data) {
         const { id, createdAt } = super.getColumns(data);
         return {

package/dist/commands/context/get.d.ts

@@ -1,4 +1,4 @@
-import { RenderBaseCommand } from "../../rendering/react/RenderBaseCommand.js";
+import { RenderBaseCommand } from "../../lib/basecommands/RenderBaseCommand.js";
 import { ReactNode } from "react";
 export declare class Get extends RenderBaseCommand<typeof Get> {
     static summary: string;

package/dist/commands/context/get.js

@@ -1,6 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { RenderBaseCommand } from "../../rendering/react/RenderBaseCommand.js";
-import { Context, } from "../../lib/context.js";
+import { RenderBaseCommand } from "../../lib/basecommands/RenderBaseCommand.js";
 import { SingleResult } from "../../rendering/react/components/SingleResult.js";
 import { Value } from "../../rendering/react/components/Value.js";
 import { usePromise } from "@mittwald/react-use-promise";
@@ -10,6 +9,7 @@ import { Set } from "./set.js";
 import { RenderJson } from "../../rendering/react/json/RenderJson.js";
 import { useRenderContext } from "../../rendering/react/context.js";
 import { LocalFilename } from "../../rendering/react/components/LocalFilename.js";
+import Context from "../../lib/context/Context.js";
 const ContextSourceValue = ({ source }) => {
     switch (source.type) {
         case "user":

package/dist/commands/context/reset.d.ts

@@ -1,4 +1,4 @@
-import { BaseCommand } from "../../BaseCommand.js";
+import { BaseCommand } from "../../lib/basecommands/BaseCommand.js";
 export declare class Reset extends BaseCommand {
     static summary: string;
     static description: string;

package/dist/commands/context/reset.js

@@ -1,5 +1,5 @@
-import { Context } from "../../lib/context.js";
-import { BaseCommand } from "../../BaseCommand.js";
+import Context from "../../lib/context/Context.js";
+import { BaseCommand } from "../../lib/basecommands/BaseCommand.js";
 export class Reset extends BaseCommand {
     static summary = "Reset context values";
     static description = "This command resets any values for common parameters that you've previously set with 'context set'.";

package/dist/commands/context/set.d.ts

@@ -1,4 +1,4 @@
-import { BaseCommand } from "../../BaseCommand.js";
+import { BaseCommand } from "../../lib/basecommands/BaseCommand.js";
 export declare class Set extends BaseCommand {
     static summary: string;
     static description: string;

package/dist/commands/context/set.js

@@ -1,7 +1,6 @@
 import { Flags } from "@oclif/core";
-import { Context } from "../../lib/context.js";
-import { BaseCommand } from "../../BaseCommand.js";
-import { normalizeAppInstallationId, normalizeCustomerId, normalizeProjectId, normalizeServerId, } from "../../normalize_id.js";
+import Context from "../../lib/context/Context.js";
+import { BaseCommand } from "../../lib/basecommands/BaseCommand.js";
 export class Set extends BaseCommand {
     static summary = "Set context values for the current project, org or server";
     static description = "The context allows you to persistently set values for common parameters, like --project-id or --server-id, so you don't have to specify them on every command.";
@@ -24,23 +23,19 @@ export class Set extends BaseCommand {
         const { flags } = await this.parse(Set);
         const ctx = new Context(this.apiClient, this.config);
         if (flags["project-id"]) {
-            const projectId = await normalizeProjectId(this.apiClient, flags["project-id"]);
-            await ctx.setProjectId(projectId);
+            const projectId = await ctx.setProjectId(flags["project-id"]);
             this.log(`Set project ID to ${projectId}`);
         }
         if (flags["server-id"]) {
-            const serverId = await normalizeServerId(this.apiClient, flags["server-id"]);
-            await ctx.setServerId(serverId);
+            const serverId = await ctx.setServerId(flags["server-id"]);
             this.log(`Set server ID to ${serverId}`);
         }
         if (flags["org-id"]) {
-            const orgId = await normalizeCustomerId(this.apiClient, flags["org-id"]);
-            await ctx.setOrgId(orgId);
+            const orgId = await ctx.setOrgId(flags["org-id"]);
             this.log(`Set organization ID to ${orgId}`);
         }
         if (flags["installation-id"]) {
-            const installationId = await normalizeAppInstallationId(this.apiClient, flags["installation-id"]);
-            await ctx.setAppInstallationId(installationId);
+            const installationId = await ctx.setAppInstallationId(flags["installation-id"]);
             this.log(`Set installation ID to ${installationId}`);
         }
     }

package/dist/commands/conversation/categories.d.ts

@@ -1,8 +1,7 @@
 import { Simplify } from "@mittwald/api-client-commons";
 import { MittwaldAPIV2, MittwaldAPIV2Client } from "@mittwald/api-client";
-import { SuccessfulResponse } from "../../types.js";
-import { ListColumns } from "../../Formatter.js";
-import { ListBaseCommand } from "../../ListBaseCommand.js";
+import { ListColumns } from "../../rendering/formatter/ListFormatter.js";
+import { ListBaseCommand } from "../../lib/basecommands/ListBaseCommand.js";
 type ResponseItem = Simplify<MittwaldAPIV2.Paths.V2ConversationCategories.Get.Responses.$200.Content.ApplicationJson[number]>;
 type Response = Awaited<ReturnType<MittwaldAPIV2Client["conversation"]["listCategories"]>>;
 export default class Categories extends ListBaseCommand<typeof Categories, ResponseItem, Response> {
@@ -33,7 +32,6 @@ export default class Categories extends ListBaseCommand<typeof Categories, Respo
         "no-relative-dates": import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     getData(): Promise<Response>;
-    protected mapData(data: SuccessfulResponse<Response, 200>["data"]): MittwaldAPIV2.Components.Schemas.ConversationCategory[];
     protected getColumns(): ListColumns<ResponseItem>;
 }
 export {};

package/dist/commands/conversation/categories.js

@@ -1,15 +1,12 @@
-import { ListBaseCommand } from "../../ListBaseCommand.js";
+import { ListBaseCommand } from "../../lib/basecommands/ListBaseCommand.js";
 export default class Categories extends ListBaseCommand {
     static description = "Get all conversation categories.";
     static args = {};
     static flags = {
         ...ListBaseCommand.baseFlags,
     };
-    async getData() {
-        return await this.apiClient.conversation.listCategories();
-    }
-    mapData(data) {
-        return data;
+    getData() {
+        return this.apiClient.conversation.listCategories();
     }
     getColumns() {
         return {

package/dist/commands/conversation/close.d.ts

@@ -1,8 +1,8 @@
-import { BaseCommand } from "../../BaseCommand.js";
-export default class Close extends BaseCommand {
+import { ExtendedBaseCommand } from "../../lib/basecommands/ExtendedBaseCommand.js";
+export default class Close extends ExtendedBaseCommand<typeof Close> {
     static description: string;
     static args: {
-        id: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
+        "conversation-id": import("@oclif/core/lib/interfaces/parser.js").Arg<string>;
     };
     run(): Promise<void>;
 }

package/dist/commands/conversation/close.js

@@ -1,18 +1,14 @@
-import { BaseCommand } from "../../BaseCommand.js";
-import { Args, ux } from "@oclif/core";
-import { normalizeConversationId } from "../../normalize_id.js";
+import { ux } from "@oclif/core";
 import { assertStatus } from "@mittwald/api-client-commons";
-export default class Close extends BaseCommand {
+import { conversationArgs, withConversationId, } from "../../lib/resources/conversation/flags.js";
+import { ExtendedBaseCommand } from "../../lib/basecommands/ExtendedBaseCommand.js";
+export default class Close extends ExtendedBaseCommand {
     static description = "Close a conversation";
     static args = {
-        id: Args.string({
-            required: true,
-            description: "ID of the conversation to show",
-        }),
+        ...conversationArgs,
     };
     async run() {
-        const { args } = await this.parse(Close);
-        const conversationId = await normalizeConversationId(this.apiClient, args.id);
+        const conversationId = await withConversationId(this.apiClient, Close, this.flags, this.args, this.config);
         ux.action.start(`closing conversation ${conversationId}`);
         const response = await this.apiClient.conversation.setConversationStatus({
             conversationId,

package/dist/commands/conversation/create.d.ts

@@ -1,4 +1,4 @@
-import { BaseCommand } from "../../BaseCommand.js";
+import { BaseCommand } from "../../lib/basecommands/BaseCommand.js";
 export default class Create extends BaseCommand {
     static description: string;
     static flags: {

package/dist/commands/conversation/create.js

@@ -1,7 +1,7 @@
-import { BaseCommand } from "../../BaseCommand.js";
+import { BaseCommand } from "../../lib/basecommands/BaseCommand.js";
 import { Flags, ux } from "@oclif/core";
 import { assertStatus } from "@mittwald/api-client-commons";
-import { messageFlags, retrieveMessage, } from "../../lib/conversation/message_input.js";
+import { messageFlags, retrieveMessage, } from "../../lib/resources/conversation/message_input.js";
 export default class Create extends BaseCommand {
     static description = "Create a new conversation";
     static flags = {

package/dist/commands/conversation/list.d.ts

@@ -1,8 +1,7 @@
 import { Simplify } from "@mittwald/api-client-commons";
 import { MittwaldAPIV2, MittwaldAPIV2Client } from "@mittwald/api-client";
-import { SuccessfulResponse } from "../../types.js";
-import { ListColumns } from "../../Formatter.js";
-import { ListBaseCommand } from "../../ListBaseCommand.js";
+import { ListColumns } from "../../rendering/formatter/ListFormatter.js";
+import { ListBaseCommand } from "../../lib/basecommands/ListBaseCommand.js";
 type ResponseItem = Simplify<MittwaldAPIV2.Paths.V2Conversations.Get.Responses.$200.Content.ApplicationJson[number]>;
 type Response = Awaited<ReturnType<MittwaldAPIV2Client["conversation"]["listConversations"]>>;
 export default class List extends ListBaseCommand<typeof List, ResponseItem, Response> {
@@ -33,7 +32,6 @@ export default class List extends ListBaseCommand<typeof List, ResponseItem, Res
         "no-relative-dates": import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     getData(): Promise<Response>;
-    protected mapData(data: SuccessfulResponse<Response, 200>["data"]): MittwaldAPIV2.Components.Schemas.ConversationConversation[];
     protected getColumns(): ListColumns<ResponseItem>;
 }
 export {};

package/dist/commands/conversation/list.js

@@ -1,5 +1,5 @@
-import { formatRelativeDate } from "../../lib/viewhelpers/date.js";
-import { ListBaseCommand } from "../../ListBaseCommand.js";
+import { formatRelativeDate } from "../../rendering/textformat/formatDate.js";
+import { ListBaseCommand } from "../../lib/basecommands/ListBaseCommand.js";
 export default class List extends ListBaseCommand {
     static description = "Get all conversations the authenticated user has created or has access to.";
     static args = {};
@@ -9,9 +9,6 @@ export default class List extends ListBaseCommand {
     async getData() {
         return await this.apiClient.conversation.listConversations();
     }
-    mapData(data) {
-        return data;
-    }
     getColumns() {
         return {
             conversationId: {

package/dist/commands/conversation/reply.d.ts

@@ -1,8 +1,8 @@
-import { BaseCommand } from "../../BaseCommand.js";
-export default class Reply extends BaseCommand {
+import { ExtendedBaseCommand } from "../../lib/basecommands/ExtendedBaseCommand.js";
+export default class Reply extends ExtendedBaseCommand<typeof Reply> {
     static description: string;
     static args: {
-        id: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
+        "conversation-id": import("@oclif/core/lib/interfaces/parser.js").Arg<string>;
     };
     static flags: {
         message: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;

package/dist/commands/conversation/reply.js

@@ -1,24 +1,19 @@
-import { BaseCommand } from "../../BaseCommand.js";
-import { Args, ux } from "@oclif/core";
-import { normalizeConversationId } from "../../normalize_id.js";
+import { BaseCommand } from "../../lib/basecommands/BaseCommand.js";
 import { assertStatus } from "@mittwald/api-client-commons";
-import { messageFlags, retrieveMessage, } from "../../lib/conversation/message_input.js";
-export default class Reply extends BaseCommand {
+import { messageFlags, retrieveMessage, } from "../../lib/resources/conversation/message_input.js";
+import { conversationArgs, withConversationId, } from "../../lib/resources/conversation/flags.js";
+import { ExtendedBaseCommand } from "../../lib/basecommands/ExtendedBaseCommand.js";
+import { ux } from "@oclif/core";
+export default class Reply extends ExtendedBaseCommand {
     static description = "Reply to a conversation";
-    static args = {
-        id: Args.string({
-            required: true,
-            description: "ID of the conversation to show",
-        }),
-    };
+    static args = { ...conversationArgs };
     static flags = {
         ...BaseCommand.baseFlags,
         ...messageFlags,
     };
     async run() {
-        const { args, flags } = await this.parse(Reply);
-        const conversationId = await normalizeConversationId(this.apiClient, args.id);
-        const messageContent = await retrieveMessage(flags);
+        const conversationId = await withConversationId(this.apiClient, Reply, this.flags, this.args, this.config);
+        const messageContent = await retrieveMessage(this.flags);
         ux.action.start(`replying to ${conversationId}`);
         const response = await this.apiClient.conversation.createMessage({
             conversationId,

package/dist/commands/conversation/show.d.ts

@@ -1,8 +1,8 @@
-import { BaseCommand } from "../../BaseCommand.js";
-export default class Show extends BaseCommand {
+import { ExtendedBaseCommand } from "../../lib/basecommands/ExtendedBaseCommand.js";
+export default class Show extends ExtendedBaseCommand<typeof Show> {
     static description: string;
     static args: {
-        id: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
+        "conversation-id": import("@oclif/core/lib/interfaces/parser.js").Arg<string>;
     };
     run(): Promise<void>;
     private loadConversationWithMessages;