@datatruck/cli 0.36.8 → 0.37.0

package/config.schema.json

@@ -759,11 +759,12 @@
             "enabled": {
               "type": "boolean"
             },
-            "actions": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/CronAction"
-              }
+            "logPath": {
+              "default": "'/var/logs/datatruck'",
+              "type": [
+                "string",
+                "boolean"
+              ]
             }
           },
           "additionalProperties": false
@@ -771,6 +772,12 @@
       },
       "additionalProperties": false
     },
+    "jobs": {
+      "type": "object",
+      "additionalProperties": {
+        "$ref": "#/definitions/Job"
+      }
+    },
     "reports": {
       "type": "array",
       "items": {
@@ -1658,12 +1665,46 @@
         }
       ]
     },
-    "CronAction": {
+    "Job": {
       "anyOf": [
         {
           "additionalProperties": false,
           "type": "object",
           "properties": {
+            "action": {
+              "type": "string",
+              "const": "backup"
+            },
+            "options": {
+              "type": "object",
+              "properties": {
+                "package": {
+                  "type": "string"
+                },
+                "packageTask": {
+                  "type": "string"
+                },
+                "repository": {
+                  "type": "string"
+                },
+                "repositoryType": {
+                  "type": "string"
+                },
+                "tag": {
+                  "type": "string"
+                },
+                "dryRun": {
+                  "type": "boolean"
+                },
+                "date": {
+                  "type": "string"
+                },
+                "prune": {
+                  "type": "boolean"
+                }
+              },
+              "additionalProperties": false
+            },
             "schedule": {
               "anyOf": [
                 {
@@ -1771,52 +1812,48 @@
                   "type": "string"
                 }
               ]
-            },
-            "name": {
+            }
+          },
+          "required": [
+            "action",
+            "options"
+          ]
+        },
+        {
+          "additionalProperties": false,
+          "type": "object",
+          "properties": {
+            "action": {
               "type": "string",
-              "const": "backup"
+              "const": "copy"
             },
             "options": {
               "type": "object",
               "properties": {
-                "package": {
+                "id": {
                   "type": "string"
                 },
-                "packageTask": {
-                  "type": "string"
+                "last": {
+                  "type": "number"
                 },
-                "repository": {
+                "package": {
                   "type": "string"
                 },
-                "repositoryType": {
+                "packageTask": {
                   "type": "string"
                 },
-                "tag": {
+                "repository": {
                   "type": "string"
                 },
-                "dryRun": {
-                  "type": "boolean"
-                },
-                "date": {
+                "repository2": {
                   "type": "string"
-                },
-                "prune": {
-                  "type": "boolean"
                 }
               },
-              "additionalProperties": false
-            }
-          },
-          "required": [
-            "name",
-            "options",
-            "schedule"
-          ]
-        },
-        {
-          "additionalProperties": false,
-          "type": "object",
-          "properties": {
+              "additionalProperties": false,
+              "required": [
+                "repository"
+              ]
+            },
             "schedule": {
               "anyOf": [
                 {
@@ -1924,49 +1961,24 @@
                   "type": "string"
                 }
               ]
-            },
-            "name": {
-              "type": "string",
-              "const": "copy"
-            },
-            "options": {
-              "type": "object",
-              "properties": {
-                "id": {
-                  "type": "string"
-                },
-                "last": {
-                  "type": "number"
-                },
-                "package": {
-                  "type": "string"
-                },
-                "packageTask": {
-                  "type": "string"
-                },
-                "repository": {
-                  "type": "string"
-                },
-                "repository2": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false,
-              "required": [
-                "repository"
-              ]
             }
           },
           "required": [
-            "name",
-            "options",
-            "schedule"
+            "action",
+            "options"
           ]
         },
         {
           "additionalProperties": false,
           "type": "object",
           "properties": {
+            "action": {
+              "type": "string",
+              "const": "prune"
+            },
+            "options": {
+              "$ref": "#/definitions/Omit<PruneCommandOptions,\"confirm\">"
+            },
             "schedule": {
               "anyOf": [
                 {
@@ -2074,19 +2086,11 @@
                   "type": "string"
                 }
               ]
-            },
-            "name": {
-              "type": "string",
-              "const": "prune"
-            },
-            "options": {
-              "$ref": "#/definitions/Omit<PruneCommandOptions,\"confirm\">"
             }
           },
           "required": [
-            "name",
-            "options",
-            "schedule"
+            "action",
+            "options"
           ]
         }
       ]

package/lib/actions/BackupAction.d.ts

@@ -77,7 +77,12 @@ export declare class BackupAction<TRequired extends boolean = true> {
     dataFormat(result: Listr3TaskResultEnd<Context>[], options?: {
         streams?: StdStreams;
         verbose?: number;
+        errors?: Error[];
     }): DataFormat;
-    exec(): Promise<(import("../utils/list").List3SummaryResult | import("../utils/list").Listr3TaskResult<Context>)[]>;
+    exec(): Promise<{
+        result: (import("../utils/list").List3SummaryResult | import("../utils/list").Listr3TaskResult<Context>)[];
+        exitCode: number;
+        errors: Error[];
+    }>;
 }
 export {};

package/lib/actions/BackupAction.js

@@ -202,15 +202,17 @@ class BackupAction {
                     { value: "Duration", width: 10 },
                     { value: "Error", width: 50 },
                 ],
-                rows: () => result
-                    .filter((item) => item.key !== "cleanup")
-                    .map((item) => [
-                    (0, cli_1.renderResult)(item.error),
-                    renderTitle(item, true),
-                    renderData(item, result, "table"),
-                    (0, date_1.duration)(item.elapsed),
-                    (0, cli_1.renderError)(item.error, options.verbose),
-                ]),
+                rows: () => {
+                    return result
+                        .filter((item) => item.key !== "cleanup")
+                        .map((item) => [
+                        (0, cli_1.renderResult)(item.error),
+                        renderTitle(item, true),
+                        renderData(item, result, "table"),
+                        (0, date_1.duration)(item.elapsed),
+                        (0, cli_1.renderError)(item.error, options.errors?.indexOf(item.error)),
+                    ]);
+                },
             },
         });
     }
@@ -430,7 +432,7 @@ class BackupAction {
                 },
             }),
         ])
-            .exec();
+            .execAndParse(this.options.verbose);
     }
 }
 exports.BackupAction = BackupAction;

package/lib/actions/CopyAction.d.ts

@@ -41,6 +41,7 @@ export declare class CopyAction<TRequired extends boolean = true> {
     dataFormat(result: Listr3TaskResultEnd<Context>[], options?: {
         streams?: StdStreams;
         verbose?: number;
+        errors?: Error[];
     }): DataFormat;
     protected fetchSnapshots(repo: RepositoryAbstract<any>): Promise<Snapshot[]>;
     protected createSourceRepoMap(): StrictMap<[Pick<Snapshot, "packageName" | "id">, Pick<RepositoryConfig, "type">], RepositoryAbstract<any>>;
@@ -54,5 +55,9 @@ export declare class CopyAction<TRequired extends boolean = true> {
     }): Promise<{
         bytes: number;
     }>;
-    exec(): Promise<(import("../utils/list").List3SummaryResult | import("../utils/list").Listr3TaskResult<Context>)[]>;
+    exec(): Promise<{
+        result: (import("../utils/list").List3SummaryResult | import("../utils/list").Listr3TaskResult<Context>)[];
+        exitCode: number;
+        errors: Error[];
+    }>;
 }

package/lib/actions/CopyAction.js

@@ -122,7 +122,7 @@ class CopyAction {
                     renderTitle(item, true),
                     renderData(item, result, "table"),
                     (0, date_1.duration)(item.elapsed),
-                    (0, cli_1.renderError)(item.error, options.verbose),
+                    (0, cli_1.renderError)(item.error, options.errors?.indexOf(item.error)),
                 ]),
             },
         });
@@ -330,7 +330,7 @@ class CopyAction {
                 },
             }),
         ])
-            .exec();
+            .execAndParse(this.options.verbose);
     }
 }
 exports.CopyAction = CopyAction;

package/lib/actions/RestoreAction.d.ts

@@ -53,7 +53,12 @@ export declare class RestoreAction<TRequired extends boolean = true> {
     dataFormat(result: Listr3TaskResultEnd<Context>[], options?: {
         streams?: StdStreams;
         verbose?: number;
+        errors?: Error[];
     }): DataFormat;
-    exec(): Promise<(import("../utils/list").List3SummaryResult | import("../utils/list").Listr3TaskResult<Context>)[]>;
+    exec(): Promise<{
+        result: (import("../utils/list").List3SummaryResult | import("../utils/list").Listr3TaskResult<Context>)[];
+        exitCode: number;
+        errors: Error[];
+    }>;
 }
 export {};

package/lib/actions/RestoreAction.js

@@ -176,7 +176,7 @@ class RestoreAction {
                     renderTitle(item, true),
                     renderData(item, true, result),
                     (0, date_1.duration)(item.elapsed),
-                    (0, cli_1.renderError)(item.error, options.verbose),
+                    (0, cli_1.renderError)(item.error, options.errors?.indexOf(item.error)),
                 ]),
             },
         });
@@ -299,7 +299,7 @@ class RestoreAction {
                 }));
             },
         }))
-            .exec();
+            .execAndParse(this.options.verbose);
     }
 }
 exports.RestoreAction = RestoreAction;

package/lib/cli.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -13,7 +36,7 @@ const exit_1 = require("./utils/exit");
 const fs_1 = require("./utils/fs");
 const string_1 = require("./utils/string");
 const temp_1 = require("./utils/temp");
-const chalk_1 = require("chalk");
+const chalk_1 = __importStar(require("chalk"));
 const commander_1 = require("commander");
 const fs_2 = require("fs");
 const path_1 = require("path");
@@ -27,43 +50,73 @@ function getGlobalOptions() {
     };
 }
 function makeCommand(command) {
-    const programCommand = program.command(command);
     const instance = (0, command_1.createCommand)(command, getGlobalOptions(), null);
     const options = instance.optionsConfig();
+    const inlineOptions = [];
+    for (const name in options) {
+        const option = options[name];
+        if (typeof option.option !== "string") {
+            inlineOptions.push({ name, required: option.required });
+        }
+    }
+    const programCommand = program.command([
+        command,
+        ...inlineOptions.map((v) => (v.required ? `<${v.name}>` : `[${v.name}]`)),
+    ].join(" "));
     for (const key in options) {
         const option = options[key];
-        const description = `${option.description}${option.defaults ? ` (defaults: ${option.defaults})` : ""}`;
-        if (option.required) {
-            programCommand.requiredOption(option.option, description);
-        }
-        else {
-            programCommand.option(option.option, description);
+        if (typeof option.option === "string") {
+            const description = `${option.description}${option.defaults ? ` (defaults: ${option.defaults})` : ""}`;
+            if (option.required) {
+                programCommand.requiredOption(option.option, description);
+            }
+            else {
+                programCommand.option(option.option, description);
+            }
         }
     }
-    return programCommand.action(makeCommandAction(command));
+    return programCommand.action(async (...args) => {
+        const inlineValues = args.slice(0, inlineOptions.length);
+        const action = makeCommandAction(command);
+        const inOptions = args[inlineOptions.length] || {};
+        const options = inlineOptions.reduce((result, inlineOption, index) => {
+            const value = inlineValues[index];
+            if (value !== undefined)
+                result[inlineOption.name] = value;
+            return result;
+        }, inOptions);
+        return await action(options);
+    });
 }
-function makeCommandAction(command) {
+function makeCommandAction(commandName) {
     return async function (options) {
         let exitCode = 1;
+        let error;
+        let errors;
         const globalOptions = getGlobalOptions();
         try {
-            const configAction = new ConfigAction_1.ConfigAction({
-                path: globalOptions.config,
-                verbose: !!globalOptions.verbose,
-            });
-            const config = await configAction.exec();
+            const config = await ConfigAction_1.ConfigAction.fromGlobalOptionsWithPath(globalOptions);
             if (config.data.tempDir)
                 globalData_1.default.tempDir = (0, path_1.isAbsolute)(config.data.tempDir)
                     ? config.data.tempDir
                     : (0, path_1.join)((0, path_1.dirname)(config.path), config.data.tempDir);
-            const response = await (0, command_1.createCommand)(command, {
-                ...globalOptions,
-                config: config.data,
-            }, options, {}, globalOptions.config).exec();
+            const command = (0, command_1.createCommand)(commandName, { ...globalOptions }, options, {}, globalOptions.config);
+            const response = await command.exec();
+            errors = response.errors;
             exitCode = response.exitCode;
         }
         catch (e) {
-            const error = e;
+            error = e;
+        }
+        if (errors?.length) {
+            console.error();
+            errors.forEach((error, index) => {
+                console.error(chalk_1.default.red(`${index + 1}. ` + error.stack ?? error.message));
+                if (errors[index + 1])
+                    console.error();
+            });
+        }
+        if (error) {
             if (globalOptions.verbose) {
                 console.error((0, chalk_1.red)(error.stack));
             }
@@ -99,6 +152,7 @@ makeCommand("snapshots").alias("s");
 makeCommand("prune").alias("p");
 makeCommand("backup").alias("b");
 makeCommand("restore").alias("r");
+makeCommand("run");
 makeCommand("copy").alias("cp");
 makeCommand("cleanCache").alias("cc");
 function buildArgs(input, options) {
@@ -117,7 +171,7 @@ function parseArgs(args) {
             process.stdout.write(cli_1.showCursorCommand);
             console.info(`\nClosing... (reason: ${eventName})`);
             if (error instanceof Error)
-                console.error((0, chalk_1.red)(error.stack));
+                console.error(error.stack);
         }
         if (!verbose)
             try {

package/lib/commands/BackupCommand.d.ts

@@ -41,5 +41,6 @@ export declare class BackupCommand extends CommandAbstract<BackupCommandOptions<
             };
         } & import("../utils/datatruck/report-list").ReportListTaskContext>)[];
         exitCode: number;
+        errors: Error[];
     }>;
 }

package/lib/commands/BackupCommand.js

@@ -64,13 +64,16 @@ class BackupCommand extends CommandAbstract_1.CommandAbstract {
             streams: this.streams,
             prune: this.options.prune,
         });
-        const result = await backup.exec();
+        const data = await backup.exec();
         if (this.globalOptions.outputFormat)
             backup
-                .dataFormat(result, { streams: this.streams, verbose })
+                .dataFormat(data.result, {
+                verbose,
+                streams: this.streams,
+                errors: data.errors,
+            })
                 .log(this.globalOptions.outputFormat);
-        const exitCode = result.some((item) => item.error) ? 1 : 0;
-        return { result, exitCode };
+        return data;
     }
 }
 exports.BackupCommand = BackupCommand;

package/lib/commands/CommandAbstract.d.ts

@@ -26,5 +26,6 @@ export declare abstract class CommandAbstract<TUnresolvedOptions, TOptions exten
     abstract exec(): Promise<{
         exitCode: number;
         result?: any;
+        errors?: Error[];
     }>;
 }

package/lib/commands/CopyCommand.d.ts

@@ -13,5 +13,6 @@ export declare class CopyCommand extends CommandAbstract<CopyCommandOptions<fals
     exec(): Promise<{
         result: (import("../utils/list").List3SummaryResult | import("../utils/list").Listr3TaskResult<import("../actions/CopyAction").Context>)[];
         exitCode: number;
+        errors: Error[];
     }>;
 }

package/lib/commands/CopyCommand.js

@@ -54,13 +54,16 @@ class CopyCommand extends CommandAbstract_1.CommandAbstract {
             tty: this.globalOptions.tty,
             progress: this.globalOptions.progress,
         });
-        const result = await copy.exec();
+        const data = await copy.exec();
         if (this.globalOptions.outputFormat)
             copy
-                .dataFormat(result, { streams: this.streams, verbose })
+                .dataFormat(data.result, {
+                verbose,
+                streams: this.streams,
+                errors: data.errors,
+            })
                 .log(this.globalOptions.outputFormat);
-        const exitCode = result.some((item) => item.error) ? 1 : 0;
-        return { result, exitCode };
+        return data;
     }
 }
 exports.CopyCommand = CopyCommand;

package/lib/commands/InitCommand.d.ts

@@ -15,5 +15,6 @@ export declare class InitCommand extends CommandAbstract<InitCommandOptions<fals
             error: Error | null;
         }[];
         exitCode: number;
+        errors: Error[];
     }>;
 }

package/lib/commands/InitCommand.js

@@ -5,6 +5,7 @@ const ConfigAction_1 = require("../actions/ConfigAction");
 const InitAction_1 = require("../actions/InitAction");
 const cli_1 = require("../utils/cli");
 const data_format_1 = require("../utils/data-format");
+const error_1 = require("../utils/error");
 const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
 class InitCommand extends CommandAbstract_1.CommandAbstract {
@@ -31,6 +32,10 @@ class InitCommand extends CommandAbstract_1.CommandAbstract {
             verbose: verbose > 0,
         });
         const result = await init.exec();
+        const exitCode = result.some((item) => item.error) ? 1 : 0;
+        const errors = result
+            .filter((item) => item.error && (verbose || !(item.error instanceof error_1.AppError)))
+            .map(({ error }) => error);
         const dataFormat = new data_format_1.DataFormat({
             streams: this.streams,
             json: result,
@@ -47,13 +52,13 @@ class InitCommand extends CommandAbstract_1.CommandAbstract {
                     item.repositoryName,
                     item.repositoryType,
                     item.repositorySource,
-                    (0, cli_1.renderError)(item.error, verbose),
+                    (0, cli_1.renderError)(item.error, errors.indexOf(item.error)),
                 ]),
             },
         });
         if (this.globalOptions.outputFormat)
             dataFormat.log(this.globalOptions.outputFormat);
-        return { result, exitCode: 0 };
+        return { result, exitCode, errors };
     }
 }
 exports.InitCommand = InitCommand;

package/lib/commands/RestoreCommand.d.ts

@@ -35,5 +35,6 @@ export declare class RestoreCommand extends CommandAbstract<RestoreCommandOption
             };
         }>)[];
         exitCode: number;
+        errors: Error[];
     }>;
 }

package/lib/commands/RestoreCommand.js

@@ -65,13 +65,16 @@ class RestoreCommand extends CommandAbstract_1.CommandAbstract {
             progress: this.globalOptions.progress,
             streams: this.streams,
         });
-        const result = await restore.exec();
+        const data = await restore.exec();
         if (this.globalOptions.outputFormat)
             restore
-                .dataFormat(result, { streams: this.streams, verbose })
+                .dataFormat(data.result, {
+                verbose,
+                streams: this.streams,
+                errors: data.errors,
+            })
                 .log(this.globalOptions.outputFormat);
-        const exitCode = result.some((item) => item.error) ? 1 : 0;
-        return { result, exitCode };
+        return data;
     }
 }
 exports.RestoreCommand = RestoreCommand;

package/lib/commands/RunCommand.d.ts

@@ -0,0 +1,10 @@
+import { CommandAbstract } from "./CommandAbstract";
+export type RunCommandOptions<TResolved = false> = {
+    jobName: string;
+};
+export declare class RunCommand extends CommandAbstract<RunCommandOptions<false>, RunCommandOptions<true>> {
+    optionsConfig(): import("../utils/cli").OptionsConfig<RunCommandOptions<false>, RunCommandOptions<true>>;
+    exec(): Promise<{
+        exitCode: number;
+    }>;
+}