@datatruck/cli 0.11.5 → 0.12.0

package/Action/RestoreAction.d.ts

@@ -11,6 +11,7 @@ export declare type RestoreActionOptionsType = {
     tags?: string[];
     packageNames?: string[];
     packageTaskNames?: string[];
+    packageConfig?: boolean;
     repositoryNames?: string[];
     repositoryTypes?: string[];
     verbose?: boolean;

package/Action/RestoreAction.js

@@ -9,6 +9,7 @@ const config_util_1 = require("../util/datatruck/config-util");
 const fs_util_1 = require("../util/fs-util");
 const object_util_1 = require("../util/object-util");
 const process_util_1 = require("../util/process-util");
+const SnapshotsAction_1 = require("./SnapshotsAction");
 const assert_1 = require("assert");
 const os_1 = require("os");
 class RestoreAction {
@@ -26,8 +27,9 @@ class RestoreAction {
     }
     async init(session, snapshotId, snapshots) {
         await session.initDrivers();
-        for (const [, pkg] of snapshots) {
-            (0, assert_1.ok)(pkg);
+        for (const [snapshot, pkg] of snapshots) {
+            if (!pkg)
+                throw new AppError_1.AppError(`Package config not found: ${snapshot.packageName}`);
             const sessionId = await session.init({
                 snapshotId: snapshotId,
                 packageName: pkg.name,
@@ -56,17 +58,22 @@ class RestoreAction {
             if (this.options.repositoryTypes &&
                 !this.options.repositoryTypes.includes(repository.type))
                 continue;
-            const repoInstance = (0, RepositoryFactory_1.RepositoryFactory)(repository);
-            const snapshots = await repoInstance.onSnapshots({
-                options: {
-                    packageNames: this.options.packageNames,
-                    packageTaskNames: this.options.packageTaskNames,
-                    ids: [this.options.snapshotId],
-                    tags: this.options.tags,
-                },
+            const snapshotsAction = new SnapshotsAction_1.SnapshotsAction(this.config, {
+                repositoryNames: [repository.name],
+                ids: [this.options.snapshotId],
+                packageNames: this.options.packageNames,
+                packageTaskNames: this.options.packageTaskNames,
+                packageConfig: this.options.packageConfig,
+                tags: this.options.tags,
             });
-            result.push(...snapshots.map((snapshot) => ({
-                ...snapshot,
+            const snapshots = await snapshotsAction.exec("restore");
+            result.push(...snapshots.map((ss) => ({
+                date: ss.date,
+                id: ss.id,
+                originalId: ss.originalId,
+                packageName: ss.packageName,
+                packageTaskName: ss.packageTaskName,
+                tags: ss.tags,
                 repositoryName: repository.name,
             })));
         }

package/Action/SnapshotsAction.d.ts

@@ -8,6 +8,7 @@ export declare type SnapshotsActionOptionsType = {
     repositoryNames?: string[];
     packageNames?: string[];
     packageTaskNames?: string[];
+    packageConfig?: boolean;
     repositoryTypes?: string[];
     verbose?: boolean;
     tags?: string[];

package/Action/SnapshotsAction.js

@@ -23,12 +23,17 @@ class SnapshotsAction {
                 !this.options.repositoryTypes.includes(repo.type))
                 continue;
             const repoInstance = (0, RepositoryFactory_1.RepositoryFactory)(repo);
+            const configPackageNames = this.config.packages.map((pkg) => pkg.name);
+            const packageNames = this.options.packageNames?.filter((name) => configPackageNames.includes(name)) || configPackageNames;
             const snapshots = await repoInstance.onSnapshots({
-                options: this.options,
+                options: {
+                    ...this.options,
+                    packageNames,
+                },
             });
-            const extentedItems = snapshots.map((item) => ({
-                ...item,
-                shortId: item.id.slice(0, 8),
+            const extentedItems = snapshots.map((ss) => ({
+                ...ss,
+                shortId: ss.id.slice(0, 8),
                 repositoryName: repo.name,
                 repositoryType: repo.type,
             }));

package/Command/BackupCommand.js

@@ -17,27 +17,27 @@ class BackupCommand extends CommandAbstract_1.CommandAbstract {
                 option: "--dryRun",
             },
             package: {
-                description: "Package names",
+                description: "Filter by package names",
                 option: "-p,--package <values>",
                 parser: string_util_1.parseStringList,
             },
             packageTask: {
-                description: "Package task names",
+                description: "Filter by package task names",
                 option: "-pt,--package-task <values>",
                 parser: string_util_1.parseStringList,
             },
             repository: {
-                description: "Repository names",
+                description: "Filter by repository names",
                 option: "-r,--repository <values>",
                 parser: string_util_1.parseStringList,
             },
             repositoryType: {
-                description: "Repository types",
+                description: "Filter by repository types",
                 option: "-rt,--repository-type <values>",
                 parser: (v) => (0, string_util_1.parseStringList)(v),
             },
             tag: {
-                description: "Tags",
+                description: "Filter by tags",
                 option: "-t,--tag <values>",
                 parser: string_util_1.parseStringList,
             },

package/Command/BackupSessionsCommand.js

@@ -13,17 +13,17 @@ class BackupSessionsCommand extends CommandAbstract_1.CommandAbstract {
     onOptions() {
         return this.returnsOptions({
             package: {
-                description: "Package names",
+                description: "Filter by package names",
                 option: "-p,--package <values>",
                 parser: string_util_1.parseStringList,
             },
             repository: {
-                description: "Repository names",
+                description: "Filter by repository names",
                 option: "-r,--repository <values>",
                 parser: string_util_1.parseStringList,
             },
             tag: {
-                description: "Tags",
+                description: "Filter by tags",
                 option: "-t,--tag <values>",
                 parser: string_util_1.parseStringList,
             },

package/Command/ConfigCommand.js

@@ -10,22 +10,22 @@ class ConfigCommand extends CommandAbstract_1.CommandAbstract {
     onOptions() {
         return this.returnsOptions({
             package: {
-                description: "Package names",
+                description: "Filter by package names",
                 option: "-p,--package <values>",
                 parser: string_util_1.parseStringList,
             },
             packageTask: {
-                description: "Package task names",
+                description: "Filter by package task names",
                 option: "-pt,--package-task <values>",
                 parser: string_util_1.parseStringList,
             },
             repository: {
-                description: "Repository names",
+                description: "Filter by repository names",
                 option: "-r,--repository <values>",
                 parser: string_util_1.parseStringList,
             },
             repositoryType: {
-                description: "Repository types",
+                description: "Filter by repository types",
                 option: "-rt,--repository-type <values>",
                 parser: (v) => (0, string_util_1.parseStringList)(v),
             },

package/Command/InitCommand.js

@@ -12,12 +12,12 @@ class InitCommand extends CommandAbstract_1.CommandAbstract {
     onOptions() {
         return this.returnsOptions({
             repository: {
-                description: "Repository names",
+                description: "Filter by repository names",
                 option: "-r,--repository <values>",
                 parser: string_util_1.parseStringList,
             },
             repositoryType: {
-                description: "Repository types",
+                description: "Filter by repository types",
                 option: "-rt,--repository-type <values>",
                 parser: (v) => (0, string_util_1.parseStringList)(v),
             },

package/Command/PruneCommand.js

@@ -26,7 +26,7 @@ class PruneCommand extends CommandAbstract_1.CommandAbstract {
                 ]),
             },
             id: {
-                description: "Snapshot id.",
+                description: "Filter by snapshot id",
                 option: "-i,--id",
                 parser: string_util_1.parseStringList,
             },
@@ -70,22 +70,22 @@ class PruneCommand extends CommandAbstract_1.CommandAbstract {
                 option: "--longId",
             },
             package: {
-                description: "Package names",
+                description: "Filter by package names",
                 option: "-p,--package <values>",
                 parser: string_util_1.parseStringList,
             },
             repository: {
-                description: "Repository names",
+                description: "Filter by repository names",
                 option: "-r,--repository <values>",
                 parser: string_util_1.parseStringList,
             },
             repositoryType: {
-                description: "Repository types",
+                description: "Filter by repository types",
                 option: "-rt,--repository-type <values>",
                 parser: (v) => (0, string_util_1.parseStringList)(v),
             },
             tag: {
-                description: "Tags",
+                description: "Filter by tags",
                 option: "-t,--tag <values>",
                 parser: string_util_1.parseStringList,
             },

package/Command/RestoreCommand.d.ts

@@ -5,6 +5,7 @@ export declare type RestoreCommandOptionsType<TResolved = false> = {
     id: string;
     package?: If<TResolved, string[]>;
     packageTask?: If<TResolved, string[]>;
+    packageConfig?: boolean;
     repository?: If<TResolved, string[]>;
     repositoryType?: If<TResolved, RepositoryConfigType["type"][]>;
     tag?: If<TResolved, string[]>;

package/Command/RestoreCommand.js

@@ -12,32 +12,36 @@ class RestoreCommand extends CommandAbstract_1.CommandAbstract {
     onOptions() {
         return this.returnsOptions({
             id: {
-                description: "Snapshot id",
+                description: "Filter by snapshot id",
                 option: "-i,--id <id>",
                 required: true,
             },
             package: {
-                description: "Package names",
+                description: "Filter by package names",
                 option: "-p,--package <values>",
                 parser: string_util_1.parseStringList,
             },
             packageTask: {
-                description: "Package task names",
+                description: "Filter by package task names",
                 option: "-pt,--package-task <values>",
                 parser: string_util_1.parseStringList,
             },
+            packageConfig: {
+                description: "Filter by package config",
+                option: "-pc,--package-config",
+            },
             repository: {
-                description: "Repository names",
+                description: "Filter by repository names",
                 option: "-r,--repository <values>",
                 parser: string_util_1.parseStringList,
             },
             repositoryType: {
-                description: "Repository types",
+                description: "Filter by repository types",
                 option: "-rt,--repository-type <values>",
                 parser: (v) => (0, string_util_1.parseStringList)(v),
             },
             tag: {
-                description: "Tags",
+                description: "Filter by tags",
                 option: "-t,--tag <values>",
                 parser: string_util_1.parseStringList,
             },
@@ -50,6 +54,7 @@ class RestoreCommand extends CommandAbstract_1.CommandAbstract {
             snapshotId: this.options.id,
             packageNames: this.options.package,
             packageTaskNames: this.options.packageTask,
+            packageConfig: this.options.packageConfig,
             repositoryNames: this.options.repository,
             repositoryTypes: this.options.repositoryType,
             tags: this.options.tag,

package/Command/RestoreSessionsCommand.js

@@ -13,17 +13,17 @@ class RestoreSessionsCommand extends CommandAbstract_1.CommandAbstract {
     onOptions() {
         return this.returnsOptions({
             package: {
-                description: "Package names",
+                description: "Filter by package names",
                 option: "-p,--package <values>",
                 parser: string_util_1.parseStringList,
             },
             repository: {
-                description: "Repository names",
+                description: "Filter by repository names",
                 option: "-r,--repository <values>",
                 parser: string_util_1.parseStringList,
             },
             tag: {
-                description: "Tags",
+                description: "Filter by tags",
                 option: "-t,--tag <values>",
                 parser: string_util_1.parseStringList,
             },

package/Command/SnapshotsCommand.d.ts

@@ -6,6 +6,7 @@ export declare type SnapshotsCommandOptionsType<TResolved = false> = {
     id?: If<TResolved, string[]>;
     package?: If<TResolved, string[]>;
     packageTask?: If<TResolved, string[]>;
+    packageConfig?: boolean;
     repository?: If<TResolved, string[]>;
     repositoryType?: If<TResolved, RepositoryConfigType["type"][]>;
     longId?: boolean;

package/Command/SnapshotsCommand.js

@@ -15,72 +15,76 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
                 description: `Group by values (${groupByValues.join(", ")})`,
                 parser: (v) => (0, string_util_1.parseStringList)(v, groupByValues),
             },
+            longId: {
+                option: "--longId",
+                description: "Show long id",
+            },
             id: {
                 option: "-i,--id <ids>",
-                description: "Snapshot identifiers",
+                description: "Filter by identifiers",
                 parser: string_util_1.parseStringList,
             },
             last: {
                 option: "-l,--last <number>",
-                description: "Last snapshots",
+                description: "Filter by last snapshots",
                 parser: Number,
             },
             lastMinutely: {
                 option: "--lastMinutely <number>",
-                description: "Last minutely snapshots",
+                description: "Filter by last minutely",
                 parser: Number,
             },
             lastDaily: {
                 option: "--lastDaily <number>",
-                description: "Last daily snapshots",
+                description: "Filter by last daily",
                 parser: Number,
             },
             lastHourly: {
                 option: "--lastHourly <number>",
-                description: "Last hourly snapshots",
+                description: "Filter by last hourly",
                 parser: Number,
             },
             lastMonthly: {
                 option: "--lastMonthly <number>",
-                description: "Last monthly snapshots",
+                description: "Filter by last monthly",
                 parser: Number,
             },
             lastWeekly: {
                 option: "--lastWeekly <number>",
-                description: "Last weekly snapshots",
+                description: "Filter by last weekly",
                 parser: Number,
             },
             lastYearly: {
                 option: "--lastYearly <number>",
-                description: "Last yearly snapshots",
+                description: "Filter by last yearly",
                 parser: Number,
             },
-            longId: {
-                option: "--longId",
-                description: "Show long id",
-            },
             package: {
                 option: "-p,--package <names>",
-                description: "Package names",
+                description: "Filter by package names",
                 parser: string_util_1.parseStringList,
             },
             packageTask: {
-                description: "Package task names",
                 option: "-pt,--package-task <values>",
+                description: "Filter by task names",
                 parser: string_util_1.parseStringList,
             },
+            packageConfig: {
+                description: "Filter by package config",
+                option: "-pc,--package-config",
+            },
             repository: {
                 option: "-r,--repository <names>",
-                description: "Repository names",
+                description: "Filter by repository names",
                 parser: string_util_1.parseStringList,
             },
             repositoryType: {
-                option: "-t,--repositoryType <names>",
-                description: "Repository types",
+                option: "-rt,--repository-type <names>",
+                description: "Filter by repository types",
                 parser: (v) => (0, string_util_1.parseStringList)(v),
             },
             tag: {
-                description: "Tags",
+                description: "Filter by tags",
                 option: "-t,--tag <values>",
                 parser: string_util_1.parseStringList,
             },
@@ -93,6 +97,7 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
             ids: this.options.id,
             packageNames: this.options.package,
             packageTaskNames: this.options.packageTask,
+            packageConfig: this.options.packageConfig,
             repositoryNames: this.options.repository,
             repositoryTypes: this.options.repositoryType,
             last: this.options.last,

package/Repository/ResticRepository.js

@@ -55,7 +55,19 @@ exports.resticRepositoryDefinition = {
                 },
                 host: { type: "string" },
                 username: { type: "string" },
-                passwordFile: { type: "string" },
+                password: {
+                    anyOf: [
+                        { type: "string" },
+                        {
+                            type: "object",
+                            additionalProperties: false,
+                            required: ["path"],
+                            properties: {
+                                path: { type: "string" },
+                            },
+                        },
+                    ],
+                },
                 port: { type: "integer" },
                 path: { type: "string" },
             },
@@ -184,7 +196,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 step: "Writing excluded paths list...",
             });
             const tmpDir = await (0, fs_util_1.mkTmpDir)("restic-exclude");
-            const ignoredContents = (0, fs_util_1.fastglobToGitIgnore)(exclude).join("\n");
+            const ignoredContents = (0, fs_util_1.fastglobToGitIgnore)(exclude, sourcePath).join("\n");
             gitignorePath = (0, path_1.join)(tmpDir, "ignored.txt");
             await (0, promises_1.writeFile)(gitignorePath, ignoredContents);
         }

package/config.schema.json

@@ -565,8 +565,24 @@
             "username": {
               "type": "string"
             },
-            "passwordFile": {
-              "type": "string"
+            "password": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "object",
+                  "additionalProperties": false,
+                  "required": [
+                    "path"
+                  ],
+                  "properties": {
+                    "path": {
+                      "type": "string"
+                    }
+                  }
+                }
+              ]
             },
             "port": {
               "type": "integer"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.11.5",
+  "version": "0.12.0",
   "dependencies": {
     "ajv": "^8.11.0",
     "async": "^3.2.4",

package/util/ResticUtil.d.ts

@@ -3,9 +3,11 @@ import { UriType } from "./string-util";
 export declare type RepositoryType = {
     name?: string;
     env?: Record<string, string>;
-    passwordFile?: string;
+    password?: string | {
+        path: string;
+    };
     backend: "local" | "rest" | "sftp" | "s3" | "azure" | "gs" | "rclone";
-} & UriType;
+} & Omit<UriType, "password">;
 export declare type BackupStreamType = {
     message_type: "status";
     seconds_elapsed: number;

package/util/ResticUtil.js

@@ -16,12 +16,15 @@ class ResticUtil {
                 throw new Error(`Invalid path at "${input.name}" repository: ${input.path}`);
             return (0, path_1.resolve)(input.path);
         }
-        if (input.passwordFile)
+        if (input.password) {
             input = {
                 ...input,
-                password: (await (0, promises_1.readFile)(input.passwordFile)).toString(),
+                password: typeof input.password === "string"
+                    ? input.password
+                    : (await (0, promises_1.readFile)(input.password.path)).toString(),
             };
-        return `${input.backend}:${(0, string_util_1.formatUri)(input, hidePassword)}`;
+        }
+        return `${input.backend}:${(0, string_util_1.formatUri)({ ...input, password: input.password }, hidePassword)}`;
     }
     async exec(args, settings, options) {
         return await (0, process_util_1.exec)("restic", args, {

package/util/fs-util.d.ts

@@ -32,7 +32,7 @@ export declare function forEachFile(dirPath: string, cb: (path: string, dir: boo
 /**
  * @experimental
  */
-export declare function fastglobToGitIgnore(patterns: string[]): string[];
+export declare function fastglobToGitIgnore(patterns: string[], baseDir: string): string[];
 export declare function writeGitIgnoreList(options: {
     paths: NodeJS.ReadableStream | string[];
 }): Promise<string>;

package/util/fs-util.js

@@ -216,10 +216,10 @@ exports.forEachFile = forEachFile;
 /**
  * @experimental
  */
-function fastglobToGitIgnore(patterns) {
+function fastglobToGitIgnore(patterns, baseDir) {
     // https://github.com/mrmlnc/fast-glob#readme
     // https://git-scm.com/docs/gitignore
-    return patterns.map((p) => (p.startsWith("/") ? p : `/${p}`));
+    return patterns.map((p) => `${baseDir}/${p}`);
 }
 exports.fastglobToGitIgnore = fastglobToGitIgnore;
 async function writeGitIgnoreList(options) {