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

package/bin/run.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import oclif from "@oclif/core";
-import { handleError } from "../dist/lib/handleError.js";
+import handleError from "../dist/lib/error/handleError.js";
 
 oclif
   .run(process.argv.slice(2), import.meta.url)

package/dist/commands/app/copy.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 = {
     appInstallationId: string;

package/dist/commands/app/copy.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { ExecRenderBaseCommand } from "../../rendering/react/ExecRenderBaseCommand.js";
-import { appInstallationArgs } from "../../lib/app/flags.js";
+import { ExecRenderBaseCommand } from "../../lib/basecommands/ExecRenderBaseCommand.js";
+import { appInstallationArgs } from "../../lib/resources/app/flags.js";
 import { makeProcessRenderer, processFlags, } from "../../rendering/process/process_flags.js";
 import { Flags } from "@oclif/core";
 import { assertStatus } from "@mittwald/api-client-commons";

package/dist/commands/app/create/node.d.ts

@@ -1,10 +1,10 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 import React from "react";
-import { AppInstallationResult, AppInstaller } from "../../../lib/app/Installer.js";
-export declare const nodeInstaller: AppInstaller<"site-title" | "wait" | "entrypoint">;
+import { AppInstallationResult, AppInstaller } from "../../../lib/resources/app/Installer.js";
+export declare const nodeInstaller: AppInstaller<"wait" | "site-title" | "entrypoint">;
 export default class InstallNode extends ExecRenderBaseCommand<typeof InstallNode, AppInstallationResult> {
     static description: string;
-    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/app/flags.js").RelevantFlags<readonly ("site-title" | "wait" | "entrypoint")[]>>;
+    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("site-title" | "entrypoint" | ("wait" | "wait-timeout"))[]>>;
     protected exec(): Promise<{
         appInstallationId: string;
     }>;

package/dist/commands/app/create/node.js

@@ -1,5 +1,5 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
-import { AppInstaller, } from "../../../lib/app/Installer.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
+import { AppInstaller, } from "../../../lib/resources/app/Installer.js";
 export const nodeInstaller = new AppInstaller("3e7f920b-a711-4d2f-9871-661e1b41a2f0", "custom Node.js", ["site-title", "wait", "entrypoint"]);
 nodeInstaller.mutateFlags = (flags) => {
     flags["entrypoint"].default =

package/dist/commands/app/create/php.d.ts

@@ -1,10 +1,10 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 import React from "react";
-import { AppInstallationResult, AppInstaller } from "../../../lib/app/Installer.js";
-export declare const phpInstaller: AppInstaller<"site-title" | "document-root" | "wait">;
+import { AppInstallationResult, AppInstaller } from "../../../lib/resources/app/Installer.js";
+export declare const phpInstaller: AppInstaller<"wait" | "site-title" | "document-root">;
 export default class InstallPhp extends ExecRenderBaseCommand<typeof InstallPhp, AppInstallationResult> {
     static description: string;
-    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/app/flags.js").RelevantFlags<readonly ("site-title" | "document-root" | "wait")[]>>;
+    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("site-title" | "document-root" | ("wait" | "wait-timeout"))[]>>;
     protected exec(): Promise<{
         appInstallationId: string;
     }>;

package/dist/commands/app/create/php.js

@@ -1,5 +1,5 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
-import { AppInstaller, } from "../../../lib/app/Installer.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
+import { AppInstaller, } from "../../../lib/resources/app/Installer.js";
 export const phpInstaller = new AppInstaller("34220303-cb87-4592-8a95-2eb20a97b2ac", "custom PHP", ["document-root", "site-title", "wait"]);
 export default class InstallPhp extends ExecRenderBaseCommand {
     static description = phpInstaller.description;

package/dist/commands/app/create/python.d.ts

@@ -1,10 +1,10 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 import React from "react";
-import { AppInstallationResult, AppInstaller } from "../../../lib/app/Installer.js";
-export declare const pythonInstaller: AppInstaller<"site-title" | "document-root" | "wait">;
+import { AppInstallationResult, AppInstaller } from "../../../lib/resources/app/Installer.js";
+export declare const pythonInstaller: AppInstaller<"wait" | "site-title" | "document-root">;
 export default class InstallPython extends ExecRenderBaseCommand<typeof InstallPython, AppInstallationResult> {
     static description: string;
-    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/app/flags.js").RelevantFlags<readonly ("site-title" | "document-root" | "wait")[]>>;
+    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("site-title" | "document-root" | ("wait" | "wait-timeout"))[]>>;
     protected exec(): Promise<{
         appInstallationId: string;
     }>;

package/dist/commands/app/create/python.js

@@ -1,5 +1,5 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
-import { AppInstaller, } from "../../../lib/app/Installer.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
+import { AppInstaller, } from "../../../lib/resources/app/Installer.js";
 export const pythonInstaller = new AppInstaller("be57d166-dae9-4480-bae2-da3f3c6f0a2e", "custom python site", ["document-root", "site-title", "wait"]);
 export default class InstallPython extends ExecRenderBaseCommand {
     static description = pythonInstaller.description;

package/dist/commands/app/create/static.d.ts

@@ -1,10 +1,10 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 import React from "react";
-import { AppInstallationResult, AppInstaller } from "../../../lib/app/Installer.js";
-export declare const staticInstaller: AppInstaller<"site-title" | "document-root" | "wait">;
+import { AppInstallationResult, AppInstaller } from "../../../lib/resources/app/Installer.js";
+export declare const staticInstaller: AppInstaller<"wait" | "site-title" | "document-root">;
 export default class InstallStatic extends ExecRenderBaseCommand<typeof InstallStatic, AppInstallationResult> {
     static description: string;
-    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/app/flags.js").RelevantFlags<readonly ("site-title" | "document-root" | "wait")[]>>;
+    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("site-title" | "document-root" | ("wait" | "wait-timeout"))[]>>;
     protected exec(): Promise<{
         appInstallationId: string;
     }>;

package/dist/commands/app/create/static.js

@@ -1,5 +1,5 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
-import { AppInstaller, } from "../../../lib/app/Installer.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
+import { AppInstaller, } from "../../../lib/resources/app/Installer.js";
 export const staticInstaller = new AppInstaller("d20baefd-81d2-42aa-bfba-9a3220ae839b", "custom static site", ["document-root", "site-title", "wait"]);
 export default class InstallStatic extends ExecRenderBaseCommand {
     static description = staticInstaller.description;

package/dist/commands/app/dependency/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, SorterFunction } from "../../../lib/basecommands/ListBaseCommand.js";
+import { ListColumns } from "../../../rendering/formatter/ListFormatter.js";
 type ResponseItem = Simplify<MittwaldAPIV2.Paths.V2SystemSoftwares.Get.Responses.$200.Content.ApplicationJson[number]>;
 type Response = Awaited<ReturnType<MittwaldAPIV2Client["app"]["listSystemsoftwares"]>>;
 export declare class List extends ListBaseCommand<typeof List, ResponseItem, Response> {
@@ -32,8 +31,8 @@ export declare class List extends ListBaseCommand<typeof List, ResponseItem, Res
         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: SorterFunction<ResponseItem>;
     getData(): Promise<Response>;
-    protected mapData(data: SuccessfulResponse<Response, 200>["data"]): MittwaldAPIV2.Components.Schemas.AppSystemSoftware[];
     protected getColumns(data: ResponseItem[]): ListColumns<ResponseItem>;
 }
 export {};

package/dist/commands/app/dependency/list.js

@@ -1,19 +1,16 @@
-import { ListBaseCommand } from "../../../ListBaseCommand.js";
+import { ListBaseCommand, } from "../../../lib/basecommands/ListBaseCommand.js";
 export class List extends ListBaseCommand {
     static description = "Get all available dependencies";
     static args = {};
     static flags = {
         ...ListBaseCommand.baseFlags,
     };
+    sorter = (a, b) => a.tags[0].localeCompare(b.tags[0]) || a.name.localeCompare(b.name);
     async getData() {
         return await this.apiClient.app.listSystemsoftwares({
             pathParameters: {},
         });
     }
-    mapData(data) {
-        data.sort((a, b) => a.tags[0].localeCompare(b.tags[0]) || a.name.localeCompare(b.name));
-        return data;
-    }
     getColumns(data) {
         const { id } = super.getColumns(data);
         return {

package/dist/commands/app/dependency/update.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 default class Update extends ExecRenderBaseCommand<typeof Update, void> {
     static summary: string;

package/dist/commands/app/dependency/update.js

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

package/dist/commands/app/dependency/versions.d.ts

@@ -1,8 +1,7 @@
 import { Simplify } from "@mittwald/api-client-commons";
 import { MittwaldAPIV2, MittwaldAPIV2Client } from "@mittwald/api-client";
-import { ListBaseCommand } from "../../../ListBaseCommand.js";
-import { SuccessfulResponse } from "../../../types.js";
-import { ListColumns } from "../../../Formatter.js";
+import { ListBaseCommand, SorterFunction } from "../../../lib/basecommands/ListBaseCommand.js";
+import { ListColumns } from "../../../rendering/formatter/ListFormatter.js";
 type ResponseItem = Simplify<MittwaldAPIV2.Paths.V2SystemSoftwareSystemSoftwareIdVersions.Get.Responses.$200.Content.ApplicationJson[number]>;
 type Response = Awaited<ReturnType<MittwaldAPIV2Client["app"]["listSystemsoftwareversions"]>>;
 export declare class Versions extends ListBaseCommand<typeof Versions, ResponseItem, Response> {
@@ -34,8 +33,8 @@ export declare class Versions extends ListBaseCommand<typeof Versions, 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>;
     };
+    sorter: SorterFunction<ResponseItem>;
     getData(): Promise<Response>;
-    protected mapData(data: SuccessfulResponse<Response, 200>["data"]): MittwaldAPIV2.Components.Schemas.AppSystemSoftwareVersion[];
     protected getColumns(data: ResponseItem[]): ListColumns<ResponseItem>;
 }
 export {};

package/dist/commands/app/dependency/versions.js

@@ -1,5 +1,5 @@
 import { assertStatus } from "@mittwald/api-client-commons";
-import { ListBaseCommand } from "../../../ListBaseCommand.js";
+import { ListBaseCommand, } from "../../../lib/basecommands/ListBaseCommand.js";
 import { SemVer } from "semver";
 import { Args } from "@oclif/core";
 export class Versions extends ListBaseCommand {
@@ -13,6 +13,7 @@ export class Versions extends ListBaseCommand {
     static flags = {
         ...ListBaseCommand.baseFlags,
     };
+    sorter = (a, b) => new SemVer(a.externalVersion).compare(b.externalVersion);
     async getData() {
         const systemSoftwareName = this.args["systemsoftware"];
         const systemSoftwares = await this.apiClient.app.listSystemsoftwares({});
@@ -25,10 +26,6 @@ export class Versions extends ListBaseCommand {
             systemSoftwareId: systemSoftware.id,
         });
     }
-    mapData(data) {
-        data.sort((a, b) => new SemVer(a.externalVersion).compare(b.externalVersion));
-        return data;
-    }
     getColumns(data) {
         const baseColumns = super.getColumns(data);
         return {

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

@@ -1,4 +1,4 @@
-import { ExecRenderBaseCommand } from "../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../lib/basecommands/ExecRenderBaseCommand.js";
 import { ReactNode } from "react";
 export declare class Download extends ExecRenderBaseCommand<typeof Download, void> {
     static summary: string;
@@ -7,9 +7,10 @@ export declare class Download extends ExecRenderBaseCommand<typeof Download, voi
         "installation-id": import("@oclif/core/lib/interfaces/parser.js").Arg<string>;
     };
     static flags: {
+        target: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        exclude: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[], import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         "dry-run": import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         delete: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        target: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         "ssh-user": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         "ssh-identity-file": 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>;

package/dist/commands/app/download.js

@@ -1,33 +1,29 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { ExecRenderBaseCommand } from "../../rendering/react/ExecRenderBaseCommand.js";
-import { appInstallationArgs } from "../../lib/app/flags.js";
+import { ExecRenderBaseCommand } from "../../lib/basecommands/ExecRenderBaseCommand.js";
+import { appInstallationArgs } from "../../lib/resources/app/flags.js";
 import { makeProcessRenderer, processFlags, } from "../../rendering/process/process_flags.js";
 import { Flags } from "@oclif/core";
 import { Success } from "../../rendering/react/components/Success.js";
-import { hasBinary } from "../../lib/hasbin.js";
-import { getSSHConnectionForAppInstallation } from "../../lib/ssh/appinstall.js";
+import { getSSHConnectionForAppInstallation } from "../../lib/resources/ssh/appinstall.js";
 import { spawnInProcess } from "../../rendering/process/process_exec.js";
-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";
+import { appInstallationSyncFlags, appInstallationSyncFlagsToRsyncFlags, filterFileDocumentation, filterFileToRsyncFlagsIfPresent, } from "../../lib/resources/app/sync.js";
+import { hasBinaryInPath } from "../../lib/util/fs/hasBinaryInPath.js";
 export class Download extends ExecRenderBaseCommand {
     static summary = "Download the filesystem of an app within a project to your local machine";
     static description = "This command downloads the filesystem of an app installation to your local machine via rsync.\n\n" +
         "For this, rsync needs to be installed on your system.\n\n" +
-        sshUsageDocumentation;
+        sshUsageDocumentation +
+        "\n\n" +
+        filterFileDocumentation;
     static args = {
         ...appInstallationArgs,
     };
     static flags = {
         ...processFlags,
         ...sshConnectionFlags,
-        "dry-run": Flags.boolean({
-            description: "do not actually download the app installation",
-            default: false,
-        }),
-        delete: Flags.boolean({
-            description: "delete local files that are not present on the server",
-            default: false,
-        }),
+        ...appInstallationSyncFlags("download"),
         target: Flags.directory({
             description: "target directory to download the app installation to",
             required: true,
@@ -36,32 +32,20 @@ export class Download extends ExecRenderBaseCommand {
     };
     async exec() {
         const appInstallationId = await this.withAppInstallationId(Download);
-        const { "dry-run": dryRun, target, delete: deleteLocal, "ssh-user": sshUser, "ssh-identity-file": sshIdentityFile, } = this.flags;
+        const { "dry-run": dryRun, target, "ssh-user": sshUser } = this.flags;
         const p = makeProcessRenderer(this.flags, "Downloading app installation");
         const { host, user, directory } = await p.runStep("getting connection data", async () => {
             return getSSHConnectionForAppInstallation(this.apiClient, appInstallationId, sshUser);
         });
         await p.runStep("check if rsync is installed", async () => {
-            if (!(await hasBinary("rsync"))) {
+            if (!(await hasBinaryInPath("rsync"))) {
                 throw new Error("this command requires rsync to be installed");
             }
         });
         const rsyncOpts = [
-            "--archive",
-            "--recursive",
-            "--verbose",
-            "--progress",
-            "--exclude=typo3temp",
+            ...appInstallationSyncFlagsToRsyncFlags(this.flags),
+            ...(await filterFileToRsyncFlagsIfPresent(target)),
         ];
-        if (dryRun) {
-            rsyncOpts.push("--dry-run");
-        }
-        if (deleteLocal) {
-            rsyncOpts.push("--delete");
-        }
-        if (sshIdentityFile) {
-            rsyncOpts.push("--rsh", `ssh -i ${sshIdentityFile}`);
-        }
         await spawnInProcess(p, "downloading app installation" + (dryRun ? " (dry-run)" : ""), "rsync", [...rsyncOpts, `${user}@${host}:${directory}/`, target]);
         if (dryRun) {
             await p.complete(_jsx(Success, { children: "App would (probably) have successfully been downloaded. \uD83D\uDE42" }));

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

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

package/dist/commands/app/get.js

@@ -1,10 +1,10 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { RenderBaseCommand } from "../../rendering/react/RenderBaseCommand.js";
+import { RenderBaseCommand } from "../../lib/basecommands/RenderBaseCommand.js";
 import { RenderJson } from "../../rendering/react/json/RenderJson.js";
-import { GetBaseCommand } from "../../GetBaseCommand.js";
+import { GetBaseCommand } from "../../lib/basecommands/GetBaseCommand.js";
 import { AppInstallationDetails } from "../../rendering/react/components/AppInstallation/AppInstallationDetails.js";
-import { useApp, useAppInstallation } from "../../lib/app/hooks.js";
-import { appInstallationArgs } from "../../lib/app/flags.js";
+import { useApp, useAppInstallation } from "../../lib/resources/app/hooks.js";
+import { appInstallationArgs } from "../../lib/resources/app/flags.js";
 export default class Get extends RenderBaseCommand {
     static description = "Get details about an app installation";
     static flags = { ...GetBaseCommand.baseFlags };

package/dist/commands/app/install/contao.d.ts

@@ -1,9 +1,9 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 import React from "react";
-import { AppInstallationResult } from "../../../lib/app/Installer.js";
+import { AppInstallationResult } from "../../../lib/resources/app/Installer.js";
 export default class InstallContao extends ExecRenderBaseCommand<typeof InstallContao, AppInstallationResult> {
     static description: string;
-    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/app/flags.js").RelevantFlags<readonly ("version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "admin-firstname" | "admin-lastname" | "site-title" | "wait")[]>>;
+    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "admin-firstname" | "admin-lastname" | "site-title" | ("wait" | "wait-timeout"))[]>>;
     protected exec(): Promise<{
         appInstallationId: string;
     }>;

package/dist/commands/app/install/contao.js

@@ -1,5 +1,5 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
-import { AppInstaller, } from "../../../lib/app/Installer.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
+import { AppInstaller, } from "../../../lib/resources/app/Installer.js";
 const installer = new AppInstaller("4916ce3e-cba4-4d2e-9798-a8764aa14cf3", "Contao", [
     "version",
     "host",
@@ -10,7 +10,6 @@ const installer = new AppInstaller("4916ce3e-cba4-4d2e-9798-a8764aa14cf3", "Cont
     "admin-firstname",
     "admin-lastname",
     "site-title",
-    "wait",
 ]);
 export default class InstallContao extends ExecRenderBaseCommand {
     static description = installer.description;

package/dist/commands/app/install/drupal.d.ts

@@ -1,10 +1,10 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 import React from "react";
-import { AppInstallationResult, AppInstaller } from "../../../lib/app/Installer.js";
-export declare const drupalInstaller: AppInstaller<"version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "site-title" | "wait">;
+import { AppInstallationResult, AppInstaller } from "../../../lib/resources/app/Installer.js";
+export declare const drupalInstaller: AppInstaller<"version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "site-title">;
 export default class InstallDrupal extends ExecRenderBaseCommand<typeof InstallDrupal, AppInstallationResult> {
     static description: string;
-    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/app/flags.js").RelevantFlags<readonly ("version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "site-title" | "wait")[]>>;
+    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "site-title" | ("wait" | "wait-timeout"))[]>>;
     protected exec(): Promise<{
         appInstallationId: string;
     }>;

package/dist/commands/app/install/drupal.js

@@ -1,5 +1,5 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
-import { AppInstaller, } from "../../../lib/app/Installer.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
+import { AppInstaller, } from "../../../lib/resources/app/Installer.js";
 export const drupalInstaller = new AppInstaller("3d8a261a-3d6f-4e09-b68c-bfe90aece514", "Drupal", [
     "version",
     "host",
@@ -7,7 +7,6 @@ export const drupalInstaller = new AppInstaller("3d8a261a-3d6f-4e09-b68c-bfe90ae
     "admin-email",
     "admin-pass",
     "site-title",
-    "wait",
 ]);
 export default class InstallDrupal extends ExecRenderBaseCommand {
     static description = drupalInstaller.description;

package/dist/commands/app/install/grav.d.ts

@@ -1,9 +1,9 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 import React from "react";
-import { AppInstallationResult } from "../../../lib/app/Installer.js";
+import { AppInstallationResult } from "../../../lib/resources/app/Installer.js";
 export default class InstallGrav extends ExecRenderBaseCommand<typeof InstallGrav, AppInstallationResult> {
     static description: string;
-    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/app/flags.js").RelevantFlags<readonly ("version" | "admin-user" | "admin-email" | "admin-pass" | "admin-firstname" | "admin-lastname" | "site-title" | "wait")[]>>;
+    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("version" | "admin-user" | "admin-email" | "admin-pass" | "admin-firstname" | "admin-lastname" | "site-title" | ("wait" | "wait-timeout"))[]>>;
     protected exec(): Promise<{
         appInstallationId: string;
     }>;

package/dist/commands/app/install/grav.js

@@ -1,5 +1,5 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
-import { AppInstaller, } from "../../../lib/app/Installer.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
+import { AppInstaller, } from "../../../lib/resources/app/Installer.js";
 const installer = new AppInstaller("d3a465da-75a2-44ab-8e81-6960055f6255", "Grav", [
     "version",
     "admin-user",
@@ -8,7 +8,6 @@ const installer = new AppInstaller("d3a465da-75a2-44ab-8e81-6960055f6255", "Grav
     "admin-firstname",
     "admin-lastname",
     "site-title",
-    "wait",
 ]);
 export default class InstallGrav extends ExecRenderBaseCommand {
     static description = installer.description;

package/dist/commands/app/install/joomla.d.ts

@@ -1,9 +1,9 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 import React from "react";
-import { AppInstallationResult } from "../../../lib/app/Installer.js";
+import { AppInstallationResult } from "../../../lib/resources/app/Installer.js";
 export default class InstallJoomla extends ExecRenderBaseCommand<typeof InstallJoomla, AppInstallationResult> {
     static description: string;
-    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/app/flags.js").RelevantFlags<readonly ("version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "admin-firstname" | "admin-lastname" | "site-title" | "wait")[]>>;
+    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "admin-firstname" | "admin-lastname" | "site-title" | ("wait" | "wait-timeout"))[]>>;
     protected exec(): Promise<{
         appInstallationId: string;
     }>;

package/dist/commands/app/install/joomla.js

@@ -1,5 +1,5 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
-import { AppInstaller, } from "../../../lib/app/Installer.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
+import { AppInstaller, } from "../../../lib/resources/app/Installer.js";
 const installer = new AppInstaller("8d404bff-6d75-4833-9eed-1b83b0552585", "Joomla!", [
     "version",
     "host",
@@ -9,7 +9,6 @@ const installer = new AppInstaller("8d404bff-6d75-4833-9eed-1b83b0552585", "Joom
     "admin-firstname",
     "admin-lastname",
     "site-title",
-    "wait",
 ]);
 export default class InstallJoomla extends ExecRenderBaseCommand {
     static description = installer.description;

package/dist/commands/app/install/matomo.d.ts

@@ -1,9 +1,9 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 import React from "react";
-import { AppInstallationResult } from "../../../lib/app/Installer.js";
+import { AppInstallationResult } from "../../../lib/resources/app/Installer.js";
 export default class InstallMatomo extends ExecRenderBaseCommand<typeof InstallMatomo, AppInstallationResult> {
     static description: string;
-    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/app/flags.js").RelevantFlags<readonly ("version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "site-title" | "wait")[]>>;
+    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "site-title" | ("wait" | "wait-timeout"))[]>>;
     protected exec(): Promise<{
         appInstallationId: string;
     }>;

package/dist/commands/app/install/matomo.js

@@ -1,5 +1,5 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
-import { AppInstaller, } from "../../../lib/app/Installer.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
+import { AppInstaller, } from "../../../lib/resources/app/Installer.js";
 const matomoInstaller = new AppInstaller("91fa05e7-34f7-42e8-a8d3-a9c42abd5f8c", "Matomo", [
     "version",
     "host",
@@ -7,7 +7,6 @@ const matomoInstaller = new AppInstaller("91fa05e7-34f7-42e8-a8d3-a9c42abd5f8c",
     "admin-email",
     "admin-pass",
     "site-title",
-    "wait",
 ]);
 export default class InstallMatomo extends ExecRenderBaseCommand {
     static description = matomoInstaller.description;

package/dist/commands/app/install/moodle.d.ts

@@ -1,10 +1,10 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 import React from "react";
-import { AppInstallationResult, AppInstaller } from "../../../lib/app/Installer.js";
-export declare const moodleInstaller: AppInstaller<"version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "site-title" | "wait">;
+import { AppInstallationResult, AppInstaller } from "../../../lib/resources/app/Installer.js";
+export declare const moodleInstaller: AppInstaller<"version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "site-title">;
 export default class InstallMoodle extends ExecRenderBaseCommand<typeof InstallMoodle, AppInstallationResult> {
     static description: string;
-    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/app/flags.js").RelevantFlags<readonly ("version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "site-title" | "wait")[]>>;
+    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "site-title" | ("wait" | "wait-timeout"))[]>>;
     protected exec(): Promise<{
         appInstallationId: string;
     }>;

package/dist/commands/app/install/moodle.js

@@ -1,5 +1,5 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
-import { AppInstaller, } from "../../../lib/app/Installer.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
+import { AppInstaller, } from "../../../lib/resources/app/Installer.js";
 export const moodleInstaller = new AppInstaller("5ba3b4ea-9f79-460a-bbef-d901beca4cf1", "Moodle", [
     "version",
     "host",
@@ -7,7 +7,6 @@ export const moodleInstaller = new AppInstaller("5ba3b4ea-9f79-460a-bbef-d901bec
     "admin-email",
     "admin-pass",
     "site-title",
-    "wait",
 ]);
 export default class InstallMoodle extends ExecRenderBaseCommand {
     static description = moodleInstaller.description;

package/dist/commands/app/install/neos.d.ts

@@ -1,10 +1,10 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 import React from "react";
-import { AppInstallationResult, AppInstaller } from "../../../lib/app/Installer.js";
-export declare const neosInstaller: AppInstaller<"version" | "admin-user" | "admin-pass" | "admin-firstname" | "admin-lastname" | "site-title" | "wait">;
+import { AppInstallationResult, AppInstaller } from "../../../lib/resources/app/Installer.js";
+export declare const neosInstaller: AppInstaller<"version" | "admin-user" | "admin-pass" | "admin-firstname" | "admin-lastname" | "site-title">;
 export default class InstallNeos extends ExecRenderBaseCommand<typeof InstallNeos, AppInstallationResult> {
     static description: string;
-    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/app/flags.js").RelevantFlags<readonly ("version" | "admin-user" | "admin-pass" | "admin-firstname" | "admin-lastname" | "site-title" | "wait")[]>>;
+    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("version" | "admin-user" | "admin-pass" | "admin-firstname" | "admin-lastname" | "site-title" | ("wait" | "wait-timeout"))[]>>;
     protected exec(): Promise<{
         appInstallationId: string;
     }>;

package/dist/commands/app/install/neos.js

@@ -1,5 +1,5 @@
-import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
-import { AppInstaller, } from "../../../lib/app/Installer.js";
+import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
+import { AppInstaller, } from "../../../lib/resources/app/Installer.js";
 export const neosInstaller = new AppInstaller("1f55f9fa-1902-409c-b305-7e428c5ed64d", "NEOS", [
     "version",
     "admin-user",
@@ -7,7 +7,6 @@ export const neosInstaller = new AppInstaller("1f55f9fa-1902-409c-b305-7e428c5ed
     "admin-firstname",
     "admin-lastname",
     "site-title",
-    "wait",
 ]);
 export default class InstallNeos extends ExecRenderBaseCommand {
     static description = neosInstaller.description;