@datatruck/cli 0.32.3 → 0.34.0

package/lib/{Command → commands}/CleanCacheCommand.d.ts

@@ -1,6 +1,8 @@
 import { CommandAbstract } from "./CommandAbstract";
 export type CleanCacheCommandOptions<TResolved = false> = {};
 export declare class CleanCacheCommand extends CommandAbstract<CleanCacheCommandOptions<false>, CleanCacheCommandOptions<true>> {
-    onOptions(): import("../utils/cli").OptionsType<CleanCacheCommandOptions<false>, CleanCacheCommandOptions<true>>;
-    onExec(): Promise<1 | 0>;
+    optionsConfig(): import("../utils/cli").OptionsConfig<CleanCacheCommandOptions<false>, CleanCacheCommandOptions<true>>;
+    exec(): Promise<{
+        exitCode: number;
+    }>;
 }

package/lib/{Command → commands}/CleanCacheCommand.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CleanCacheCommand = void 0;
-const CleanCacheAction_1 = require("../Action/CleanCacheAction");
+const CleanCacheAction_1 = require("../actions/CleanCacheAction");
 const DataFormat_1 = require("../utils/DataFormat");
 const bytes_1 = require("../utils/bytes");
 const CommandAbstract_1 = require("./CommandAbstract");
 class CleanCacheCommand extends CommandAbstract_1.CommandAbstract {
-    onOptions() {
-        return this.returnsOptions({});
+    optionsConfig() {
+        return this.castOptionsConfig({});
     }
-    async onExec() {
+    async exec() {
         const cleanCache = new CleanCacheAction_1.CleanCacheAction({
             verbose: !!this.globalOptions.verbose,
         });
@@ -32,7 +32,8 @@ class CleanCacheCommand extends CommandAbstract_1.CommandAbstract {
         await cleanCache.exec();
         if (this.globalOptions.outputFormat)
             dataFormat.log(this.globalOptions.outputFormat);
-        return result.errors.length ? 1 : 0;
+        const exitCode = result.errors.length ? 1 : 0;
+        return { exitCode };
     }
 }
 exports.CleanCacheCommand = CleanCacheCommand;

package/lib/{Command → commands}/CommandAbstract.d.ts

@@ -1,6 +1,6 @@
-import { Config } from "../Config/Config";
 import { DataFormatType } from "../utils/DataFormat";
-import { OptionsType } from "../utils/cli";
+import { OptionsConfig } from "../utils/cli";
+import type { Config } from "../utils/datatruck/config-type";
 import { ProgressMode } from "../utils/progress";
 import { Streams } from "../utils/stream";
 import { If, SimilarObject } from "../utils/ts";
@@ -16,11 +16,15 @@ export type CommandConstructor<TUnresolvedOptions, TOptions extends SimilarObjec
 };
 export declare abstract class CommandAbstract<TUnresolvedOptions, TOptions extends SimilarObject<TUnresolvedOptions>> {
     readonly globalOptions: GlobalOptions<true>;
+    readonly inputOptions: TUnresolvedOptions;
     readonly configPath?: string | undefined;
     readonly options: TOptions;
     readonly streams: Streams;
-    constructor(globalOptions: GlobalOptions<true>, options: TUnresolvedOptions, streams?: Partial<Streams>, configPath?: string | undefined);
-    abstract onOptions(): OptionsType<TUnresolvedOptions, TOptions>;
-    protected returnsOptions(options: OptionsType<TUnresolvedOptions, TOptions>): OptionsType<TUnresolvedOptions, TOptions>;
-    abstract onExec(): Promise<number>;
+    constructor(globalOptions: GlobalOptions<true>, inputOptions: TUnresolvedOptions, streams?: Partial<Streams>, configPath?: string | undefined);
+    abstract optionsConfig(): OptionsConfig<TUnresolvedOptions, TOptions>;
+    protected castOptionsConfig(options: OptionsConfig<TUnresolvedOptions, TOptions>): OptionsConfig<TUnresolvedOptions, TOptions>;
+    abstract exec(): Promise<{
+        exitCode: number;
+        result?: any;
+    }>;
 }

package/lib/{Command → commands}/CommandAbstract.js

@@ -5,16 +5,18 @@ const cli_1 = require("../utils/cli");
 const stream_1 = require("../utils/stream");
 class CommandAbstract {
     globalOptions;
+    inputOptions;
     configPath;
     options;
     streams;
-    constructor(globalOptions, options, streams = {}, configPath) {
+    constructor(globalOptions, inputOptions, streams = {}, configPath) {
         this.globalOptions = globalOptions;
+        this.inputOptions = inputOptions;
         this.configPath = configPath;
-        this.options = (0, cli_1.parseOptions)(options, this.onOptions());
+        this.options = (0, cli_1.parseOptions)(inputOptions, this.optionsConfig());
         this.streams = (0, stream_1.createStreams)(streams);
     }
-    returnsOptions(options) {
+    castOptionsConfig(options) {
         return options;
     }
 }

package/lib/commands/ConfigCommand.d.ts

@@ -0,0 +1,22 @@
+import type { RepositoryConfig } from "../utils/datatruck/config-type";
+import { If } from "../utils/ts";
+import { CommandAbstract } from "./CommandAbstract";
+export type ConfigCommandOptions<TResolved = false> = {
+    package?: If<TResolved, string[]>;
+    packageTask?: If<TResolved, string[]>;
+    repository?: If<TResolved, string[]>;
+    repositoryType?: If<TResolved, RepositoryConfig["type"][]>;
+};
+export declare class ConfigCommand extends CommandAbstract<ConfigCommandOptions<false>, ConfigCommandOptions<true>> {
+    optionsConfig(): import("../utils/cli").OptionsConfig<ConfigCommandOptions<false>, ConfigCommandOptions<true>>;
+    exec(): Promise<{
+        result: {
+            path: string;
+            data: import("../utils/datatruck/config-type").Config;
+        } | {
+            path: null;
+            data: import("../utils/datatruck/config-type").Config;
+        };
+        exitCode: number;
+    }>;
+}

package/lib/{Command → commands}/ConfigCommand.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigCommand = void 0;
-const ConfigAction_1 = require("../Action/ConfigAction");
+const ConfigAction_1 = require("../actions/ConfigAction");
 const DataFormat_1 = require("../utils/DataFormat");
 const config_1 = require("../utils/datatruck/config");
 const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
 class ConfigCommand extends CommandAbstract_1.CommandAbstract {
-    onOptions() {
-        return this.returnsOptions({
+    optionsConfig() {
+        return this.castOptionsConfig({
             package: {
                 description: "Filter by package names",
                 option: "-p,--package <values>",
@@ -31,7 +31,7 @@ class ConfigCommand extends CommandAbstract_1.CommandAbstract {
             },
         });
     }
-    async onExec() {
+    async exec() {
         const result = await ConfigAction_1.ConfigAction.fromGlobalOptionsWithPath(this.globalOptions);
         const packages = (0, config_1.filterPackages)(result.data, {
             packageNames: this.options.package,
@@ -66,7 +66,7 @@ class ConfigCommand extends CommandAbstract_1.CommandAbstract {
                     pkgNames: () => summaryConfig.map((i) => i.packageName).join(),
                 },
             });
-        return 0;
+        return { result, exitCode: 0 };
     }
 }
 exports.ConfigCommand = ConfigCommand;

package/lib/commands/CopyCommand.d.ts

@@ -0,0 +1,17 @@
+import { If } from "../utils/ts";
+import { CommandAbstract } from "./CommandAbstract";
+export type CopyCommandOptions<TResolved = false> = {
+    id?: If<TResolved, string[]>;
+    last?: number;
+    package?: If<TResolved, string[]>;
+    packageTask?: If<TResolved, string[]>;
+    repository: string;
+    repository2?: If<TResolved, string[]>;
+};
+export declare class CopyCommand extends CommandAbstract<CopyCommandOptions<false>, CopyCommandOptions<true>> {
+    optionsConfig(): import("../utils/cli").OptionsConfig<CopyCommandOptions<false>, CopyCommandOptions<true>>;
+    exec(): Promise<{
+        result: (import("../utils/list").List3SummaryResult | import("../utils/list").Listr3TaskResult<import("../actions/CopyAction").Context>)[];
+        exitCode: number;
+    }>;
+}

package/lib/{Command → commands}/CopyCommand.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CopyCommand = void 0;
-const ConfigAction_1 = require("../Action/ConfigAction");
-const CopyAction_1 = require("../Action/CopyAction");
+const ConfigAction_1 = require("../actions/ConfigAction");
+const CopyAction_1 = require("../actions/CopyAction");
 const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
 class CopyCommand extends CommandAbstract_1.CommandAbstract {
-    onOptions() {
-        return this.returnsOptions({
+    optionsConfig() {
+        return this.castOptionsConfig({
             id: {
                 option: "-i,--id <ids>",
                 description: "Filter by identifiers",
@@ -40,7 +40,7 @@ class CopyCommand extends CommandAbstract_1.CommandAbstract {
             },
         });
     }
-    async onExec() {
+    async exec() {
         const verbose = this.globalOptions.verbose ?? 0;
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const copy = new CopyAction_1.CopyAction(config, {
@@ -59,7 +59,8 @@ class CopyCommand extends CommandAbstract_1.CommandAbstract {
             copy
                 .dataFormat(result, { streams: this.streams, verbose })
                 .log(this.globalOptions.outputFormat);
-        return result.some((item) => item.error) ? 1 : 0;
+        const exitCode = result.some((item) => item.error) ? 1 : 0;
+        return { result, exitCode };
     }
 }
 exports.CopyCommand = CopyCommand;

package/lib/commands/InitCommand.d.ts

@@ -0,0 +1,19 @@
+import type { RepositoryConfig } from "../utils/datatruck/config-type";
+import { If } from "../utils/ts";
+import { CommandAbstract } from "./CommandAbstract";
+export type InitCommandOptions<TResolved = false> = {
+    repository?: If<TResolved, string[]>;
+    repositoryType?: If<TResolved, RepositoryConfig["type"][]>;
+};
+export declare class InitCommand extends CommandAbstract<InitCommandOptions<false>, InitCommandOptions<true>> {
+    optionsConfig(): import("../utils/cli").OptionsConfig<InitCommandOptions<false>, InitCommandOptions<true>>;
+    exec(): Promise<{
+        result: {
+            repositoryName: string;
+            repositoryType: string;
+            repositorySource: string;
+            error: Error | null;
+        }[];
+        exitCode: number;
+    }>;
+}

package/lib/{Command → commands}/InitCommand.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InitCommand = void 0;
-const ConfigAction_1 = require("../Action/ConfigAction");
-const InitAction_1 = require("../Action/InitAction");
+const ConfigAction_1 = require("../actions/ConfigAction");
+const InitAction_1 = require("../actions/InitAction");
 const DataFormat_1 = require("../utils/DataFormat");
 const cli_1 = require("../utils/cli");
 const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
 class InitCommand extends CommandAbstract_1.CommandAbstract {
-    onOptions() {
-        return this.returnsOptions({
+    optionsConfig() {
+        return this.castOptionsConfig({
             repository: {
                 description: "Filter by repository names",
                 option: "-r,--repository <values>",
@@ -22,7 +22,7 @@ class InitCommand extends CommandAbstract_1.CommandAbstract {
             },
         });
     }
-    async onExec() {
+    async exec() {
         const verbose = this.globalOptions.verbose ?? 0;
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const init = new InitAction_1.InitAction(config, {
@@ -30,10 +30,10 @@ class InitCommand extends CommandAbstract_1.CommandAbstract {
             repositoryTypes: this.options.repositoryType,
             verbose: verbose > 0,
         });
-        const response = await init.exec();
+        const result = await init.exec();
         const dataFormat = new DataFormat_1.DataFormat({
             streams: this.streams,
-            json: response,
+            json: result,
             table: {
                 headers: [
                     { value: "", width: 3 },
@@ -42,7 +42,7 @@ class InitCommand extends CommandAbstract_1.CommandAbstract {
                     { value: "Repository source" },
                     { value: "Error", width: 50 },
                 ],
-                rows: () => response.map((item) => [
+                rows: () => result.map((item) => [
                     (0, cli_1.renderResult)(item.error),
                     item.repositoryName,
                     item.repositoryType,
@@ -53,7 +53,7 @@ class InitCommand extends CommandAbstract_1.CommandAbstract {
         });
         if (this.globalOptions.outputFormat)
             dataFormat.log(this.globalOptions.outputFormat);
-        return 0;
+        return { result, exitCode: 0 };
     }
 }
 exports.InitCommand = InitCommand;

package/lib/{Command → commands}/PruneCommand.d.ts

@@ -1,5 +1,5 @@
-import { SnapshotGroupByType } from "../Action/SnapshotsAction";
-import { RepositoryConfig } from "../Config/RepositoryConfig";
+import { SnapshotGroupByType } from "../actions/SnapshotsAction";
+import type { RepositoryConfig } from "../utils/datatruck/config-type";
 import { KeepObject } from "../utils/date";
 import { If } from "../utils/ts";
 import { CommandAbstract } from "./CommandAbstract";
@@ -16,6 +16,9 @@ export type PruneCommandOptions<TResolved = false> = KeepObject & {
     confirm?: boolean;
 };
 export declare class PruneCommand extends CommandAbstract<PruneCommandOptions<false>, PruneCommandOptions<true>> {
-    onOptions(): import("../utils/cli").OptionsType<PruneCommandOptions<false>, PruneCommandOptions<true>>;
-    onExec(): Promise<number>;
+    optionsConfig(): import("../utils/cli").OptionsConfig<PruneCommandOptions<false>, PruneCommandOptions<true>>;
+    exec(): Promise<{
+        result: import("../actions/PruneAction").PruneResult;
+        exitCode: number;
+    }>;
 }

package/lib/{Command → commands}/PruneCommand.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PruneCommand = void 0;
-const ConfigAction_1 = require("../Action/ConfigAction");
-const PruneAction_1 = require("../Action/PruneAction");
+const ConfigAction_1 = require("../actions/ConfigAction");
+const PruneAction_1 = require("../actions/PruneAction");
 const DataFormat_1 = require("../utils/DataFormat");
 const cli_1 = require("../utils/cli");
 const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
 class PruneCommand extends CommandAbstract_1.CommandAbstract {
-    onOptions() {
-        return this.returnsOptions({
+    optionsConfig() {
+        return this.castOptionsConfig({
             dryRun: {
                 description: "",
                 option: "--dry-run",
@@ -99,7 +99,7 @@ class PruneCommand extends CommandAbstract_1.CommandAbstract {
             },
         });
     }
-    async onExec() {
+    async exec() {
         const verbose = this.globalOptions.verbose ?? 0;
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const prune = new PruneAction_1.PruneAction(config, {
@@ -121,10 +121,10 @@ class PruneCommand extends CommandAbstract_1.CommandAbstract {
             longId: this.options.longId,
             returnsAll: this.options.showAll,
         });
-        const pruneResult = await prune.exec();
+        const result = await prune.exec();
         const dataFormat = new DataFormat_1.DataFormat({
             streams: this.streams,
-            json: pruneResult,
+            json: result,
             table: {
                 headers: [
                     { value: "Id.", width: (this.options.longId ? 32 : 8) + 2 },
@@ -134,7 +134,7 @@ class PruneCommand extends CommandAbstract_1.CommandAbstract {
                     { value: "Repository type" },
                     { value: "Exclusion reasons" },
                 ],
-                rows: () => pruneResult.snapshots.map((item) => [
+                rows: () => result.snapshots.map((item) => [
                     this.options.longId ? item.id : item.id.slice(0, 8),
                     item.date.replace("T", " ").replace("Z", ""),
                     item.packageName,
@@ -147,11 +147,11 @@ class PruneCommand extends CommandAbstract_1.CommandAbstract {
         if (this.globalOptions.outputFormat)
             dataFormat.log(this.globalOptions.outputFormat);
         if (!this.options.confirm && !this.options.dryRun) {
-            const answer = await (0, cli_1.confirm)(`Delete ${pruneResult.prune}/${pruneResult.total} snapshots?`);
+            const answer = await (0, cli_1.confirm)(`Delete ${result.prune}/${result.total} snapshots?`);
             if (answer)
-                await prune.confirm(pruneResult.snapshots);
+                await prune.confirm(result.snapshots);
         }
-        return 0;
+        return { result, exitCode: 0 };
     }
 }
 exports.PruneCommand = PruneCommand;

package/lib/commands/RestoreCommand.d.ts

@@ -0,0 +1,38 @@
+import type { RepositoryConfig } from "../utils/datatruck/config-type";
+import { If } from "../utils/ts";
+import { CommandAbstract } from "./CommandAbstract";
+export type RestoreCommandOptions<TResolved = false> = {
+    id: string;
+    package?: If<TResolved, string[]>;
+    packageTask?: If<TResolved, string[]>;
+    packageConfig?: boolean;
+    repository?: If<TResolved, string[]>;
+    repositoryType?: If<TResolved, RepositoryConfig["type"][]>;
+    tag?: If<TResolved, string[]>;
+    initial?: boolean;
+};
+export declare class RestoreCommand extends CommandAbstract<RestoreCommandOptions<false>, RestoreCommandOptions<true>> {
+    optionsConfig(): import("../utils/cli").OptionsConfig<RestoreCommandOptions<false>, RestoreCommandOptions<true>>;
+    exec(): Promise<{
+        result: (import("../utils/list").List3SummaryResult | import("../utils/list").Listr3TaskResult<{
+            snapshots: {
+                id: string;
+                packages: number;
+            };
+            task: {
+                taskName: string;
+                packageName: string;
+            };
+            restore: import("../repositories/RepositoryAbstract").PreSnapshot & {
+                originalId: string;
+                packageName: string;
+                packageTaskName: string | undefined;
+                tags: string[];
+                size: number;
+            } & {
+                repositoryName: string;
+            };
+        }>)[];
+        exitCode: number;
+    }>;
+}

package/lib/{Command → commands}/RestoreCommand.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RestoreCommand = void 0;
-const ConfigAction_1 = require("../Action/ConfigAction");
-const RestoreAction_1 = require("../Action/RestoreAction");
+const ConfigAction_1 = require("../actions/ConfigAction");
+const RestoreAction_1 = require("../actions/RestoreAction");
 const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
 class RestoreCommand extends CommandAbstract_1.CommandAbstract {
-    onOptions() {
-        return this.returnsOptions({
+    optionsConfig() {
+        return this.castOptionsConfig({
             id: {
                 description: "Filter by snapshot id",
                 option: "-i,--id <id>",
@@ -48,7 +48,7 @@ class RestoreCommand extends CommandAbstract_1.CommandAbstract {
             },
         });
     }
-    async onExec() {
+    async exec() {
         const verbose = this.globalOptions.verbose ?? 0;
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const restore = new RestoreAction_1.RestoreAction(config, {
@@ -70,7 +70,8 @@ class RestoreCommand extends CommandAbstract_1.CommandAbstract {
             restore
                 .dataFormat(result, { streams: this.streams, verbose })
                 .log(this.globalOptions.outputFormat);
-        return result.some((item) => item.error) ? 1 : 0;
+        const exitCode = result.some((item) => item.error) ? 1 : 0;
+        return { result, exitCode };
     }
 }
 exports.RestoreCommand = RestoreCommand;

package/lib/{Command → commands}/SnapshotsCommand.d.ts

@@ -1,6 +1,6 @@
-import { SnapshotsAction } from "../Action/SnapshotsAction";
-import { RepositoryConfig } from "../Config/RepositoryConfig";
-import { If, Unwrap } from "../utils/ts";
+import { SnapshotsAction } from "../actions/SnapshotsAction";
+import type { RepositoryConfig } from "../utils/datatruck/config-type";
+import { If } from "../utils/ts";
 import { CommandAbstract } from "./CommandAbstract";
 export type SnapshotsCommandOptions<TResolved = false> = {
     id?: If<TResolved, string[]>;
@@ -20,8 +20,10 @@ export type SnapshotsCommandOptions<TResolved = false> = {
     groupBy?: If<TResolved, SnapshotsAction["options"]["groupBy"]>;
     tag?: If<TResolved, string[]>;
 };
-export type SnapshotsCommandResult = Unwrap<SnapshotsAction["exec"]>;
 export declare class SnapshotsCommand extends CommandAbstract<SnapshotsCommandOptions<false>, SnapshotsCommandOptions<true>> {
-    onOptions(): import("../utils/cli").OptionsType<SnapshotsCommandOptions<false>, SnapshotsCommandOptions<true>>;
-    onExec(): Promise<number>;
+    optionsConfig(): import("../utils/cli").OptionsConfig<SnapshotsCommandOptions<false>, SnapshotsCommandOptions<true>>;
+    exec(): Promise<{
+        result: import("../actions/SnapshotsAction").ExtendedSnapshot[];
+        exitCode: number;
+    }>;
 }

package/lib/{Command → commands}/SnapshotsCommand.js

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SnapshotsCommand = void 0;
-const ConfigAction_1 = require("../Action/ConfigAction");
-const SnapshotsAction_1 = require("../Action/SnapshotsAction");
+const ConfigAction_1 = require("../actions/ConfigAction");
+const SnapshotsAction_1 = require("../actions/SnapshotsAction");
 const DataFormat_1 = require("../utils/DataFormat");
 const bytes_1 = require("../utils/bytes");
 const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
 class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
-    onOptions() {
+    optionsConfig() {
         const groupByValues = [
             "id",
             "packageName",
             "repositoryName",
             "repositoryType",
         ];
-        return this.returnsOptions({
+        return this.castOptionsConfig({
             groupBy: {
                 option: "-g,--group-by <values>",
                 description: `Group by values (${groupByValues.join(", ")})`,
@@ -96,7 +96,7 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
             },
         });
     }
-    async onExec() {
+    async exec() {
         const verbose = this.globalOptions.verbose ?? 0;
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const snapshots = new SnapshotsAction_1.SnapshotsAction(config, {
@@ -117,10 +117,10 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
             verbose: verbose > 0,
             tags: this.options.tag,
         });
-        const items = await snapshots.exec();
+        const result = await snapshots.exec();
         const dataFormat = new DataFormat_1.DataFormat({
             streams: this.streams,
-            json: items,
+            json: result,
             table: {
                 headers: [
                     { value: "Id.", width: (this.options.longId ? 32 : 8) + 2 },
@@ -131,7 +131,7 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
                     { value: "Repository" },
                     { value: "Repository type" },
                 ],
-                rows: () => items.map((item) => [
+                rows: () => result.map((item) => [
                     this.options.longId ? item.id : item.id.slice(0, 8),
                     item.date.replace("T", " ").replace("Z", ""),
                     item.packageName,
@@ -145,12 +145,12 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
         if (this.globalOptions.outputFormat)
             dataFormat.log(this.globalOptions.outputFormat, {
                 tpl: {
-                    sids: () => items.map((i) => i.id).join(),
-                    ssids: () => items.map((i) => i.shortId).join(),
-                    pkgNames: () => items.map((i) => i.packageName).join(),
+                    sids: () => result.map((i) => i.id).join(),
+                    ssids: () => result.map((i) => i.shortId).join(),
+                    pkgNames: () => result.map((i) => i.packageName).join(),
                 },
             });
-        return 0;
+        return { result, exitCode: 0 };
     }
 }
 exports.SnapshotsCommand = SnapshotsCommand;

package/lib/{Command → commands}/StartServerCommand.d.ts

@@ -1,6 +1,8 @@
 import { CommandAbstract } from "./CommandAbstract";
 export type StartServerCommandOptions<TResolved = false> = {};
 export declare class StartServerCommand extends CommandAbstract<StartServerCommandOptions<false>, StartServerCommandOptions<true>> {
-    onOptions(): import("../utils/cli").OptionsType<StartServerCommandOptions<false>, StartServerCommandOptions<true>>;
-    onExec(): Promise<number>;
+    optionsConfig(): import("../utils/cli").OptionsConfig<StartServerCommandOptions<false>, StartServerCommandOptions<true>>;
+    exec(): Promise<{
+        exitCode: number;
+    }>;
 }

package/lib/{Command → commands}/StartServerCommand.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StartServerCommand = void 0;
-const ConfigAction_1 = require("../Action/ConfigAction");
+const ConfigAction_1 = require("../actions/ConfigAction");
 const cron_server_1 = require("../utils/datatruck/cron-server");
 const repository_server_1 = require("../utils/datatruck/repository-server");
 const CommandAbstract_1 = require("./CommandAbstract");
 class StartServerCommand extends CommandAbstract_1.CommandAbstract {
-    onOptions() {
-        return this.returnsOptions({});
+    optionsConfig() {
+        return this.castOptionsConfig({});
     }
-    async onExec() {
+    async exec() {
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const verbose = !!this.globalOptions.verbose;
         const log = config.server?.log ?? true;
@@ -43,7 +43,7 @@ class StartServerCommand extends CommandAbstract_1.CommandAbstract {
         process.on("SIGINT", () => process.exit(1));
         process.on("SIGTERM", () => process.exit(1));
         await new Promise(() => setInterval(() => { }, 60000));
-        return 0;
+        return { exitCode: 0 };
     }
 }
 exports.StartServerCommand = StartServerCommand;

package/lib/index.d.ts

@@ -1,24 +1,21 @@
-export type { Config } from "./Config/Config";
-export type { PackageConfig } from "./Config/PackageConfig";
-export type { PackageRepositoryConfig } from "./Config/PackageRepositoryConfig";
-export type { PrunePolicyConfig } from "./Config/PrunePolicyConfig";
-export type { RepositoryConfig } from "./Config/RepositoryConfig";
-export { type ResticRepositoryConfig } from "./Repository/ResticRepository";
-export { type DatatruckRepositoryConfig } from "./Repository/DatatruckRepository";
-export { type GitRepositoryConfig } from "./Repository/GitRepository";
-export type { TaskConfig } from "./Config/TaskConfig";
-export { type GitTaskConfig } from "./Task/GitTask";
-export { type MariadbTaskConfig } from "./Task/MariadbTask";
-export { type MssqlTaskConfig } from "./Task/MssqlTask";
-export { type MysqlDumpTaskConfig } from "./Task/MysqlDumpTask";
-export { type PostgresqlDumpTaskConfig } from "./Task/PostgresqlDumpTask";
-export { type ScriptTaskConfig } from "./Task/ScriptTask";
-export { BackupAction, type BackupActionOptions } from "./Action/BackupAction";
-export { CleanCacheAction, type CleanCacheActionOptions, } from "./Action/CleanCacheAction";
-export { ConfigAction, type ConfigActionOptions } from "./Action/ConfigAction";
-export { CopyAction, type CopyActionOptions } from "./Action/CopyAction";
-export { InitAction, type InitActionOptions } from "./Action/InitAction";
-export { PruneAction, type PruneActionsOptions } from "./Action/PruneAction";
-export { RestoreAction, type RestoreActionOptions, } from "./Action/RestoreAction";
-export { SnapshotsAction, type SnapshotsActionOptions, } from "./Action/SnapshotsAction";
+export type { Config, PackageConfig, PackageConfigMeta, DatatruckPolicyConfig, DatatruckReportConfig, DatatruckServerOptions, } from "./utils/datatruck/config-type";
+export type { PackageRepositoryConfig, RepositoryConfig, } from "./utils/datatruck/config-repository-type";
+export type { TaskConfig } from "./utils/datatruck/config-task-type";
+export { type ResticRepositoryConfig } from "./repositories/ResticRepository";
+export { type DatatruckRepositoryConfig } from "./repositories/DatatruckRepository";
+export { type GitRepositoryConfig } from "./repositories/GitRepository";
+export { type GitTaskConfig } from "./tasks/GitTask";
+export { type MariadbTaskConfig } from "./tasks/MariadbTask";
+export { type MssqlTaskConfig } from "./tasks/MssqlTask";
+export { type MysqlDumpTaskConfig } from "./tasks/MysqlDumpTask";
+export { type PostgresqlDumpTaskConfig } from "./tasks/PostgresqlDumpTask";
+export { type ScriptTaskConfig } from "./tasks/ScriptTask";
+export { BackupAction, type BackupActionOptions } from "./actions/BackupAction";
+export { CleanCacheAction, type CleanCacheActionOptions, } from "./actions/CleanCacheAction";
+export { ConfigAction, type ConfigActionOptions } from "./actions/ConfigAction";
+export { CopyAction, type CopyActionOptions } from "./actions/CopyAction";
+export { InitAction, type InitActionOptions } from "./actions/InitAction";
+export { PruneAction, type PruneActionsOptions } from "./actions/PruneAction";
+export { RestoreAction, type RestoreActionOptions, } from "./actions/RestoreAction";
+export { SnapshotsAction, type SnapshotsActionOptions, } from "./actions/SnapshotsAction";
 export { parseArgs } from "./cli";