@mittwald/cli 1.0.0-alpha.8 → 1.0.0-alpha.9

package/dist/esm/commands/project/filesystem/usage.js

@@ -1,11 +1,53 @@
-/* eslint-disable */
-/* prettier-ignore */
-/* This file is auto-generated with acg (@mittwald/api-code-generator) */
-import { GeneratedProjectFileSystemGetDiskUsage } from "../../../generated/projectFileSystem/getDiskUsage.js";
-import { normalizeProjectIdToUuid } from "../../../Helpers.js";
-export default class Get extends GeneratedProjectFileSystemGetDiskUsage {
-    async mapParams(input) {
-        input.projectId = await normalizeProjectIdToUuid(this.apiClient, input.projectId);
-        return super.mapParams(input);
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { GetBaseCommand } from "../../../GetBaseCommand.js";
+import { projectArgs, withProjectId } from "../../../lib/project/flags.js";
+import { RenderBaseCommand } from "../../../rendering/react/RenderBaseCommand.js";
+import { usePromise } from "@mittwald/react-use-promise";
+import { SingleResult } from "../../../rendering/react/components/SingleResult.js";
+import { Box, Text } from "ink";
+import { Value } from "../../../rendering/react/components/Value.js";
+import { assertStatus } from "@mittwald/api-client-commons";
+import { Flags } from "@oclif/core";
+import { ByteFormat } from "../../../rendering/react/components/ByteFormat.js";
+import { parseBytes } from "../../../lib/bytes.js";
+import { Note, noteColor } from "../../../rendering/react/components/Note.js";
+import { ListItem } from "../../../rendering/react/components/ListItem.js";
+export class Usage extends RenderBaseCommand {
+    static description = "Get a Project directory filesystem usage.";
+    static flags = {
+        ...GetBaseCommand.baseFlags,
+        human: Flags.boolean({
+            description: "Display human readable sizes.",
+        }),
+    };
+    static args = { ...projectArgs };
+    render() {
+        const projectId = usePromise(() => withProjectId(this.apiClient, this.flags, this.args, this.config), []);
+        const project = usePromise((id) => this.apiClient.project.getProject({ pathParameters: { id } }), [projectId]);
+        const projectDiskUsage = usePromise((id) => this.apiClient.projectFileSystem.getDiskUsage({
+            pathParameters: { projectId: id },
+        }), [projectId]);
+        assertStatus(project, 200);
+        assertStatus(projectDiskUsage, 200);
+        const planLimitStr = project.data.spec?.storage ?? undefined;
+        const planLimit = planLimitStr ? parseBytes(planLimitStr) : undefined;
+        const formatSize = this.flags.human
+            ? (bytes) => (_jsx(Value, { children: _jsx(ByteFormat, { bytes: bytes }) }))
+            : (bytes) => _jsx(Value, { children: bytes });
+        const formatMaybe = (bytes) => (_jsx(Text, { children: bytes ? formatSize(bytes) : _jsx(Value, { notSet: true }) }));
+        const usageRelative = planLimit && projectDiskUsage.data.usedBytes
+            ? projectDiskUsage.data.usedBytes / planLimit
+            : undefined;
+        const UsageRelative = () => {
+            if (!usageRelative) {
+                return undefined;
+            }
+            return (_jsxs(Text, { children: [" ", "(", "relative: ", _jsxs(Value, { children: [Math.round(usageRelative * 100), "%"] }), ")"] }));
+        };
+        return (_jsxs(Box, { flexDirection: "column", children: [_jsx(SingleResult, { title: _jsxs(Text, { children: ["PROJECT FILESYSTEM USAGE:", " ", _jsx(Value, { children: project.data.description })] }), rows: {
+                        "Provisioned storage": formatMaybe(planLimit),
+                        "Hard limit": formatMaybe(projectDiskUsage.data.totalBytes),
+                        Usage: (_jsxs(Text, { children: [formatMaybe(projectDiskUsage.data.usedBytes), _jsx(UsageRelative, {})] })),
+                    } }), _jsxs(Note, { marginY: 1, raw: true, children: [_jsx(Text, { color: noteColor, children: "When inspecting the filesystem usage, please note the following:" }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(ListItem, { children: _jsx(Text, { color: noteColor, children: "The usage is not updated in real-time. It may take a up to an hour for the usage to be updated." }) }), _jsx(ListItem, { children: _jsx(Text, { color: noteColor, children: "The \"hard limit\" is a technical limitation that is not related to your hosting plan." }) })] })] })] }));
     }
 }

package/dist/esm/commands/project/get.d.ts

@@ -1,4 +1,14 @@
-import { GeneratedProjectGetProject, PathParams } from "../../generated/project/getProject.js";
-export default class Get extends GeneratedProjectGetProject {
-    protected mapParams(input: PathParams): Promise<PathParams>;
+import { ReactNode } from "react";
+import { GetFormatter } from "../../Formatter.js";
+import { RenderBaseCommand } from "../../rendering/react/RenderBaseCommand.js";
+export declare class Get extends RenderBaseCommand<typeof Get> {
+    static description: string;
+    static flags: {
+        [x: string]: import("@oclif/core/lib/interfaces/parser.js").CompletableFlag<any>;
+    };
+    static args: {
+        [x: string]: import("@oclif/core/lib/interfaces/parser.js").Arg<unknown>;
+    };
+    protected formatter: GetFormatter;
+    protected render(): ReactNode;
 }

package/dist/esm/commands/project/get.js

@@ -1,11 +1,78 @@
-/* eslint-disable */
-/* prettier-ignore */
-/* This file is auto-generated with acg (@mittwald/api-code-generator) */
-import { GeneratedProjectGetProject } from "../../generated/project/getProject.js";
-import { normalizeProjectIdToUuid } from "../../Helpers.js";
-export default class Get extends GeneratedProjectGetProject {
-    async mapParams(input) {
-        input.id = await normalizeProjectIdToUuid(this.apiClient, input.id);
-        return super.mapParams(input);
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { GetBaseCommand } from "../../GetBaseCommand.js";
+import { projectArgs, withProjectId } from "../../lib/project/flags.js";
+import { GetFormatter } from "../../Formatter.js";
+import { SingleResult, SingleResultTable, } from "../../rendering/react/components/SingleResult.js";
+import { Box, Text } from "ink";
+import { Value } from "../../rendering/react/components/Value.js";
+import { IDAndShortID } from "../../rendering/react/components/IDAndShortID.js";
+import { CreatedAt } from "../../rendering/react/components/CreatedAt.js";
+import { useRenderContext } from "../../rendering/react/context.js";
+import { usePromise } from "@mittwald/react-use-promise";
+import { ComponentPrinter } from "../../rendering/react/ComponentPrinter.js";
+import { RenderBaseCommand } from "../../rendering/react/RenderBaseCommand.js";
+import { assertStatus } from "@mittwald/api-client-commons";
+import { ByteFormat } from "../../rendering/react/components/ByteFormat.js";
+import { RenderJson } from "../../rendering/react/json/RenderJson.js";
+import Link from "ink-link";
+import { ProjectStatus } from "../../rendering/react/components/ProjectStatus.js";
+const ProjectSpecs = ({ projectId, spec }) => {
+    if ("cpu" in spec) {
+        const { apiClient } = useRenderContext();
+        const usage = usePromise((id) => apiClient.projectFileSystem.getDiskUsage({
+            pathParameters: { projectId: id },
+        }), [projectId]);
+        const used = usage.data?.usedBytes ? (_jsxs(Text, { children: [" ", "(", _jsx(Value, { children: _jsx(ByteFormat, { bytes: usage.data?.usedBytes }) }), " ", "used)"] })) : undefined;
+        return (_jsx(SingleResult, { title: "Compute resources", rows: {
+                CPUs: _jsx(Value, { children: spec.cpu }),
+                Memory: _jsx(Value, { children: spec.memory }),
+                Storage: (_jsxs(Text, { children: [_jsx(Value, { children: spec.storage }), used] })),
+            } }));
+    }
+};
+const ProjectCustomer = ({ customer }) => {
+    return (_jsx(SingleResultTable, { rows: {
+            ID: _jsx(Value, { children: customer.customerId }),
+            Customernumber: _jsx(Value, { children: customer.customerNumber }),
+            Name: _jsx(Value, { children: customer.name }),
+        } }));
+};
+const GetProject = ({ response }) => {
+    const { apiClient } = useRenderContext();
+    const customer = usePromise((id) => apiClient.customer.getCustomer({ pathParameters: { customerId: id } }), [response.customerId]);
+    assertStatus(customer, 200);
+    const host = `${response.shortId}.project.space`;
+    const url = `https://${host}`;
+    const rows = {
+        "Project ID": _jsx(IDAndShortID, { object: response }),
+        "Created At": _jsx(CreatedAt, { object: response }),
+        Status: _jsx(ProjectStatus, { project: response }),
+        Customer: _jsx(ProjectCustomer, { customer: customer.data }),
+    };
+    const sections = [
+        _jsx(SingleResult, { title: _jsxs(_Fragment, { children: ["PROJECT DETAILS: ", _jsx(Value, { children: response.description })] }), rows: rows }, "primary"),
+        _jsx(SingleResult, { title: "Access", rows: {
+                "HTTP(S)": (_jsx(Link, { url: url, children: _jsx(Value, { children: host }) })),
+                "SSH/SFTP": (_jsxs(Text, { children: [_jsxs(Value, { children: ["ssh.", response.clusterID, ".", response.clusterDomain] }), " ", _jsx(Text, { color: "gray", children: "(Use the \"project ssh\" command to connect directly using the CLI)" })] })),
+            } }, "access"),
+    ];
+    if (response.spec) {
+        sections.push(_jsx(ProjectSpecs, { projectId: response.id, spec: response.spec }, "specs"));
+    }
+    return (_jsx(Box, { flexDirection: "column", marginBottom: 1, children: sections }));
+};
+export class Get extends RenderBaseCommand {
+    static description = "Get a Project.";
+    static flags = { ...GetBaseCommand.baseFlags };
+    static args = { ...projectArgs };
+    formatter = new GetFormatter(new ComponentPrinter((r) => _jsx(GetProject, { response: r })));
+    render() {
+        const projectId = usePromise(() => withProjectId(this.apiClient, this.flags, this.args, this.config), []);
+        const projectResponse = usePromise((id) => this.apiClient.project.getProject({ pathParameters: { id } }), [projectId]);
+        assertStatus(projectResponse, 200);
+        if (this.flags.output === "json") {
+            return _jsx(RenderJson, { name: "project", data: projectResponse.data });
+        }
+        return _jsx(GetProject, { response: projectResponse.data });
     }
 }

package/dist/esm/commands/project/invite/list-own.js

@@ -1,5 +1,5 @@
 import { GeneratedProjectListProjectInvites, } from "../../../generated/project/listProjectInvites.js";
-import { formatDate } from "../../../lib/viewhelpers/date.js";
+import { formatRelativeDate } from "../../../lib/viewhelpers/date.js";
 export default class List extends GeneratedProjectListProjectInvites {
     mapData(data) {
         return data;
@@ -17,7 +17,7 @@ export default class List extends GeneratedProjectListProjectInvites {
                     if (!row.membershipExpiresAt) {
                         return "never";
                     }
-                    return formatDate(new Date(row.membershipExpiresAt));
+                    return formatRelativeDate(new Date(row.membershipExpiresAt));
                 },
             },
             projectId: {

package/dist/esm/commands/project/invite/list.d.ts

@@ -1,7 +1,7 @@
 import { Simplify } from "@mittwald/api-client-commons";
 import { MittwaldAPIV2 } from "@mittwald/api-client";
 import { SuccessfulResponse } from "../../../types.js";
-import { GeneratedProjectListInvitesForProject, Response, PathParams } from "../../../generated/project/listInvitesForProject.js";
+import { GeneratedProjectListInvitesForProject, PathParams, Response } from "../../../generated/project/listInvitesForProject.js";
 import { ListColumns } from "../../../Formatter.js";
 type ResponseItem = Simplify<MittwaldAPIV2.Paths.V2ProjectsProjectIdInvites.Get.Responses.$200.Content.ApplicationJson[number]>;
 export default class List extends GeneratedProjectListInvitesForProject<ResponseItem> {

package/dist/esm/commands/project/invite/list.js

@@ -1,6 +1,6 @@
 import { GeneratedProjectListInvitesForProject, } from "../../../generated/project/listInvitesForProject.js";
 import { normalizeProjectIdToUuid } from "../../../Helpers.js";
-import { formatDate } from "../../../lib/viewhelpers/date.js";
+import { formatRelativeDate } from "../../../lib/viewhelpers/date.js";
 export default class List extends GeneratedProjectListInvitesForProject {
     mapData(data) {
         return data;
@@ -22,7 +22,7 @@ export default class List extends GeneratedProjectListInvitesForProject {
                     if (!row.membershipExpiresAt) {
                         return "never";
                     }
-                    return formatDate(new Date(row.membershipExpiresAt));
+                    return formatRelativeDate(new Date(row.membershipExpiresAt));
                 },
             },
             mailAddress: { header: "Email" },

package/dist/esm/commands/project/{list2.d.ts → list-react.d.ts}

@@ -2,7 +2,9 @@ import React from "react";
 import { RenderBaseCommand } from "../../rendering/react/RenderBaseCommand.js";
 export default class List extends RenderBaseCommand<typeof List> {
     static flags: {
-        columns: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        columns: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        extended: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        noTruncate: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         wait: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<any>;
     };
     protected render(): React.ReactNode;

package/dist/esm/commands/project/list-react.js

@@ -0,0 +1,42 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { assertStatus } from "@mittwald/api-client-commons";
+import { usePromise } from "@mittwald/react-use-promise";
+import { RenderBaseCommand } from "../../rendering/react/RenderBaseCommand.js";
+import { useRenderContext } from "../../rendering/react/context.js";
+import { Table } from "../../rendering/react/components/Table/index.js";
+import { UsePromiseRenderSetup } from "../../rendering/setup/usePromiseSetup.js";
+import { TableRenderSetup } from "../../rendering/setup/TableRenderSetup.js";
+import { ProjectStatus } from "../../rendering/react/components/ProjectStatus.js";
+const usePromiseSetup = new UsePromiseRenderSetup();
+const tableSetupInstance = new TableRenderSetup();
+export default class List extends RenderBaseCommand {
+    static flags = {
+        ...usePromiseSetup.flags,
+        ...tableSetupInstance.flags,
+        ...RenderBaseCommand.buildFlags(),
+    };
+    render() {
+        const { apiClient } = useRenderContext();
+        const tableSetup = tableSetupInstance.getSetup(this.flags);
+        const usePromiseOptions = usePromiseSetup.getSetup(this.flags);
+        const projects = usePromise(apiClient.project.listProjects, [], usePromiseOptions);
+        assertStatus(projects, 200);
+        return (_jsx(Table, { data: projects.data, setup: tableSetup, columns: {
+                id: {
+                    isUuid: true,
+                },
+                shortId: {
+                    minWidth: 8,
+                },
+                customerId: {
+                    isUuid: true,
+                    extended: true,
+                },
+                description: {},
+                status: {
+                    render: (project) => _jsx(ProjectStatus, { project: project }),
+                },
+                createdAt: {},
+            } }));
+    }
+}

package/dist/esm/commands/project/membership/list-own.js

@@ -1,5 +1,5 @@
 import { GeneratedProjectListProjectMemberships, } from "../../../generated/project/listProjectMemberships.js";
-import { formatDate } from "../../../lib/viewhelpers/date.js";
+import { formatRelativeDate } from "../../../lib/viewhelpers/date.js";
 export default class List extends GeneratedProjectListProjectMemberships {
     mapData(data) {
         return data;
@@ -18,7 +18,7 @@ export default class List extends GeneratedProjectListProjectMemberships {
                     if (!row.expiresAt) {
                         return "never";
                     }
-                    return formatDate(new Date(row.expiresAt));
+                    return formatRelativeDate(new Date(row.expiresAt));
                 },
             },
             projectId: { header: "Project Id" },

package/dist/esm/commands/project/membership/list.d.ts

@@ -1,7 +1,7 @@
 import { Simplify } from "@mittwald/api-client-commons";
 import { MittwaldAPIV2 } from "@mittwald/api-client";
 import { SuccessfulResponse } from "../../../types.js";
-import { GeneratedProjectListMembershipsForProject, Response, PathParams } from "../../../generated/project/listMembershipsForProject.js";
+import { GeneratedProjectListMembershipsForProject, PathParams, Response } from "../../../generated/project/listMembershipsForProject.js";
 import { ListColumns } from "../../../Formatter.js";
 type ResponseItem = Simplify<MittwaldAPIV2.Paths.V2ProjectsProjectIdMemberships.Get.Responses.$200.Content.ApplicationJson[number]> & {
     user?: MittwaldAPIV2.Components.Schemas.UserUser;

package/dist/esm/commands/project/membership/list.js

@@ -1,5 +1,5 @@
 import { GeneratedProjectListMembershipsForProject, } from "../../../generated/project/listMembershipsForProject.js";
-import { formatDate } from "../../../lib/viewhelpers/date.js";
+import { formatRelativeDate } from "../../../lib/viewhelpers/date.js";
 import { normalizeProjectIdToUuid } from "../../../Helpers.js";
 export default class List extends GeneratedProjectListMembershipsForProject {
     mapData(data) {
@@ -32,7 +32,7 @@ export default class List extends GeneratedProjectListMembershipsForProject {
                     if (!row.expiresAt) {
                         return "never";
                     }
-                    return formatDate(new Date(row.expiresAt));
+                    return formatRelativeDate(new Date(row.expiresAt));
                 },
             },
             userId: {

package/dist/esm/commands/project/ssh.d.ts

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

package/dist/esm/commands/project/ssh.js

@@ -1,18 +1,13 @@
-import { Args } from "@oclif/core";
 import { BaseCommand } from "../../BaseCommand.js";
 import { assertStatus } from "@mittwald/api-client-commons";
 import * as child_process from "child_process";
+import { projectArgs, withProjectId } from "../../lib/project/flags.js";
 export default class Ssh extends BaseCommand {
     static description = "Connect to a project via SSH";
-    static args = {
-        id: Args.string({
-            required: true,
-            description: "ID of the Project to be retrieved.",
-        }),
-    };
+    static args = { ...projectArgs };
     async run() {
         const { args } = await this.parse(Ssh);
-        const { id } = args;
+        const id = await withProjectId(this.apiClient, {}, args, this.config);
         const projectResponse = await this.apiClient.project.getProject({
             pathParameters: { id },
         });

package/dist/esm/commands/project/update.d.ts

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

package/dist/esm/commands/project/update.js

@@ -1,15 +1,12 @@
-import { Args } from "@oclif/core";
 import { BaseCommand } from "../../BaseCommand.js";
+import { projectArgs, withProjectId } from "../../lib/project/flags.js";
 export default class Update extends BaseCommand {
     static description = "Updates a project";
-    static args = {
-        id: Args.string({
-            required: true,
-            description: "ID of the Project to be retrieved.",
-        }),
-    };
+    static args = { ...projectArgs };
     async run() {
-        const { args, flags } = await this.parse(Update);
-        console.log(args, flags);
+        const { args } = await this.parse(Update);
+        const id = await withProjectId(this.apiClient, {}, args, this.config);
+        console.log("updating project ", id);
+        console.log("TODO: Implement me");
     }
 }

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

@@ -1,11 +1,17 @@
-import { BaseCommand } from "../../../BaseCommand.js";
-export default class Create extends BaseCommand<typeof Create> {
+import { ExecRenderBaseCommand } from "../../../rendering/react/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>;
+        quiet: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     private determineExpiration;
-    run(): Promise<void>;
+    protected exec(): Promise<{
+        token: string;
+    }>;
+    protected render(): null;
 }

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

@@ -1,10 +1,16 @@
-import { Flags, ux } from "@oclif/core";
-import { BaseCommand } from "../../../BaseCommand.js";
+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";
-export default class Create extends BaseCommand {
+import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { makeProcessRenderer, processFlags, } from "../../../rendering/react/process_flags.js";
+import { Success } from "../../../rendering/react/components/Success.js";
+import { Newline, Text } from "ink";
+import { Value } from "../../../rendering/react/components/Value.js";
+export default class Create extends ExecRenderBaseCommand {
     static description = "Create a new API token";
     static flags = {
+        ...processFlags,
         description: Flags.string({
             description: "Description of the API token",
             required: true,
@@ -29,18 +35,30 @@ export default class Create extends BaseCommand {
         }
         return new Date(Date.now() + duration);
     }
-    async run() {
-        const { flags, args } = await this.parse(Create);
+    async exec() {
+        const { flags } = await this.parse(Create);
+        const process = makeProcessRenderer(flags, "Creating an API token");
         const expiresAt = this.determineExpiration(flags["expires-in"]);
-        ux.action.start("creating API token");
-        const response = await this.apiClient.user.createApiToken({
-            data: {
-                description: flags.description,
-                expiresAt: expiresAt?.toJSON(),
-                roles: flags.roles,
-            },
-        });
-        assertStatus(response, 201);
-        ux.action.stop();
+        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,
+                },
+            });
+            step.complete();
+            assertStatus(response, 201);
+            process.complete(_jsx(Success, { width: 100, children: _jsxs(Text, { children: ["API token successfully created. Have fun. \uD83E\uDD73", _jsx(Newline, { count: 2 }), "This is your API token; make sure to store it somewhere safe:", _jsx(Newline, { count: 1 }), _jsx(Value, { children: response.data.token })] }) }));
+            return { token: response.data.token };
+        }
+        catch (e) {
+            process.error(e);
+            throw e;
+        }
+    }
+    render() {
+        return null;
     }
 }

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

@@ -1,5 +1,5 @@
 import { GeneratedUserListApiTokens, } from "../../../generated/user/listApiTokens.js";
-import { formatCreatedAt, formatDate } from "../../../lib/viewhelpers/date.js";
+import { formatCreatedAt, formatRelativeDate, } from "../../../lib/viewhelpers/date.js";
 export default class List extends GeneratedUserListApiTokens {
     mapData(data) {
         return data;
@@ -14,7 +14,9 @@ export default class List extends GeneratedUserListApiTokens {
             },
             expiresAt: {
                 header: "Expires at",
-                get: (r) => r.expiresAt ? formatDate(new Date(`${r.expiresAt}`)) : "never",
+                get: (r) => r.expiresAt
+                    ? formatRelativeDate(new Date(`${r.expiresAt}`))
+                    : "never",
             },
         };
     }

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

@@ -1,8 +1,13 @@
-import { BaseCommand } from "../../../BaseCommand.js";
-export default class Revoke extends BaseCommand<typeof Revoke> {
+import { DeleteBaseCommand } from "../../../DeleteBaseCommand.js";
+export default class Revoke extends DeleteBaseCommand<typeof Revoke> {
     static description: string;
+    static resource: string;
     static args: {
         id: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
     };
-    run(): Promise<void>;
+    static flags: {
+        force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        quiet: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+    };
+    protected deleteResource(): Promise<void>;
 }

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

@@ -1,21 +1,21 @@
-import { Args, ux } from "@oclif/core";
-import { BaseCommand } from "../../../BaseCommand.js";
+import { Args } from "@oclif/core";
 import { assertStatus } from "@mittwald/api-client-commons";
-export default class Revoke extends BaseCommand {
+import { DeleteBaseCommand } from "../../../DeleteBaseCommand.js";
+export default class Revoke extends DeleteBaseCommand {
     static description = "Revoke an API token";
+    static resource = "API token";
     static args = {
         id: Args.string({
             description: "ID of the API token to revoke",
             required: true,
         }),
     };
-    async run() {
+    static flags = { ...DeleteBaseCommand.baseFlags };
+    async deleteResource() {
         const { args } = await this.parse(Revoke);
-        ux.action.start(`revoking API token ${args.id}`);
         const response = await this.apiClient.user.deleteApiToken({
             pathParameters: { apiTokenId: args.id },
         });
         assertStatus(response, 200);
-        ux.action.stop();
     }
 }

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

@@ -1,5 +1,5 @@
 import { GeneratedUserListSessions, } from "../../../generated/user/listSessions.js";
-import { formatDate } from "../../../lib/viewhelpers/date.js";
+import { formatRelativeDate } from "../../../lib/viewhelpers/date.js";
 export default class List extends GeneratedUserListSessions {
     mapData(data) {
         return data;
@@ -17,7 +17,9 @@ export default class List extends GeneratedUserListSessions {
             },
             lastAccess: {
                 header: "Last Access",
-                get: (row) => row.lastAccess ? formatDate(new Date(`${row.lastAccess}`)) : "never",
+                get: (row) => row.lastAccess
+                    ? formatRelativeDate(new Date(`${row.lastAccess}`))
+                    : "never",
             },
         };
     }

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

@@ -1,10 +1,13 @@
-import { BaseCommand } from "../../../BaseCommand.js";
-export default class Create extends BaseCommand<typeof Create> {
+import { ExecRenderBaseCommand } from "../../../rendering/react/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>;
         expiresAt: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        quiet: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
-    run(): Promise<void>;
+    protected exec(): Promise<undefined>;
+    protected render(): null;
 }