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

package/dist/commands/conversation/show.js

@@ -1,12 +1,12 @@
-import { BaseCommand } from "../../BaseCommand.js";
-import { Args } from "@oclif/core";
-import { normalizeConversationId } from "../../normalize_id.js";
 import { assertStatus } from "@mittwald/api-client-commons";
-import { formatRelativeDate } from "../../lib/viewhelpers/date.js";
+import { formatRelativeDate } from "../../rendering/textformat/formatDate.js";
 import { marked } from "marked";
 import TerminalRenderer from "marked-terminal";
 import chalk from "chalk";
-import { printHeader, printKeyValues } from "../../lib/viewhelpers/tui.js";
+import { conversationArgs, withConversationId, } from "../../lib/resources/conversation/flags.js";
+import { ExtendedBaseCommand } from "../../lib/basecommands/ExtendedBaseCommand.js";
+import { printHeader } from "../../rendering/formatter/printHeader.js";
+import { printKeyValues } from "../../rendering/formatter/printKeyValues.js";
 function printStatusChange(text, date) {
     console.log(chalk.gray(`${text}, ${formatRelativeDate(date)}`));
 }
@@ -72,17 +72,11 @@ async function printConversationMessages(responseItems) {
         await printResponseItem(responseItem);
     }
 }
-export default class Show extends BaseCommand {
+export default class Show extends ExtendedBaseCommand {
     static description = "Show a conversation and message history";
-    static args = {
-        id: Args.string({
-            required: true,
-            description: "ID of the conversation to show",
-        }),
-    };
+    static args = { ...conversationArgs };
     async run() {
-        const { args } = await this.parse(Show);
-        const conversationId = await normalizeConversationId(this.apiClient, args.id);
+        const conversationId = await withConversationId(this.apiClient, Show, this.flags, this.args, this.config);
         const [conversation, responseItems] = await this.loadConversationWithMessages(conversationId);
         printConversationMetadata(conversation);
         await printConversationMessages(responseItems);

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

@@ -1,5 +1,5 @@
 import React from "react";
-import { RenderBaseCommand } from "../../rendering/react/RenderBaseCommand.js";
+import { RenderBaseCommand } from "../../lib/basecommands/RenderBaseCommand.js";
 export default class Show extends RenderBaseCommand<typeof Show> {
     static flags: {
         wait: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<any>;

package/dist/commands/conversation/show2.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Suspense } from "react";
 import { assertStatus } from "@mittwald/api-client-commons";
 import { usePromise } from "@mittwald/react-use-promise";
-import { RenderBaseCommand } from "../../rendering/react/RenderBaseCommand.js";
+import { RenderBaseCommand } from "../../lib/basecommands/RenderBaseCommand.js";
 import { useRenderContext } from "../../rendering/react/context.js";
 import { UsePromiseRenderSetup } from "../../rendering/setup/usePromiseSetup.js";
 import { Box } from "ink";

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

@@ -1,5 +1,6 @@
-import { ExecRenderBaseCommand } from "../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../lib/basecommands/ExecRenderBaseCommand.js";
 import { ReactNode } from "react";
+import Duration from "../../lib/units/Duration.js";
 type Result = {
     cronjobId: string;
 };
@@ -13,6 +14,7 @@ export declare class Create extends ExecRenderBaseCommand<typeof Create, Result>
         url: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         interpreter: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         command: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        timeout: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<Duration, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         quiet: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         "installation-id": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string>;
     };

package/dist/commands/cronjob/create.js

@@ -1,11 +1,12 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { ExecRenderBaseCommand } from "../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../lib/basecommands/ExecRenderBaseCommand.js";
 import { makeProcessRenderer, processFlags, } from "../../rendering/process/process_flags.js";
 import { Flags } from "@oclif/core";
 import { assertStatus } from "@mittwald/api-client-commons";
 import { Success } from "../../rendering/react/components/Success.js";
 import { Value } from "../../rendering/react/components/Value.js";
-import { appInstallationFlags } from "../../lib/app/flags.js";
+import { appInstallationFlags } from "../../lib/resources/app/flags.js";
+import Duration from "../../lib/units/Duration.js";
 export class Create extends ExecRenderBaseCommand {
     static summary = "Create a new cron job";
     static flags = {
@@ -47,11 +48,16 @@ export class Create extends ExecRenderBaseCommand {
             default: undefined,
             exclusive: ["url"],
         }),
+        timeout: Duration.relativeFlag({
+            summary: "timeout for the cron job; common duration formats are supported (for example, '1h', '30m', '30s')",
+            default: Duration.fromString("1h"),
+            required: false,
+        }),
     };
     async exec() {
         const p = makeProcessRenderer(this.flags, "Creating a new cron job");
         const appInstallationId = await this.withAppInstallationId(Create);
-        const { description, interval, disable, email, url, interpreter, command } = this.flags;
+        const { description, interval, disable, email, url, interpreter, command, timeout, } = this.flags;
         if (!url && !command) {
             throw new Error("either `--url` or `--command` must be specified");
         }
@@ -75,7 +81,7 @@ export class Create extends ExecRenderBaseCommand {
                     interval,
                     email,
                     destination: url ? { url } : { interpreter, path: command },
-                    timeout: 3600,
+                    timeout: timeout.seconds,
                 },
             });
             assertStatus(r, 201);

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

@@ -1,4 +1,4 @@
-import { DeleteBaseCommand } from "../../DeleteBaseCommand.js";
+import { DeleteBaseCommand } from "../../lib/basecommands/DeleteBaseCommand.js";
 export default class Delete extends DeleteBaseCommand<typeof Delete> {
     static description: string;
     static resourceName: string;

package/dist/commands/cronjob/delete.js

@@ -1,6 +1,6 @@
-import { DeleteBaseCommand } from "../../DeleteBaseCommand.js";
+import { DeleteBaseCommand } from "../../lib/basecommands/DeleteBaseCommand.js";
 import { Args } from "@oclif/core";
-import assertSuccess from "../../lib/assert_success.js";
+import assertSuccess from "../../lib/apiutil/assert_success.js";
 export default class Delete extends DeleteBaseCommand {
     static description = "Delete a cron job";
     static resourceName = "cron job";

package/dist/commands/cronjob/execute.d.ts

@@ -1,4 +1,4 @@
-import { ExecRenderBaseCommand } from "../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../lib/basecommands/ExecRenderBaseCommand.js";
 import { ReactNode } from "react";
 type Result = {
     executionId: string;

package/dist/commands/cronjob/execute.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { ExecRenderBaseCommand } from "../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../lib/basecommands/ExecRenderBaseCommand.js";
 import { makeProcessRenderer, processFlags, } from "../../rendering/process/process_flags.js";
 import { Args } from "@oclif/core";
 import { assertStatus } from "@mittwald/api-client-commons";

package/dist/commands/cronjob/execution/abort.d.ts

@@ -1,4 +1,4 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 import { ReactNode } from "react";
 type Result = {
     executionId: string;

package/dist/commands/cronjob/execution/abort.js

@@ -1,10 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 import { makeProcessRenderer, processFlags, } from "../../../rendering/process/process_flags.js";
 import { Args } from "@oclif/core";
 import { Success } from "../../../rendering/react/components/Success.js";
 import { Value } from "../../../rendering/react/components/Value.js";
-import assertSuccess from "../../../lib/assert_success.js";
+import assertSuccess from "../../../lib/apiutil/assert_success.js";
 export class Abort extends ExecRenderBaseCommand {
     static summary = "Abort a running cron job execution.";
     static flags = {

package/dist/commands/cronjob/execution/get.d.ts

@@ -1,5 +1,5 @@
 import { MittwaldAPIV2Client } from "@mittwald/api-client";
-import { GetBaseCommand } from "../../../GetBaseCommand.js";
+import { GetBaseCommand } from "../../../lib/basecommands/GetBaseCommand.js";
 type APIResponse = Awaited<ReturnType<MittwaldAPIV2Client["cronjob"]["getExecution"]>>;
 export declare class Get extends GetBaseCommand<typeof Get, APIResponse> {
     static description: string;

package/dist/commands/cronjob/execution/get.js

@@ -1,4 +1,4 @@
-import { GetBaseCommand } from "../../../GetBaseCommand.js";
+import { GetBaseCommand } from "../../../lib/basecommands/GetBaseCommand.js";
 import { Args } from "@oclif/core";
 export class Get extends GetBaseCommand {
     static description = "Get a cron job execution.";

package/dist/commands/cronjob/execution/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.V2CronjobsCronjobIdExecutions.Get.Responses.$200.Content.ApplicationJson[number]>;
 type Response = Awaited<ReturnType<MittwaldAPIV2Client["cronjob"]["listExecutions"]>>;
 export declare class List extends ListBaseCommand<typeof List, ResponseItem, Response> {
@@ -36,7 +35,6 @@ export declare 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.CronjobCronjobExecution[];
     protected getColumns(): ListColumns<ResponseItem>;
 }
 export {};

package/dist/commands/cronjob/execution/list.js

@@ -1,6 +1,7 @@
-import { ListBaseCommand } from "../../../ListBaseCommand.js";
+import { ListBaseCommand } from "../../../lib/basecommands/ListBaseCommand.js";
 import { Flags } from "@oclif/core";
-import { formatRelativeDate, optionalDateRenderer, } from "../../../lib/viewhelpers/date.js";
+import { formatRelativeDate } from "../../../rendering/textformat/formatDate.js";
+import maybe from "../../../lib/util/maybe.js";
 export class List extends ListBaseCommand {
     static description = "List CronjobExecutions belonging to a Cronjob.";
     static aliases = ["project:cronjob:execution:list"];
@@ -18,9 +19,6 @@ export class List extends ListBaseCommand {
         const { "cronjob-id": cronjobId } = this.flags;
         return await this.apiClient.cronjob.listExecutions({ cronjobId });
     }
-    mapData(data) {
-        return data;
-    }
     getColumns() {
         return {
             id: {},
@@ -31,10 +29,10 @@ export class List extends ListBaseCommand {
                     : "",
             },
             started: {
-                get: (r) => optionalDateRenderer(formatRelativeDate)(r.executionStart),
+                get: (r) => maybe(formatRelativeDate)(r.executionStart),
             },
             ended: {
-                get: (r) => optionalDateRenderer(formatRelativeDate)(r.executionEnd),
+                get: (r) => maybe(formatRelativeDate)(r.executionEnd),
             },
         };
     }

package/dist/commands/cronjob/execution/logs.d.ts

@@ -1,5 +1,5 @@
 import { MittwaldAPIV2 } from "@mittwald/api-client";
-import { BaseCommand } from "../../../BaseCommand.js";
+import { BaseCommand } from "../../../lib/basecommands/BaseCommand.js";
 export type PathParams = MittwaldAPIV2.Paths.V2CronjobsCronjobIdExecutionsExecutionId.Get.Parameters.Path;
 export declare class Logs extends BaseCommand {
     static summary: string;

package/dist/commands/cronjob/execution/logs.js

@@ -1,6 +1,6 @@
-import { GetBaseCommand } from "../../../GetBaseCommand.js";
+import { GetBaseCommand } from "../../../lib/basecommands/GetBaseCommand.js";
 import { Args, Flags } from "@oclif/core";
-import { BaseCommand } from "../../../BaseCommand.js";
+import { BaseCommand } from "../../../lib/basecommands/BaseCommand.js";
 import { assertStatus } from "@mittwald/api-client-commons";
 import * as cp from "child_process";
 import * as fs from "fs";

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

@@ -1,6 +1,6 @@
-import { RenderBaseCommand } from "../../rendering/react/RenderBaseCommand.js";
-import { GetFormatter } from "../../Formatter.js";
+import { RenderBaseCommand } from "../../lib/basecommands/RenderBaseCommand.js";
 import { ReactNode } from "react";
+import { GetFormatter } from "../../rendering/formatter/GetFormatter.js";
 export declare class Get extends RenderBaseCommand<typeof Get> {
     static description: string;
     static flags: {

package/dist/commands/cronjob/get.js

@@ -1,13 +1,13 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { GetBaseCommand } from "../../GetBaseCommand.js";
+import { GetBaseCommand } from "../../lib/basecommands/GetBaseCommand.js";
 import { Args } from "@oclif/core";
-import { RenderBaseCommand } from "../../rendering/react/RenderBaseCommand.js";
-import { GetFormatter } from "../../Formatter.js";
+import { RenderBaseCommand } from "../../lib/basecommands/RenderBaseCommand.js";
 import { ComponentPrinter } from "../../rendering/react/ComponentPrinter.js";
 import { usePromise } from "@mittwald/react-use-promise";
 import { assertStatus } from "@mittwald/api-client-commons";
 import { RenderJson } from "../../rendering/react/json/RenderJson.js";
 import { CronJobDetails } from "../../rendering/react/components/CronJob/CronJobDetails.js";
+import { GetFormatter } from "../../rendering/formatter/GetFormatter.js";
 export class Get extends RenderBaseCommand {
     static description = "Get details of a cron job";
     static flags = { ...GetBaseCommand.baseFlags };

package/dist/commands/cronjob/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 { ListBaseCommand } from "../../ListBaseCommand.js";
-import { ListColumns } from "../../Formatter.js";
+import { ListBaseCommand } from "../../lib/basecommands/ListBaseCommand.js";
+import { ListColumns } from "../../rendering/formatter/ListFormatter.js";
 type ResponseItem = Simplify<MittwaldAPIV2.Paths.V2ProjectsProjectIdCronjobs.Get.Responses.$200.Content.ApplicationJson[number]>;
 export type PathParams = MittwaldAPIV2.Paths.V2ProjectsProjectIdCronjobs.Get.Parameters.Path;
 export type Response = Awaited<ReturnType<MittwaldAPIV2Client["cronjob"]["listCronjobs"]>>;
@@ -37,7 +36,6 @@ export declare 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"]): ResponseItem[] | Promise<ResponseItem[]>;
     protected getColumns(data: ResponseItem[]): ListColumns<ResponseItem>;
 }
 export {};

package/dist/commands/cronjob/list.js

@@ -1,6 +1,6 @@
-import { ListBaseCommand } from "../../ListBaseCommand.js";
-import { projectFlags } from "../../lib/project/flags.js";
-import { formatRelativeDate } from "../../lib/viewhelpers/date.js";
+import { ListBaseCommand } from "../../lib/basecommands/ListBaseCommand.js";
+import { projectFlags } from "../../lib/resources/project/flags.js";
+import { formatRelativeDate } from "../../rendering/textformat/formatDate.js";
 export class List extends ListBaseCommand {
     static description = "List cron jobs belonging to a project.";
     static aliases = ["project:cronjob:list"];
@@ -14,9 +14,6 @@ export class List extends ListBaseCommand {
         const projectId = await this.withProjectId(List);
         return await this.apiClient.cronjob.listCronjobs({ projectId });
     }
-    mapData(data) {
-        return data;
-    }
     getColumns(data) {
         const { id, shortId, createdAt } = super.getColumns(data);
         return {

package/dist/commands/database/mysql/charsets.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 { ListBaseCommand } from "../../../ListBaseCommand.js";
-import { ListColumns } from "../../../Formatter.js";
+import { ListBaseCommand } from "../../../lib/basecommands/ListBaseCommand.js";
+import { ListColumns } from "../../../rendering/formatter/ListFormatter.js";
 type ResponseItem = Simplify<MittwaldAPIV2.Paths.V2MysqlCharsets.Get.Responses.$200.Content.ApplicationJson[number]>;
 type Response = Awaited<ReturnType<MittwaldAPIV2Client["database"]["listMysqlCharsets"]>>;
 export declare class Charsets extends ListBaseCommand<typeof Charsets, ResponseItem, Response> {
@@ -32,8 +31,8 @@ export declare class Charsets extends ListBaseCommand<typeof Charsets, ResponseI
         sort?: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined> | undefined;
         "no-relative-dates": import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
+    protected sorter: (a: ResponseItem, b: ResponseItem) => number;
     getData(): Promise<Response>;
-    protected mapData(data: SuccessfulResponse<Response, 200>["data"]): MittwaldAPIV2.Components.Schemas.DatabaseMySqlCharacterSettings[];
     protected getColumns(): ListColumns<ResponseItem>;
 }
 export {};

package/dist/commands/database/mysql/charsets.js

@@ -1,17 +1,14 @@
-import { ListBaseCommand } from "../../../ListBaseCommand.js";
+import { ListBaseCommand } from "../../../lib/basecommands/ListBaseCommand.js";
 export class Charsets extends ListBaseCommand {
     static description = "List available MySQL character sets and collations, optionally filtered by a MySQLVersion.";
     static args = {};
     static flags = {
         ...ListBaseCommand.baseFlags,
     };
+    sorter = (a, b) => a.name.localeCompare(b.name);
     async getData() {
         return await this.apiClient.database.listMysqlCharsets({});
     }
-    mapData(data) {
-        data.sort((a, b) => a.name.localeCompare(b.name));
-        return data;
-    }
     getColumns() {
         return {
             name: {},

package/dist/commands/database/mysql/create.d.ts

@@ -1,4 +1,4 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 import { ReactNode } from "react";
 type Result = {
     databaseId: string;
@@ -13,7 +13,7 @@ export declare class Create extends ExecRenderBaseCommand<typeof Create, Result>
         "character-set": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         "user-password": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         "user-external": import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        "user-access-level": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        "user-access-level": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<"full" | "readonly", import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         quiet: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         "project-id": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string>;
     };

package/dist/commands/database/mysql/create.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
-import { projectFlags } from "../../../lib/project/flags.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
+import { projectFlags } from "../../../lib/resources/project/flags.js";
 import { makeProcessRenderer, processFlags, } from "../../../rendering/process/process_flags.js";
 import { Flags } from "@oclif/core";
 import { Text } from "ink";
@@ -38,11 +38,11 @@ export class Create extends ExecRenderBaseCommand {
             summary: "enable external access for default user",
             default: false,
         }),
-        "user-access-level": Flags.string({
+        "user-access-level": Flags.custom({
             summary: "the access level preset for the default user",
             options: ["full", "readonly"],
             default: "full",
-        }),
+        })(),
     };
     async exec() {
         const p = makeProcessRenderer(this.flags, "Creating a new MySQL database");
@@ -59,7 +59,7 @@ export class Create extends ExecRenderBaseCommand {
         }, {
             password,
             externalAccess,
-            accessLevel: accessLevel,
+            accessLevel,
         });
         const database = await p.runStep("fetching database", async () => {
             const response = await this.apiClient.database.getMysqlDatabase({

package/dist/commands/database/mysql/delete.d.ts

@@ -1,4 +1,4 @@
-import { DeleteBaseCommand } from "../../../DeleteBaseCommand.js";
+import { DeleteBaseCommand } from "../../../lib/basecommands/DeleteBaseCommand.js";
 export default class Delete extends DeleteBaseCommand<typeof Delete> {
     static description: string;
     static resourceName: string;
@@ -10,5 +10,4 @@ export default class Delete extends DeleteBaseCommand<typeof Delete> {
         "database-id": import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
     };
     protected deleteResource(): Promise<void>;
-    protected mapResourceId(id: string): Promise<string>;
 }

package/dist/commands/database/mysql/delete.js

@@ -1,7 +1,6 @@
-import { normalizeProjectId } from "../../../normalize_id.js";
-import { DeleteBaseCommand } from "../../../DeleteBaseCommand.js";
-import { mysqlArgs, withMySQLId } from "../../../lib/database/mysql/flags.js";
-import assertSuccess from "../../../lib/assert_success.js";
+import { DeleteBaseCommand } from "../../../lib/basecommands/DeleteBaseCommand.js";
+import { mysqlArgs, withMySQLId, } from "../../../lib/resources/database/mysql/flags.js";
+import assertSuccess from "../../../lib/apiutil/assert_success.js";
 export default class Delete extends DeleteBaseCommand {
     static description = "Delete a MySQL database";
     static resourceName = "MySQL database";
@@ -14,7 +13,4 @@ export default class Delete extends DeleteBaseCommand {
         });
         assertSuccess(response);
     }
-    mapResourceId(id) {
-        return normalizeProjectId(this.apiClient, id);
-    }
 }

package/dist/commands/database/mysql/dump.d.ts

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

package/dist/commands/database/mysql/dump.js

@@ -1,17 +1,17 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 import { Flags } from "@oclif/core";
 import { makeProcessRenderer, processFlags, } from "../../../rendering/process/process_flags.js";
 import { Text } from "ink";
 import { Value } from "../../../rendering/react/components/Value.js";
 import * as fs from "fs";
 import { Success } from "../../../rendering/react/components/Success.js";
-import { mysqlArgs, mysqlConnectionFlagsWithTempUser, withMySQLId, } from "../../../lib/database/mysql/flags.js";
-import { runWithConnectionDetails } from "../../../lib/database/mysql/connect.js";
-import { executeViaSSH } from "../../../lib/ssh/exec.js";
+import { mysqlArgs, mysqlConnectionFlagsWithTempUser, withMySQLId, } from "../../../lib/resources/database/mysql/flags.js";
+import { runWithConnectionDetails } from "../../../lib/resources/database/mysql/connect.js";
+import { executeViaSSH } from "../../../lib/resources/ssh/exec.js";
 import shellEscape from "shell-escape";
-import { sshConnectionFlags } from "../../../lib/ssh/flags.js";
-import { sshUsageDocumentation } from "../../../lib/ssh/doc.js";
+import { sshConnectionFlags } from "../../../lib/resources/ssh/flags.js";
+import { sshUsageDocumentation } from "../../../lib/resources/ssh/doc.js";
 export class Dump extends ExecRenderBaseCommand {
     static summary = "Create a dump of a MySQL database";
     static description = "This command creates a dump of a MySQL database via mysqldump and saves it to a local file.\n\n" +

package/dist/commands/database/mysql/get.d.ts

@@ -1,5 +1,5 @@
 import { MittwaldAPIV2, MittwaldAPIV2Client } from "@mittwald/api-client";
-import { GetBaseCommand } from "../../../GetBaseCommand.js";
+import { GetBaseCommand } from "../../../lib/basecommands/GetBaseCommand.js";
 export type PathParams = MittwaldAPIV2.Paths.V2MysqlDatabasesMysqlDatabaseId.Get.Parameters.Path;
 type APIResponse = Awaited<ReturnType<MittwaldAPIV2Client["database"]["getMysqlDatabase"]>>;
 export declare abstract class Get extends GetBaseCommand<typeof Get, APIResponse> {

package/dist/commands/database/mysql/get.js

@@ -1,5 +1,5 @@
-import { GetBaseCommand } from "../../../GetBaseCommand.js";
-import { mysqlArgs, withMySQLId } from "../../../lib/database/mysql/flags.js";
+import { GetBaseCommand } from "../../../lib/basecommands/GetBaseCommand.js";
+import { mysqlArgs, withMySQLId, } from "../../../lib/resources/database/mysql/flags.js";
 export class Get extends GetBaseCommand {
     static description = "Get a MySQLDatabase.";
     static flags = {

package/dist/commands/database/mysql/import.d.ts

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

package/dist/commands/database/mysql/import.js

@@ -1,17 +1,17 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 import { Flags } from "@oclif/core";
 import { makeProcessRenderer, processFlags, } from "../../../rendering/process/process_flags.js";
 import { Text } from "ink";
 import { Value } from "../../../rendering/react/components/Value.js";
 import * as fs from "fs";
 import { Success } from "../../../rendering/react/components/Success.js";
-import { mysqlArgs, mysqlConnectionFlagsWithTempUser, withMySQLId, } from "../../../lib/database/mysql/flags.js";
-import { executeViaSSH } from "../../../lib/ssh/exec.js";
-import { sshConnectionFlags } from "../../../lib/ssh/flags.js";
+import { mysqlArgs, mysqlConnectionFlagsWithTempUser, withMySQLId, } from "../../../lib/resources/database/mysql/flags.js";
+import { executeViaSSH } from "../../../lib/resources/ssh/exec.js";
+import { sshConnectionFlags } from "../../../lib/resources/ssh/flags.js";
 import shellEscape from "shell-escape";
-import { runWithConnectionDetails } from "../../../lib/database/mysql/connect.js";
-import { sshUsageDocumentation } from "../../../lib/ssh/doc.js";
+import { runWithConnectionDetails } from "../../../lib/resources/database/mysql/connect.js";
+import { sshUsageDocumentation } from "../../../lib/resources/ssh/doc.js";
 export class Import extends ExecRenderBaseCommand {
     static summary = "Imports a dump of a MySQL database";
     static description = "This command imports a mysqldump file from your local filesystem into a MySQL database.\n\n" +

package/dist/commands/database/mysql/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.V2ProjectsProjectIdMysqlDatabases.Get.Responses.$200.Content.ApplicationJson[number]>;
 type Response = Awaited<ReturnType<MittwaldAPIV2Client["database"]["listMysqlDatabases"]>>;
 export declare class List extends ListBaseCommand<typeof List, ResponseItem, Response> {
@@ -34,7 +33,6 @@ export declare 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.DatabaseMySqlDatabase[];
     protected getColumns(ignoredData: ResponseItem[]): ListColumns<ResponseItem>;
 }
 export {};

package/dist/commands/database/mysql/list.js

@@ -1,5 +1,5 @@
-import { ListBaseCommand } from "../../../ListBaseCommand.js";
-import { projectFlags } from "../../../lib/project/flags.js";
+import { ListBaseCommand } from "../../../lib/basecommands/ListBaseCommand.js";
+import { projectFlags } from "../../../lib/resources/project/flags.js";
 export class List extends ListBaseCommand {
     static description = "List MySQLDatabases belonging to a Project.";
     static args = {};
@@ -13,9 +13,6 @@ export class List extends ListBaseCommand {
             projectId,
         });
     }
-    mapData(data) {
-        return data;
-    }
     getColumns(ignoredData) {
         const { id, name, createdAt } = super.getColumns(ignoredData, {
             shortIdKey: "name",

package/dist/commands/database/mysql/phpmyadmin.d.ts

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

package/dist/commands/database/mysql/phpmyadmin.js

@@ -1,7 +1,7 @@
-import { BaseCommand } from "../../../BaseCommand.js";
+import { BaseCommand } from "../../../lib/basecommands/BaseCommand.js";
 import { assertStatus } from "@mittwald/api-client-commons";
 import open from "open";
-import { mysqlArgs, withMySQLId } from "../../../lib/database/mysql/flags.js";
+import { mysqlArgs, withMySQLId, } from "../../../lib/resources/database/mysql/flags.js";
 export class PhpMyAdmin extends BaseCommand {
     static summary = "Open phpMyAdmin for a MySQL database.";
     static args = { ...mysqlArgs };

package/dist/commands/database/mysql/port-forward.d.ts

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