@datatruck/cli 0.37.0 → 0.38.1

package/config.schema.json

@@ -1466,13 +1466,13 @@
             "type": "string"
           }
         },
-        "keepDaily": {
+        "keepMinutely": {
           "type": "number"
         },
-        "keepHourly": {
+        "keepDaily": {
           "type": "number"
         },
-        "keepMinutely": {
+        "keepHourly": {
           "type": "number"
         },
         "keepLast": {
@@ -1676,34 +1676,7 @@
               "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
+              "$ref": "#/definitions/BackupCommandOptions"
             },
             "schedule": {
               "anyOf": [
@@ -1828,31 +1801,7 @@
               "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"
-              ]
+              "$ref": "#/definitions/CopyCommandOptions"
             },
             "schedule": {
               "anyOf": [
@@ -2095,31 +2044,147 @@
         }
       ]
     },
-    "Omit<PruneCommandOptions,\"confirm\">": {
+    "BackupCommandOptions": {
+      "additionalProperties": false,
       "type": "object",
       "properties": {
-        "repository": {
-          "type": "string"
+        "dryRun": {
+          "type": "boolean"
         },
-        "repositoryType": {
+        "date": {
           "type": "string"
         },
-        "id": {
+        "prune": {
+          "type": "boolean"
+        },
+        "repositoryNames": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "repositoryTypes": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "packageNames": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "packageTaskNames": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "CopyCommandOptions": {
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+        "repositoryName": {
           "type": "string"
         },
+        "repositoryNames2": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "packageNames": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "packageTaskNames": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "ids": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "last": {
+          "type": "number"
+        }
+      },
+      "required": [
+        "repositoryName"
+      ]
+    },
+    "Omit<PruneCommandOptions,\"confirm\">": {
+      "type": "object",
+      "properties": {
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "ids": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "repositoryNames": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "repositoryTypes": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "packageNames": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
         "groupBy": {
-          "type": "string"
+          "type": "array",
+          "items": {
+            "enum": [
+              "packageName",
+              "repositoryName",
+              "repositoryType"
+            ],
+            "type": "string"
+          }
         },
         "dryRun": {
           "type": "boolean"
         },
-        "keepDaily": {
+        "showAll": {
+          "type": "string"
+        },
+        "keepMinutely": {
           "type": "number"
         },
-        "keepHourly": {
+        "keepDaily": {
           "type": "number"
         },
-        "keepMinutely": {
+        "keepHourly": {
           "type": "number"
         },
         "keepLast": {
@@ -2134,17 +2199,8 @@
         "keepYearly": {
           "type": "number"
         },
-        "package": {
-          "type": "string"
-        },
-        "tag": {
-          "type": "string"
-        },
         "longId": {
           "type": "boolean"
-        },
-        "showAll": {
-          "type": "boolean"
         }
       },
       "additionalProperties": false

package/lib/actions/BackupAction.d.ts

@@ -1,25 +1,11 @@
 import { PreSnapshot } from "../repositories/RepositoryAbstract";
 import { DataFormat } from "../utils/data-format";
-import type { Config, PackageConfig, RepositoryConfig } from "../utils/datatruck/config-type";
+import type { Config, PackageConfig } from "../utils/datatruck/config-type";
 import { ReportListTaskContext } from "../utils/datatruck/report-list";
 import { Listr3TaskResultEnd } from "../utils/list";
+import { InferOptions } from "../utils/options";
 import { Progress, ProgressMode } from "../utils/progress";
 import { StdStreams } from "../utils/stream";
-import { IfRequireKeys } from "../utils/ts";
-export type BackupActionOptions = {
-    repositoryNames?: string[];
-    repositoryTypes?: RepositoryConfig["type"][];
-    packageNames?: string[];
-    packageTaskNames?: string[];
-    tags?: string[];
-    dryRun?: boolean;
-    verbose?: boolean;
-    date?: string;
-    tty?: "auto" | boolean;
-    progress?: ProgressMode;
-    streams?: StdStreams;
-    prune?: boolean;
-};
 type Context = {
     snapshot: {
         id: string;
@@ -46,10 +32,60 @@ type Context = {
         pruned: number;
     };
 } & ReportListTaskContext;
-export declare class BackupAction<TRequired extends boolean = true> {
+export declare const backupActionOptions: {
+    dryRun: {
+        description: string;
+        value: "boolean";
+    };
+    date: {
+        description: string;
+    };
+    prune: {
+        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";
+    };
+};
+export type BackupActionOptions = InferOptions<typeof backupActionOptions> & {
+    verbose?: boolean;
+};
+export declare class BackupAction {
     readonly config: Config;
-    readonly options: IfRequireKeys<TRequired, BackupActionOptions>;
-    constructor(config: Config, options?: IfRequireKeys<TRequired, BackupActionOptions>);
+    readonly options: BackupActionOptions;
+    readonly settings: {
+        tty?: "auto" | boolean;
+        progress?: ProgressMode;
+        streams?: StdStreams;
+    };
+    constructor(config: Config, options: BackupActionOptions, settings: {
+        tty?: "auto" | boolean;
+        progress?: ProgressMode;
+        streams?: StdStreams;
+    });
     protected prepareSnapshot(): PreSnapshot;
     protected getPackages(snapshot: PreSnapshot): PackageConfig[];
     protected getRepositoryNames(repositoryNames: string[]): {

package/lib/actions/BackupAction.js

@@ -48,7 +48,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BackupAction = void 0;
+exports.BackupAction = exports.backupActionOptions = void 0;
 const bytes_1 = require("../utils/bytes");
 const cli_1 = require("../utils/cli");
 const data_format_1 = require("../utils/data-format");
@@ -60,20 +60,44 @@ const date_1 = require("../utils/date");
 const error_1 = require("../utils/error");
 const fs_1 = require("../utils/fs");
 const list_1 = require("../utils/list");
+const object_1 = require("../utils/object");
 const progress_1 = require("../utils/progress");
 const temp_1 = require("../utils/temp");
 const PruneAction_1 = require("./PruneAction");
+const SnapshotsAction_1 = require("./SnapshotsAction");
 const assert_1 = require("assert");
 const chalk_1 = __importDefault(require("chalk"));
 const crypto_1 = require("crypto");
 const dayjs_1 = __importDefault(require("dayjs"));
 const os_1 = require("os");
+exports.backupActionOptions = {
+    ...(0, object_1.pickProps)(SnapshotsAction_1.snapshotsActionOptions, {
+        repositoryNames: true,
+        repositoryTypes: true,
+        packageNames: true,
+        packageTaskNames: true,
+        tags: true,
+    }),
+    dryRun: {
+        description: "Skip execution",
+        value: "boolean",
+    },
+    date: {
+        description: "Date time (ISO)",
+    },
+    prune: {
+        description: "Prune backups",
+        value: "boolean",
+    },
+};
 class BackupAction {
     config;
     options;
-    constructor(config, options = {}) {
+    settings;
+    constructor(config, options, settings) {
         this.config = config;
         this.options = options;
+        this.settings = settings;
     }
     prepareSnapshot() {
         const date = this.options.date ?? new Date().toISOString();
@@ -217,15 +241,15 @@ class BackupAction {
         });
     }
     async exec() {
-        const { options } = this;
+        const { options, settings } = this;
         const gc = new temp_1.GargabeCollector();
         const pm = new progress_1.ProgressManager({
             verbose: options.verbose,
-            tty: options.tty,
-            mode: options.progress,
+            tty: settings.tty,
+            mode: settings.progress,
         });
         const l = new list_1.Listr3({
-            streams: this.options.streams,
+            streams: settings.streams,
             progressManager: pm,
             gargabeCollector: gc,
         });
@@ -274,7 +298,7 @@ class BackupAction {
                                             try {
                                                 const progress = __addDisposableResource(env_1, pm.create(task), false);
                                                 taskResult = await (0, task_1.createTask)(pkg.task).backup({
-                                                    options,
+                                                    options: this.options,
                                                     package: pkg,
                                                     snapshot,
                                                     onProgress: progress.update,

package/lib/actions/CleanCacheAction.d.ts

@@ -1,10 +1,9 @@
-import { IfRequireKeys } from "../utils/ts";
-export type CleanCacheActionOptions = {
-    verbose?: boolean;
-};
-export declare class CleanCacheAction<TRequired extends boolean = true> {
-    readonly options: IfRequireKeys<TRequired, CleanCacheActionOptions>;
-    constructor(options: IfRequireKeys<TRequired, CleanCacheActionOptions>);
+import { InferOptions } from "../utils/options";
+export declare const cleanCacheActionOptions: {};
+export type CleanCacheActionOptions = InferOptions<typeof cleanCacheActionOptions>;
+export declare class CleanCacheAction {
+    readonly options: CleanCacheActionOptions;
+    constructor(options: CleanCacheActionOptions);
     exec(): Promise<{
         errors: never[];
         path: string;

package/lib/actions/CleanCacheAction.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CleanCacheAction = void 0;
+exports.CleanCacheAction = exports.cleanCacheActionOptions = void 0;
 const fs_1 = require("../utils/fs");
 const temp_1 = require("../utils/temp");
 const promises_1 = require("fs/promises");
+exports.cleanCacheActionOptions = {};
 class CleanCacheAction {
     options;
     constructor(options) {

package/lib/actions/ConfigAction.d.ts

@@ -1,13 +1,11 @@
 import { GlobalOptions } from "../commands/CommandAbstract";
 import type { Config } from "../utils/datatruck/config-type";
-import { IfRequireKeys } from "../utils/ts";
 export type ConfigActionOptions = {
     path: string;
-    verbose?: boolean;
 };
-export declare class ConfigAction<TRequired extends boolean = true> {
-    readonly options: IfRequireKeys<TRequired, ConfigActionOptions>;
-    constructor(options: IfRequireKeys<TRequired, ConfigActionOptions>);
+export declare class ConfigAction {
+    readonly options: ConfigActionOptions;
+    constructor(options: ConfigActionOptions);
     static validate(config: Config): void;
     static check(config: Config): void;
     static normalize(config: Config): Config;

package/lib/actions/ConfigAction.js

@@ -87,7 +87,6 @@ class ConfigAction {
             };
         const configAction = new ConfigAction({
             path: globalOptions.config,
-            verbose: !!globalOptions.verbose && globalOptions.verbose > 0,
         });
         return await configAction.exec();
     }

package/lib/actions/CopyAction.d.ts

@@ -4,16 +4,42 @@ import type { Config, RepositoryConfig } from "../utils/datatruck/config-type";
 import { ReportListTaskContext } from "../utils/datatruck/report-list";
 import { Listr3TaskResultEnd } from "../utils/list";
 import { StrictMap } from "../utils/object";
+import { InferOptions } from "../utils/options";
 import { Progress, ProgressMode } from "../utils/progress";
 import { StdStreams } from "../utils/stream";
-import { IfRequireKeys } from "../utils/ts";
-export type CopyActionOptions = {
-    ids?: string[];
-    last?: number;
-    repositoryName: string;
-    packageNames?: string[];
-    packageTaskNames?: string[];
-    repositoryNames2?: string[];
+export declare const copyActionOptions: {
+    repositoryNames2: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    packageNames: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    packageTaskNames: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    ids: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    last: {
+        description: string;
+        shortFlag: string;
+        value: "number";
+    };
+    repositoryName: {
+        description: string;
+        shortFlag: string;
+        required: true;
+    };
+};
+export type CopyActionOptions = InferOptions<typeof copyActionOptions> & {
     verbose?: boolean;
     tty?: "auto" | boolean;
     progress?: ProgressMode;
@@ -34,10 +60,10 @@ export type Context = {
         bytes: number;
     };
 } & ReportListTaskContext;
-export declare class CopyAction<TRequired extends boolean = true> {
+export declare class CopyAction {
     readonly config: Config;
-    readonly options: IfRequireKeys<TRequired, CopyActionOptions>;
-    constructor(config: Config, options: IfRequireKeys<TRequired, CopyActionOptions>);
+    readonly options: CopyActionOptions;
+    constructor(config: Config, options: CopyActionOptions);
     dataFormat(result: Listr3TaskResultEnd<Context>[], options?: {
         streams?: StdStreams;
         verbose?: number;

package/lib/actions/CopyAction.js

@@ -48,7 +48,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CopyAction = void 0;
+exports.CopyAction = exports.copyActionOptions = void 0;
 const bytes_1 = require("../utils/bytes");
 const cli_1 = require("../utils/cli");
 const data_format_1 = require("../utils/data-format");
@@ -62,8 +62,35 @@ const list_1 = require("../utils/list");
 const object_1 = require("../utils/object");
 const progress_1 = require("../utils/progress");
 const temp_1 = require("../utils/temp");
+const SnapshotsAction_1 = require("./SnapshotsAction");
 const chalk_1 = __importDefault(require("chalk"));
 const os_1 = require("os");
+exports.copyActionOptions = {
+    ids: {
+        description: "Filter by identifiers",
+        shortFlag: "i",
+        value: "array",
+    },
+    last: {
+        description: "Last snapshots",
+        shortFlag: "l",
+        value: "number",
+    },
+    repositoryName: {
+        description: "Filter by repository name",
+        shortFlag: "r",
+        required: true,
+    },
+    ...(0, object_1.pickProps)(SnapshotsAction_1.snapshotsActionOptions, {
+        packageNames: true,
+        packageTaskNames: true,
+    }),
+    repositoryNames2: {
+        description: "Filter by repository names",
+        shortFlag: "r2",
+        value: "array",
+    },
+};
 class CopyAction {
     config;
     options;
@@ -156,7 +183,7 @@ class CopyAction {
             await repo.restore({
                 options: {
                     verbose: this.options.verbose,
-                    snapshotId: snapshot.id,
+                    id: snapshot.id,
                 },
                 snapshot: { id: snapshot.id, date: snapshot.date },
                 package: { name: snapshot.packageName },