@datatruck/cli 0.37.0 → 0.38.1

package/lib/commands/PruneCommand.js

@@ -1,112 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PruneCommand = void 0;
+exports.PruneCommand = exports.pruneCommandOptions = void 0;
 const ConfigAction_1 = require("../actions/ConfigAction");
 const PruneAction_1 = require("../actions/PruneAction");
 const cli_1 = require("../utils/cli");
 const data_format_1 = require("../utils/data-format");
-const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
+exports.pruneCommandOptions = {
+    ...PruneAction_1.pruneActionOptions,
+    longId: {
+        description: "Show long snapshot id",
+        value: "boolean",
+    },
+    confirm: {
+        description: "Confirm action",
+        value: "boolean",
+    },
+};
 class PruneCommand extends CommandAbstract_1.CommandAbstract {
-    optionsConfig() {
-        return this.castOptionsConfig({
-            dryRun: {
-                description: "",
-                option: "--dry-run",
-                parser: undefined,
-            },
-            groupBy: {
-                description: "Group by values (packageName, repositoryName, repositoryType)",
-                option: "-g,--group-by <values>",
-                defaults: "packageName, repositoryName",
-                parser: (v) => (0, string_1.parseStringList)(v, [
-                    "packageName",
-                    "repositoryName",
-                    "repositoryType",
-                ]),
-            },
-            id: {
-                description: "Filter by snapshot id",
-                option: "-i,--id <snapshotId>",
-                parser: string_1.parseStringList,
-            },
-            keepMinutely: {
-                description: "Keep last N minutely snapshots",
-                option: "--keepMinutely <number>",
-                parser: Number,
-            },
-            keepDaily: {
-                description: "Keep last N daily snapshots",
-                option: "--keepDaily <number>",
-                parser: Number,
-            },
-            keepHourly: {
-                description: "Keep last N hourly snapshots",
-                option: "--keepHourly <number>",
-                parser: Number,
-            },
-            keepLast: {
-                description: "Keep last N snapshots",
-                option: "--keepLast <number>",
-                parser: Number,
-            },
-            keepMonthly: {
-                description: "Keep last N monthly snapshots",
-                option: "--keepMonthly <number>",
-                parser: Number,
-            },
-            keepWeekly: {
-                description: "Keep last N weekly snapshots",
-                option: "--keepWeekly <number>",
-                parser: Number,
-            },
-            keepYearly: {
-                description: "Keep last N yearly snapshots",
-                option: "--keepYearly <number>",
-                parser: Number,
-            },
-            longId: {
-                description: "Show long snapshot id",
-                option: "--longId",
-            },
-            package: {
-                description: "Filter by package names",
-                option: "-p,--package <values>",
-                parser: string_1.parseStringList,
-            },
-            repository: {
-                description: "Filter by repository names",
-                option: "-r,--repository <values>",
-                parser: string_1.parseStringList,
-            },
-            repositoryType: {
-                description: "Filter by repository types",
-                option: "-rt,--repository-type <values>",
-                parser: (v) => (0, string_1.parseStringList)(v),
-            },
-            tag: {
-                description: "Filter by tags",
-                option: "-t,--tag <values>",
-                parser: string_1.parseStringList,
-            },
-            showAll: {
-                description: "Show all",
-                option: "-a,--showAll",
-            },
-            confirm: {
-                description: "Confirm action",
-                option: "--confirm",
-            },
-        });
+    static config() {
+        return {
+            name: "prune",
+            alias: "p",
+            options: exports.pruneCommandOptions,
+        };
+    }
+    get optionsConfig() {
+        return exports.pruneCommandOptions;
     }
     async exec() {
         const verbose = this.globalOptions.verbose ?? 0;
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const prune = new PruneAction_1.PruneAction(config, {
-            ids: this.options.id,
-            packageNames: this.options.package,
-            repositoryNames: this.options.repository,
-            repositoryTypes: this.options.repositoryType,
+            ids: this.options.ids,
+            packageNames: this.options.packageNames,
+            repositoryNames: this.options.repositoryNames,
+            repositoryTypes: this.options.repositoryTypes,
             verbose: verbose > 0,
             dryRun: this.options.dryRun || !this.options.confirm,
             groupBy: this.options.groupBy,
@@ -117,9 +46,8 @@ class PruneCommand extends CommandAbstract_1.CommandAbstract {
             keepMonthly: this.options.keepMonthly,
             keepWeekly: this.options.keepWeekly,
             keepYearly: this.options.keepYearly,
-            tags: this.options.tag,
-            longId: this.options.longId,
-            returnsAll: this.options.showAll,
+            tags: this.options.tags,
+            showAll: this.options.showAll,
         });
         const result = await prune.exec();
         const dataFormat = new data_format_1.DataFormat({

package/lib/commands/RestoreCommand.d.ts

@@ -1,18 +1,131 @@
-import type { RepositoryConfig } from "../utils/datatruck/config-type";
-import { If } from "../utils/ts";
+import { InferOptions } from "../utils/options";
 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 const restoreCommandOptions: {
+    initial: {
+        description: string;
+        value: "boolean";
+    };
+    repositoryNames: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    repositoryTypes: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    packageNames: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    packageTaskNames: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    tags: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    packageConfig: {
+        description: string;
+        shortFlag: string;
+    };
+    id: {
+        description: string;
+        shortFlag: string;
+        required: true;
+    };
 };
-export declare class RestoreCommand extends CommandAbstract<RestoreCommandOptions<false>, RestoreCommandOptions<true>> {
-    optionsConfig(): import("../utils/cli").OptionsConfig<RestoreCommandOptions<false>, RestoreCommandOptions<true>>;
+export type RestoreCommandOptions = InferOptions<typeof restoreCommandOptions>;
+export declare class RestoreCommand extends CommandAbstract<typeof restoreCommandOptions> {
+    static config(): {
+        name: string;
+        alias: string;
+        options: {
+            initial: {
+                description: string;
+                value: "boolean";
+            };
+            repositoryNames: {
+                description: string;
+                shortFlag: string;
+                value: "array";
+            };
+            repositoryTypes: {
+                description: string;
+                shortFlag: string;
+                value: "array";
+            };
+            packageNames: {
+                description: string;
+                shortFlag: string;
+                value: "array";
+            };
+            packageTaskNames: {
+                description: string;
+                shortFlag: string;
+                value: "array";
+            };
+            tags: {
+                description: string;
+                shortFlag: string;
+                value: "array";
+            };
+            packageConfig: {
+                description: string;
+                shortFlag: string;
+            };
+            id: {
+                description: string;
+                shortFlag: string;
+                required: true;
+            };
+        };
+    };
+    get optionsConfig(): {
+        initial: {
+            description: string;
+            value: "boolean";
+        };
+        repositoryNames: {
+            description: string;
+            shortFlag: string;
+            value: "array";
+        };
+        repositoryTypes: {
+            description: string;
+            shortFlag: string;
+            value: "array";
+        };
+        packageNames: {
+            description: string;
+            shortFlag: string;
+            value: "array";
+        };
+        packageTaskNames: {
+            description: string;
+            shortFlag: string;
+            value: "array";
+        };
+        tags: {
+            description: string;
+            shortFlag: string;
+            value: "array";
+        };
+        packageConfig: {
+            description: string;
+            shortFlag: string;
+        };
+        id: {
+            description: string;
+            shortFlag: string;
+            required: true;
+        };
+    };
     exec(): Promise<{
         result: (import("../utils/list").List3SummaryResult | import("../utils/list").Listr3TaskResult<{
             snapshots: {

package/lib/commands/RestoreCommand.js

@@ -1,66 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RestoreCommand = void 0;
+exports.RestoreCommand = exports.restoreCommandOptions = void 0;
 const ConfigAction_1 = require("../actions/ConfigAction");
 const RestoreAction_1 = require("../actions/RestoreAction");
-const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
+exports.restoreCommandOptions = {
+    ...RestoreAction_1.restoreActionOptions,
+};
 class RestoreCommand extends CommandAbstract_1.CommandAbstract {
-    optionsConfig() {
-        return this.castOptionsConfig({
-            id: {
-                description: "Filter by snapshot id",
-                option: "-i,--id <id>",
-                required: true,
-            },
-            package: {
-                description: "Filter by package names",
-                option: "-p,--package <values>",
-                parser: string_1.parseStringList,
-            },
-            initial: {
-                description: "Initial restoring (disables restore path)",
-                option: "--initial",
-            },
-            packageTask: {
-                description: "Filter by package task names",
-                option: "-pt,--package-task <values>",
-                parser: string_1.parseStringList,
-            },
-            packageConfig: {
-                description: "Filter by package config",
-                option: "-pc,--package-config",
-            },
-            repository: {
-                description: "Filter by repository names",
-                option: "-r,--repository <values>",
-                parser: string_1.parseStringList,
-            },
-            repositoryType: {
-                description: "Filter by repository types",
-                option: "-rt,--repository-type <values>",
-                parser: (v) => (0, string_1.parseStringList)(v),
-            },
-            tag: {
-                description: "Filter by tags",
-                option: "-t,--tag <values>",
-                parser: string_1.parseStringList,
-            },
-        });
+    static config() {
+        return {
+            name: "restore",
+            alias: "r",
+            options: exports.restoreCommandOptions,
+        };
+    }
+    get optionsConfig() {
+        return exports.restoreCommandOptions;
     }
     async exec() {
         const verbose = this.globalOptions.verbose ?? 0;
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const restore = new RestoreAction_1.RestoreAction(config, {
-            snapshotId: this.options.id,
-            packageNames: this.options.package,
-            packageTaskNames: this.options.packageTask,
+            id: this.options.id,
+            packageNames: this.options.packageNames,
+            packageTaskNames: this.options.packageTaskNames,
             packageConfig: this.options.packageConfig,
-            repositoryNames: this.options.repository,
-            repositoryTypes: this.options.repositoryType,
-            tags: this.options.tag,
+            repositoryNames: this.options.repositoryNames,
+            repositoryTypes: this.options.repositoryTypes,
+            tags: this.options.tags,
             verbose: verbose > 0,
             initial: this.options.initial,
+        }, {
             tty: this.globalOptions.tty,
             progress: this.globalOptions.progress,
             streams: this.streams,

package/lib/commands/RunCommand.d.ts

@@ -1,9 +1,28 @@
+import { InferOptions } from "../utils/options";
 import { CommandAbstract } from "./CommandAbstract";
-export type RunCommandOptions<TResolved = false> = {
-    jobName: string;
+export declare const runCommandOptions: {
+    jobName: {
+        description: string;
+        flag: false;
+    };
 };
-export declare class RunCommand extends CommandAbstract<RunCommandOptions<false>, RunCommandOptions<true>> {
-    optionsConfig(): import("../utils/cli").OptionsConfig<RunCommandOptions<false>, RunCommandOptions<true>>;
+export type RunCommandOptions = InferOptions<typeof runCommandOptions>;
+export declare class RunCommand extends CommandAbstract<typeof runCommandOptions> {
+    static config(): {
+        name: string;
+        options: {
+            jobName: {
+                description: string;
+                flag: false;
+            };
+        };
+    };
+    get optionsConfig(): {
+        jobName: {
+            description: string;
+            flag: false;
+        };
+    };
     exec(): Promise<{
         exitCode: number;
     }>;

package/lib/commands/RunCommand.js

@@ -1,18 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RunCommand = void 0;
+exports.RunCommand = exports.runCommandOptions = void 0;
 const ConfigAction_1 = require("../actions/ConfigAction");
 const job_1 = require("../utils/datatruck/job");
-const error_1 = require("../utils/error");
 const CommandAbstract_1 = require("./CommandAbstract");
+exports.runCommandOptions = {
+    jobName: {
+        description: "Job name",
+        flag: false,
+    },
+};
 class RunCommand extends CommandAbstract_1.CommandAbstract {
-    optionsConfig() {
-        return this.castOptionsConfig({
-            jobName: {
-                description: "Job name",
-                required: true,
-            },
-        });
+    static config() {
+        return {
+            name: "run",
+            options: exports.runCommandOptions,
+        };
+    }
+    get optionsConfig() {
+        return exports.runCommandOptions;
     }
     async exec() {
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptionsWithPath(this.globalOptions);
@@ -20,9 +26,12 @@ class RunCommand extends CommandAbstract_1.CommandAbstract {
         const log = config.data.server?.log ?? true;
         const jobs = config.data.jobs || {};
         const jobName = this.options.jobName;
-        const job = jobs[jobName];
-        if (!job)
-            throw new error_1.AppError(`Job not found: ${jobName}`);
+        const job = jobName ? jobs[jobName] : undefined;
+        if (!job || !jobName) {
+            const jobNames = Object.keys(config.data.jobs || {});
+            console.error(`error: missing required argument 'jobName' (values: ${jobNames.join(", ")})`);
+            return { exitCode: 1 };
+        }
         await (0, job_1.runJob)(job, jobName, {
             log,
             verbose: verbose,