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

package/dist/commands/app/install/nextcloud.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 InstallNextcloud extends ExecRenderBaseCommand<typeof InstallNextcloud, 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/nextcloud.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("0b97d59f-ee13-4f18-a1f6-53e1beaf2e70", "Nextcloud", [
     "version",
     "host",
@@ -7,7 +7,6 @@ const installer = new AppInstaller("0b97d59f-ee13-4f18-a1f6-53e1beaf2e70", "Next
     "admin-email",
     "admin-pass",
     "site-title",
-    "wait",
 ]);
 export default class InstallNextcloud extends ExecRenderBaseCommand {
     static description = installer.description;

package/dist/commands/app/install/prestashop.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 prestashopInstaller: AppInstaller<"version" | "host" | "admin-email" | "admin-pass" | "admin-firstname" | "admin-lastname" | "site-title" | "shop-lang" | "wait">;
+import { AppInstallationResult, AppInstaller } from "../../../lib/resources/app/Installer.js";
+export declare const prestashopInstaller: AppInstaller<"version" | "host" | "admin-email" | "admin-pass" | "admin-firstname" | "admin-lastname" | "site-title" | "shop-lang">;
 export default class InstallPrestashop extends ExecRenderBaseCommand<typeof InstallPrestashop, AppInstallationResult> {
     static description: string;
-    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/app/flags.js").RelevantFlags<readonly ("version" | "host" | "admin-email" | "admin-pass" | "admin-firstname" | "admin-lastname" | "site-title" | "shop-lang" | "wait")[]>>;
+    static flags: import("@oclif/core/lib/interfaces/parser.js").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("version" | "host" | "admin-email" | "admin-pass" | "admin-firstname" | "admin-lastname" | "site-title" | "shop-lang" | ("wait" | "wait-timeout"))[]>>;
     protected exec(): Promise<{
         appInstallationId: string;
     }>;

package/dist/commands/app/install/prestashop.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 prestashopInstaller = new AppInstaller("3a231de7-6fd2-4aab-9948-45906952752f", "PrestaShop", [
     "version",
     "host",
@@ -9,7 +9,6 @@ export const prestashopInstaller = new AppInstaller("3a231de7-6fd2-4aab-9948-459
     "admin-lastname",
     "site-title",
     "shop-lang",
-    "wait",
 ]);
 export default class InstallPrestashop extends ExecRenderBaseCommand {
     static description = prestashopInstaller.description;

package/dist/commands/app/install/shopware5.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 InstallShopware5 extends ExecRenderBaseCommand<typeof InstallShopware5, 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" | "shop-email" | "shop-lang" | "shop-currency" | "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" | "shop-email" | "shop-lang" | "shop-currency" | ("wait" | "wait-timeout"))[]>>;
     protected exec(): Promise<{
         appInstallationId: string;
     }>;

package/dist/commands/app/install/shopware5.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("a23acf9c-9298-4082-9e7d-25356f9976dc", "Shopware 5", [
     "version",
     "host",
@@ -12,7 +12,6 @@ const installer = new AppInstaller("a23acf9c-9298-4082-9e7d-25356f9976dc", "Shop
     "shop-email",
     "shop-lang",
     "shop-currency",
-    "wait",
 ]);
 export default class InstallShopware5 extends ExecRenderBaseCommand {
     static description = installer.description;

package/dist/commands/app/install/shopware6.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 shopware6Installer: AppInstaller<"version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "admin-firstname" | "admin-lastname" | "site-title" | "shop-email" | "shop-lang" | "shop-currency" | "wait">;
+import { AppInstallationResult, AppInstaller } from "../../../lib/resources/app/Installer.js";
+export declare const shopware6Installer: AppInstaller<"version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "admin-firstname" | "admin-lastname" | "site-title" | "shop-email" | "shop-lang" | "shop-currency">;
 export default class InstallShopware6 extends ExecRenderBaseCommand<typeof InstallShopware6, 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" | "shop-email" | "shop-lang" | "shop-currency" | "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" | "shop-email" | "shop-lang" | "shop-currency" | ("wait" | "wait-timeout"))[]>>;
     protected exec(): Promise<{
         appInstallationId: string;
     }>;

package/dist/commands/app/install/shopware6.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 shopware6Installer = new AppInstaller("12d54d05-7e55-4cf3-90c4-093516e0eaf8", "Shopware 6", [
     "version",
     "host",
@@ -12,7 +12,6 @@ export const shopware6Installer = new AppInstaller("12d54d05-7e55-4cf3-90c4-0935
     "shop-email",
     "shop-lang",
     "shop-currency",
-    "wait",
 ]);
 export default class InstallShopware6 extends ExecRenderBaseCommand {
     static description = shopware6Installer.description;

package/dist/commands/app/install/typo3.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 typo3Installer: AppInstaller<"version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "site-title" | "install-mode" | "wait">;
+import { AppInstallationResult, AppInstaller } from "../../../lib/resources/app/Installer.js";
+export declare const typo3Installer: AppInstaller<"version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "site-title" | "install-mode">;
 export default class InstallTYPO3 extends ExecRenderBaseCommand<typeof InstallTYPO3, 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" | "install-mode" | "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" | "install-mode" | ("wait" | "wait-timeout"))[]>>;
     protected exec(): Promise<{
         appInstallationId: string;
     }>;

package/dist/commands/app/install/typo3.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 typo3Installer = new AppInstaller("352971cc-b96a-4a26-8651-b08d7c8a7357", "TYPO3", [
     "version",
     "host",
@@ -8,7 +8,6 @@ export const typo3Installer = new AppInstaller("352971cc-b96a-4a26-8651-b08d7c8a
     "admin-pass",
     "site-title",
     "install-mode",
-    "wait",
 ]);
 export default class InstallTYPO3 extends ExecRenderBaseCommand {
     static description = typo3Installer.description;

package/dist/commands/app/install/wordpress.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 wordpressInstaller: AppInstaller<"version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "site-title" | "wait">;
+import { AppInstallationResult, AppInstaller } from "../../../lib/resources/app/Installer.js";
+export declare const wordpressInstaller: AppInstaller<"version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "site-title">;
 export default class InstallWordPress extends ExecRenderBaseCommand<typeof InstallWordPress, 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/wordpress.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 wordpressInstaller = new AppInstaller("da3aa3ae-4b6b-4398-a4a8-ee8def827876", "WordPress", [
     "version",
     "host",
@@ -7,7 +7,6 @@ export const wordpressInstaller = new AppInstaller("da3aa3ae-4b6b-4398-a4a8-ee8d
     "admin-email",
     "admin-pass",
     "site-title",
-    "wait",
 ]);
 export default class InstallWordPress extends ExecRenderBaseCommand {
     static description = wordpressInstaller.description;

package/dist/commands/app/list-upgrade-candidates.d.ts

@@ -1,7 +1,7 @@
 import { Simplify } from "@mittwald/api-client-commons";
-import { ListBaseCommand } from "../../ListBaseCommand.js";
+import { ListBaseCommand } from "../../lib/basecommands/ListBaseCommand.js";
 import { MittwaldAPIV2, MittwaldAPIV2Client } from "@mittwald/api-client";
-import { ListColumns } from "../../Formatter.js";
+import { ListColumns } from "../../rendering/formatter/ListFormatter.js";
 type ResponseItem = Simplify<MittwaldAPIV2.Paths.V2AppsAppIdVersions.Get.Responses.$200.Content.ApplicationJson[number]>;
 type Response = Awaited<ReturnType<MittwaldAPIV2Client["app"]["listAppversions"]>>;
 export default class List extends ListBaseCommand<typeof List, ResponseItem, Response> {

package/dist/commands/app/list-upgrade-candidates.js

@@ -1,7 +1,7 @@
-import { appInstallationArgs, withAppInstallationId, } from "../../lib/app/flags.js";
-import { ListBaseCommand } from "../../ListBaseCommand.js";
-import { getAppInstallationFromUuid } from "../../lib/app/uuid.js";
-import { sortArrayByExternalVersion } from "../../lib/app/versions.js";
+import { appInstallationArgs, withAppInstallationId, } from "../../lib/resources/app/flags.js";
+import { ListBaseCommand } from "../../lib/basecommands/ListBaseCommand.js";
+import { getAppInstallationFromUuid } from "../../lib/resources/app/uuid.js";
+import { sortArrayByExternalVersion } from "../../lib/resources/app/versions.js";
 export default class List extends ListBaseCommand {
     static description = "List upgrade candidates for an app installation.";
     static args = {

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

@@ -1,8 +1,8 @@
 import { Simplify } from "@mittwald/api-client-commons";
-import { ListBaseCommand } from "../../ListBaseCommand.js";
+import { ListBaseCommand } from "../../lib/basecommands/ListBaseCommand.js";
 import { MittwaldAPIV2, MittwaldAPIV2Client } from "@mittwald/api-client";
-import { SuccessfulResponse } from "../../types.js";
-import { ListColumns } from "../../Formatter.js";
+import { SuccessfulResponse } from "../../lib/apiutil/SuccessfulResponse.js";
+import { ListColumns } from "../../rendering/formatter/ListFormatter.js";
 type AppApp = MittwaldAPIV2.Components.Schemas.AppApp;
 type AppAppVersion = MittwaldAPIV2.Components.Schemas.AppAppVersion;
 type ResponseItem = Simplify<MittwaldAPIV2.Paths.V2ProjectsProjectIdAppInstallations.Get.Responses.$200.Content.ApplicationJson[number]>;

package/dist/commands/app/list.js

@@ -1,8 +1,8 @@
 import { assertStatus } from "@mittwald/api-client-commons";
-import { projectFlags, withProjectId } from "../../lib/project/flags.js";
-import { ListBaseCommand } from "../../ListBaseCommand.js";
-import { getAppFromUuid, getAppVersionFromUuid } from "../../lib/app/uuid.js";
-import { isCustomAppInstallation } from "../../lib/app/custom_installation.js";
+import { projectFlags, withProjectId, } from "../../lib/resources/project/flags.js";
+import { ListBaseCommand } from "../../lib/basecommands/ListBaseCommand.js";
+import { getAppFromUuid, getAppVersionFromUuid, } from "../../lib/resources/app/uuid.js";
+import { isCustomAppInstallation } from "../../lib/resources/app/custom_installation.js";
 export default class List extends ListBaseCommand {
     static description = "List installed apps in a project.";
     static flags = {

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

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

package/dist/commands/app/ssh.js

@@ -1,11 +1,11 @@
 import * as child_process from "child_process";
-import { appInstallationArgs } from "../../lib/app/flags.js";
+import { appInstallationArgs } from "../../lib/resources/app/flags.js";
 import { Flags } from "@oclif/core";
-import { ExtendedBaseCommand } from "../../ExtendedBaseCommand.js";
-import { getSSHConnectionForAppInstallation } from "../../lib/ssh/appinstall.js";
-import { sshConnectionFlags } from "../../lib/ssh/flags.js";
-import { sshWrapperDocumentation } from "../../lib/ssh/doc.js";
-import { buildSSHClientFlags } from "../../lib/ssh/connection.js";
+import { ExtendedBaseCommand } from "../../lib/basecommands/ExtendedBaseCommand.js";
+import { getSSHConnectionForAppInstallation } from "../../lib/resources/ssh/appinstall.js";
+import { sshConnectionFlags, } from "../../lib/resources/ssh/flags.js";
+import { sshWrapperDocumentation } from "../../lib/resources/ssh/doc.js";
+import { buildSSHClientFlags } from "../../lib/resources/ssh/connection.js";
 export default class Ssh extends ExtendedBaseCommand {
     static summary = "Connect to an app via SSH";
     static description = "Establishes an interactive SSH connection to an app installation.\n\n" +

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

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

package/dist/commands/app/uninstall.js

@@ -1,6 +1,6 @@
 import { assertStatus } from "@mittwald/api-client-commons";
-import { DeleteBaseCommand } from "../../DeleteBaseCommand.js";
-import { appInstallationArgs } from "../../lib/app/flags.js";
+import { DeleteBaseCommand } from "../../lib/basecommands/DeleteBaseCommand.js";
+import { appInstallationArgs } from "../../lib/resources/app/flags.js";
 export default class Uninstall extends DeleteBaseCommand {
     static description = "Uninstall an app";
     static resourceName = "app installation";

package/dist/commands/app/upgrade.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 UpgradeApp extends ExecRenderBaseCommand<typeof UpgradeApp, void> {
     static description: string;
@@ -6,10 +6,11 @@ export declare class UpgradeApp extends ExecRenderBaseCommand<typeof UpgradeApp,
         "installation-id": import("@oclif/core/lib/interfaces/parser.js").Arg<string>;
     };
     static flags: {
+        wait: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        "wait-timeout": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<import("../../lib/units/Duration.js").default, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         quiet: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         "project-id": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string>;
         "target-version": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        wait: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     protected exec(): Promise<void>;

package/dist/commands/app/upgrade.js

@@ -1,15 +1,16 @@
 import { jsxs as _jsxs, Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
-import { ExecRenderBaseCommand } from "../../rendering/react/ExecRenderBaseCommand.js";
-import { appInstallationArgs, withAppInstallationId, } from "../../lib/app/flags.js";
-import { projectFlags } from "../../lib/project/flags.js";
+import { ExecRenderBaseCommand } from "../../lib/basecommands/ExecRenderBaseCommand.js";
+import { appInstallationArgs, withAppInstallationId, } from "../../lib/resources/app/flags.js";
+import { projectFlags } from "../../lib/resources/project/flags.js";
 import { Flags, ux } from "@oclif/core";
 import { Text } from "ink";
-import { getAppFromUuid, getAppInstallationFromUuid, getAppVersionFromUuid, } from "../../lib/app/uuid.js";
-import { getAllUpgradeCandidatesFromAppInstallationId, getAvailableTargetAppVersionFromExternalVersion, getLatestAvailableTargetAppVersionForAppVersionUpgradeCandidates, } from "../../lib/app/versions.js";
+import { getAppFromUuid, getAppInstallationFromUuid, getAppVersionFromUuid, } from "../../lib/resources/app/uuid.js";
+import { getAllUpgradeCandidatesFromAppInstallationId, getAvailableTargetAppVersionFromExternalVersion, getLatestAvailableTargetAppVersionForAppVersionUpgradeCandidates, } from "../../lib/resources/app/versions.js";
 import { makeProcessRenderer, processFlags, } from "../../rendering/process/process_flags.js";
 import { Success } from "../../rendering/react/components/Success.js";
-import { waitUntilAppStateHasNormalized } from "../../lib/app/wait.js";
+import { waitUntilAppStateHasNormalized } from "../../lib/resources/app/wait.js";
 import { assertStatus } from "@mittwald/api-client-commons";
+import { waitFlags } from "../../lib/wait.js";
 export class UpgradeApp extends ExecRenderBaseCommand {
     static description = "Upgrade app installation to target version";
     static args = {
@@ -19,16 +20,13 @@ export class UpgradeApp extends ExecRenderBaseCommand {
         "target-version": Flags.string({
             description: "target version to upgrade app to; if omitted, target version will be prompted interactively",
         }),
-        wait: Flags.boolean({
-            description: "wait for the upgrade process to finish",
-            char: "w",
-        }),
         force: Flags.boolean({
             char: "f",
             description: "Do not ask for confirmation.",
         }),
         ...projectFlags,
         ...processFlags,
+        ...waitFlags,
     };
     async exec() {
         const process = makeProcessRenderer(this.flags, "App upgrade");
@@ -84,7 +82,7 @@ export class UpgradeApp extends ExecRenderBaseCommand {
         assertStatus(patchAppTriggerResponse, 204);
         let successText;
         if (this.flags.wait) {
-            await waitUntilAppStateHasNormalized(this.apiClient, process, appInstallationId, "waiting for app upgrade to be done");
+            await waitUntilAppStateHasNormalized(this.apiClient, process, appInstallationId, "waiting for app upgrade to be done", this.flags["wait-timeout"]);
             successText =
                 "The upgrade finished successfully. Please check if everything is in its place. 🔎";
         }

package/dist/commands/app/upload.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 Upload extends ExecRenderBaseCommand<typeof Upload, void> {
     static summary: string;
@@ -7,9 +7,10 @@ export declare class Upload extends ExecRenderBaseCommand<typeof Upload, void> {
         "installation-id": import("@oclif/core/lib/interfaces/parser.js").Arg<string>;
     };
     static flags: {
+        source: 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>;
-        source: 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/upload.js

@@ -1,35 +1,31 @@
 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 Upload extends ExecRenderBaseCommand {
     static summary = "Upload the filesystem of an app to a project";
     static description = "Upload the filesystem of an app from your local machine to a project.\n\n" +
         "For this, rsync needs to be installed on your system.\n\n" +
         "CAUTION: This is a potentially destructive operation. It will overwrite files on the server with the files from your local machine. " +
         "This is NOT a turnkey deployment solution. It is intended for development purposes only.\n\n" +
-        sshUsageDocumentation;
+        sshUsageDocumentation +
+        "\n\n" +
+        filterFileDocumentation;
     static args = {
         ...appInstallationArgs,
     };
     static flags = {
         ...processFlags,
         ...sshConnectionFlags,
-        "dry-run": Flags.boolean({
-            description: "do not actually upload the app installation",
-            default: false,
-        }),
-        delete: Flags.boolean({
-            description: "delete remote files that are not present locally",
-            default: false,
-        }),
+        ...appInstallationSyncFlags("upload"),
         source: Flags.directory({
             description: "source directory from which to upload the app installation",
             required: true,
@@ -38,29 +34,20 @@ export class Upload extends ExecRenderBaseCommand {
     };
     async exec() {
         const appInstallationId = await this.withAppInstallationId(Upload);
-        const { "dry-run": dryRun, source, delete: deleteRemote, "ssh-user": sshUser, } = this.flags;
+        const { "dry-run": dryRun, source, "ssh-user": sshUser } = this.flags;
         const p = makeProcessRenderer(this.flags, "Uploading 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(source)),
         ];
-        if (dryRun) {
-            rsyncOpts.push("--dry-run");
-        }
-        if (deleteRemote) {
-            rsyncOpts.push("--delete");
-        }
         await spawnInProcess(p, "uploading app installation" + (dryRun ? " (dry-run)" : ""), "rsync", [...rsyncOpts, source, `${user}@${host}:${directory}/`]);
         await p.complete(_jsx(UploadSuccess, { dryRun: dryRun }));
     }

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

@@ -1,4 +1,4 @@
-import { BaseCommand } from "../../BaseCommand.js";
+import { BaseCommand } from "../../lib/basecommands/BaseCommand.js";
 import { MittwaldAPIV2Client } from "@mittwald/api-client";
 export default class AppVersions extends BaseCommand {
     static description: string;
@@ -6,7 +6,7 @@ export default class AppVersions extends BaseCommand {
         app: import("@oclif/core/lib/interfaces/parser.js").Arg<string | undefined, Record<string, unknown>>;
     };
     run(): Promise<void>;
-    protected getApp(apiClient: MittwaldAPIV2Client, appId: string): Promise<string[]>;
+    protected getApp(apiClient: MittwaldAPIV2Client, appId: string): Promise<string>;
     protected getAllApps(apiClient: MittwaldAPIV2Client): Promise<string[]>;
     protected outputVersionsForAppUuid(apiClient: MittwaldAPIV2Client, appUuid: string): Promise<void>;
 }

package/dist/commands/app/versions.js

@@ -1,8 +1,8 @@
-import { BaseCommand } from "../../BaseCommand.js";
+import { BaseCommand } from "../../lib/basecommands/BaseCommand.js";
 import { Args } from "@oclif/core";
-import { isUuid } from "../../normalize_id.js";
 import { assertStatus } from "@mittwald/api-client-commons";
-import { getAppNameFromUuid, getAppUuidFromAppName, } from "../../lib/app/uuid.js";
+import { validate as validateUuid } from "uuid";
+import { getAppNameFromUuid, getAppUuidFromAppName, } from "../../lib/resources/app/uuid.js";
 export default class AppVersions extends BaseCommand {
     static description = "List supported Apps and Versions";
     static args = {
@@ -13,33 +13,24 @@ export default class AppVersions extends BaseCommand {
     };
     async run() {
         const { args } = await this.parse(AppVersions);
-        const AppUuidsToGetVersionsFor = args.app
-            ? await this.getApp(this.apiClient, args.app)
+        const appUuidsToGetVersionsFor = args.app
+            ? [await this.getApp(this.apiClient, args.app)]
             : await this.getAllApps(this.apiClient);
-        for (const appUuid of AppUuidsToGetVersionsFor) {
+        for (const appUuid of appUuidsToGetVersionsFor) {
             console.log(`Available ${await getAppNameFromUuid(this.apiClient, appUuid)} Versions:`);
             await this.outputVersionsForAppUuid(this.apiClient, appUuid);
             console.log("");
         }
     }
     async getApp(apiClient, appId) {
-        let appUuid;
-        if (isUuid(appId)) {
-            appUuid = appId;
-        }
-        else {
-            appUuid = await getAppUuidFromAppName(apiClient, appId);
-        }
-        return [appUuid];
+        return validateUuid(appId)
+            ? appId
+            : await getAppUuidFromAppName(apiClient, appId);
     }
     async getAllApps(apiClient) {
         const apps = await apiClient.app.listApps();
         assertStatus(apps, 200);
-        const appUuids = [];
-        for (const app of apps.data) {
-            appUuids.push(app.id);
-        }
-        return appUuids;
+        return apps.data.map((app) => app.id);
     }
     async outputVersionsForAppUuid(apiClient, appUuid) {
         const versions = await apiClient.app.listAppversions({

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

@@ -1,4 +1,4 @@
-import { ExecRenderBaseCommand } from "../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../lib/basecommands/ExecRenderBaseCommand.js";
 import { ReactNode } from "react";
 type CreateResult = {
     backupId: string;
@@ -7,8 +7,8 @@ export declare class Create extends ExecRenderBaseCommand<typeof Create, CreateR
     static summary: string;
     static flags: {
         wait: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        "wait-timeout": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        expires: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        "wait-timeout": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<import("../../lib/units/Duration.js").default, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        expires: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<Date>;
         description: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         "project-id": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string>;
         quiet: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;

package/dist/commands/backup/create.js

@@ -1,13 +1,13 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { ExecRenderBaseCommand } from "../../rendering/react/ExecRenderBaseCommand.js";
+import { ExecRenderBaseCommand } from "../../lib/basecommands/ExecRenderBaseCommand.js";
 import { makeProcessRenderer, processFlags, } from "../../rendering/process/process_flags.js";
-import { projectFlags } from "../../lib/project/flags.js";
+import { projectFlags } from "../../lib/resources/project/flags.js";
 import { Flags } from "@oclif/core";
-import { expirationDateFromFlags, expireFlagsRequired, } from "../../lib/expires.js";
 import { assertStatus } from "@mittwald/api-client-commons";
 import { Success } from "../../rendering/react/components/Success.js";
 import { waitFlags, waitUntil } from "../../lib/wait.js";
 import { Text } from "ink";
+import { expireFlags } from "../../lib/flags/expireFlags.js";
 export class Create extends ExecRenderBaseCommand {
     static summary = "Create a new backup of a project";
     static flags = {
@@ -16,7 +16,7 @@ export class Create extends ExecRenderBaseCommand {
         description: Flags.string({
             description: "a description for the backup.",
         }),
-        ...expireFlagsRequired("backup"),
+        ...expireFlags("backup", true),
         ...waitFlags,
     };
     static aliases = ["project:backup:create"];
@@ -24,14 +24,13 @@ export class Create extends ExecRenderBaseCommand {
     async exec() {
         const p = makeProcessRenderer(this.flags, "Creating backup");
         const projectId = await this.withProjectId(Create);
-        const { description } = this.flags;
-        const expirationTime = expirationDateFromFlags(this.flags);
+        const { description, expires } = this.flags;
         const backup = await p.runStep("creating backup", async () => {
             const r = await this.apiClient.backup.createProjectBackup({
                 projectId,
                 data: {
                     description,
-                    expirationTime: expirationTime.toJSON(),
+                    expirationTime: expires.toJSON(),
                 },
             });
             assertStatus(r, 201);