@datatruck/cli 0.17.0 → 0.17.2

package/SessionDriver/ConsoleSessionDriver.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConsoleSessionDriver = void 0;
 const AppError_1 = require("../Error/AppError");
-const cli_util_1 = require("../util/cli-util");
-const date_util_1 = require("../util/date-util");
+const cli_1 = require("../utils/cli");
+const date_1 = require("../utils/date");
 const SessionDriverAbstract_1 = require("./SessionDriverAbstract");
 const chalk_1 = require("chalk");
 const pretty_bytes_1 = __importDefault(require("pretty-bytes"));
@@ -17,7 +17,7 @@ class ConsoleSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract
     constructor() {
         super(...arguments);
         this.prints = 0;
-        this.chron = (0, date_util_1.createChron)();
+        this.chron = (0, date_1.createChron)();
     }
     async onInit() {
         this.tty = this.options.verbose
@@ -34,8 +34,8 @@ class ConsoleSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract
     async onEnd(data) {
         clearInterval(this.renderInterval);
         if (this.tty)
-            process.stdout.write(cli_util_1.showCursorCommand);
-        (0, cli_util_1.logVars)({
+            process.stdout.write(cli_1.showCursorCommand);
+        (0, cli_1.logVars)({
             ...data,
             elapsed: this.chron.elapsed(true),
         });
@@ -56,10 +56,10 @@ class ConsoleSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract
             const line = this.renderSpinner(text);
             const [truncatedLine, truncated] = endMessage
                 ? [line, false]
-                : (0, cli_util_1.truncate)(line, columns);
+                : (0, cli_1.truncate)(line, columns);
             if (this.lastColumns && columns !== this.lastColumns && truncated)
-                process.stdout.write(`${cli_util_1.clearCommand}\n`);
-            process.stdout.write(`${cli_util_1.clearCommand}${truncatedLine}${cli_util_1.hideCursorCommand}`);
+                process.stdout.write(`${cli_1.clearCommand}\n`);
+            process.stdout.write(`${cli_1.clearCommand}${truncatedLine}${cli_1.hideCursorCommand}`);
             this.lastColumns = columns;
         }
         this.prints++;
@@ -67,7 +67,7 @@ class ConsoleSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract
         this.lastMessageText = text;
     }
     renderSpinner(text) {
-        return text.replace("{spinner}", (0, chalk_1.grey)(this.tty ? (0, cli_util_1.renderSpinner)(this.prints) : "?"));
+        return text.replace("{spinner}", (0, chalk_1.grey)(this.tty ? (0, cli_1.renderSpinner)(this.prints) : "?"));
     }
     renderMessage(message) {
         const badges = renderBadges([
@@ -85,7 +85,7 @@ class ConsoleSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract
         const relative = progress?.relative || {};
         if (typeof absolute.percent === "number" ||
             typeof relative.percent === "number") {
-            parts.push((0, cli_util_1.renderProgressBar)(absolute.percent ?? 0, 10, relative.percent ?? undefined));
+            parts.push((0, cli_1.renderProgressBar)(absolute.percent ?? 0, 10, relative.percent ?? undefined));
         }
         const createProgressParts = (p) => {
             const result = [];

package/SessionDriver/SqliteSessionDriver.js

@@ -9,14 +9,14 @@ const BackupSessionEntity_1 = require("../Entity/BackupSessionEntity");
 const BackupSessionRepositoryEntity_1 = require("../Entity/BackupSessionRepositoryEntity");
 const RestoreSessionEntity_1 = require("../Entity/RestoreSessionEntity");
 const RestoreSessionRepositoryEntity_1 = require("../Entity/RestoreSessionRepositoryEntity");
-const cli_util_1 = require("../util/cli-util");
-const entity_util_1 = require("../util/entity-util");
-const path_util_1 = require("../util/path-util");
-const process_util_1 = require("../util/process-util");
+const cli_1 = require("../utils/cli");
+const entity_1 = require("../utils/entity");
+const path_1 = require("../utils/path");
+const process_1 = require("../utils/process");
 const SessionDriverAbstract_1 = require("./SessionDriverAbstract");
 const assert_1 = require("assert");
 const os_1 = require("os");
-const path_1 = require("path");
+const path_2 = require("path");
 const sqlite_1 = require("sqlite");
 const sqlite3_1 = __importDefault(require("sqlite3"));
 class SqliteSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract {
@@ -27,11 +27,11 @@ class SqliteSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract
     async onInit() {
         this.db = await (0, sqlite_1.open)({
             filename: process.env["DATATRUCK_SQLITE_DB"] ??
-                (0, path_1.join)((0, os_1.homedir)(), "datatruck.sqlite"),
+                (0, path_2.join)((0, os_1.homedir)(), "datatruck.sqlite"),
             driver: sqlite3_1.default.Database,
         });
         await this.db.migrate({
-            migrationsPath: (0, path_1.join)(path_util_1.rootPath, "migrations"),
+            migrationsPath: (0, path_2.join)(path_1.rootPath, "migrations"),
         });
     }
     buildInsertStm(tableName, values) {
@@ -49,12 +49,12 @@ class SqliteSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract
     }
     async exec(query, cb) {
         if (this.options.verbose) {
-            (0, cli_util_1.logExec)("query");
-            (0, process_util_1.logExecStdout)({ data: query, lineSalt: true });
+            (0, cli_1.logExec)("query");
+            (0, process_1.logExecStdout)({ data: query, lineSalt: true });
         }
         const result = await cb();
         if (this.options.verbose)
-            (0, process_util_1.logExecStdout)({ data: JSON.stringify(result, null, 2), lineSalt: true });
+            (0, process_1.logExecStdout)({ data: JSON.stringify(result, null, 2), lineSalt: true });
         return result;
     }
     async onRead(data, type) {
@@ -64,8 +64,8 @@ class SqliteSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract
         const sessionRepositoryMeta = (0, EntityDecorator_1.EntityDecoratorHandler)(type === SessionDriverAbstract_1.EntityEnum.BackupSession
             ? BackupSessionRepositoryEntity_1.BackupSessionRepositoryEntity
             : RestoreSessionRepositoryEntity_1.RestoreSessionRepositoryEntity);
-        const sessionTable = (0, entity_util_1.makeTableSelector)(sessionMeta.get().tableName);
-        const repoTable = (0, entity_util_1.makeTableSelector)(sessionRepositoryMeta.get().tableName);
+        const sessionTable = (0, entity_1.makeTableSelector)(sessionMeta.get().tableName);
+        const repoTable = (0, entity_1.makeTableSelector)(sessionRepositoryMeta.get().tableName);
         const where = {};
         if (data.packageNames)
             where[sessionTable("packageName")] = data.packageNames;

package/SessionManager/BackupSessionManager.d.ts

@@ -3,8 +3,8 @@ import { BackupSessionEntity } from "../Entity/BackupSessionEntity";
 import { BackupSessionRepositoryEntity } from "../Entity/BackupSessionRepositoryEntity";
 import { BackupSessionTaskEntity } from "../Entity/BackupSessionTaskEntity";
 import { WriteDataType } from "../SessionDriver/SessionDriverAbstract";
-import { ObjectVault } from "../util/ObjectVault";
-import { Progress } from "../util/progress";
+import { ObjectVault } from "../utils/ObjectVault";
+import { Progress } from "../utils/progress";
 import SessionManagerAbstract from "./SessionManagerAbstract";
 export declare class BackupSessionManager extends SessionManagerAbstract {
     sessionVault: ObjectVault<BackupSessionEntity>;

package/SessionManager/BackupSessionManager.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BackupSessionManager = void 0;
 const SessionDriverAbstract_1 = require("../SessionDriver/SessionDriverAbstract");
-const ObjectVault_1 = require("../util/ObjectVault");
+const ObjectVault_1 = require("../utils/ObjectVault");
 const SessionManagerAbstract_1 = __importDefault(require("./SessionManagerAbstract"));
 class BackupSessionManager extends SessionManagerAbstract_1.default {
     constructor() {

package/SessionManager/RestoreSessionManager.d.ts

@@ -3,8 +3,8 @@ import { RestoreSessionEntity } from "../Entity/RestoreSessionEntity";
 import { RestoreSessionRepositoryEntity } from "../Entity/RestoreSessionRepositoryEntity";
 import { RestoreSessionTaskEntity } from "../Entity/RestoreSessionTaskEntity";
 import { WriteDataType } from "../SessionDriver/SessionDriverAbstract";
-import { ObjectVault } from "../util/ObjectVault";
-import { Progress } from "../util/progress";
+import { ObjectVault } from "../utils/ObjectVault";
+import { Progress } from "../utils/progress";
 import SessionManagerAbstract from "./SessionManagerAbstract";
 export declare class RestoreSessionManager extends SessionManagerAbstract {
     sessionVault: ObjectVault<RestoreSessionEntity>;

package/SessionManager/RestoreSessionManager.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RestoreSessionManager = void 0;
 const SessionDriverAbstract_1 = require("../SessionDriver/SessionDriverAbstract");
-const ObjectVault_1 = require("../util/ObjectVault");
+const ObjectVault_1 = require("../utils/ObjectVault");
 const SessionManagerAbstract_1 = __importDefault(require("./SessionManagerAbstract"));
 class RestoreSessionManager extends SessionManagerAbstract_1.default {
     constructor() {

package/Task/GitTask.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GitTask = exports.gitTaskDefinition = exports.gitTaskName = void 0;
 const DefinitionEnum_1 = require("../JsonSchema/DefinitionEnum");
-const cli_util_1 = require("../util/cli-util");
-const fs_util_1 = require("../util/fs-util");
-const math_util_1 = require("../util/math-util");
-const process_util_1 = require("../util/process-util");
+const cli_1 = require("../utils/cli");
+const fs_1 = require("../utils/fs");
+const math_1 = require("../utils/math");
+const process_1 = require("../utils/process");
 const TaskAbstract_1 = require("./TaskAbstract");
 const assert_1 = require("assert");
-const fs_1 = require("fs");
+const fs_2 = require("fs");
 const promises_1 = require("fs/promises");
 const micromatch_1 = require("micromatch");
 const path_1 = require("path");
@@ -77,7 +77,7 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
                 description: "Creating bundle",
             },
         });
-        await (0, process_util_1.exec)(this.command, ["bundle", "create", bundlePath, "--all"], {
+        await (0, process_1.exec)(this.command, ["bundle", "create", bundlePath, "--all"], {
             cwd: path,
         }, {
             log: this.verbose,
@@ -112,11 +112,11 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
             if (!option.include)
                 continue;
             option.pathsPath = (0, path_1.join)(targetPath, `repo.${option.name}-paths.txt`);
-            const stream = (0, fs_1.createWriteStream)(option.pathsPath);
+            const stream = (0, fs_2.createWriteStream)(option.pathsPath);
             let streamError;
             stream.on("error", (e) => (streamError = e));
             try {
-                await (0, process_util_1.exec)(this.command, [
+                await (0, process_1.exec)(this.command, [
                     "-c",
                     "core.quotepath=off",
                     "ls-files",
@@ -161,10 +161,10 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
             if (!option.include)
                 continue;
             const outPath = (0, path_1.join)(targetPath, `repo.${option.name}`);
-            await (0, fs_util_1.mkdirIfNotExists)(outPath);
+            await (0, fs_1.mkdirIfNotExists)(outPath);
             if (data.options.verbose)
-                (0, cli_util_1.logExec)(`Copying ${option.name} files to ${outPath}`);
-            await (0, fs_util_1.cpy)({
+                (0, cli_1.logExec)(`Copying ${option.name} files to ${outPath}`);
+            await (0, fs_1.cpy)({
                 input: {
                     type: "pathList",
                     path: option.pathsPath,
@@ -183,7 +183,7 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
                         absolute: {
                             total,
                             current: currentFiles,
-                            percent: (0, math_util_1.progressPercent)(total, currentFiles),
+                            percent: (0, math_1.progressPercent)(total, currentFiles),
                         },
                     });
                 },
@@ -202,18 +202,18 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
         const targetPath = data.targetPath;
         (0, assert_1.ok)(typeof restorePath === "string");
         (0, assert_1.ok)(typeof targetPath === "string");
-        await (0, fs_util_1.mkdirIfNotExists)(restorePath);
-        await (0, fs_util_1.ensureEmptyDir)(restorePath);
+        await (0, fs_1.mkdirIfNotExists)(restorePath);
+        await (0, fs_1.ensureEmptyDir)(restorePath);
         // Stats
         let totalFiles = 0;
         let currentFiles = 0;
-        await (0, fs_util_1.forEachFile)(targetPath, () => totalFiles++, true);
+        await (0, fs_1.forEachFile)(targetPath, () => totalFiles++, true);
         const incrementProgress = async (description, item, count = true) => {
             await data.onProgress({
                 absolute: {
                     total: totalFiles,
                     current: Math.max(currentFiles, 0),
-                    percent: (0, math_util_1.progressPercent)(totalFiles, Math.max(currentFiles, 0)),
+                    percent: (0, math_1.progressPercent)(totalFiles, Math.max(currentFiles, 0)),
                 },
                 relative: { description, payload: item },
             });
@@ -222,7 +222,7 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
         };
         // Bundle
         const bundlePath = (0, path_1.join)(targetPath, "repo.bundle");
-        await (0, process_util_1.exec)(this.command, ["clone", bundlePath, "."], {
+        await (0, process_1.exec)(this.command, ["clone", bundlePath, "."], {
             cwd: restorePath,
         }, {
             log: this.verbose,
@@ -230,17 +230,17 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
         await incrementProgress();
         // Config
         const configPath = (0, path_1.join)(targetPath, "repo.config");
-        if (await (0, fs_util_1.checkFile)(configPath)) {
+        if (await (0, fs_1.checkFile)(configPath)) {
             await (0, promises_1.copyFile)(configPath, (0, path_1.join)(restorePath, ".git", "config"));
             await incrementProgress();
         }
         // ls-files
         for (const name of ["untracked", "modified", "ignored"]) {
             const sourcePath = (0, path_1.join)(targetPath, `repo.${name}`);
-            if (await (0, fs_util_1.checkDir)(sourcePath)) {
+            if (await (0, fs_1.checkDir)(sourcePath)) {
                 if (data.options.verbose)
-                    (0, cli_util_1.logExec)(`Copying ${name} files to ${restorePath}`);
-                await (0, fs_util_1.cpy)({
+                    (0, cli_1.logExec)(`Copying ${name} files to ${restorePath}`);
+                await (0, fs_1.cpy)({
                     input: {
                         type: "glob",
                         sourcePath,

package/Task/MariadbTask.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MariadbTask = exports.mariadbTaskDefinition = exports.mariadbTaskName = void 0;
 const DefinitionEnum_1 = require("../JsonSchema/DefinitionEnum");
-const cli_util_1 = require("../util/cli-util");
-const fs_util_1 = require("../util/fs-util");
-const math_util_1 = require("../util/math-util");
-const process_util_1 = require("../util/process-util");
+const cli_1 = require("../utils/cli");
+const fs_1 = require("../utils/fs");
+const math_1 = require("../utils/math");
+const process_1 = require("../utils/process");
 const TaskAbstract_1 = require("./TaskAbstract");
 const assert_1 = require("assert");
 const promises_1 = require("fs/promises");
@@ -80,7 +80,7 @@ class MariadbTask extends TaskAbstract_1.TaskAbstract {
             args.push(`--tables-exclude=^(${config.excludeTables.join("|")})$`);
         let total = 0;
         let current = 0;
-        await (0, fs_util_1.forEachFile)(sourcePath, () => {
+        await (0, fs_1.forEachFile)(sourcePath, () => {
             total++;
         });
         let childProcess;
@@ -114,13 +114,13 @@ class MariadbTask extends TaskAbstract_1.TaskAbstract {
                     },
                     absolute: {
                         current,
-                        percent: (0, math_util_1.progressPercent)(total, current),
+                        percent: (0, math_1.progressPercent)(total, current),
                         total,
                     },
                 });
             }
         };
-        await (0, process_util_1.exec)(command, args, undefined, {
+        await (0, process_1.exec)(command, args, undefined, {
             log: this.verbose,
             onSpawn: (p) => {
                 childProcess = p;
@@ -132,7 +132,7 @@ class MariadbTask extends TaskAbstract_1.TaskAbstract {
                 onData,
             },
         });
-        await (0, process_util_1.exec)(command, [`--prepare`, `--target-dir=${targetPath}`], undefined, {
+        await (0, process_1.exec)(command, [`--prepare`, `--target-dir=${targetPath}`], undefined, {
             log: this.verbose,
             stderr: { onData: () => { } },
         });
@@ -141,13 +141,13 @@ class MariadbTask extends TaskAbstract_1.TaskAbstract {
         this.verbose = data.options.verbose;
         const restorePath = data.package.restorePath;
         (0, assert_1.ok)(typeof restorePath === "string");
-        await (0, fs_util_1.mkdirIfNotExists)(restorePath);
-        const files = await (0, fs_util_1.readDir)(restorePath);
+        await (0, fs_1.mkdirIfNotExists)(restorePath);
+        const files = await (0, fs_1.readDir)(restorePath);
         for (const file of files) {
             if (file.startsWith("ib_logfile")) {
                 const filePath = (0, path_1.join)(restorePath, file);
                 if (this.verbose)
-                    (0, cli_util_1.logExec)("rm", [filePath]);
+                    (0, cli_1.logExec)("rm", [filePath]);
                 await (0, promises_1.rm)(filePath);
             }
         }

package/Task/MssqlTask.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MssqlTask = exports.mssqlTaskDefinition = exports.mssqlTaskName = void 0;
 const AppError_1 = require("../Error/AppError");
 const DefinitionEnum_1 = require("../JsonSchema/DefinitionEnum");
-const config_util_1 = require("../util/datatruck/config-util");
-const fs_util_1 = require("../util/fs-util");
-const process_util_1 = require("../util/process-util");
+const config_1 = require("../utils/datatruck/config");
+const fs_1 = require("../utils/fs");
+const process_1 = require("../utils/process");
 const TaskAbstract_1 = require("./TaskAbstract");
 const assert_1 = require("assert");
 const promises_1 = require("fs/promises");
@@ -29,7 +29,7 @@ class MssqlTask extends TaskAbstract_1.TaskAbstract {
         return this.config.command ?? "sqlcmd";
     }
     async exec(query) {
-        const result = await (0, process_util_1.exec)(this.command, [
+        const result = await (0, process_1.exec)(this.command, [
             ...(this.config.hostname ? ["-S", this.config.hostname] : []),
             ...(this.config.username ? ["-U", this.config.username] : []),
             ...(this.config.passwordFile
@@ -73,7 +73,7 @@ class MssqlTask extends TaskAbstract_1.TaskAbstract {
             (0, micromatch_1.isMatch)(databaseName, this.config.includeDatabases)) &&
             (!this.config.excludeDatabases ||
                 !(0, micromatch_1.isMatch)(databaseName, this.config.excludeDatabases)));
-        await (0, fs_util_1.mkdirIfNotExists)(targetPath);
+        await (0, fs_1.mkdirIfNotExists)(targetPath);
         for (const databaseName of databaseNames) {
             const databasePath = (0, path_1.join)(targetPath, `${databaseName}${MssqlTask.SUFFIX}`);
             await this.exec(`BACKUP DATABASE [${databaseName}] TO DISK='${databasePath}' WITH FORMAT`);
@@ -83,14 +83,14 @@ class MssqlTask extends TaskAbstract_1.TaskAbstract {
         this.verbose = data.options.verbose;
         const restorePath = data.package.restorePath;
         (0, assert_1.ok)(typeof restorePath === "string");
-        await (0, fs_util_1.mkdirIfNotExists)(restorePath);
-        const files = await (0, fs_util_1.readDir)(restorePath);
+        await (0, fs_1.mkdirIfNotExists)(restorePath);
+        const files = await (0, fs_1.readDir)(restorePath);
         for (const file of files) {
             if (!file.endsWith(MssqlTask.SUFFIX))
                 continue;
             let databaseName = file.slice(0, MssqlTask.SUFFIX.length * -1);
             if (this.config.targetDatabase)
-                databaseName = (0, config_util_1.resolveDatabaseName)(this.config.targetDatabase, {
+                databaseName = (0, config_1.resolveDatabaseName)(this.config.targetDatabase, {
                     action: "restore",
                     database: databaseName,
                     packageName: data.package.name,

package/Task/MysqlDumpTask.d.ts

@@ -7,7 +7,7 @@ export declare class MysqlDumpTask extends SqlDumpTaskAbstract<MysqlDumpTaskConf
     buildConnectionArgs(database?: boolean): Promise<string[]>;
     onDatabaseIsEmpty(name: string): Promise<boolean>;
     onCreateDatabase(database: TargetDatabaseType): Promise<void>;
-    onExecQuery(query: string): Promise<import("../util/process-util").ExecResultType>;
+    onExecQuery(query: string): Promise<import("../utils/process").ExecResultType>;
     onFetchTableNames(database: string): Promise<string[]>;
     onExportTables(tableNames: string[], output: string, onProgress: (progress: {
         totalBytes: number;

package/Task/MysqlDumpTask.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlDumpTask = exports.mysqlDumpTaskDefinition = exports.mysqlDumpTaskName = void 0;
 const AppError_1 = require("../Error/AppError");
 const DefinitionEnum_1 = require("../JsonSchema/DefinitionEnum");
-const fs_util_1 = require("../util/fs-util");
-const process_util_1 = require("../util/process-util");
+const fs_1 = require("../utils/fs");
+const process_1 = require("../utils/process");
 const SqlDumpTaskAbstract_1 = require("./SqlDumpTaskAbstract");
-const fs_1 = require("fs");
 const fs_2 = require("fs");
+const fs_3 = require("fs");
 exports.mysqlDumpTaskName = "mysql-dump";
 exports.mysqlDumpTaskDefinition = {
     allOf: [(0, DefinitionEnum_1.makeRef)(DefinitionEnum_1.DefinitionEnum.sqlDumpTask)],
@@ -43,7 +43,7 @@ class MysqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
         await this.onExecQuery(query);
     }
     async onExecQuery(query) {
-        return await (0, process_util_1.exec)("mysql", [
+        return await (0, process_1.exec)("mysql", [
             ...(await this.buildConnectionArgs()),
             "-e",
             query.replace(/\s{1,}/g, " "),
@@ -71,13 +71,13 @@ class MysqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
 	`);
     }
     async onExportTables(tableNames, output, onProgress) {
-        const stream = (0, fs_1.createWriteStream)(output);
+        const stream = (0, fs_2.createWriteStream)(output);
         await Promise.all([
             new Promise((resolve, reject) => {
                 stream.on("close", resolve);
                 stream.on("error", reject);
             }),
-            await (0, process_util_1.exec)("mysqldump", [
+            await (0, process_1.exec)("mysqldump", [
                 ...(await this.buildConnectionArgs()),
                 "--lock-tables=false",
                 "--skip-add-drop-table=false",
@@ -97,8 +97,8 @@ class MysqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
                 },
             }),
         ]);
-        const headerContents = await (0, fs_util_1.readPartialFile)(output, [0, 100]);
-        const footerContents = await (0, fs_util_1.readPartialFile)(output, [-100]);
+        const headerContents = await (0, fs_1.readPartialFile)(output, [0, 100]);
+        const footerContents = await (0, fs_1.readPartialFile)(output, [-100]);
         const successHeader = headerContents.split(/\r?\n/).some((line) => {
             const firstLine = line.trim().toLowerCase();
             return (firstLine.startsWith("-- mysql dump") ||
@@ -113,13 +113,13 @@ class MysqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
             throw new AppError_1.AppError("No end line found (incomplete backup)");
     }
     async onExportStoredPrograms(output) {
-        const stream = (0, fs_1.createWriteStream)(output);
+        const stream = (0, fs_2.createWriteStream)(output);
         await Promise.all([
             new Promise((resolve, reject) => {
                 stream.on("close", resolve);
                 stream.on("error", reject);
             }),
-            await (0, process_util_1.exec)("mysqldump", [
+            await (0, process_1.exec)("mysqldump", [
                 ...(await this.buildConnectionArgs()),
                 "--lock-tables=false",
                 "--routines",
@@ -143,12 +143,12 @@ class MysqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
         ]);
     }
     async onImport(path, database) {
-        await (0, process_util_1.exec)("mysql", [...(await this.buildConnectionArgs(false)), database], null, {
+        await (0, process_1.exec)("mysql", [...(await this.buildConnectionArgs(false)), database], null, {
             pipe: {
-                stream: (0, fs_2.createReadStream)(path),
+                stream: (0, fs_3.createReadStream)(path),
                 onReadProgress: (data) => {
                     if (this.verbose)
-                        (0, process_util_1.logExecStdout)({
+                        (0, process_1.logExecStdout)({
                             data: JSON.stringify(data),
                             colorize: true,
                             stderr: true,

package/Task/PostgresqlDumpTask.d.ts

@@ -7,7 +7,7 @@ export declare class PostgresqlDumpTask extends SqlDumpTaskAbstract<PostgresqlDu
     buildConnectionArgs(database?: string): Promise<string[]>;
     onDatabaseIsEmpty(name: string): Promise<boolean>;
     onCreateDatabase(database: TargetDatabaseType): Promise<void>;
-    onExecQuery(query: string): Promise<import("../util/process-util").ExecResultType>;
+    onExecQuery(query: string): Promise<import("../utils/process").ExecResultType>;
     onFetchTableNames(database: string): Promise<string[]>;
     onExportTables(tableNames: string[], output: string, onProgress: (progress: {
         totalBytes: number;

package/Task/PostgresqlDumpTask.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostgresqlDumpTask = exports.postgresqlDumpTaskDefinition = exports.postgresqlDumpTaskName = void 0;
 const DefinitionEnum_1 = require("../JsonSchema/DefinitionEnum");
-const process_util_1 = require("../util/process-util");
+const process_1 = require("../utils/process");
 const SqlDumpTaskAbstract_1 = require("./SqlDumpTaskAbstract");
 const fs_1 = require("fs");
 const path_1 = require("path");
@@ -45,7 +45,7 @@ class PostgresqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
         await this.onExecQuery(query);
     }
     async onExecQuery(query) {
-        return await (0, process_util_1.exec)("psql", [
+        return await (0, process_1.exec)("psql", [
             ...(await this.buildConnectionArgs()),
             "-t",
             "-c",
@@ -80,7 +80,7 @@ class PostgresqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
                 stream.on("close", resolve);
                 stream.on("error", reject);
             }),
-            (0, process_util_1.exec)("pg_dump", [
+            (0, process_1.exec)("pg_dump", [
                 ...(await this.buildConnectionArgs()),
                 ...(tableNames?.flatMap((v) => ["-t", v]) ?? []),
             ], null, {
@@ -96,7 +96,7 @@ class PostgresqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
         throw new Error(`Method not implemented: onExportStoredPrograms`);
     }
     async onImport(path, database) {
-        await (0, process_util_1.exec)("psql", [...(await this.buildConnectionArgs(database)), "-f", (0, path_1.normalize)(path)], undefined, {
+        await (0, process_1.exec)("psql", [...(await this.buildConnectionArgs(database)), "-f", (0, path_1.normalize)(path)], undefined, {
             log: this.verbose,
         });
     }

package/Task/ScriptTask.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScriptTask = exports.scriptTaskDefinition = exports.scriptTaskName = void 0;
 const DefinitionEnum_1 = require("../JsonSchema/DefinitionEnum");
-const fs_util_1 = require("../util/fs-util");
-const process_util_1 = require("../util/process-util");
-const string_util_1 = require("../util/string-util");
+const fs_1 = require("../utils/fs");
+const process_1 = require("../utils/process");
+const string_1 = require("../utils/string");
 const TaskAbstract_1 = require("./TaskAbstract");
 const assert_1 = require("assert");
 const promises_1 = require("fs/promises");
@@ -110,7 +110,7 @@ class ScriptTask extends TaskAbstract_1.TaskAbstract {
         const steps = Array.isArray(input) ? input : [input];
         for (const step of steps) {
             if (step.type === "process") {
-                await (0, process_util_1.exec)(step.config.command, (step.config.args || []).map((v) => (0, string_util_1.render)(v, options.vars)), {
+                await (0, process_1.exec)(step.config.command, (step.config.args || []).map((v) => (0, string_1.render)(v, options.vars)), {
                     env: {
                         ...process.env,
                         ...options.vars,
@@ -127,7 +127,7 @@ class ScriptTask extends TaskAbstract_1.TaskAbstract {
                 await (0, promises_1.writeFile)(scriptPath, Array.isArray(step.config.code)
                     ? step.config.code.join("\n")
                     : step.config.code);
-                await (0, process_util_1.exec)("node", [scriptPath], {
+                await (0, process_1.exec)("node", [scriptPath], {
                     env: {
                         ...process.env,
                         ...options.vars,
@@ -168,8 +168,8 @@ class ScriptTask extends TaskAbstract_1.TaskAbstract {
         const targetPath = data.targetPath;
         (0, assert_1.ok)(typeof restorePath === "string");
         (0, assert_1.ok)(typeof targetPath === "string");
-        await (0, fs_util_1.mkdirIfNotExists)(restorePath);
-        await (0, fs_util_1.ensureEmptyDir)(restorePath);
+        await (0, fs_1.mkdirIfNotExists)(restorePath);
+        await (0, fs_1.ensureEmptyDir)(restorePath);
         await this.processSteps(config.restoreSteps, {
             env: config.env,
             vars: this.getVars(data),

package/Task/SqlDumpTaskAbstract.d.ts

@@ -1,4 +1,4 @@
-import { exec } from "../util/process-util";
+import { exec } from "../utils/process";
 import { BackupDataType, RestoreDataType, TaskAbstract } from "./TaskAbstract";
 import { JSONSchema7 } from "json-schema";
 export type TargetDatabaseType = {