@datatruck/cli 0.34.3 → 0.34.4

package/lib/actions/BackupAction.js

@@ -12,6 +12,7 @@ const report_list_1 = require("../utils/datatruck/report-list");
 const repository_1 = require("../utils/datatruck/repository");
 const task_1 = require("../utils/datatruck/task");
 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 progress_1 = require("../utils/progress");
@@ -32,7 +33,7 @@ class BackupAction {
     prepareSnapshot() {
         const date = this.options.date ?? new Date().toISOString();
         if (!(0, dayjs_1.default)(date, "YYYY-MM-DDTHH:mm:ss.SSS[Z]", true).isValid())
-            throw new Error(`Invalid snapshot date: ${date}`);
+            throw new error_1.AppError(`Invalid snapshot date: ${date}`);
         return {
             id: (0, crypto_1.randomUUID)().replaceAll("-", ""),
             date,
@@ -243,7 +244,7 @@ class BackupAction {
                                         ? l.result("task", pkg.name)
                                         : undefined;
                                     if (taskSummary?.error)
-                                        throw new Error(`Task failed`);
+                                        throw new error_1.AppError(`Task failed`);
                                     const backup = await this.backup({
                                         pkg,
                                         repositoryName,
@@ -289,7 +290,7 @@ class BackupAction {
                                         name,
                                     ]);
                                     if (backupSummary.error)
-                                        throw new Error(`Backup failed`);
+                                        throw new error_1.AppError(`Backup failed`);
                                     const copy = await this.copy({
                                         repositoryName: name,
                                         mirrorRepositoryName: mirror,

package/lib/actions/ConfigAction.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigAction = void 0;
 const config_schema_1 = require("../config.schema");
 const config_1 = require("../utils/datatruck/config");
-const error_1 = require("../utils/datatruck/error");
+const error_1 = require("../utils/error");
 const fs_1 = require("../utils/fs");
 const ajv_1 = __importDefault(require("ajv"));
 const assert_1 = require("assert");

package/lib/actions/CopyAction.js

@@ -57,6 +57,7 @@ const report_list_1 = require("../utils/datatruck/report-list");
 const repository_1 = require("../utils/datatruck/repository");
 const snapshot_1 = require("../utils/datatruck/snapshot");
 const date_1 = require("../utils/date");
+const error_1 = require("../utils/error");
 const list_1 = require("../utils/list");
 const object_1 = require("../utils/object");
 const progress_1 = require("../utils/progress");
@@ -98,6 +99,12 @@ class CopyAction {
         return new data_format_1.DataFormat({
             streams: options.streams,
             json: result,
+            list: () => result.map((item) => {
+                const icon = (0, cli_1.renderResult)(item.error, false);
+                const title = renderTitle(item);
+                const data = renderData(item, false, result);
+                return `${icon} ${title}: ${data}`;
+            }),
             table: {
                 headers: [
                     { value: "", width: 3 },
@@ -131,7 +138,7 @@ class CopyAction {
             }).map(({ item }) => item)
             : snapshots;
         if (!result.length)
-            throw new Error("No snapshots found");
+            throw new error_1.AppError("No snapshots found");
         return result;
     }
     createSourceRepoMap() {
@@ -212,83 +219,90 @@ class CopyAction {
                         action: "backup",
                     }), [repoConfig.type]);
                     if (!repositoryNames2.length)
-                        throw new Error("No mirror snapshots found");
+                        throw new error_1.AppError("No mirror snapshots found");
                     const sourceRepoMap = this.createSourceRepoMap();
-                    return data.snapshots.flatMap((snapshot) => repositoryNames2.map((repo2) => {
-                        const id = snapshot.id.slice(0, 8);
-                        const pkgName = snapshot.packageName;
-                        return l.$task({
-                            key: "copy",
-                            keyIndex: [snapshot.packageName, repo2.name, snapshot.id],
-                            data: {
-                                snapshotId: snapshot.id,
-                                packageName: snapshot.packageName,
-                                repositoryName: repoConfig.name,
-                                mirrorRepositoryName: repo2.name,
-                                bytes: 0,
-                                skipped: false,
-                            },
-                            title: {
-                                initial: `Copy snapshot: ${pkgName} (${id}) » ${repo2.name}`,
-                                started: `Copying snapshot: ${pkgName} (${id}) » ${repo2.name}`,
-                                completed: `Snapshot copied: ${pkgName} (${id}) » ${repo2.name}`,
-                                failed: `Snapshot copy failed: ${pkgName} (${id}) » ${repo2.name}`,
-                            },
-                            exitOnError: false,
-                            run: async (task, data) => {
-                                const mirrorConfig = (0, config_1.findRepositoryOrFail)(this.config, repo2.name);
-                                const mirrorRepo = await (0, repository_1.createAndInitRepo)(mirrorConfig, this.options.verbose);
-                                const currentCopies = await mirrorRepo.fetchSnapshots({
-                                    options: {
-                                        ids: [snapshot.id],
-                                        packageNames: [snapshot.packageName],
-                                        verbose: this.options.verbose,
-                                    },
-                                });
-                                if (currentCopies.length) {
-                                    data.skipped = true;
-                                    return task.skip(`Already exists at ${mirrorConfig.name}: ${pkgName} (${id})`);
-                                }
-                                if (this.config.minFreeDiskSpace)
-                                    await mirrorRepo.ensureFreeDiskSpace(mirrorConfig.config, this.config.minFreeDiskSpace);
-                                const sourceRepo = sourceRepoMap.with([
-                                    snapshot,
-                                    mirrorConfig,
-                                ]);
-                                if (sourceRepo.has()) {
-                                    const copy = await sourceRepo.get().copy({
-                                        mirrorRepositoryConfig: mirrorConfig.config,
-                                        options: { verbose: this.options.verbose },
-                                        package: { name: snapshot.packageName },
-                                        snapshot,
-                                        onProgress: (p) => pm.update(p, (d) => (task.output = d)),
-                                    });
-                                    data.bytes = copy.bytes;
-                                }
-                                else {
-                                    const copy = await this.copyCrossRepository({
-                                        mirrorConfig,
-                                        mirrorRepo,
-                                        repo,
-                                        repoConfig,
-                                        snapshot,
-                                        onProgress: (p) => pm.update(p, (d) => (task.output = d)),
+                    return [
+                        ...data.snapshots.flatMap((snapshot) => repositoryNames2.map((repo2) => {
+                            const id = snapshot.id.slice(0, 8);
+                            const pkgName = snapshot.packageName;
+                            return l.$task({
+                                key: "copy",
+                                keyIndex: [snapshot.packageName, repo2.name, snapshot.id],
+                                data: {
+                                    snapshotId: snapshot.id,
+                                    packageName: snapshot.packageName,
+                                    repositoryName: repoConfig.name,
+                                    mirrorRepositoryName: repo2.name,
+                                    bytes: 0,
+                                    skipped: false,
+                                },
+                                title: {
+                                    initial: `Copy snapshot: ${pkgName} (${id}) » ${repo2.name}`,
+                                    started: `Copying snapshot: ${pkgName} (${id}) » ${repo2.name}`,
+                                    completed: `Snapshot copied: ${pkgName} (${id}) » ${repo2.name}`,
+                                    failed: `Snapshot copy failed: ${pkgName} (${id}) » ${repo2.name}`,
+                                },
+                                exitOnError: false,
+                                run: async (task, data) => {
+                                    const mirrorConfig = (0, config_1.findRepositoryOrFail)(this.config, repo2.name);
+                                    const mirrorRepo = await (0, repository_1.createAndInitRepo)(mirrorConfig, this.options.verbose);
+                                    const currentCopies = await mirrorRepo.fetchSnapshots({
+                                        options: {
+                                            ids: [snapshot.id],
+                                            packageNames: [snapshot.packageName],
+                                            verbose: this.options.verbose,
+                                        },
                                     });
-                                    data.bytes = copy.bytes;
-                                    sourceRepo.set(mirrorRepo);
-                                }
-                            },
-                        });
-                    }));
+                                    if (currentCopies.length) {
+                                        data.skipped = true;
+                                        return task.skip(`Already exists at ${mirrorConfig.name}: ${pkgName} (${id})`);
+                                    }
+                                    if (this.config.minFreeDiskSpace)
+                                        await mirrorRepo.ensureFreeDiskSpace(mirrorConfig.config, this.config.minFreeDiskSpace);
+                                    const sourceRepo = sourceRepoMap.withKey([
+                                        { id: snapshot.id, packageName: snapshot.packageName },
+                                        { type: mirrorConfig.type },
+                                    ]);
+                                    const $sourceRepo = repoConfig.type === mirrorConfig.type
+                                        ? repo
+                                        : sourceRepo.has()
+                                            ? sourceRepo.get()
+                                            : undefined;
+                                    if ($sourceRepo) {
+                                        const copy = await $sourceRepo.copy({
+                                            mirrorRepositoryConfig: mirrorConfig.config,
+                                            options: { verbose: this.options.verbose },
+                                            package: { name: snapshot.packageName },
+                                            snapshot,
+                                            onProgress: (p) => pm.update(p, (d) => (task.output = d)),
+                                        });
+                                        data.bytes = copy.bytes;
+                                    }
+                                    else {
+                                        const copy = await this.copyCrossRepository({
+                                            mirrorConfig,
+                                            mirrorRepo,
+                                            repo,
+                                            repoConfig,
+                                            snapshot,
+                                            onProgress: (p) => pm.update(p, (d) => (task.output = d)),
+                                        });
+                                        data.bytes = copy.bytes;
+                                        sourceRepo.set(mirrorRepo);
+                                    }
+                                },
+                            });
+                        })),
+                        ...(0, report_list_1.createReportListTasks)(l, {
+                            hostname: this.config.hostname ?? (0, os_1.hostname)(),
+                            action: "copy",
+                            reports: this.config.reports || [],
+                            verbose: this.options.verbose,
+                            onMessage: (result, report) => this.dataFormat(result).format(report.format ?? "list"),
+                        }),
+                    ];
                 },
             }),
-            ...(0, report_list_1.createReportListTasks)(l, {
-                hostname: this.config.hostname ?? (0, os_1.hostname)(),
-                action: "copy",
-                reports: this.config.reports || [],
-                verbose: this.options.verbose,
-                onMessage: (result, report) => this.dataFormat(result).format(report.format ?? "list"),
-            }),
         ])
             .exec();
     }

package/lib/actions/PruneAction.js

@@ -4,6 +4,7 @@ exports.PruneAction = void 0;
 const repository_1 = require("../utils/datatruck/repository");
 const snapshot_1 = require("../utils/datatruck/snapshot");
 const date_1 = require("../utils/date");
+const error_1 = require("../utils/error");
 const object_1 = require("../utils/object");
 const SnapshotsAction_1 = require("./SnapshotsAction");
 class PruneAction {
@@ -41,10 +42,10 @@ class PruneAction {
         const keepFilter = (0, date_1.createFilterByLastOptions)(this.options);
         const hasKeepFilter = Object.values(keepFilter).some((v) => typeof v === "number");
         if (hasIdFilter && hasKeepFilter)
-            throw new Error(`Snapshot id filter can not be used with 'keep' filters`);
+            throw new error_1.AppError(`Snapshot id filter can not be used with 'keep' filters`);
         const prunePolicy = !hasIdFilter && !hasKeepFilter;
         if (prunePolicy && !this.options.groupBy?.includes("packageName"))
-            throw new Error(`Policy config requires groupBy packageName`);
+            throw new error_1.AppError(`Policy config requires groupBy packageName`);
         const keepSnapshots = hasKeepFilter
             ? (0, snapshot_1.groupAndFilter)(snapshots, this.options.groupBy, keepFilter)
             : prunePolicy

package/lib/actions/RestoreAction.js

@@ -10,6 +10,7 @@ const config_1 = require("../utils/datatruck/config");
 const repository_1 = require("../utils/datatruck/repository");
 const task_1 = require("../utils/datatruck/task");
 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 progress_1 = require("../utils/progress");
@@ -165,10 +166,10 @@ class RestoreAction {
                 if (minFreeDiskSpace)
                     await (0, temp_1.ensureFreeDiskTempSpace)(minFreeDiskSpace);
                 if (!options.snapshotId)
-                    throw new Error("Snapshot id is required");
+                    throw new error_1.AppError("Snapshot id is required");
                 const snapshots = this.groupSnapshots(await this.findSnapshots());
                 if (!snapshots.length)
-                    throw new Error("None snapshot found");
+                    throw new error_1.AppError("None snapshot found");
                 data.id = options.snapshotId;
                 data.packages = snapshots.length;
                 return snapshots.map((snapshot) => l.$task({

package/lib/cli.js

@@ -8,7 +8,7 @@ const ConfigAction_1 = require("./actions/ConfigAction");
 const globalData_1 = __importDefault(require("./globalData"));
 const cli_1 = require("./utils/cli");
 const command_1 = require("./utils/datatruck/command");
-const error_1 = require("./utils/datatruck/error");
+const error_1 = require("./utils/error");
 const exit_1 = require("./utils/exit");
 const fs_1 = require("./utils/fs");
 const string_1 = require("./utils/string");

package/lib/commands/StartServerCommand.js

@@ -4,6 +4,7 @@ exports.StartServerCommand = void 0;
 const ConfigAction_1 = require("../actions/ConfigAction");
 const cron_server_1 = require("../utils/datatruck/cron-server");
 const repository_server_1 = require("../utils/datatruck/repository-server");
+const error_1 = require("../utils/error");
 const CommandAbstract_1 = require("./CommandAbstract");
 class StartServerCommand extends CommandAbstract_1.CommandAbstract {
     optionsConfig() {
@@ -31,7 +32,7 @@ class StartServerCommand extends CommandAbstract_1.CommandAbstract {
         const cronOptions = config.server?.cron || {};
         if (cronOptions.enabled ?? true) {
             if (typeof this.configPath !== "string")
-                throw new Error(`Config path is required by cron server`);
+                throw new error_1.AppError(`Config path is required by cron server`);
             const server = (0, cron_server_1.createCronServer)(cronOptions, {
                 verbose,
                 log,

package/lib/repositories/DatatruckRepository.js

@@ -4,8 +4,8 @@ exports.DatatruckRepository = exports.datatruckRepositoryName = void 0;
 const cli_1 = require("../utils/cli");
 const crypto_1 = require("../utils/crypto");
 const client_1 = require("../utils/datatruck/client");
-const error_1 = require("../utils/datatruck/error");
 const paths_1 = require("../utils/datatruck/paths");
+const error_1 = require("../utils/error");
 const fs_1 = require("../utils/fs");
 const math_1 = require("../utils/math");
 const string_1 = require("../utils/string");
@@ -65,7 +65,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
     async fetchSnapshots(data) {
         const fs = (0, client_1.createFs)(this.config.backend);
         if (!(await fs.existsDir(".")))
-            throw new Error(`Repository (${this.repository.name}) out path does not exist: ${fs.resolvePath(".")}`);
+            throw new error_1.AppError(`Repository (${this.repository.name}) out path does not exist: ${fs.resolvePath(".")}`);
         const snapshots = [];
         const snapshotNames = await fs.readdir(".");
         const packagePatterns = (0, string_1.makePathPatterns)(data.options.packageNames);
@@ -147,7 +147,8 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         scanner.total++;
         stream.writeLine(defaultsPackIndex, ".");
         await scanner.start(async (entry) => {
-            let packIndex = configPacks.findIndex((pack) => (0, string_1.match)(entry.path, pack.include, pack.exclude));
+            let packIndex = packs.findIndex((pack) => pack !== defaultsPack &&
+                (0, string_1.match)(entry.path, pack.include, pack.exclude));
             if (packIndex === -1)
                 packIndex = defaultsPackIndex;
             const pack = packs[packIndex];
@@ -261,6 +262,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                         relative: {
                             description: "Downloading",
                             format: "size",
+                            payload: entry,
                             ...progress,
                         },
                     }),
@@ -277,6 +279,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                             relative: {
                                 description: "Downloading",
                                 format: "size",
+                                payload: entry,
                                 ...progress,
                             },
                         }),

package/lib/repositories/ResticRepository.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResticRepository = exports.resticRepositoryName = void 0;
 const cli_1 = require("../utils/cli");
-const error_1 = require("../utils/datatruck/error");
 const paths_1 = require("../utils/datatruck/paths");
+const error_1 = require("../utils/error");
 const fs_1 = require("../utils/fs");
 const math_1 = require("../utils/math");
 const restic_1 = require("../utils/restic");

package/lib/tasks/GitTask.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GitTask = exports.gitTaskName = void 0;
 const async_process_1 = require("../utils/async-process");
 const cli_1 = require("../utils/cli");
+const error_1 = require("../utils/error");
 const fs_1 = require("../utils/fs");
 const math_1 = require("../utils/math");
 const stream_1 = require("../utils/stream");
@@ -21,7 +22,7 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
     }
     async backup(data) {
         if (!data.package.path)
-            throw new Error(`Path is required`);
+            throw new error_1.AppError(`'package.path' is required`);
         const snapshotPath = await (0, temp_1.mkTmpDir)(exports.gitTaskName, "task", "backup", "snapshot");
         this.verbose = data.options.verbose;
         const config = this.config;

package/lib/tasks/MssqlTask.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MssqlTask = exports.mssqlTaskName = void 0;
 const async_process_1 = require("../utils/async-process");
 const config_1 = require("../utils/datatruck/config");
-const error_1 = require("../utils/datatruck/error");
+const error_1 = require("../utils/error");
 const fs_1 = require("../utils/fs");
 const temp_1 = require("../utils/temp");
 const TaskAbstract_1 = require("./TaskAbstract");
@@ -51,7 +51,7 @@ class MssqlTask extends TaskAbstract_1.TaskAbstract {
     async backup(data) {
         this.verbose = data.options.verbose;
         if (data.package.path)
-            throw new Error(`Path is not required: ${data.package.path}`);
+            throw new error_1.AppError(`'package.path' is required: ${data.package.path}`);
         const snapshotPath = await (0, temp_1.mkTmpDir)(exports.mssqlTaskName, "task", "backup", "snapshot");
         const databaseNames = (await this.fetchDatabaseNames()).filter((databaseName) => (!this.config.includeDatabases ||
             (0, micromatch_1.isMatch)(databaseName, this.config.includeDatabases)) &&

package/lib/tasks/MysqlDumpTask.js

@@ -4,7 +4,7 @@ exports.MysqlDumpTask = exports.mysqlDumpTaskName = void 0;
 const async_1 = require("../utils/async");
 const cli_1 = require("../utils/cli");
 const config_1 = require("../utils/datatruck/config");
-const error_1 = require("../utils/datatruck/error");
+const error_1 = require("../utils/error");
 const fs_1 = require("../utils/fs");
 const math_1 = require("../utils/math");
 const mysql_1 = require("../utils/mysql");

package/lib/tasks/SqlDumpTaskAbstract.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqlDumpTaskAbstract = void 0;
 const cli_1 = require("../utils/cli");
 const config_1 = require("../utils/datatruck/config");
-const error_1 = require("../utils/datatruck/error");
+const error_1 = require("../utils/error");
 const fs_1 = require("../utils/fs");
 const math_1 = require("../utils/math");
 const temp_1 = require("../utils/temp");
@@ -42,7 +42,7 @@ function parseSqlFile(fileName) {
         return { fileName, database: lastName };
     }
     else {
-        throw new Error(`Invalid sql file type: ${type}`);
+        throw new error_1.AppError(`Invalid SQL file type: ${type}`);
     }
 }
 class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {

package/lib/utils/async-process.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AsyncProcess = void 0;
 const cli_1 = require("./cli");
+const error_1 = require("./error");
 const math_1 = require("./math");
 const process_1 = require("./process");
 const stream_1 = require("./stream");
@@ -22,7 +23,7 @@ function ensureDir(cwd) {
         }
         catch (error) { }
         if (!isDir)
-            throw new Error(`Current working directory does not exist: ${cwd}`);
+            throw new error_1.AppError(`Current working directory does not exist: ${cwd}`);
     }
 }
 class StdIn {
@@ -215,7 +216,7 @@ class AsyncProcess {
         else if (result === false) {
             return exitCode;
         }
-        return new Error(message, {
+        return new error_1.AppError(message, {
             cause: {
                 command: this.command,
                 argv: this.argv,

package/lib/utils/cli.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirm = exports.stringifyOptions = exports.parseOptions = exports.renderObject = exports.renderListTaskItem = exports.renderError = exports.renderResult = exports.logExec = exports.renderProgressBar = exports.showCursorCommand = void 0;
+const error_1 = require("./error");
 const chalk_1 = __importDefault(require("chalk"));
 const chalk_2 = require("chalk");
 const readline_1 = require("readline");
@@ -59,20 +60,19 @@ function renderResult(error, color = true) {
 }
 exports.renderResult = renderResult;
 function renderError(error, verbose) {
-    let message = null;
-    if (typeof error === "string") {
-        message = error;
+    if (!error) {
+        return "";
     }
-    else if (error) {
-        message = error.message;
+    else if (error instanceof error_1.AppError) {
+        return chalk_1.default.red(verbose ? error.stack ?? error.message : error.message);
     }
-    else {
-        return "";
+    else if (error instanceof Error) {
+        return chalk_1.default.red(error.stack ?? error.message);
     }
-    if (!verbose) {
-        message = message.split(/\r?\n/).shift() ?? "";
+    else {
+        const message = error.split(/\r?\n/).shift() ?? "";
+        return chalk_1.default.red(message.trim());
     }
-    return chalk_1.default.red(message.trim());
 }
 exports.renderError = renderError;
 function renderListTaskItem(item, color, config) {

package/lib/utils/data-format.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataFormat = exports.dataFormats = void 0;
-const error_1 = require("./datatruck/error");
+const error_1 = require("./error");
 const stream_1 = require("./stream");
 const tty_table_1 = __importDefault(require("tty-table"));
 const util_1 = require("util");
@@ -47,13 +47,13 @@ class DataFormat {
     }
     formatToTable() {
         if (!this.options.table)
-            throw new Error(`Unsupported format: table`);
+            throw new error_1.AppError(`Unsupported format: table`);
         const table = (0, tty_table_1.default)(this.options.table.headers, this.options.table.rows(), {});
         return table.render();
     }
     formatToList() {
         if (!this.options.list)
-            throw new Error(`Unsupported format: list`);
+            throw new error_1.AppError(`Unsupported format: list`);
         return this.options.list().join("\n");
     }
     log(format, options) {

package/lib/utils/datatruck/command.js

@@ -10,7 +10,7 @@ const PruneCommand_1 = require("../../commands/PruneCommand");
 const RestoreCommand_1 = require("../../commands/RestoreCommand");
 const SnapshotsCommand_1 = require("../../commands/SnapshotsCommand");
 const StartServerCommand_1 = require("../../commands/StartServerCommand");
-const error_1 = require("./error");
+const error_1 = require("../error");
 const stream_1 = require("stream");
 exports.datatruckCommandMap = {
     config: ConfigCommand_1.ConfigCommand,

package/lib/utils/datatruck/config.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.params = exports.dbNameParams = exports.pkgRestorePathParams = exports.pkgExcludeParams = exports.pkgIncludeParams = exports.pkgPathParams = exports.resolvePackages = exports.resolvePackage = exports.resolveDatabaseName = exports.resolvePackagePath = exports.filterPackages = exports.filterRepositoryByEnabled = exports.ensureSameRepositoryType = exports.sortReposByType = exports.filterRepository = exports.findPackageRepositoryConfig = exports.findPackageOrFail = exports.findRepositoryOrFail = void 0;
+const error_1 = require("../error");
 const string_1 = require("../string");
 const temp_1 = require("../temp");
-const error_1 = require("./error");
 const micromatch_1 = require("micromatch");
 function findRepositoryOrFail(config, repositoryName) {
     const repo = config.repositories.find((v) => v.name === repositoryName);
@@ -59,7 +59,7 @@ function ensureSameRepositoryType(a, b) {
     if (a.type !== b.type) {
         const names = [a.name, b.name].join(" and ");
         const types = [a.type, b.type].join(" != ");
-        throw new Error(`Incompatible repository types between ${names} (${types})`);
+        throw new error_1.AppError(`Incompatible repository types between ${names} (${types})`);
     }
 }
 exports.ensureSameRepositoryType = ensureSameRepositoryType;

package/lib/utils/datatruck/report-list.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReportListTasks = void 0;
+const error_1 = require("../error");
 const reportSteps_1 = require("../reportSteps");
 const spawnSteps_1 = require("../spawnSteps");
 function createReportListTasks(list, options) {
@@ -48,7 +49,7 @@ function createReportListTasks(list, options) {
                     });
                 }
                 else {
-                    throw new Error(`Invalid step type: ${report.run.type}`);
+                    throw new error_1.AppError(`Invalid step type: ${report.run.type}`);
                 }
             },
         });

package/lib/utils/datatruck/repository.js

@@ -4,7 +4,7 @@ exports.createAndInitRepo = exports.createRepo = exports.getRepoConstructor = vo
 const DatatruckRepository_1 = require("../../repositories/DatatruckRepository");
 const GitRepository_1 = require("../../repositories/GitRepository");
 const ResticRepository_1 = require("../../repositories/ResticRepository");
-const error_1 = require("./error");
+const error_1 = require("../error");
 const repoMap = {
     [GitRepository_1.gitRepositoryName]: GitRepository_1.GitRepository,
     [ResticRepository_1.resticRepositoryName]: ResticRepository_1.ResticRepository,

package/lib/utils/datatruck/task.js

@@ -7,7 +7,7 @@ const MssqlTask_1 = require("../../tasks/MssqlTask");
 const MysqlDumpTask_1 = require("../../tasks/MysqlDumpTask");
 const PostgresqlDumpTask_1 = require("../../tasks/PostgresqlDumpTask");
 const ScriptTask_1 = require("../../tasks/ScriptTask");
-const error_1 = require("./error");
+const error_1 = require("../error");
 function createTask(task) {
     if (task.name === GitTask_1.gitTaskName) {
         return new GitTask_1.GitTask(task.config ?? {});

package/lib/utils/{datatruck/error.d.ts → error.d.ts}

@@ -1,4 +1,4 @@
 export declare class AppError extends Error {
-    constructor(message: string);
+    constructor(message: string, options?: ErrorOptions);
     static create(message: string, errors: Error[]): Error;
 }

package/lib/utils/{datatruck/error.js → error.js}

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppError = void 0;
 class AppError extends Error {
-    constructor(message) {
-        super(message);
+    constructor(message, options) {
+        super(message, options);
         this.name = AppError.name;
     }
     static create(message, errors) {

package/lib/utils/fs.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.asFile = exports.groupFiles = exports.ensureFreeDiskSpace = exports.checkFreeDiskSpace = exports.fetchDiskStats = exports.initEmptyDir = exports.tryRm = exports.safeRename = exports.fetchData = exports.countFileLines = exports.createWriteStreamPool = exports.createFileScanner = exports.createProgress = exports.cpy = exports.readTextFile = exports.isNotFoundError = exports.updateFileStats = exports.copyFileWithStreams = exports.writeGitIgnoreList = exports.fastglobToGitIgnore = exports.forEachFile = exports.readDir = exports.readPartialFile = exports.fastFolderSizeAsync = exports.findFile = exports.parsePackageFile = exports.parseFile = exports.include = exports.parseFileExtensions = exports.writeJSONFile = exports.existsFile = exports.existsDir = exports.safeStat = exports.ensureExistsDir = exports.ensureSingleFile = exports.ensureEmptyDir = exports.mkdirIfNotExists = exports.isLocalDir = exports.isEmptyDir = exports.isWSLSystem = void 0;
 const pkg_1 = require("../pkg");
 const bytes_1 = require("./bytes");
+const error_1 = require("./error");
 const math_1 = require("./math");
 const stream_1 = require("./stream");
 const string_1 = require("./string");
@@ -53,20 +54,20 @@ async function mkdirIfNotExists(path) {
 exports.mkdirIfNotExists = mkdirIfNotExists;
 async function ensureEmptyDir(path) {
     if (!(await isEmptyDir(path)))
-        throw new Error(`Dir is not empty: ${path}`);
+        throw new error_1.AppError(`Dir is not empty: ${path}`);
 }
 exports.ensureEmptyDir = ensureEmptyDir;
 async function ensureSingleFile(path) {
     const files = await readDir(path);
     if (files.length !== 1)
-        throw new Error(`Dir has not one file: ${files.length}`);
+        throw new error_1.AppError(`Dir has not one file: ${files.length}`);
     const [file] = files;
     return (0, path_1.join)(path, file);
 }
 exports.ensureSingleFile = ensureSingleFile;
 async function ensureExistsDir(path) {
     if (!(await existsDir(path)))
-        throw new Error(`Dir is not created: ${path}`);
+        throw new error_1.AppError(`Dir is not created: ${path}`);
 }
 exports.ensureExistsDir = ensureExistsDir;
 async function safeStat(path) {

package/lib/utils/mysql.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createMysqlCli = exports.assertDumpFile = void 0;
 const async_process_1 = require("./async-process");
 const cli_1 = require("./cli");
-const error_1 = require("./datatruck/error");
+const error_1 = require("./error");
 const fs_1 = require("./fs");
 const process_1 = require("./process");
 const string_1 = require("./string");

package/lib/utils/object.d.ts

@@ -11,7 +11,7 @@ export declare class StrictMap<K, V> {
     has(key: K): boolean;
     get(key: K): NonNullable<V>;
     set(key: K, value: V): void;
-    with(key: K): {
+    withKey(key: K): {
         has: () => boolean;
         get: () => NonNullable<V>;
         set: (value: V) => void;

package/lib/utils/object.js

@@ -78,7 +78,7 @@ class StrictMap {
             throw new Error(`Map key already exists: ${stringKey}`);
         this.map.set(stringKey, value);
     }
-    with(key) {
+    withKey(key) {
         return {
             has: () => this.has(key),
             get: () => this.get(key),

package/lib/utils/reportSteps.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runReportSteps = exports.isReportStep = void 0;
+const error_1 = require("./error");
 const http_1 = require("./http");
 function isReportStep(step) {
     return step.type === "telegram" || step.type === "ntfy";
@@ -25,7 +26,7 @@ async function runReportSteps(input, options) {
                 .filter(Boolean)
                 .join("-");
             if (topic.length < 32)
-                throw new Error(`Topic is less than 32 characters: ${topic}`);
+                throw new error_1.AppError(`'step.config.topic' is less than 32 characters: ${topic}`);
             await (0, http_1.post)(`https://ntfy.sh/${topic}`, options.data.message, {
                 headers: {
                     Title: options.data.title,
@@ -34,7 +35,7 @@ async function runReportSteps(input, options) {
             });
         }
         else {
-            throw new Error(`Invalid step type: ${step.type}`);
+            throw new error_1.AppError(`Invalid step type: ${step.type}`);
         }
     }
 }

package/lib/utils/string.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compareJsons = exports.undefIfEmpty = exports.checkMatch = exports.createMatchFilter = exports.endsWith = exports.match = exports.makePathPatterns = exports.formatUri = exports.parseStringList = exports.render = exports.snakeCase = void 0;
-const error_1 = require("./datatruck/error");
+const error_1 = require("./error");
 const micromatch_1 = require("micromatch");
 function snakeCase(value, char = "_") {
     return value.replace(/[A-Z]/g, (letter) => `${char}${letter.toLowerCase()}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.34.3",
+  "version": "0.34.4",
   "description": "Tool for creating and managing backups",
   "homepage": "https://github.com/swordev/datatruck#readme",
   "bugs": {