@datatruck/cli 0.17.0 → 0.17.2

package/Repository/DatatruckRepository.js

@@ -6,16 +6,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatatruckRepository = exports.datatruckPackageRepositoryDefinition = exports.datatruckRepositoryDefinition = exports.datatruckRepositoryName = void 0;
 const AppError_1 = require("../Error/AppError");
 const DefinitionEnum_1 = require("../JsonSchema/DefinitionEnum");
-const cli_util_1 = require("../util/cli-util");
-const paths_util_1 = require("../util/datatruck/paths-util");
-const fs_util_1 = require("../util/fs-util");
-const math_util_1 = require("../util/math-util");
-const string_util_1 = require("../util/string-util");
-const zip_util_1 = require("../util/zip-util");
+const cli_1 = require("../utils/cli");
+const paths_1 = require("../utils/datatruck/paths");
+const fs_1 = require("../utils/fs");
+const math_1 = require("../utils/math");
+const string_1 = require("../utils/string");
+const zip_1 = require("../utils/zip");
 const RepositoryAbstract_1 = require("./RepositoryAbstract");
 const assert_1 = require("assert");
 const fast_glob_1 = __importDefault(require("fast-glob"));
-const fs_1 = require("fs");
+const fs_2 = require("fs");
 const promises_1 = require("fs/promises");
 const micromatch_1 = require("micromatch");
 const path_1 = require("path");
@@ -90,7 +90,15 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         return (0, path_1.join)(this.config.outPath, snapshotName, packageName) + ".meta.json";
     }
     static async parseMetaData(path) {
-        const contents = await (0, promises_1.readFile)(path);
+        let contents;
+        try {
+            contents = await (0, promises_1.readFile)(path);
+        }
+        catch (error) {
+            if ((0, fs_1.isNotFoundError)(error))
+                return;
+            throw error;
+        }
         return JSON.parse(contents.toString());
     }
     static stringifyMetaData(data) {
@@ -100,7 +108,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         return this.config.outPath;
     }
     async onInit(data) {
-        await (0, fs_util_1.mkdirIfNotExists)(this.config.outPath);
+        await (0, fs_1.mkdirIfNotExists)(this.config.outPath);
     }
     async createFileScanner(options) {
         const object = {
@@ -116,7 +124,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                     absolute: {
                         total: object.total,
                         current: object.current + data.current,
-                        percent: (0, math_util_1.progressPercent)(object.total, object.current + data.current),
+                        percent: (0, math_1.progressPercent)(object.total, object.current + data.current),
                     },
                 });
                 if (data.type === "end") {
@@ -137,7 +145,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 }
             },
             start: async (cb) => {
-                for await (const entry of (0, fs_util_1.pathIterator)(stream)) {
+                for await (const entry of (0, fs_1.pathIterator)(stream)) {
                     if (!options.disableCounting)
                         object.total++;
                     await object.updateProgress();
@@ -170,19 +178,19 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         });
         const snapshotPath = (0, path_1.join)(this.config.outPath, snapshotName);
         if (data.options.verbose)
-            (0, cli_util_1.logExec)(`Deleting ${snapshotPath}`);
-        if (await (0, fs_util_1.checkDir)(snapshotPath))
+            (0, cli_1.logExec)(`Deleting ${snapshotPath}`);
+        if (await (0, fs_1.checkDir)(snapshotPath))
             await (0, promises_1.rm)(snapshotPath, {
                 recursive: true,
             });
     }
     async onSnapshots(data) {
-        if (!(await (0, fs_util_1.checkDir)(this.config.outPath)))
+        if (!(await (0, fs_1.checkDir)(this.config.outPath)))
             throw new Error(`Repository (${this.repository.name}) out path does not exist: ${this.config.outPath}`);
-        const snapshotNames = await (0, fs_util_1.readDir)(this.config.outPath);
+        const snapshotNames = await (0, fs_1.readDir)(this.config.outPath);
         const snapshots = [];
-        const packagePatterns = (0, string_util_1.makePathPatterns)(data.options.packageNames);
-        const taskPatterns = (0, string_util_1.makePathPatterns)(data.options.packageTaskNames);
+        const packagePatterns = (0, string_1.makePathPatterns)(data.options.packageNames);
+        const taskPatterns = (0, string_1.makePathPatterns)(data.options.packageTaskNames);
         for (const snapshotName of snapshotNames) {
             const snapshotNameData = DatatruckRepository.parseSnapshotName(snapshotName);
             if (!snapshotNameData)
@@ -195,7 +203,9 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 continue;
             const metaPath = (0, path_1.join)(this.config.outPath, snapshotName, "meta.json");
             const meta = await DatatruckRepository.parseMetaData(metaPath);
-            if (taskPatterns && !(0, string_util_1.checkMatch)(meta.task, taskPatterns))
+            if (!meta)
+                continue;
+            if (taskPatterns && !(0, string_1.checkMatch)(meta.task, taskPatterns))
                 continue;
             if (data.options.ids &&
                 !data.options.ids.some((id) => meta.id.startsWith(id)))
@@ -245,24 +255,24 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         const sourcePath = data.targetPath ?? pkg.path;
         (0, assert_1.ok)(sourcePath);
         const compress = this.normalizeCompressConfig(data.packageConfig);
-        const include = await (0, paths_util_1.parsePaths)(pkg.include ?? ["**"], {
+        const include = await (0, paths_1.parsePaths)(pkg.include ?? ["**"], {
             cwd: sourcePath,
             verbose: data.options.verbose,
         });
         const exclude = pkg.exclude
-            ? await (0, paths_util_1.parsePaths)(pkg.exclude, {
+            ? await (0, paths_1.parsePaths)(pkg.exclude, {
                 cwd: sourcePath,
                 verbose: data.options.verbose,
             })
             : undefined;
         const packs = compress?.packs || [];
         const tmpDir = await this.mkTmpDir("path-lists");
-        const unpackedStream = (0, fs_1.createWriteStream)((0, path_1.join)(tmpDir, "unpacked.txt"));
-        const singlePackStream = (0, fs_1.createWriteStream)((0, path_1.join)(tmpDir, "single-pack.txt"));
-        const packStreams = Array.from({ length: packs.length }).map((v, i) => (0, fs_1.createWriteStream)((0, path_1.join)(tmpDir, `pack-${i}.txt`)));
+        const unpackedStream = (0, fs_2.createWriteStream)((0, path_1.join)(tmpDir, "unpacked.txt"));
+        const singlePackStream = (0, fs_2.createWriteStream)((0, path_1.join)(tmpDir, "single-pack.txt"));
+        const packStreams = Array.from({ length: packs.length }).map((v, i) => (0, fs_2.createWriteStream)((0, path_1.join)(tmpDir, `pack-${i}.txt`)));
         const streams = [unpackedStream, singlePackStream, ...packStreams];
         if (data.options.verbose)
-            (0, cli_util_1.logExec)(`Writing file lists in ${tmpDir}`);
+            (0, cli_1.logExec)(`Writing file lists in ${tmpDir}`);
         const scanner = await this.createFileScanner({
             glob: {
                 include,
@@ -274,7 +284,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
             disableCounting: true,
         });
         await Promise.all([
-            ...streams.map((p) => (0, fs_util_1.waitForClose)(p)),
+            ...streams.map((p) => (0, fs_1.waitForClose)(p)),
             (async () => {
                 await scanner.start(async (entry) => {
                     const pathSubject = entry.stats.isDirectory()
@@ -283,7 +293,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                     let stream = unpackedStream;
                     let successPackIndex;
                     for (const [packIndex, pack] of packs.entries()) {
-                        if ((0, string_util_1.checkPath)(pathSubject, pack.include, pack.exclude)) {
+                        if ((0, string_1.checkPath)(pathSubject, pack.include, pack.exclude)) {
                             stream = pack.onePackByResult
                                 ? singlePackStream
                                 : packStreams[packIndex];
@@ -296,7 +306,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                     const isSinglePackStream = stream === singlePackStream;
                     const include = isPackStream
                         ? entry.stats.isDirectory()
-                            ? await (0, fs_util_1.isEmptyDir)((0, path_1.join)(sourcePath, entry.path))
+                            ? await (0, fs_1.isEmptyDir)((0, path_1.join)(sourcePath, entry.path))
                             : true
                         : true;
                     if (include) {
@@ -322,8 +332,8 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         await (0, promises_1.copyFile)(unpackedStream.path, (0, path_1.join)(outPath, "permissions.txt"));
         // Non pack
         if (data.options.verbose)
-            (0, cli_util_1.logExec)(`Copying files from ${unpackedStream.path.toString()} to ${unpackedPath}`);
-        await (0, fs_util_1.cpy)({
+            (0, cli_1.logExec)(`Copying files from ${unpackedStream.path.toString()} to ${unpackedPath}`);
+        await (0, fs_1.cpy)({
             input: {
                 type: "pathList",
                 path: unpackedStream.path.toString(),
@@ -336,7 +346,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         });
         // Single pack
         const singleReader = (0, readline_1.createInterface)({
-            input: (0, fs_1.createReadStream)(singlePackStream.path),
+            input: (0, fs_2.createReadStream)(singlePackStream.path),
         });
         for await (const line of singleReader) {
             let [packPath, packIndex] = line.split(":");
@@ -347,33 +357,29 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 `-${encodeURIComponent(packPath.replace(/[\\/]/g, "-"))}` +
                 `.zip`).slice(0, 255);
             const target = (0, path_1.join)(outPath, outBasename);
-            await (0, zip_util_1.zip)({
+            await (0, zip_1.zip)({
                 path: pkg.path,
                 output: target,
                 filter: [{ patterns: [packPath] }],
                 verbose: data.options.verbose,
-                onProgress: async (progress) => await scanner.progress(progress.type === "start"
-                    ? "Starting compressing"
-                    : "Compressing file", progress),
+                onProgress: async (progress) => await scanner.progress("Compressing file", progress),
             });
         }
         // Packs
         for (const [packIndex, packStream] of packStreams.entries()) {
             const pack = packs[packIndex];
             const target = (0, path_1.join)(outPath, `pack-${packIndex}${pack.name ? `-${pack.name}` : ""}.zip`);
-            await (0, zip_util_1.zip)({
+            await (0, zip_1.zip)({
                 path: sourcePath,
                 output: target,
                 includeList: packStream.path.toString(),
                 verbose: data.options.verbose,
-                onProgress: async (progress) => await scanner.progress(progress.type === "start"
-                    ? "Starting compressing"
-                    : "Compressing file", progress),
+                onProgress: async (progress) => await scanner.progress("Compressing file", progress),
             });
         }
         // Meta
         const metaPath = `${outPath}/meta.json`;
-        const nodePkg = (0, fs_util_1.parsePackageFile)();
+        const nodePkg = (0, fs_1.parsePackageFile)();
         const meta = {
             id: data.snapshot.id,
             date: data.snapshot.date,
@@ -381,10 +387,10 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
             package: data.package.name,
             task: data.package.task?.name,
             version: nodePkg.version,
-            size: await (0, fs_util_1.fastFolderSizeAsync)(outPath),
+            size: await (0, fs_1.fastFolderSizeAsync)(outPath),
         };
         if (data.options.verbose)
-            (0, cli_util_1.logExec)(`Writing metadata into ${metaPath}`);
+            (0, cli_1.logExec)(`Writing metadata into ${metaPath}`);
         await (0, promises_1.writeFile)(metaPath, DatatruckRepository.stringifyMetaData(meta));
     }
     async onCopyBackup(data) {
@@ -396,7 +402,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         const sourcePath = (0, path_1.resolve)((0, path_1.join)(this.config.outPath, snapshotName));
         const targetPath = (0, path_1.resolve)((0, path_1.join)(data.mirrorRepositoryConfig.outPath, snapshotName));
         if (data.options.verbose)
-            (0, cli_util_1.logExec)(`Copying backup files to ${targetPath}`);
+            (0, cli_1.logExec)(`Copying backup files to ${targetPath}`);
         await (0, promises_1.mkdir)(targetPath);
         const scanner = await this.createFileScanner({
             glob: {
@@ -406,7 +412,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
             onProgress: data.onProgress,
         });
         await scanner.start();
-        await (0, fs_util_1.cpy)({
+        await (0, fs_1.cpy)({
             input: {
                 type: "glob",
                 sourcePath,
@@ -449,7 +455,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 await scanner.updateProgress();
             }
             else if (dirent.name.endsWith(".zip")) {
-                await (0, zip_util_1.listZip)({
+                await (0, zip_1.listZip)({
                     path,
                     verbose: data.options.verbose,
                     onStream: async (item) => {
@@ -463,8 +469,8 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         }
         await scanner.updateProgress(true);
         if (data.options.verbose)
-            (0, cli_util_1.logExec)(`Copying files to ${restorePath}`);
-        await (0, fs_util_1.cpy)({
+            (0, cli_1.logExec)(`Copying files to ${restorePath}`);
+        await (0, fs_1.cpy)({
             input: {
                 type: "glob",
                 sourcePath: (0, path_1.join)(sourcePath, "unpacked"),
@@ -478,24 +484,22 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
             const path = (0, path_1.join)(sourcePath, dirent.name);
             if (dirent.name === "permissions.txt") {
                 if (data.options.verbose)
-                    (0, cli_util_1.logExec)(`Applying permissions (${path})`);
+                    (0, cli_1.logExec)(`Applying permissions (${path})`);
                 await scanner.progress("Applying permissions", {
                     current: 0,
                 });
-                await (0, fs_util_1.applyPermissions)(restorePath, path);
+                await (0, fs_1.applyPermissions)(restorePath, path);
                 await scanner.progress("Permissions applied", {
                     current: 1,
                     type: "end",
                 });
             }
             else if (dirent.name.endsWith(".zip")) {
-                await (0, zip_util_1.unzip)({
+                await (0, zip_1.unzip)({
                     input: path,
                     output: restorePath,
                     verbose: data.options.verbose,
-                    onProgress: async (progress) => await scanner.progress(progress.type === "start"
-                        ? "Starting extracting"
-                        : "Extracting file", progress),
+                    onProgress: async (progress) => await scanner.progress("Extracting file", progress),
                 });
             }
         }

package/Repository/GitRepository.js

@@ -5,11 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GitRepository = exports.gitPackageRepositoryDefinition = exports.gitRepositoryDefinition = exports.gitRepositoryName = void 0;
 const AppError_1 = require("../Error/AppError");
-const GitUtil_1 = require("../util/GitUtil");
-const cli_util_1 = require("../util/cli-util");
-const paths_util_1 = require("../util/datatruck/paths-util");
-const fs_util_1 = require("../util/fs-util");
-const string_util_1 = require("../util/string-util");
+const Git_1 = require("../utils/Git");
+const cli_1 = require("../utils/cli");
+const paths_1 = require("../utils/datatruck/paths");
+const fs_1 = require("../utils/fs");
+const string_1 = require("../utils/string");
 const RepositoryAbstract_1 = require("./RepositoryAbstract");
 const assert_1 = require("assert");
 const fast_glob_1 = __importDefault(require("fast-glob"));
@@ -56,8 +56,8 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         return `${GitRepository.refPrefix}/${packageName}`;
     }
     async onInit(data) {
-        const git = new GitUtil_1.GitUtil({
-            dir: (0, fs_util_1.tmpDir)(GitRepository.name + "-snapshot"),
+        const git = new Git_1.Git({
+            dir: (0, fs_1.tmpDir)(GitRepository.name + "-snapshot"),
             log: data.options.verbose,
         });
         if (await git.canBeInit(this.config.repo)) {
@@ -70,7 +70,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
             repo: this.config.repo,
         });
         if (!existsBranch) {
-            await (0, fs_util_1.mkdirIfNotExists)(git.options.dir);
+            await (0, fs_1.mkdirIfNotExists)(git.options.dir);
             await git.clone({
                 repo: this.config.repo,
             });
@@ -83,7 +83,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         }
     }
     async onPrune(data) {
-        const git = new GitUtil_1.GitUtil({
+        const git = new Git_1.Git({
             dir: await this.mkTmpDir(GitRepository.name + "-snapshot"),
             log: data.options.verbose,
         });
@@ -106,12 +106,12 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         await git.exec(["push", "--delete", "origin", data.snapshot.originalId]);
     }
     async onSnapshots(data) {
-        const git = new GitUtil_1.GitUtil({
+        const git = new Git_1.Git({
             dir: await this.mkTmpDir(GitRepository.name + "-snapshot"),
             log: data.options.verbose,
         });
-        const pkgPatterns = (0, string_util_1.makePathPatterns)(data.options.packageNames);
-        const pkgTaskPatterns = (0, string_util_1.makePathPatterns)(data.options.packageTaskNames);
+        const pkgPatterns = (0, string_1.makePathPatterns)(data.options.packageNames);
+        const pkgTaskPatterns = (0, string_1.makePathPatterns)(data.options.packageTaskNames);
         await git.clone({ repo: this.config.repo });
         const tagNames = data.options.ids?.map((id) => `${GitRepository.refPrefix}/*/${id}*`) || [`${GitRepository.refPrefix}/*`];
         const tags = await git.getTags(tagNames);
@@ -124,7 +124,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 return result;
             if (pkgPatterns && !(0, micromatch_1.isMatch)(parsedTag.package, pkgPatterns))
                 return result;
-            if (pkgTaskPatterns && !(0, string_util_1.checkMatch)(parsedTag.task, pkgTaskPatterns))
+            if (pkgTaskPatterns && !(0, string_1.checkMatch)(parsedTag.task, pkgTaskPatterns))
                 return result;
             if (data.options.tags &&
                 !parsedTag.tags.some((value) => data.options.tags?.includes(value)))
@@ -146,16 +146,16 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         const pkg = data.package;
         const sourcePath = data.targetPath ?? pkg.path;
         (0, assert_1.ok)(typeof sourcePath === "string");
-        if (!(await (0, fs_util_1.existsDir)(sourcePath)))
+        if (!(await (0, fs_1.existsDir)(sourcePath)))
             throw new AppError_1.AppError(`Package path not exists: ${sourcePath}`);
         const tmpPath = await this.mkTmpDir(GitRepository.name + "-backup");
         const branchName = GitRepository.buildBranchName(data.package.name);
-        const git = new GitUtil_1.GitUtil({
+        const git = new Git_1.Git({
             dir: tmpPath,
             log: data.options.verbose,
         });
         if (data.options.verbose)
-            (0, cli_util_1.logExec)("cd", [tmpPath]);
+            (0, cli_1.logExec)("cd", [tmpPath]);
         await git.clone({
             repo: this.config.repo,
         });
@@ -165,12 +165,12 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         });
         await git.removeAll();
         const createdPaths = [];
-        const include = await (0, paths_util_1.parsePaths)(pkg.include ?? ["**"], {
+        const include = await (0, paths_1.parsePaths)(pkg.include ?? ["**"], {
             cwd: sourcePath,
             verbose: data.options.verbose,
         });
         const exclude = pkg.exclude
-            ? await (0, paths_util_1.parsePaths)(pkg.exclude, {
+            ? await (0, paths_1.parsePaths)(pkg.exclude, {
                 cwd: sourcePath,
                 verbose: data.options.verbose,
             })
@@ -199,7 +199,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         await git.exec(["add", "--verbose", "."]);
         if (await git.haveChanges())
             await git.exec(["commit", "-m", data.snapshot.id]);
-        const nodePkg = (0, fs_util_1.parsePackageFile)();
+        const nodePkg = (0, fs_1.parsePackageFile)();
         const meta = GitRepository.buildSnapshotTag({
             id: data.snapshot.id,
             shortId: data.snapshot.id.slice(0, 8),
@@ -208,8 +208,8 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
             package: data.package.name,
             task: data.package.task?.name,
             version: nodePkg.version,
-            size: ((await (0, fs_util_1.fastFolderSizeAsync)(tmpPath)) -
-                (await (0, fs_util_1.fastFolderSizeAsync)((0, path_1.join)(tmpPath, ".git")))).toString(),
+            size: ((await (0, fs_1.fastFolderSizeAsync)(tmpPath)) -
+                (await (0, fs_1.fastFolderSizeAsync)((0, path_1.join)(tmpPath, ".git")))).toString(),
         });
         await git.addTag(meta.name, meta.message);
         await git.push({ branchName });
@@ -228,12 +228,12 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
             id: data.snapshot.id,
             package: data.package.name,
         });
-        const git = new GitUtil_1.GitUtil({
+        const git = new Git_1.Git({
             dir: restorePath,
             log: data.options.verbose,
         });
         if (data.options.verbose)
-            (0, cli_util_1.logExec)("cd", [restorePath]);
+            (0, cli_1.logExec)("cd", [restorePath]);
         await git.clone({
             repo: this.config.repo,
             branch: tagName,

package/Repository/RepositoryAbstract.d.ts

@@ -4,7 +4,7 @@ import type { RestoreActionOptionsType } from "../Action/RestoreAction";
 import type { SnapshotExtendedType, SnapshotsActionOptionsType } from "../Action/SnapshotsAction";
 import type { PackageConfigType } from "../Config/PackageConfig";
 import type { RepositoryConfigType } from "../Config/RepositoryConfig";
-import { Progress } from "../util/progress";
+import { Progress } from "../utils/progress";
 export type SnapshotType = {
     id: string;
     date: string;

package/Repository/RepositoryAbstract.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RepositoryAbstract = exports.SnapshotTagEnum = void 0;
-const fs_util_1 = require("../util/fs-util");
+const fs_1 = require("../utils/fs");
 var SnapshotTagEnum;
 (function (SnapshotTagEnum) {
     SnapshotTagEnum["ID"] = "id";
@@ -20,7 +20,7 @@ class RepositoryAbstract {
         this.config = repository.config;
     }
     async mkTmpDir(prefix, id) {
-        const dir = await (0, fs_util_1.mkTmpDir)(prefix, id);
+        const dir = await (0, fs_1.mkTmpDir)(prefix, id);
         this.tmpDirs.push(dir);
         return dir;
     }

package/Repository/ResticRepository.d.ts

@@ -1,4 +1,4 @@
-import { RepositoryType } from "../util/ResticUtil";
+import { RepositoryType } from "../utils/Restic";
 import { RepositoryAbstract, BackupDataType, InitDataType, RestoreDataType, SnapshotsDataType, SnapshotResultType, SnapshotTagObjectType, SnapshotTagEnum, PruneDataType, CopyBackupType } from "./RepositoryAbstract";
 import { JSONSchema7 } from "json-schema";
 export type ResticRepositoryConfigType = {

package/Repository/ResticRepository.js

@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResticRepository = exports.resticPackageRepositoryDefinition = exports.resticRepositoryDefinition = exports.resticRepositoryName = void 0;
 const AppError_1 = require("../Error/AppError");
-const ResticUtil_1 = require("../util/ResticUtil");
-const cli_util_1 = require("../util/cli-util");
-const paths_util_1 = require("../util/datatruck/paths-util");
-const fs_util_1 = require("../util/fs-util");
-const math_util_1 = require("../util/math-util");
-const string_util_1 = require("../util/string-util");
+const Restic_1 = require("../utils/Restic");
+const cli_1 = require("../utils/cli");
+const paths_1 = require("../utils/datatruck/paths");
+const fs_1 = require("../utils/fs");
+const math_1 = require("../utils/math");
+const string_1 = require("../utils/string");
 const RepositoryAbstract_1 = require("./RepositoryAbstract");
 const assert_1 = require("assert");
 const fast_glob_1 = __importDefault(require("fast-glob"));
@@ -88,7 +88,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             ...(typeof this.config.password === "string"
                 ? { RESTIC_PASSWORD: this.config.password }
                 : { RESTIC_PASSWORD_FILE: (0, path_1.resolve)(this.config.password.path) }),
-            RESTIC_REPOSITORY: await ResticUtil_1.ResticUtil.formatRepository(this.config.repository),
+            RESTIC_REPOSITORY: await Restic_1.Restic.formatRepository(this.config.repository),
         });
     }
     static buildSnapshotTag(name, value) {
@@ -122,25 +122,25 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         return result;
     }
     onGetSource() {
-        return (0, string_util_1.formatUri)({ ...this.config.repository, password: undefined });
+        return (0, string_1.formatUri)({ ...this.config.repository, password: undefined });
     }
     async onInit(data) {
-        const restic = new ResticUtil_1.ResticUtil({
+        const restic = new Restic_1.Restic({
             env: await this.buildEnv(),
             log: data.options.verbose,
         });
         if (this.config.repository.backend === "local")
-            await (0, fs_util_1.mkdirIfNotExists)(this.env.RESTIC_REPOSITORY);
+            await (0, fs_1.mkdirIfNotExists)(this.env.RESTIC_REPOSITORY);
         if (!(await restic.checkRepository()))
             await restic.exec(["init"]);
     }
     async onSnapshots(data) {
-        const restic = new ResticUtil_1.ResticUtil({
+        const restic = new Restic_1.Restic({
             env: await this.buildEnv(),
             log: data.options.verbose,
         });
-        const packagePatterns = (0, string_util_1.makePathPatterns)(data.options.packageNames);
-        const taskNamePatterns = (0, string_util_1.makePathPatterns)(data.options.packageTaskNames);
+        const packagePatterns = (0, string_1.makePathPatterns)(data.options.packageNames);
+        const taskNamePatterns = (0, string_1.makePathPatterns)(data.options.packageTaskNames);
         const result = await restic.snapshots({
             json: true,
             tags: [
@@ -153,7 +153,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 return items;
             if (packagePatterns && !(0, micromatch_1.isMatch)(tag.package, packagePatterns))
                 return items;
-            if (taskNamePatterns && !(0, string_util_1.checkMatch)(tag.task, taskNamePatterns))
+            if (taskNamePatterns && !(0, string_1.checkMatch)(tag.task, taskNamePatterns))
                 return items;
             const itemTags = tag.tags ?? [];
             if (data.options.tags && !itemTags.some((t) => itemTags.includes(t)))
@@ -171,7 +171,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         }, []);
     }
     async onPrune(data) {
-        const restic = new ResticUtil_1.ResticUtil({
+        const restic = new Restic_1.Restic({
             env: await this.buildEnv(),
             log: data.options.verbose,
         });
@@ -181,7 +181,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         });
     }
     async onBackup(data) {
-        const restic = new ResticUtil_1.ResticUtil({
+        const restic = new Restic_1.Restic({
             env: await this.buildEnv(),
             log: data.options.verbose,
         });
@@ -190,7 +190,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         (0, assert_1.ok)(sourcePath);
         let gitignorePath;
         if (!pkg.include && pkg.exclude) {
-            const exclude = await (0, paths_util_1.parsePaths)(pkg.exclude, {
+            const exclude = await (0, paths_1.parsePaths)(pkg.exclude, {
                 cwd: sourcePath,
                 verbose: data.options.verbose,
             });
@@ -200,17 +200,17 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 },
             });
             const tmpDir = await this.mkTmpDir("restic-exclude");
-            const ignoredContents = (0, fs_util_1.fastglobToGitIgnore)(exclude, sourcePath).join("\n");
+            const ignoredContents = (0, fs_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 ?? ["**"], {
+            const include = await (0, paths_1.parsePaths)(pkg.include ?? ["**"], {
                 cwd: sourcePath,
                 verbose: data.options.verbose,
             });
             const exclude = pkg.exclude
-                ? await (0, paths_util_1.parsePaths)(pkg.exclude, {
+                ? await (0, paths_1.parsePaths)(pkg.exclude, {
                     cwd: sourcePath,
                     verbose: data.options.verbose,
                 })
@@ -223,13 +223,13 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 markDirectories: true,
             });
             if (data.options.verbose)
-                (0, cli_util_1.logExec)(`Writing paths lists`);
+                (0, cli_1.logExec)(`Writing paths lists`);
             await data.onProgress({
                 relative: {
                     description: "Writing excluded paths list",
                 },
             });
-            gitignorePath = await (0, fs_util_1.writeGitIgnoreList)({
+            gitignorePath = await (0, fs_1.writeGitIgnoreList)({
                 paths: stream,
                 outDir: await this.mkTmpDir("gitignore-list"),
             });
@@ -247,7 +247,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             tags: [packageTag],
             latest: 1,
         });
-        const nodePkg = (0, fs_util_1.parsePackageFile)();
+        const nodePkg = (0, fs_1.parsePackageFile)();
         let lastProgress;
         let totalFilesChanges = 0;
         const totalFilesChangesLimit = 10;
@@ -338,13 +338,13 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         });
         if (!snapshot)
             throw new AppError_1.AppError(`Snapshot not found`);
-        const restic = new ResticUtil_1.ResticUtil({
+        const restic = new Restic_1.Restic({
             env: {
                 ...(await this.buildEnv()),
                 ...(typeof config.password === "string"
                     ? { RESTIC_PASSWORD2: config.password }
                     : { RESTIC_PASSWORD_FILE2: (0, path_1.resolve)(config.password.path) }),
-                RESTIC_REPOSITORY2: await ResticUtil_1.ResticUtil.formatRepository(config.repository),
+                RESTIC_REPOSITORY2: await Restic_1.Restic.formatRepository(config.repository),
             },
             log: data.options.verbose,
         });
@@ -355,7 +355,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
     async onRestore(data) {
         const restorePath = data.targetPath ?? data.package.restorePath;
         (0, assert_1.ok)(restorePath);
-        const restic = new ResticUtil_1.ResticUtil({
+        const restic = new Restic_1.Restic({
             env: await this.buildEnv(),
             log: data.options.verbose,
         });
@@ -377,7 +377,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
                         absolute: {
                             total: snapshot.size,
                             current,
-                            percent: (0, math_util_1.progressPercent)(snapshot.size, current),
+                            percent: (0, math_1.progressPercent)(snapshot.size, current),
                         },
                     });
                 }

package/SessionDriver/ConsoleSessionDriver.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Progress } from "../util/progress";
+import { Progress } from "../utils/progress";
 import { WriteDataType, ReadResultType, SessionDriverAbstract, SessionDriverOptions } from "./SessionDriverAbstract";
 type BadgeType = {
     name: string;