@datatruck/cli 0.11.4 → 0.11.7

package/Repository/ResticRepository.js

@@ -13,6 +13,7 @@ const string_util_1 = require("../util/string-util");
 const RepositoryAbstract_1 = require("./RepositoryAbstract");
 const assert_1 = require("assert");
 const fast_glob_1 = __importDefault(require("fast-glob"));
+const promises_1 = require("fs/promises");
 const micromatch_1 = require("micromatch");
 const path_1 = require("path");
 exports.resticRepositoryName = "restic";
@@ -54,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" },
             },
@@ -174,7 +187,20 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         const sourcePath = data.targetPath ?? data.package.path;
         (0, assert_1.ok)(sourcePath);
         let gitignorePath;
-        if (pkg.include || pkg.exclude) {
+        if (!pkg.include && pkg.exclude) {
+            const exclude = await (0, paths_util_1.parsePaths)(pkg.exclude, {
+                cwd: sourcePath,
+                verbose: data.options.verbose,
+            });
+            await data.onProgress({
+                step: "Writing excluded paths list...",
+            });
+            const tmpDir = await (0, fs_util_1.mkTmpDir)("restic-exclude");
+            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);
+        }
+        else if (pkg.include || pkg.exclude) {
             const include = await (0, paths_util_1.parsePaths)(pkg.include ?? ["**"], {
                 cwd: sourcePath,
                 verbose: data.options.verbose,

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.4",
+  "version": "0.11.7",
   "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

@@ -29,6 +29,10 @@ export declare function checkFile(path: string): Promise<boolean>;
 export declare function checkDir(path: string): Promise<boolean>;
 export declare function readDir(path: string): Promise<string[]>;
 export declare function forEachFile(dirPath: string, cb: (path: string, dir: boolean) => void, includeDir?: boolean): Promise<void>;
+/**
+ * @experimental
+ */
+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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cpy = exports.updateFileStats = exports.copyFileWithStreams = exports.writePathLists = exports.writeGitIgnoreList = exports.forEachFile = exports.readDir = exports.checkDir = exports.checkFile = exports.readPartialFile = exports.mkTmpDir = exports.tmpDir = exports.sessionTmpDir = exports.parentTmpDir = exports.existsFile = exports.findFile = exports.parsePackageFile = exports.parseFile = exports.parseFileExtensions = exports.readdirIfExists = exports.writeJSONFile = exports.existsDir = exports.ensureEmptyDir = exports.mkdirIfNotExists = exports.isDirEmpty = exports.isLocalDir = exports.isWSLSystem = void 0;
+exports.cpy = exports.updateFileStats = exports.copyFileWithStreams = exports.writePathLists = exports.writeGitIgnoreList = exports.fastglobToGitIgnore = exports.forEachFile = exports.readDir = exports.checkDir = exports.checkFile = exports.readPartialFile = exports.mkTmpDir = exports.tmpDir = exports.sessionTmpDir = exports.parentTmpDir = exports.existsFile = exports.findFile = exports.parsePackageFile = exports.parseFile = exports.parseFileExtensions = exports.readdirIfExists = exports.writeJSONFile = exports.existsDir = exports.ensureEmptyDir = exports.mkdirIfNotExists = exports.isDirEmpty = exports.isLocalDir = exports.isWSLSystem = void 0;
 const globalData_1 = __importDefault(require("../globalData"));
 const path_util_1 = require("./path-util");
 const async_1 = require("async");
@@ -213,6 +213,15 @@ async function forEachFile(dirPath, cb, includeDir) {
     }
 }
 exports.forEachFile = forEachFile;
+/**
+ * @experimental
+ */
+function fastglobToGitIgnore(patterns, baseDir) {
+    // https://github.com/mrmlnc/fast-glob#readme
+    // https://git-scm.com/docs/gitignore
+    return patterns.map((p) => `${baseDir}/${p}`);
+}
+exports.fastglobToGitIgnore = fastglobToGitIgnore;
 async function writeGitIgnoreList(options) {
     const tempDir = await mkTmpDir("gitignore-list");
     const path = (0, path_1.join)(tempDir, `.gitignore`);