@datatruck/cli 0.34.3 → 0.34.5

package/lib/actions/RestoreAction.js

@@ -1,4 +1,49 @@
 "use strict";
+var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
+    if (value !== null && value !== void 0) {
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+        var dispose;
+        if (async) {
+            if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+            dispose = value[Symbol.asyncDispose];
+        }
+        if (dispose === void 0) {
+            if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+            dispose = value[Symbol.dispose];
+        }
+        if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+        env.stack.push({ value: value, dispose: dispose, async: async });
+    }
+    else if (async) {
+        env.stack.push({ async: true });
+    }
+    return value;
+};
+var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
+    return function (env) {
+        function fail(e) {
+            env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
+            env.hasError = true;
+        }
+        function next() {
+            while (env.stack.length) {
+                var rec = env.stack.pop();
+                try {
+                    var result = rec.dispose && rec.dispose.call(rec.value);
+                    if (rec.async) return Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+                }
+                catch (e) {
+                    fail(e);
+                }
+            }
+            if (env.hasError) throw env.error;
+        }
+        return next();
+    };
+})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+});
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -10,6 +55,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");
@@ -70,27 +116,25 @@ class RestoreAction {
         const repoConfig = (0, config_1.findRepositoryOrFail)(this.config, snapshot.repositoryName);
         const repo = await (0, repository_1.createAndInitRepo)(repoConfig, this.options.verbose);
         let snapshotPath = pkg.restorePath ?? pkg.path;
-        await data.gc.cleanupIfFail(async () => {
-            if (task) {
-                const taskResult = await task.prepareRestore({
-                    options: this.options,
-                    package: pkg,
-                    snapshot,
-                });
-                snapshotPath = taskResult?.snapshotPath;
-            }
-            await (0, fs_1.initEmptyDir)(snapshotPath);
-            if (this.config.minFreeDiskSpace)
-                await (0, fs_1.ensureFreeDiskSpace)([snapshotPath], this.config.minFreeDiskSpace);
-            await repo.restore({
+        if (task) {
+            const taskResult = await task.prepareRestore({
                 options: this.options,
-                snapshot: data.snapshot,
                 package: pkg,
-                snapshotPath: snapshotPath,
-                packageConfig: pkg.repositoryConfigs?.find((config) => config.type === repoConfig.type &&
-                    (!config.names || config.names.includes(repoConfig.name)))?.config,
-                onProgress: data.onProgress,
+                snapshot,
             });
+            snapshotPath = taskResult?.snapshotPath;
+        }
+        await (0, fs_1.initEmptyDir)(snapshotPath);
+        if (this.config.minFreeDiskSpace)
+            await (0, fs_1.ensureFreeDiskSpace)([snapshotPath], this.config.minFreeDiskSpace);
+        await repo.restore({
+            options: this.options,
+            snapshot: data.snapshot,
+            package: pkg,
+            snapshotPath: snapshotPath,
+            packageConfig: pkg.repositoryConfigs?.find((config) => config.type === repoConfig.type &&
+                (!config.names || config.names.includes(repoConfig.name)))?.config,
+            onProgress: data.onProgress,
         });
         return { snapshotPath };
     }
@@ -138,6 +182,7 @@ class RestoreAction {
     }
     async exec() {
         const { options } = this;
+        const gc = new temp_1.GargabeCollector();
         const pm = new progress_1.ProgressManager({
             verbose: options.verbose,
             tty: options.tty,
@@ -146,6 +191,7 @@ class RestoreAction {
         const l = new list_1.Listr3({
             streams: options.streams,
             progressManager: pm,
+            gargabeCollector: gc,
         });
         return l
             .add(l.$task({
@@ -165,10 +211,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({
@@ -183,48 +229,71 @@ class RestoreAction {
                     },
                     exitOnError: false,
                     run: async (listTask) => {
-                        let pkg = (0, config_1.resolvePackage)((0, config_1.findPackageOrFail)(this.config, snapshot.packageName), {
-                            snapshotId: options.snapshotId,
-                            snapshotDate: snapshot.date,
-                            action: "restore",
-                        });
-                        if (this.options.initial)
-                            pkg = { ...pkg, restorePath: pkg.path };
-                        const gc = new temp_1.GargabeCollector();
-                        const task = pkg.task ? (0, task_1.createTask)(pkg.task) : undefined;
-                        const restore = await this.restore({
-                            gc,
-                            pkg,
-                            task,
-                            snapshot: snapshot,
-                            onProgress: (p) => pm.update(p, (t) => (listTask.output = t)),
-                        });
-                        if (!task)
-                            return await gc.cleanup();
-                        return l.$tasks({
-                            key: "task",
-                            keyIndex: pkg.name,
-                            data: { taskName: pkg.task.name, packageName: pkg.name },
-                            title: {
-                                initial: `Execute task: ${pkg.name} (${pkg.task.name})`,
-                                started: `Executing task: ${pkg.name} (${pkg.task.name})`,
-                                completed: `Task executed: ${pkg.name} (${pkg.task.name})`,
-                                failed: `Task execute failed: ${pkg.name} (${pkg.task.name})`,
-                            },
-                            exitOnError: false,
-                            runWrapper: gc.cleanup.bind(gc),
-                            run: async (listTask) => {
-                                const { snapshotPath } = restore;
-                                (0, assert_1.ok)(snapshotPath);
-                                await task.restore({
-                                    package: pkg,
-                                    options,
-                                    snapshot,
-                                    snapshotPath,
-                                    onProgress: (p) => pm.update(p, (t) => (listTask.output = t)),
-                                });
-                            },
-                        });
+                        const env_1 = { stack: [], error: void 0, hasError: false };
+                        try {
+                            let pkg = (0, config_1.resolvePackage)((0, config_1.findPackageOrFail)(this.config, snapshot.packageName), {
+                                snapshotId: options.snapshotId,
+                                snapshotDate: snapshot.date,
+                                action: "restore",
+                            });
+                            if (this.options.initial)
+                                pkg = { ...pkg, restorePath: pkg.path };
+                            const task = pkg.task ? (0, task_1.createTask)(pkg.task) : undefined;
+                            const progress = __addDisposableResource(env_1, pm.create(listTask), false);
+                            const restoreGc = gc.create();
+                            const restore = await restoreGc.disposeIfFail(() => this.restore({
+                                pkg,
+                                task,
+                                snapshot: snapshot,
+                                onProgress: progress.update,
+                            }));
+                            if (!task)
+                                return await restoreGc.dispose();
+                            return l.$tasks({
+                                key: "task",
+                                keyIndex: pkg.name,
+                                data: { taskName: pkg.task.name, packageName: pkg.name },
+                                title: {
+                                    initial: `Execute task: ${pkg.name} (${pkg.task.name})`,
+                                    started: `Executing task: ${pkg.name} (${pkg.task.name})`,
+                                    completed: `Task executed: ${pkg.name} (${pkg.task.name})`,
+                                    failed: `Task execute failed: ${pkg.name} (${pkg.task.name})`,
+                                },
+                                exitOnError: false,
+                                run: async (listTask) => {
+                                    const env_2 = { stack: [], error: void 0, hasError: false };
+                                    try {
+                                        const _ = __addDisposableResource(env_2, restoreGc.disposeOnFinish(), true);
+                                        const { snapshotPath } = restore;
+                                        (0, assert_1.ok)(snapshotPath);
+                                        const progress = __addDisposableResource(env_2, pm.create(listTask), false);
+                                        await task.restore({
+                                            package: pkg,
+                                            options,
+                                            snapshot,
+                                            snapshotPath,
+                                            onProgress: progress.update,
+                                        });
+                                    }
+                                    catch (e_2) {
+                                        env_2.error = e_2;
+                                        env_2.hasError = true;
+                                    }
+                                    finally {
+                                        const result_1 = __disposeResources(env_2);
+                                        if (result_1)
+                                            await result_1;
+                                    }
+                                },
+                            });
+                        }
+                        catch (e_1) {
+                            env_1.error = e_1;
+                            env_1.hasError = true;
+                        }
+                        finally {
+                            __disposeResources(env_1);
+                        }
                     },
                 }));
             },

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.d.ts

@@ -12,7 +12,7 @@ export type MetaData = {
         files: number;
         size: number;
         checksum: string;
-    }>;
+    } | undefined>;
 };
 export type DatatruckRepositoryConfig = {
     backend: string;

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");
@@ -45,15 +45,15 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         return this.config.backend;
     }
     fetchDiskStats(config) {
-        const fs = (0, client_1.createFs)(config.backend);
+        const fs = (0, client_1.createFs)(config.backend, this.verbose);
         return fs.fetchDiskStats(".");
     }
     async init(data) {
-        const fs = (0, client_1.createFs)(this.config.backend);
+        const fs = (0, client_1.createFs)(this.config.backend, this.verbose);
         await fs.mkdir(".");
     }
     async prune(data) {
-        const fs = (0, client_1.createFs)(this.config.backend);
+        const fs = (0, client_1.createFs)(this.config.backend, this.verbose);
         const snapshotName = DatatruckRepository.buildSnapshotName(data.snapshot, {
             name: data.snapshot.packageName,
         });
@@ -63,9 +63,9 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
             await fs.rmAll(snapshotName);
     }
     async fetchSnapshots(data) {
-        const fs = (0, client_1.createFs)(this.config.backend);
+        const fs = (0, client_1.createFs)(this.config.backend, this.verbose);
         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);
@@ -105,7 +105,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         return snapshots;
     }
     async backup(data) {
-        const fs = (0, client_1.createFs)(this.config.backend);
+        const fs = (0, client_1.createFs)(this.config.backend, this.verbose);
         const snapshotName = DatatruckRepository.buildSnapshotName(data.snapshot, data.package);
         const outPath = fs.isLocal()
             ? fs.resolvePath(snapshotName)
@@ -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];
@@ -176,11 +177,11 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 .join("-") + (pack.compress ? `.tar.gz` : `.tar`);
             const includeList = stream.path(packIndex);
             if (includeList) {
-                tarStats[packBasename] = {
+                const stats = (tarStats[packBasename] = {
                     files: stream.lines(packIndex),
                     size: 0,
                     checksum: "",
-                };
+                });
                 const tarPath = (0, path_1.join)(outPath, packBasename);
                 await (0, tar_1.createTar)({
                     compress: pack.compress,
@@ -191,8 +192,8 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                     onEntry: async (data) => scanner.progress(pack.compress ? "Compressing" : "Packing", data.path),
                 });
                 scanner.progress("Fetching tar stats", (0, path_1.basename)(tarPath), false);
-                tarStats[packBasename].checksum = await (0, crypto_1.calcFileHash)(tarPath, "sha1");
-                tarStats[packBasename].size = (await (0, promises_1.stat)(tarPath)).size;
+                stats.checksum = await (0, crypto_1.calcFileHash)(tarPath, "sha1");
+                stats.size = (await (0, promises_1.stat)(tarPath)).size;
                 if (!fs.isLocal()) {
                     scanner.progress("Uploading tar", (0, path_1.basename)(tarPath), false);
                     await fs.upload(tarPath, `${snapshotName}/${packBasename}`);
@@ -203,7 +204,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         }
         scanner.end();
         // Meta
-        const size = Object.values(tarStats).reduce((total, { size }) => total + size, 0);
+        const size = Object.values(tarStats).reduce((total, stat) => total + stat.size, 0);
         const metaPath = `${snapshotName}/meta.json`;
         const nodePkg = (0, fs_1.parsePackageFile)();
         const meta = {
@@ -224,8 +225,8 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         };
     }
     async copy(data) {
-        const sourceFs = (0, client_1.createFs)(this.config.backend);
-        const targetFs = (0, client_1.createFs)(data.mirrorRepositoryConfig.backend);
+        const sourceFs = (0, client_1.createFs)(this.config.backend, this.verbose);
+        const targetFs = (0, client_1.createFs)(data.mirrorRepositoryConfig.backend, this.verbose);
         const snapshotName = DatatruckRepository.buildSnapshotName(data.snapshot, data.package);
         if (data.options.verbose)
             (0, cli_1.logExec)(`Copying backup files to ${data.mirrorRepositoryConfig.backend}`);
@@ -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,
                             },
                         }),
@@ -293,7 +296,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         return { bytes };
     }
     async restore(data) {
-        const fs = (0, client_1.createFs)(this.config.backend);
+        const fs = (0, client_1.createFs)(this.config.backend, this.verbose);
         const relRestorePath = data.snapshotPath;
         (0, assert_1.ok)(relRestorePath);
         const restorePath = (0, path_1.resolve)(relRestorePath);
@@ -322,10 +325,20 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 if (!fs.isLocal()) {
                     const tempDir = await (0, temp_1.mkTmpDir)(exports.datatruckRepositoryName, "repo", "restore", "remote-fs", entry);
                     tempEntry = `${tempDir}/${entry}`;
-                    await fs.download(sourceEntry, tempEntry);
+                    await fs.download(sourceEntry, tempEntry, {
+                        onProgress: (stats) => {
+                            progress.updateRelative("Downloading", entry, {
+                                ...stats,
+                                format: "size",
+                            });
+                        },
+                    });
                 }
+                const stats = tarStats[entry];
+                if (data.options.verbose)
+                    (0, cli_1.logExec)(`Stats of '${entry}' is not available`);
                 await (0, tar_1.extractTar)({
-                    total: tarStats[entry].files,
+                    total: stats?.files,
                     input: tempEntry ?? fs.resolvePath(sourceEntry),
                     output: restorePath,
                     decompress: entry.endsWith(".tar.gz"),

package/lib/repositories/GitRepository.js

@@ -68,7 +68,11 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 branchName,
                 orphan: true,
             });
-            await git.exec(["commit", "-m", "Initial commit", "--allow-empty"]);
+            await git.commit("Initial commit", {
+                allowEmpty: true,
+                userName: "datatruck",
+                userEmail: "datatruck@localhost",
+            });
             await git.push({ branchName });
         }
     }
@@ -184,8 +188,12 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         if (data.options.verbose)
             console.info(`Copied ${files} files`);
         await git.exec(["add", "--verbose", "."]);
-        if (await git.haveChanges())
-            await git.exec(["commit", "-m", data.snapshot.id]);
+        if (await git.haveChanges()) {
+            await git.commit(data.snapshot.id, {
+                userName: "datatruck",
+                userEmail: "datatruck@localhost",
+            });
+        }
         const nodePkg = (0, fs_1.parsePackageFile)();
         const size = (await (0, fs_1.fastFolderSizeAsync)(tmpPath)) -
             (await (0, fs_1.fastFolderSizeAsync)((0, path_1.join)(tmpPath, ".git")));

package/lib/repositories/RepositoryAbstract.d.ts

@@ -75,8 +75,9 @@ export type SnapshotTagObject = {
 };
 export declare abstract class RepositoryAbstract<TConfig> {
     readonly repository: RepositoryConfig;
+    readonly verbose: boolean;
     readonly config: TConfig;
-    constructor(repository: RepositoryConfig);
+    constructor(repository: RepositoryConfig, verbose: boolean);
     abstract getSource(): string;
     abstract fetchDiskStats(config: TConfig): Promise<DiskStats | undefined>;
     ensureFreeDiskSpace(config: TConfig, minFreeDiskSpace: number | string): Promise<void>;

package/lib/repositories/RepositoryAbstract.js

@@ -15,9 +15,11 @@ var SnapshotTagEnum;
 })(SnapshotTagEnum || (exports.SnapshotTagEnum = SnapshotTagEnum = {}));
 class RepositoryAbstract {
     repository;
+    verbose;
     config;
-    constructor(repository) {
+    constructor(repository, verbose) {
         this.repository = repository;
+        this.verbose = verbose;
         this.config = repository.config;
     }
     async ensureFreeDiskSpace(config, minFreeDiskSpace) {

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) {