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

package/dist/commands/ssh-user/delete.js

@@ -1,5 +1,5 @@
-import { DeleteBaseCommand } from "../../DeleteBaseCommand.js";
-import assertSuccess from "../../lib/assert_success.js";
+import { DeleteBaseCommand } from "../../lib/basecommands/DeleteBaseCommand.js";
+import assertSuccess from "../../lib/apiutil/assert_success.js";
 import { Args } from "@oclif/core";
 export default class Delete extends DeleteBaseCommand {
     static description = "Delete an SSH user";

package/dist/commands/ssh-user/list.d.ts

@@ -1,9 +1,7 @@
 import { MittwaldAPIV2, MittwaldAPIV2Client } from "@mittwald/api-client";
 import { Simplify } from "@mittwald/api-client-commons";
-import { SuccessfulResponse } from "../../types.js";
-import { ListColumns } from "../../Formatter.js";
-import { ListBaseCommand } from "../../ListBaseCommand.js";
-type SshUserResponse = Awaited<ReturnType<MittwaldAPIV2Client["sshsftpUser"]["sftpUserListSftpUsers"]>>;
+import { ListColumns } from "../../rendering/formatter/ListFormatter.js";
+import { ListBaseCommand } from "../../lib/basecommands/ListBaseCommand.js";
 type SshUserResponseItem = Simplify<MittwaldAPIV2.Paths.V2ProjectsProjectIdSftpUsers.Get.Responses.$200.Content.ApplicationJson[number]>;
 type Response = Awaited<ReturnType<MittwaldAPIV2Client["sshsftpUser"]["sshUserListSshUsers"]>>;
 export declare class List extends ListBaseCommand<typeof List, SshUserResponseItem, Response> {
@@ -37,7 +35,6 @@ export declare class List extends ListBaseCommand<typeof List, SshUserResponseIt
     static aliases: string[];
     static deprecateAliases: boolean;
     getData(): Promise<Response>;
-    protected mapData(data: SuccessfulResponse<SshUserResponse, 200>["data"]): SshUserResponseItem[];
     protected getColumns(data: SshUserResponseItem[]): ListColumns<SshUserResponseItem>;
 }
 export {};

package/dist/commands/ssh-user/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 all SSH users for a project.";
     static args = {};
@@ -13,9 +13,6 @@ export class List extends ListBaseCommand {
         const projectId = await this.withProjectId(List);
         return await this.apiClient.sshsftpUser.sshUserListSshUsers({ projectId });
     }
-    mapData(data) {
-        return data;
-    }
     getColumns(data) {
         const { id, userName, createdAt } = super.getColumns(data, {
             shortIdKey: "userName",

package/dist/commands/user/api-token/create.d.ts

@@ -1,15 +1,14 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 export default class Create extends ExecRenderBaseCommand<typeof Create, {
     token: string;
 }> {
     static description: string;
     static flags: {
         description: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        "expires-in": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        roles: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[], import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        roles: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<["api_read" | "api_write", ...("api_read" | "api_write")[]], import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        expires: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<Date | undefined>;
         quiet: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
-    private determineExpiration;
     protected exec(): Promise<{
         token: string;
     }>;

package/dist/commands/user/api-token/create.js

@@ -1,51 +1,40 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Flags } from "@oclif/core";
 import { assertStatus } from "@mittwald/api-client-commons";
-import parseDuration from "parse-duration";
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 import { makeProcessRenderer, processFlags, } from "../../../rendering/process/process_flags.js";
 import { Success } from "../../../rendering/react/components/Success.js";
 import { Newline, Text } from "ink";
 import { Value } from "../../../rendering/react/components/Value.js";
+import { expireFlags } from "../../../lib/flags/expireFlags.js";
+const roleFlags = Flags.custom({
+    options: ["api_read", "api_write"],
+});
 export default class Create extends ExecRenderBaseCommand {
     static description = "Create a new API token";
     static flags = {
         ...processFlags,
+        ...expireFlags("API token", false),
         description: Flags.string({
-            description: "Description of the API token",
+            description: "description of the API token",
             required: true,
         }),
-        "expires-in": Flags.string({
-            description: "Expiration interval of the API token (example: 30d)",
-        }),
-        roles: Flags.string({
-            description: "Roles of the API token",
+        roles: roleFlags({
+            description: "roles of the API token",
             required: true,
             multiple: true,
-            options: ["api_read", "api_write"],
         }),
     };
-    determineExpiration(input) {
-        if (input === undefined) {
-            return undefined;
-        }
-        const duration = parseDuration(input);
-        if (duration === undefined) {
-            throw new Error(`Could not parse duration ${input}`);
-        }
-        return new Date(Date.now() + duration);
-    }
     async exec() {
-        const { flags } = await this.parse(Create);
-        const process = makeProcessRenderer(flags, "Creating an API token");
-        const expiresAt = this.determineExpiration(flags["expires-in"]);
+        const process = makeProcessRenderer(this.flags, "Creating an API token");
+        const { description, roles, expires } = this.flags;
         const step = process.addStep("creating API token");
         try {
             const response = await this.apiClient.user.createApiToken({
                 data: {
-                    description: flags.description,
-                    expiresAt: expiresAt?.toJSON(),
-                    roles: flags.roles,
+                    description,
+                    expiresAt: expires?.toJSON(),
+                    roles,
                 },
             });
             step.complete();

package/dist/commands/user/api-token/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["user"]["getApiToken"]>>;
 export default class Get extends GetBaseCommand<typeof Get, APIResponse> {
     static description: string;

package/dist/commands/user/api-token/get.js

@@ -1,5 +1,5 @@
 import { Args } from "@oclif/core";
-import { GetBaseCommand } from "../../../GetBaseCommand.js";
+import { GetBaseCommand } from "../../../lib/basecommands/GetBaseCommand.js";
 export default class Get extends GetBaseCommand {
     static description = "Get a specific API token";
     static flags = {

package/dist/commands/user/api-token/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.V2UsersSelfApiTokens.Get.Responses.$200.Content.ApplicationJson[number]>;
 type Response = Awaited<ReturnType<MittwaldAPIV2Client["user"]["listApiTokens"]>>;
 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.SignupApiToken[];
     protected getColumns(): ListColumns<ResponseItem>;
 }
 export {};

package/dist/commands/user/api-token/list.js

@@ -1,6 +1,5 @@
-import { formatRelativeDate } from "../../../lib/viewhelpers/date.js";
-import { ListBaseCommand } from "../../../ListBaseCommand.js";
-import { buildCreatedAtColumn } from "../../../lib/viewhelpers/list_column_date.js";
+import { ListBaseCommand } from "../../../lib/basecommands/ListBaseCommand.js";
+import ListDateColumnFormatter from "../../../rendering/formatter/ListDateColumnFormatter.js";
 export default class List extends ListBaseCommand {
     static description = "List all API tokens of the user";
     static args = {};
@@ -10,21 +9,19 @@ export default class List extends ListBaseCommand {
     async getData() {
         return await this.apiClient.user.listApiTokens();
     }
-    mapData(data) {
-        return data;
-    }
     getColumns() {
-        const createdAt = buildCreatedAtColumn(this.flags);
+        const dateColumnBuilder = new ListDateColumnFormatter(this.flags);
+        const createdAt = dateColumnBuilder.buildColumn();
+        const expiresAt = dateColumnBuilder.buildColumn({
+            header: "Expires at",
+            column: "expiresAt",
+            fallback: "never",
+        });
         return {
             apiTokenId: { header: "ID", minWidth: 36 },
             description: {},
             createdAt,
-            expiresAt: {
-                header: "Expires at",
-                get: (r) => r.expiresAt
-                    ? formatRelativeDate(new Date(`${r.expiresAt}`))
-                    : "never",
-            },
+            expiresAt,
         };
     }
 }

package/dist/commands/user/api-token/revoke.d.ts

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

package/dist/commands/user/api-token/revoke.js

@@ -1,6 +1,6 @@
 import { Args } from "@oclif/core";
 import { assertStatus } from "@mittwald/api-client-commons";
-import { DeleteBaseCommand } from "../../../DeleteBaseCommand.js";
+import { DeleteBaseCommand } from "../../../lib/basecommands/DeleteBaseCommand.js";
 export default class Revoke extends DeleteBaseCommand {
     static description = "Revoke an API token";
     static resource = "API token";

package/dist/commands/user/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.V2UsersUserId.Get.Parameters.Path;
 type APIResponse = Awaited<ReturnType<MittwaldAPIV2Client["user"]["getUser"]>>;
 export default class Get extends GetBaseCommand<typeof Get, APIResponse> {

package/dist/commands/user/get.js

@@ -1,4 +1,4 @@
-import { GetBaseCommand } from "../../GetBaseCommand.js";
+import { GetBaseCommand } from "../../lib/basecommands/GetBaseCommand.js";
 import { Args } from "@oclif/core";
 export default class Get extends GetBaseCommand {
     static description = "Get profile information for a user.";

package/dist/commands/user/session/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["user"]["getSession"]>>;
 export default class Get extends GetBaseCommand<typeof Get, APIResponse> {
     static description: string;

package/dist/commands/user/session/get.js

@@ -1,5 +1,5 @@
 import { Args } from "@oclif/core";
-import { GetBaseCommand } from "../../../GetBaseCommand.js";
+import { GetBaseCommand } from "../../../lib/basecommands/GetBaseCommand.js";
 export default class Get extends GetBaseCommand {
     static description = "Get a specific session";
     static flags = {

package/dist/commands/user/session/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.V2UsersSelfSessions.Get.Responses.$200.Content.ApplicationJson[number]>;
 type Response = Awaited<ReturnType<MittwaldAPIV2Client["user"]["listSessions"]>>;
 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.SignupUserSession[];
     protected getColumns(): ListColumns<ResponseItem>;
 }
 export {};

package/dist/commands/user/session/list.js

@@ -1,5 +1,5 @@
-import { formatRelativeDate } from "../../../lib/viewhelpers/date.js";
-import { ListBaseCommand } from "../../../ListBaseCommand.js";
+import { ListBaseCommand } from "../../../lib/basecommands/ListBaseCommand.js";
+import ListDateColumnFormatter from "../../../rendering/formatter/ListDateColumnFormatter.js";
 export default class List extends ListBaseCommand {
     static description = "List all active sessions";
     static args = {};
@@ -9,26 +9,24 @@ export default class List extends ListBaseCommand {
     async getData() {
         return await this.apiClient.user.listSessions();
     }
-    mapData(data) {
-        return data;
-    }
     getColumns() {
+        const dateColumnBuilder = new ListDateColumnFormatter(this.flags);
+        const lastAccess = dateColumnBuilder.buildColumn({
+            header: "Last access",
+            column: "lastAccess",
+            fallback: "(never)",
+        });
         return {
             tokenId: { header: "ID", minWidth: 36 },
             device: {
                 header: "Device",
-                get: (row) => `${row.device.browser} on ${row.device.os}`,
+                get: (row) => `${row.device.browser ?? "unknown browser"} on ${row.device.os ?? "unknown OS"}`,
             },
             location: {
                 header: "Location",
                 get: (row) => row.location?.country,
             },
-            lastAccess: {
-                header: "Last Access",
-                get: (row) => row.lastAccess
-                    ? formatRelativeDate(new Date(`${row.lastAccess}`))
-                    : "never",
-            },
+            lastAccess,
         };
     }
 }

package/dist/commands/user/ssh-key/create.d.ts

@@ -1,11 +1,11 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 export default class Create extends ExecRenderBaseCommand<typeof Create, undefined> {
     static description: string;
     static flags: {
         output: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         "no-passphrase": import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         comment: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        expires: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        expires: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<Date | undefined>;
         quiet: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     protected exec(): Promise<undefined>;

package/dist/commands/user/ssh-key/create.js

@@ -4,18 +4,18 @@ import { assertStatus } from "@mittwald/api-client-commons";
 import * as path from "path";
 import * as os from "os";
 import * as fs from "fs/promises";
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 import { makeProcessRenderer, processFlags, } from "../../../rendering/process/process_flags.js";
 import { Success } from "../../../rendering/react/components/Success.js";
 import { Filename } from "../../../rendering/react/components/Filename.js";
 import { Text } from "ink";
-import { expirationDateFromFlagsOptional, expireFlags, } from "../../../lib/expires.js";
 import { spawnInProcess } from "../../../rendering/process/process_exec.js";
+import { expireFlags } from "../../../lib/flags/expireFlags.js";
 export default class Create extends ExecRenderBaseCommand {
     static description = "Create and import a new SSH key";
     static flags = {
         ...processFlags,
-        ...expireFlags("SSH key"),
+        ...expireFlags("SSH key", false),
         output: Flags.string({
             description: "A filename in your ~/.ssh directory to write the SSH key to.",
             default: "mstudio-cli",
@@ -31,7 +31,7 @@ export default class Create extends ExecRenderBaseCommand {
         const cmd = "ssh-keygen";
         const outputFile = path.join(os.homedir(), ".ssh", this.flags.output);
         const r = makeProcessRenderer(this.flags, "Creating a new SSH key");
-        const expiresAt = expirationDateFromFlagsOptional(this.flags);
+        const { expires } = this.flags;
         const passphrase = await this.getPassphrase(r);
         const args = ["-t", "rsa", "-f", outputFile, "-N", passphrase];
         if (this.flags.comment) {
@@ -44,7 +44,7 @@ export default class Create extends ExecRenderBaseCommand {
             const response = await this.apiClient.user.createSshKey({
                 data: {
                     publicKey,
-                    expiresAt: expiresAt?.toJSON(),
+                    expiresAt: expires?.toJSON(),
                 },
             });
             assertStatus(response, 201);

package/dist/commands/user/ssh-key/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/user/ssh-key/delete.js

@@ -1,6 +1,6 @@
 import { Args } from "@oclif/core";
 import { assertStatus } from "@mittwald/api-client-commons";
-import { DeleteBaseCommand } from "../../../DeleteBaseCommand.js";
+import { DeleteBaseCommand } from "../../../lib/basecommands/DeleteBaseCommand.js";
 export default class Delete extends DeleteBaseCommand {
     static description = "Delete an SSH key";
     static resourceName = "SSH key";

package/dist/commands/user/ssh-key/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["user"]["getSshKey"]>>;
 export default class Get extends GetBaseCommand<typeof Get, APIResponse> {
     static description: string;

package/dist/commands/user/ssh-key/get.js

@@ -1,5 +1,5 @@
 import { Args } from "@oclif/core";
-import { GetBaseCommand } from "../../../GetBaseCommand.js";
+import { GetBaseCommand } from "../../../lib/basecommands/GetBaseCommand.js";
 export default class Get extends GetBaseCommand {
     static description = "Get a specific SSH key";
     static flags = {

package/dist/commands/user/ssh-key/import.d.ts

@@ -1,9 +1,9 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 export default class Import extends ExecRenderBaseCommand<typeof Import, undefined> {
     static description: string;
     static flags: {
         input: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        expires: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        expires: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<Date | undefined>;
         quiet: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     protected exec(): Promise<undefined>;

package/dist/commands/user/ssh-key/import.js

@@ -4,16 +4,16 @@ import { assertStatus } from "@mittwald/api-client-commons";
 import * as path from "path";
 import * as os from "os";
 import * as fs from "fs/promises";
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 import { makeProcessRenderer, processFlags, } from "../../../rendering/process/process_flags.js";
 import { Success } from "../../../rendering/react/components/Success.js";
 import { Filename } from "../../../rendering/react/components/Filename.js";
-import { expirationDateFromFlagsOptional, expireFlags, } from "../../../lib/expires.js";
+import { expireFlags } from "../../../lib/flags/expireFlags.js";
 export default class Import extends ExecRenderBaseCommand {
     static description = "Import an existing (local) SSH key";
     static flags = {
         ...processFlags,
-        ...expireFlags("SSH key"),
+        ...expireFlags("SSH key", false),
         input: Flags.string({
             description: "A filename in your ~/.ssh directory containing the key to import.",
             default: "id_rsa.pub",
@@ -22,7 +22,7 @@ export default class Import extends ExecRenderBaseCommand {
     async exec() {
         const inputFile = path.join(os.homedir(), ".ssh", this.flags.input);
         const r = makeProcessRenderer(this.flags, "Importing an SSH key");
-        const expiresAt = expirationDateFromFlagsOptional(this.flags);
+        const { expires } = this.flags;
         const publicKey = await fs.readFile(inputFile, "utf-8");
         const publicKeyParts = publicKey.split(" ");
         const keys = await r.runStep("retrieving existing SSH keys", async () => {
@@ -40,7 +40,7 @@ export default class Import extends ExecRenderBaseCommand {
             const response = await this.apiClient.user.createSshKey({
                 data: {
                     publicKey,
-                    expiresAt: expiresAt?.toJSON(),
+                    expiresAt: expires?.toJSON(),
                 },
             });
             assertStatus(response, 201);

package/dist/commands/user/ssh-key/list.d.ts

@@ -1,8 +1,8 @@
 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 { SuccessfulResponse } from "../../../lib/apiutil/SuccessfulResponse.js";
+import { ListColumns } from "../../../rendering/formatter/ListFormatter.js";
+import { ListBaseCommand } from "../../../lib/basecommands/ListBaseCommand.js";
 type ResponseItem = Simplify<Required<MittwaldAPIV2.Paths.V2UsersSelfSshKeys.Get.Responses.$200.Content.ApplicationJson>["sshKeys"][number]>;
 type Response = Awaited<ReturnType<MittwaldAPIV2Client["user"]["listSshKeys"]>>;
 export default class List extends ListBaseCommand<typeof List, ResponseItem, Response> {

package/dist/commands/user/ssh-key/list.js

@@ -1,5 +1,5 @@
-import { ListBaseCommand } from "../../../ListBaseCommand.js";
-import { buildCreatedAtColumn } from "../../../lib/viewhelpers/list_column_date.js";
+import { ListBaseCommand } from "../../../lib/basecommands/ListBaseCommand.js";
+import ListDateColumnFormatter from "../../../rendering/formatter/ListDateColumnFormatter.js";
 export default class List extends ListBaseCommand {
     static description = "Get your stored ssh keys";
     static args = {};
@@ -20,7 +20,7 @@ export default class List extends ListBaseCommand {
             },
             comment: {},
             fingerprint: {},
-            createdAt: buildCreatedAtColumn(this.flags),
+            createdAt: new ListDateColumnFormatter(this.flags).buildColumn(),
         };
     }
 }

package/dist/lib/apiutil/SuccessfulResponse.d.ts

@@ -0,0 +1,19 @@
+import { Response } from "@mittwald/api-client-commons";
+/**
+ * Helper type to assert that a response has a specific status code.
+ *
+ * Usage:
+ *
+ *     // ResponseType is a union of all possible responses
+ *     type AppListResponseType = Awaited<
+ *       ReturnType<MittwaldAPIV2Client["app"]["listAppinstallations"]>
+ *     >;
+ *
+ *     type AppListSuccessfulResponse = SuccessfulResponse<
+ *       AppListResponseType,
+ *       200
+ *     >;
+ */
+export type SuccessfulResponse<T extends Response, S extends T["status"]> = T & {
+    status: S;
+};

package/dist/lib/auth/token.js

@@ -1,6 +1,6 @@
 import path from "path";
 import fs from "fs/promises";
-import { isNotFound } from "../fsutil.js";
+import { isNotFound } from "../util/fs/isNotFound.js";
 /**
  * Gets the filename in which the CLI should store the API token.
  *

package/dist/{BaseCommand.js → lib/basecommands/BaseCommand.js}

@@ -1,9 +1,9 @@
 import { Command } from "@oclif/core";
 import { MittwaldAPIV2Client } from "@mittwald/api-client";
-import { configureAxiosRetry } from "./lib/api_retry.js";
-import { configureConsistencyHandling } from "./lib/api_consistency.js";
-import { getTokenFilename, readApiToken } from "./lib/auth/token.js";
-import { configureAxiosLogging } from "./lib/api_logging.js";
+import { configureAxiosRetry } from "../apiutil/api_retry.js";
+import { configureConsistencyHandling } from "../apiutil/api_consistency.js";
+import { getTokenFilename, readApiToken } from "../auth/token.js";
+import { configureAxiosLogging } from "../apiutil/api_logging.js";
 export class BaseCommand extends Command {
     authenticationRequired = true;
     apiClient = MittwaldAPIV2Client.newUnauthenticated();

package/dist/{types.d.ts → lib/basecommands/CommandFlags.d.ts}

@@ -1,8 +1,6 @@
-import { Response } from "@mittwald/api-client-commons";
 import { BaseCommand } from "./BaseCommand.js";
 import { Interfaces } from "@oclif/core";
-export type SuccessfulResponse<T extends Response, S extends T["status"]> = T & {
-    status: S;
-};
+/** CommandFlags is a helper type that extracts the flags from a command class. */
 export type CommandFlags<T extends typeof BaseCommand> = Interfaces.InferredFlags<T["flags"]>;
+/** CommandArgs is a helper type that extracts the args from a command class. */
 export type CommandArgs<T extends typeof BaseCommand> = Interfaces.InferredArgs<T["args"]>;

package/dist/{DeleteBaseCommand.d.ts → lib/basecommands/DeleteBaseCommand.d.ts}

@@ -1,5 +1,5 @@
 import { BaseCommand } from "./BaseCommand.js";
-import { ExecRenderBaseCommand } from "./rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "./ExecRenderBaseCommand.js";
 export declare abstract class DeleteBaseCommand<T extends typeof BaseCommand> extends ExecRenderBaseCommand<T, void> {
     static resourceName: string;
     static baseFlags: {

package/dist/{DeleteBaseCommand.js → lib/basecommands/DeleteBaseCommand.js}

@@ -1,8 +1,8 @@
 import { jsxs as _jsxs, Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { Flags, ux } from "@oclif/core";
-import { ExecRenderBaseCommand } from "./rendering/react/ExecRenderBaseCommand.js";
-import { makeProcessRenderer, processFlags, } from "./rendering/process/process_flags.js";
-import { Success } from "./rendering/react/components/Success.js";
+import { ExecRenderBaseCommand } from "./ExecRenderBaseCommand.js";
+import { makeProcessRenderer, processFlags, } from "../../rendering/process/process_flags.js";
+import { Success } from "../../rendering/react/components/Success.js";
 import { Text } from "ink";
 export class DeleteBaseCommand extends ExecRenderBaseCommand {
     static resourceName = "object";

package/dist/{rendering/react → lib/basecommands}/ExecRenderBaseCommand.d.ts

@@ -1,6 +1,6 @@
-import { BaseCommand } from "../../BaseCommand.js";
+import { BaseCommand } from "./BaseCommand.js";
 import { ReactNode } from "react";
-import { ExtendedBaseCommand } from "../../ExtendedBaseCommand.js";
+import { ExtendedBaseCommand } from "./ExtendedBaseCommand.js";
 export declare abstract class ExecRenderBaseCommand<T extends typeof BaseCommand, TRes> extends ExtendedBaseCommand<T> {
     protected abstract exec(): Promise<TRes>;
     run(): Promise<void>;

package/dist/{rendering/react → lib/basecommands}/ExecRenderBaseCommand.js

@@ -1,8 +1,8 @@
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { Suspense } from "react";
 import { render, Text } from "ink";
-import { RenderContextProvider } from "./context.js";
-import { ExtendedBaseCommand } from "../../ExtendedBaseCommand.js";
+import { RenderContextProvider } from "../../rendering/react/context.js";
+import { ExtendedBaseCommand } from "./ExtendedBaseCommand.js";
 const RenderComponent = (p) => (_jsx(_Fragment, { children: p.render() }));
 function wrapRender(fn) {
     return (result) => {

package/dist/{ExtendedBaseCommand.d.ts → lib/basecommands/ExtendedBaseCommand.d.ts}

@@ -1,6 +1,6 @@
 import { BaseCommand } from "./BaseCommand.js";
-import { CommandArgs, CommandFlags } from "./types.js";
-import { CommandType } from "./lib/context_flags.js";
+import { CommandArgs, CommandFlags } from "./CommandFlags.js";
+import { CommandType } from "../context/FlagSetBuilder.js";
 export declare abstract class ExtendedBaseCommand<T extends typeof BaseCommand> extends BaseCommand {
     protected flags: CommandFlags<T>;
     protected args: CommandArgs<T>;