@datatruck/cli 0.32.2 → 0.33.0

package/lib/{Command → commands}/PruneCommand.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PruneCommand = void 0;
-const ConfigAction_1 = require("../Action/ConfigAction");
-const PruneAction_1 = require("../Action/PruneAction");
+const ConfigAction_1 = require("../actions/ConfigAction");
+const PruneAction_1 = require("../actions/PruneAction");
 const DataFormat_1 = require("../utils/DataFormat");
 const cli_1 = require("../utils/cli");
 const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
 class PruneCommand extends CommandAbstract_1.CommandAbstract {
-    onOptions() {
-        return this.returnsOptions({
+    optionsConfig() {
+        return this.castOptionsConfig({
             dryRun: {
                 description: "",
                 option: "--dry-run",
@@ -99,7 +99,7 @@ class PruneCommand extends CommandAbstract_1.CommandAbstract {
             },
         });
     }
-    async onExec() {
+    async exec() {
         const verbose = this.globalOptions.verbose ?? 0;
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const prune = new PruneAction_1.PruneAction(config, {
@@ -121,10 +121,10 @@ class PruneCommand extends CommandAbstract_1.CommandAbstract {
             longId: this.options.longId,
             returnsAll: this.options.showAll,
         });
-        const pruneResult = await prune.exec();
+        const result = await prune.exec();
         const dataFormat = new DataFormat_1.DataFormat({
             streams: this.streams,
-            json: pruneResult,
+            json: result,
             table: {
                 headers: [
                     { value: "Id.", width: (this.options.longId ? 32 : 8) + 2 },
@@ -134,7 +134,7 @@ class PruneCommand extends CommandAbstract_1.CommandAbstract {
                     { value: "Repository type" },
                     { value: "Exclusion reasons" },
                 ],
-                rows: () => pruneResult.snapshots.map((item) => [
+                rows: () => result.snapshots.map((item) => [
                     this.options.longId ? item.id : item.id.slice(0, 8),
                     item.date.replace("T", " ").replace("Z", ""),
                     item.packageName,
@@ -147,11 +147,11 @@ class PruneCommand extends CommandAbstract_1.CommandAbstract {
         if (this.globalOptions.outputFormat)
             dataFormat.log(this.globalOptions.outputFormat);
         if (!this.options.confirm && !this.options.dryRun) {
-            const answer = await (0, cli_1.confirm)(`Delete ${pruneResult.prune}/${pruneResult.total} snapshots?`);
+            const answer = await (0, cli_1.confirm)(`Delete ${result.prune}/${result.total} snapshots?`);
             if (answer)
-                await prune.confirm(pruneResult.snapshots);
+                await prune.confirm(result.snapshots);
         }
-        return 0;
+        return { result, exitCode: 0 };
     }
 }
 exports.PruneCommand = PruneCommand;

package/lib/commands/RestoreCommand.d.ts

@@ -0,0 +1,38 @@
+import type { RepositoryConfig } from "../utils/datatruck/config-type";
+import { If } from "../utils/ts";
+import { CommandAbstract } from "./CommandAbstract";
+export type RestoreCommandOptions<TResolved = false> = {
+    id: string;
+    package?: If<TResolved, string[]>;
+    packageTask?: If<TResolved, string[]>;
+    packageConfig?: boolean;
+    repository?: If<TResolved, string[]>;
+    repositoryType?: If<TResolved, RepositoryConfig["type"][]>;
+    tag?: If<TResolved, string[]>;
+    initial?: boolean;
+};
+export declare class RestoreCommand extends CommandAbstract<RestoreCommandOptions<false>, RestoreCommandOptions<true>> {
+    optionsConfig(): import("../utils/cli").OptionsConfig<RestoreCommandOptions<false>, RestoreCommandOptions<true>>;
+    exec(): Promise<{
+        result: (import("../utils/list").List3SummaryResult | import("../utils/list").Listr3TaskResult<{
+            snapshots: {
+                id: string;
+                packages: number;
+            };
+            task: {
+                taskName: string;
+                packageName: string;
+            };
+            restore: import("../repositories/RepositoryAbstract").PreSnapshot & {
+                originalId: string;
+                packageName: string;
+                packageTaskName: string | undefined;
+                tags: string[];
+                size: number;
+            } & {
+                repositoryName: string;
+            };
+        }>)[];
+        exitCode: number;
+    }>;
+}

package/lib/{Command → commands}/RestoreCommand.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RestoreCommand = void 0;
-const ConfigAction_1 = require("../Action/ConfigAction");
-const RestoreAction_1 = require("../Action/RestoreAction");
+const ConfigAction_1 = require("../actions/ConfigAction");
+const RestoreAction_1 = require("../actions/RestoreAction");
 const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
 class RestoreCommand extends CommandAbstract_1.CommandAbstract {
-    onOptions() {
-        return this.returnsOptions({
+    optionsConfig() {
+        return this.castOptionsConfig({
             id: {
                 description: "Filter by snapshot id",
                 option: "-i,--id <id>",
@@ -48,7 +48,7 @@ class RestoreCommand extends CommandAbstract_1.CommandAbstract {
             },
         });
     }
-    async onExec() {
+    async exec() {
         const verbose = this.globalOptions.verbose ?? 0;
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const restore = new RestoreAction_1.RestoreAction(config, {
@@ -70,7 +70,8 @@ class RestoreCommand extends CommandAbstract_1.CommandAbstract {
             restore
                 .dataFormat(result, { streams: this.streams, verbose })
                 .log(this.globalOptions.outputFormat);
-        return result.some((item) => item.error) ? 1 : 0;
+        const exitCode = result.some((item) => item.error) ? 1 : 0;
+        return { result, exitCode };
     }
 }
 exports.RestoreCommand = RestoreCommand;

package/lib/{Command → commands}/SnapshotsCommand.d.ts

@@ -1,6 +1,6 @@
-import { SnapshotsAction } from "../Action/SnapshotsAction";
-import { RepositoryConfig } from "../Config/RepositoryConfig";
-import { If, Unwrap } from "../utils/ts";
+import { SnapshotsAction } from "../actions/SnapshotsAction";
+import type { RepositoryConfig } from "../utils/datatruck/config-type";
+import { If } from "../utils/ts";
 import { CommandAbstract } from "./CommandAbstract";
 export type SnapshotsCommandOptions<TResolved = false> = {
     id?: If<TResolved, string[]>;
@@ -20,8 +20,10 @@ export type SnapshotsCommandOptions<TResolved = false> = {
     groupBy?: If<TResolved, SnapshotsAction["options"]["groupBy"]>;
     tag?: If<TResolved, string[]>;
 };
-export type SnapshotsCommandResult = Unwrap<SnapshotsAction["exec"]>;
 export declare class SnapshotsCommand extends CommandAbstract<SnapshotsCommandOptions<false>, SnapshotsCommandOptions<true>> {
-    onOptions(): import("../utils/cli").OptionsType<SnapshotsCommandOptions<false>, SnapshotsCommandOptions<true>>;
-    onExec(): Promise<number>;
+    optionsConfig(): import("../utils/cli").OptionsConfig<SnapshotsCommandOptions<false>, SnapshotsCommandOptions<true>>;
+    exec(): Promise<{
+        result: import("../actions/SnapshotsAction").ExtendedSnapshot[];
+        exitCode: number;
+    }>;
 }

package/lib/{Command → commands}/SnapshotsCommand.js

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SnapshotsCommand = void 0;
-const ConfigAction_1 = require("../Action/ConfigAction");
-const SnapshotsAction_1 = require("../Action/SnapshotsAction");
+const ConfigAction_1 = require("../actions/ConfigAction");
+const SnapshotsAction_1 = require("../actions/SnapshotsAction");
 const DataFormat_1 = require("../utils/DataFormat");
 const bytes_1 = require("../utils/bytes");
 const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
 class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
-    onOptions() {
+    optionsConfig() {
         const groupByValues = [
             "id",
             "packageName",
             "repositoryName",
             "repositoryType",
         ];
-        return this.returnsOptions({
+        return this.castOptionsConfig({
             groupBy: {
                 option: "-g,--group-by <values>",
                 description: `Group by values (${groupByValues.join(", ")})`,
@@ -96,7 +96,7 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
             },
         });
     }
-    async onExec() {
+    async exec() {
         const verbose = this.globalOptions.verbose ?? 0;
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const snapshots = new SnapshotsAction_1.SnapshotsAction(config, {
@@ -117,10 +117,10 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
             verbose: verbose > 0,
             tags: this.options.tag,
         });
-        const items = await snapshots.exec();
+        const result = await snapshots.exec();
         const dataFormat = new DataFormat_1.DataFormat({
             streams: this.streams,
-            json: items,
+            json: result,
             table: {
                 headers: [
                     { value: "Id.", width: (this.options.longId ? 32 : 8) + 2 },
@@ -131,7 +131,7 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
                     { value: "Repository" },
                     { value: "Repository type" },
                 ],
-                rows: () => items.map((item) => [
+                rows: () => result.map((item) => [
                     this.options.longId ? item.id : item.id.slice(0, 8),
                     item.date.replace("T", " ").replace("Z", ""),
                     item.packageName,
@@ -145,12 +145,12 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
         if (this.globalOptions.outputFormat)
             dataFormat.log(this.globalOptions.outputFormat, {
                 tpl: {
-                    sids: () => items.map((i) => i.id).join(),
-                    ssids: () => items.map((i) => i.shortId).join(),
-                    pkgNames: () => items.map((i) => i.packageName).join(),
+                    sids: () => result.map((i) => i.id).join(),
+                    ssids: () => result.map((i) => i.shortId).join(),
+                    pkgNames: () => result.map((i) => i.packageName).join(),
                 },
             });
-        return 0;
+        return { result, exitCode: 0 };
     }
 }
 exports.SnapshotsCommand = SnapshotsCommand;

package/lib/{Command → commands}/StartServerCommand.d.ts

@@ -1,6 +1,8 @@
 import { CommandAbstract } from "./CommandAbstract";
 export type StartServerCommandOptions<TResolved = false> = {};
 export declare class StartServerCommand extends CommandAbstract<StartServerCommandOptions<false>, StartServerCommandOptions<true>> {
-    onOptions(): import("../utils/cli").OptionsType<StartServerCommandOptions<false>, StartServerCommandOptions<true>>;
-    onExec(): Promise<number>;
+    optionsConfig(): import("../utils/cli").OptionsConfig<StartServerCommandOptions<false>, StartServerCommandOptions<true>>;
+    exec(): Promise<{
+        exitCode: number;
+    }>;
 }

package/lib/{Command → commands}/StartServerCommand.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StartServerCommand = void 0;
-const ConfigAction_1 = require("../Action/ConfigAction");
+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 CommandAbstract_1 = require("./CommandAbstract");
 class StartServerCommand extends CommandAbstract_1.CommandAbstract {
-    onOptions() {
-        return this.returnsOptions({});
+    optionsConfig() {
+        return this.castOptionsConfig({});
     }
-    async onExec() {
+    async exec() {
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const verbose = !!this.globalOptions.verbose;
         const log = config.server?.log ?? true;
@@ -43,7 +43,7 @@ class StartServerCommand extends CommandAbstract_1.CommandAbstract {
         process.on("SIGINT", () => process.exit(1));
         process.on("SIGTERM", () => process.exit(1));
         await new Promise(() => setInterval(() => { }, 60000));
-        return 0;
+        return { exitCode: 0 };
     }
 }
 exports.StartServerCommand = StartServerCommand;

package/lib/index.d.ts

@@ -1,24 +1,21 @@
-export type { Config } from "./Config/Config";
-export type { PackageConfig } from "./Config/PackageConfig";
-export type { PackageRepositoryConfig } from "./Config/PackageRepositoryConfig";
-export type { PrunePolicyConfig } from "./Config/PrunePolicyConfig";
-export type { RepositoryConfig } from "./Config/RepositoryConfig";
-export { type ResticRepositoryConfig } from "./Repository/ResticRepository";
-export { type DatatruckRepositoryConfig } from "./Repository/DatatruckRepository";
-export { type GitRepositoryConfig } from "./Repository/GitRepository";
-export type { TaskConfig } from "./Config/TaskConfig";
-export { type GitTaskConfig } from "./Task/GitTask";
-export { type MariadbTaskConfig } from "./Task/MariadbTask";
-export { type MssqlTaskConfig } from "./Task/MssqlTask";
-export { type MysqlDumpTaskConfig } from "./Task/MysqlDumpTask";
-export { type PostgresqlDumpTaskConfig } from "./Task/PostgresqlDumpTask";
-export { type ScriptTaskConfig } from "./Task/ScriptTask";
-export { BackupAction, type BackupActionOptions } from "./Action/BackupAction";
-export { CleanCacheAction, type CleanCacheActionOptions, } from "./Action/CleanCacheAction";
-export { ConfigAction, type ConfigActionOptions } from "./Action/ConfigAction";
-export { CopyAction, type CopyActionOptions } from "./Action/CopyAction";
-export { InitAction, type InitActionOptions } from "./Action/InitAction";
-export { PruneAction, type PruneActionsOptions } from "./Action/PruneAction";
-export { RestoreAction, type RestoreActionOptions, } from "./Action/RestoreAction";
-export { SnapshotsAction, type SnapshotsActionOptions, } from "./Action/SnapshotsAction";
+export type { Config, PackageConfig, PackageConfigMeta, DatatruckPolicyConfig, DatatruckReportConfig, DatatruckServerOptions, } from "./utils/datatruck/config-type";
+export type { PackageRepositoryConfig, RepositoryConfig, } from "./utils/datatruck/config-repository-type";
+export type { TaskConfig } from "./utils/datatruck/config-task-type";
+export { type ResticRepositoryConfig } from "./repositories/ResticRepository";
+export { type DatatruckRepositoryConfig } from "./repositories/DatatruckRepository";
+export { type GitRepositoryConfig } from "./repositories/GitRepository";
+export { type GitTaskConfig } from "./tasks/GitTask";
+export { type MariadbTaskConfig } from "./tasks/MariadbTask";
+export { type MssqlTaskConfig } from "./tasks/MssqlTask";
+export { type MysqlDumpTaskConfig } from "./tasks/MysqlDumpTask";
+export { type PostgresqlDumpTaskConfig } from "./tasks/PostgresqlDumpTask";
+export { type ScriptTaskConfig } from "./tasks/ScriptTask";
+export { BackupAction, type BackupActionOptions } from "./actions/BackupAction";
+export { CleanCacheAction, type CleanCacheActionOptions, } from "./actions/CleanCacheAction";
+export { ConfigAction, type ConfigActionOptions } from "./actions/ConfigAction";
+export { CopyAction, type CopyActionOptions } from "./actions/CopyAction";
+export { InitAction, type InitActionOptions } from "./actions/InitAction";
+export { PruneAction, type PruneActionsOptions } from "./actions/PruneAction";
+export { RestoreAction, type RestoreActionOptions, } from "./actions/RestoreAction";
+export { SnapshotsAction, type SnapshotsActionOptions, } from "./actions/SnapshotsAction";
 export { parseArgs } from "./cli";

package/lib/index.js

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseArgs = exports.SnapshotsAction = exports.RestoreAction = exports.PruneAction = exports.InitAction = exports.CopyAction = exports.ConfigAction = exports.CleanCacheAction = exports.BackupAction = void 0;
-var BackupAction_1 = require("./Action/BackupAction");
+var BackupAction_1 = require("./actions/BackupAction");
 Object.defineProperty(exports, "BackupAction", { enumerable: true, get: function () { return BackupAction_1.BackupAction; } });
-var CleanCacheAction_1 = require("./Action/CleanCacheAction");
+var CleanCacheAction_1 = require("./actions/CleanCacheAction");
 Object.defineProperty(exports, "CleanCacheAction", { enumerable: true, get: function () { return CleanCacheAction_1.CleanCacheAction; } });
-var ConfigAction_1 = require("./Action/ConfigAction");
+var ConfigAction_1 = require("./actions/ConfigAction");
 Object.defineProperty(exports, "ConfigAction", { enumerable: true, get: function () { return ConfigAction_1.ConfigAction; } });
-var CopyAction_1 = require("./Action/CopyAction");
+var CopyAction_1 = require("./actions/CopyAction");
 Object.defineProperty(exports, "CopyAction", { enumerable: true, get: function () { return CopyAction_1.CopyAction; } });
-var InitAction_1 = require("./Action/InitAction");
+var InitAction_1 = require("./actions/InitAction");
 Object.defineProperty(exports, "InitAction", { enumerable: true, get: function () { return InitAction_1.InitAction; } });
-var PruneAction_1 = require("./Action/PruneAction");
+var PruneAction_1 = require("./actions/PruneAction");
 Object.defineProperty(exports, "PruneAction", { enumerable: true, get: function () { return PruneAction_1.PruneAction; } });
-var RestoreAction_1 = require("./Action/RestoreAction");
+var RestoreAction_1 = require("./actions/RestoreAction");
 Object.defineProperty(exports, "RestoreAction", { enumerable: true, get: function () { return RestoreAction_1.RestoreAction; } });
-var SnapshotsAction_1 = require("./Action/SnapshotsAction");
+var SnapshotsAction_1 = require("./actions/SnapshotsAction");
 Object.defineProperty(exports, "SnapshotsAction", { enumerable: true, get: function () { return SnapshotsAction_1.SnapshotsAction; } });
 var cli_1 = require("./cli");
 Object.defineProperty(exports, "parseArgs", { enumerable: true, get: function () { return cli_1.parseArgs; } });

package/lib/{Repository → repositories}/DatatruckRepository.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatatruckRepository = exports.datatruckRepositoryName = void 0;
-const AppError_1 = require("../Error/AppError");
 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 fs_1 = require("../utils/fs");
 const math_1 = require("../utils/math");
@@ -295,7 +295,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
             },
         });
         if (!snapshot)
-            throw new AppError_1.AppError("Snapshot not found");
+            throw new error_1.AppError("Snapshot not found");
         const snapshotName = DatatruckRepository.buildSnapshotName(snapshot, data.package);
         const meta = await DatatruckRepository.parseMetaData(await fs.readFile(`${snapshotName}/meta.json`));
         const progress = (0, fs_1.createProgress)({ onProgress: data.onProgress });

package/lib/{Repository → repositories}/RepositoryAbstract.d.ts

@@ -1,9 +1,7 @@
-import type { BackupActionOptions } from "../Action/BackupAction";
-import type { InitActionOptions } from "../Action/InitAction";
-import type { RestoreActionOptions } from "../Action/RestoreAction";
-import type { ExtendedSnapshot, SnapshotsActionOptions } from "../Action/SnapshotsAction";
-import type { PackageConfig } from "../Config/PackageConfig";
-import type { RepositoryConfig } from "../Config/RepositoryConfig";
+import type { BackupActionOptions } from "../actions/BackupAction";
+import type { RestoreActionOptions } from "../actions/RestoreAction";
+import type { ExtendedSnapshot, SnapshotsActionOptions } from "../actions/SnapshotsAction";
+import type { PackageConfig, RepositoryConfig } from "../utils/datatruck/config-type";
 import { type DiskStats } from "../utils/fs";
 import type { Progress } from "../utils/progress";
 export type PreSnapshot = {
@@ -18,7 +16,9 @@ export type Snapshot = PreSnapshot & {
     size: number;
 };
 export type RepoInitData = {
-    options: InitActionOptions;
+    options: {
+        verbose?: boolean;
+    };
 };
 export type RepoFetchSnapshotsData = {
     options: Pick<SnapshotsActionOptions, "ids" | "packageNames" | "packageTaskNames" | "verbose" | "tags">;

package/lib/{Repository → repositories}/ResticRepository.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResticRepository = exports.resticRepositoryName = void 0;
-const AppError_1 = require("../Error/AppError");
 const Restic_1 = require("../utils/Restic");
 const cli_1 = require("../utils/cli");
+const error_1 = require("../utils/datatruck/error");
 const paths_1 = require("../utils/datatruck/paths");
 const fs_1 = require("../utils/fs");
 const math_1 = require("../utils/math");
@@ -175,7 +175,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             });
         }
         if (data.options.tags?.some((tag) => tag.startsWith(ResticRepository.refPrefix)))
-            throw new AppError_1.AppError(`Tag prefix is not allowed`);
+            throw new error_1.AppError(`Tag prefix is not allowed`);
         const packageTag = ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.PACKAGE, data.package.name);
         data.onProgress({
             relative: {
@@ -255,9 +255,9 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             },
         });
         if (typeof resticSnapshotId !== "string")
-            throw new AppError_1.AppError(`Restic snapshot id is is not defined`);
+            throw new error_1.AppError(`Restic snapshot id is is not defined`);
         if (typeof resticTotalBytes !== "number")
-            throw new AppError_1.AppError(`Restic snapshot total bytes is not defined`);
+            throw new error_1.AppError(`Restic snapshot total bytes is not defined`);
         const sizeTag = ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.SIZE, resticTotalBytes.toString());
         await restic.exec(["tag", "--add", sizeTag, resticSnapshotId]);
         data.onProgress({
@@ -274,10 +274,11 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             options: {
                 ids: [data.snapshot.id],
                 packageNames: [data.package.name],
+                verbose: data.options.verbose,
             },
         });
         if (!snapshot)
-            throw new AppError_1.AppError(`Snapshot not found`);
+            throw new error_1.AppError(`Snapshot not found`);
         const restic = new Restic_1.Restic({
             env: {
                 ...(await this.buildEnv()),
@@ -305,7 +306,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             },
         });
         if (!snapshot)
-            throw new AppError_1.AppError(`Snapshot not found`);
+            throw new error_1.AppError(`Snapshot not found`);
         await restic.restore({
             id: snapshot.originalId,
             target: restorePath,

package/lib/{Task → tasks}/MssqlTask.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MssqlTask = exports.mssqlTaskName = void 0;
-const AppError_1 = require("../Error/AppError");
 const config_1 = require("../utils/datatruck/config");
+const error_1 = require("../utils/datatruck/error");
 const fs_1 = require("../utils/fs");
 const process_1 = require("../utils/process");
 const temp_1 = require("../utils/temp");
@@ -88,7 +88,7 @@ class MssqlTask extends TaskAbstract_1.TaskAbstract {
             const databasePath = (0, path_1.join)(snapshotPath, file);
             const exists = await this.fetchDatabaseNames(databaseName);
             if (exists.length)
-                throw new AppError_1.AppError(`Target database already exists: ${databaseName}`);
+                throw new error_1.AppError(`Target database already exists: ${databaseName}`);
             await this.exec(`RESTORE DATABASE [${databaseName}] FROM disk='${databasePath}'`);
         }
     }

package/lib/{Task → tasks}/MysqlDumpTask.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlDumpTask = exports.mysqlDumpTaskName = void 0;
-const AppError_1 = require("../Error/AppError");
 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 fs_1 = require("../utils/fs");
 const math_1 = require("../utils/math");
 const mysql_1 = require("../utils/mysql");
@@ -88,7 +88,7 @@ class MysqlDumpTask extends TaskAbstract_1.TaskAbstract {
                             const successCsvDump = files.length === 2 &&
                                 files.every((file) => file === schemaFile || file === dataFile);
                             if (!successCsvDump)
-                                throw new AppError_1.AppError(`Invalid csv dump files: ${files.join(", ")}`);
+                                throw new error_1.AppError(`Invalid csv dump files: ${files.join(", ")}`);
                             const schemaPath = (0, path_1.join)(snapshotPath, `${tableName}${suffix.tableSchema}`);
                             await (0, fs_1.safeRename)((0, path_1.join)(tableSharedPath, schemaFile), schemaPath);
                             await compressAndClean?.(schemaPath);
@@ -200,7 +200,7 @@ class MysqlDumpTask extends TaskAbstract_1.TaskAbstract {
         // Database check
         if (files.some((f) => f.endsWith(suffix.database)) &&
             !(await sql.isDatabaseEmpty(database.name)))
-            throw new AppError_1.AppError(`Target database is not empty: ${database.name}`);
+            throw new error_1.AppError(`Target database is not empty: ${database.name}`);
         // Table check
         const restoreTables = [
             ...new Set(...files
@@ -210,7 +210,7 @@ class MysqlDumpTask extends TaskAbstract_1.TaskAbstract {
         const serverTables = await sql.fetchTableNames(database.name);
         const errorTables = restoreTables.filter((v) => serverTables.includes(v));
         if (errorTables.length)
-            throw new AppError_1.AppError(`Target table already exists: ${errorTables.join(", ")}`);
+            throw new error_1.AppError(`Target table already exists: ${errorTables.join(", ")}`);
         // Data check
         const dataFiles = files.filter((f) => f.endsWith(suffix.tableData));
         const sharedDir = dataFiles.length

package/lib/{Task → tasks}/ScriptTask.d.ts

@@ -1,5 +1,5 @@
-import { PackageConfig } from "../Config/PackageConfig";
-import { PreSnapshot } from "../Repository/RepositoryAbstract";
+import { PreSnapshot } from "../repositories/RepositoryAbstract";
+import type { PackageConfig } from "../utils/datatruck/config-type";
 import { ProcessEnv } from "../utils/process";
 import { SpawnStep } from "../utils/spawnSteps";
 import { TaskBackupData, TaskPrepareRestoreData, TaskRestoreData, TaskAbstract } from "./TaskAbstract";

package/lib/{Task → tasks}/SqlDumpTaskAbstract.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqlDumpTaskAbstract = void 0;
-const AppError_1 = require("../Error/AppError");
 const cli_1 = require("../utils/cli");
 const config_1 = require("../utils/datatruck/config");
+const error_1 = require("../utils/datatruck/error");
 const fs_1 = require("../utils/fs");
 const math_1 = require("../utils/math");
 const temp_1 = require("../utils/temp");
@@ -23,7 +23,7 @@ function serializeSqlFile(input) {
         return `${input.table}.table.sql`;
     }
     else {
-        throw new AppError_1.AppError(`Invalid sql file input: ${JSON.stringify(input)}`);
+        throw new error_1.AppError(`Invalid sql file input: ${JSON.stringify(input)}`);
     }
 }
 function parseSqlFile(fileName) {
@@ -177,7 +177,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
         // Database check
         const databaseItems = items.filter((v) => v.database);
         if (databaseItems.length && !(await this.onDatabaseIsEmpty(database.name)))
-            throw new AppError_1.AppError(`Target database is not empty: ${database.name}`);
+            throw new error_1.AppError(`Target database is not empty: ${database.name}`);
         // Table check
         const restoreTables = items
             .filter((v) => v.table)
@@ -185,7 +185,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
         const serverTables = await this.onFetchTableNames(database.name);
         const errorTables = restoreTables.filter((v) => serverTables.includes(v));
         if (errorTables.length) {
-            throw new AppError_1.AppError(`Target table already exists: ${errorTables.join(", ")}`);
+            throw new error_1.AppError(`Target table already exists: ${errorTables.join(", ")}`);
         }
         await this.onCreateDatabase(database);
         if (this.verbose)

package/lib/{Task → tasks}/TaskAbstract.d.ts

@@ -1,7 +1,7 @@
-import { BackupActionOptions } from "../Action/BackupAction";
-import { RestoreActionOptions } from "../Action/RestoreAction";
-import { PackageConfig } from "../Config/PackageConfig";
-import { PreSnapshot } from "../Repository/RepositoryAbstract";
+import { BackupActionOptions } from "../actions/BackupAction";
+import { RestoreActionOptions } from "../actions/RestoreAction";
+import { PreSnapshot } from "../repositories/RepositoryAbstract";
+import type { PackageConfig } from "../utils/datatruck/config-type";
 import { Progress } from "../utils/progress";
 type TaskCommonData = {
     package: PackageConfig;

package/lib/utils/DataFormat.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 AppError_1 = require("../Error/AppError");
+const error_1 = require("./datatruck/error");
 const stream_1 = require("./stream");
 const tty_table_1 = __importDefault(require("tty-table"));
 const util_1 = require("util");
@@ -84,12 +84,12 @@ class DataFormat {
             const tpl = options?.tpl || {};
             if (!(name in tpl)) {
                 const tplNames = Object.keys(tpl).join(", ");
-                throw new AppError_1.AppError(`Template name not found: ${name} (valid names: ${tplNames})`);
+                throw new error_1.AppError(`Template name not found: ${name} (valid names: ${tplNames})`);
             }
             return tpl[name]();
         }
         else {
-            throw new AppError_1.AppError(`Invalid output format: ${format}`);
+            throw new error_1.AppError(`Invalid output format: ${format}`);
         }
     }
 }

package/lib/utils/Restic.d.ts

@@ -68,6 +68,7 @@ export declare class Restic {
         paths?: string[];
         latest?: number;
         json?: boolean;
+        snapshotIds?: string[];
     }): Promise<{
         time: string;
         tree: string;