@datatruck/cli 0.6.1 → 0.7.0

package/Action/BackupAction.d.ts

@@ -10,6 +10,7 @@ export declare type BackupActionOptionsType = {
     repositoryNames?: string[];
     repositoryTypes?: string[];
     packageNames?: string[];
+    packageTaskNames?: string[];
     tags?: string[];
     dryRun?: boolean;
     verbose?: boolean;

package/Action/BackupAction.js

@@ -21,6 +21,7 @@ class BackupAction {
         await session.initDrivers();
         let packages = (0, config_util_1.filterPackages)(this.config, {
             packageNames: this.options.packageNames,
+            packageTaskNames: this.options.packageTaskNames,
             repositoryNames: this.options.repositoryNames,
             repositoryTypes: this.options.repositoryTypes,
             sourceAction: "backup",
@@ -193,7 +194,9 @@ class BackupAction {
                 error: error?.message,
             });
         }
-        await session.endDrivers();
+        await session.endDrivers({
+            snapshotId: snapshot.id.slice(0, 8),
+        });
         return {
             total: total,
             errors: errors,

package/Action/RestoreAction.d.ts

@@ -10,6 +10,7 @@ export declare type RestoreActionOptionsType = {
     snapshotId: string;
     tags?: string[];
     packageNames?: string[];
+    packageTaskNames?: string[];
     repositoryNames?: string[];
     repositoryTypes?: string[];
     verbose?: boolean;

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @datatruck/cli
 
+## 0.7.0
+
+### Minor Changes
+
+- [`3b8d6da`](https://github.com/swordev/datatruck/commit/3b8d6da01495799aceb848a63b35b8c46a7d1b0e) Thanks [@juanrgm](https://github.com/juanrgm)! - Add `--package-task` cli option
+
+* [`69b34a0`](https://github.com/swordev/datatruck/commit/69b34a02b9cade48df2b071a92a8f79d5cfec23e) Thanks [@juanrgm](https://github.com/juanrgm)! - Allow restore multiple backups over the same database
+
+- [`69caf26`](https://github.com/swordev/datatruck/commit/69caf26881272331bd4c8d7d345b3b85d33e33ac) Thanks [@juanrgm](https://github.com/juanrgm)! - Add cli short option to `--tag`
+
+* [`377f0de`](https://github.com/swordev/datatruck/commit/377f0de345c9c8f45c772ac47e4ded81e91725d7) Thanks [@juanrgm](https://github.com/juanrgm)! - Rename cli short option to `-rt`
+
+### Patch Changes
+
+- [`c03200a`](https://github.com/swordev/datatruck/commit/c03200a6347d1e9f9fdad86dcb22df30bbefcab4) Thanks [@juanrgm](https://github.com/juanrgm)! - Fix `sql-dump` tasks
+
+* [`f56a4bc`](https://github.com/swordev/datatruck/commit/f56a4bcb429a674c13f32de73985cd67eb1acc23) Thanks [@juanrgm](https://github.com/juanrgm)! - Show full error message
+
+- [`4324422`](https://github.com/swordev/datatruck/commit/4324422550474619811a8d455af55bc6e3b08aeb) Thanks [@juanrgm](https://github.com/juanrgm)! - Use connection port in `mysql-dump` task
+
 ## 0.6.1
 
 ### Patch Changes

package/Command/BackupCommand.d.ts

@@ -3,6 +3,7 @@ import { If } from "../util/ts-util";
 import { CommandAbstract } from "./CommandAbstract";
 export declare type BackupCommandOptionsType<TResolved = false> = {
     package?: If<TResolved, string[]>;
+    packageTask?: If<TResolved, string[]>;
     repository?: If<TResolved, string[]>;
     repositoryType?: If<TResolved, RepositoryConfigType["type"][]>;
     tag?: If<TResolved, string[]>;

package/Command/BackupCommand.js

@@ -21,6 +21,11 @@ class BackupCommand extends CommandAbstract_1.CommandAbstract {
                 option: "-p,--package <values>",
                 parser: string_util_1.parseStringList,
             },
+            packageTask: {
+                description: "Package task names",
+                option: "-pt,--package-task <values>",
+                parser: string_util_1.parseStringList,
+            },
             repository: {
                 description: "Repository names",
                 option: "-r,--repository <values>",
@@ -28,12 +33,12 @@ class BackupCommand extends CommandAbstract_1.CommandAbstract {
             },
             repositoryType: {
                 description: "Repository types",
-                option: "-t,--repository-type <values>",
+                option: "-rt,--repository-type <values>",
                 parser: (v) => (0, string_util_1.parseStringList)(v),
             },
             tag: {
                 description: "Tags",
-                option: "--tag <values>",
+                option: "-t,--tag <values>",
                 parser: string_util_1.parseStringList,
             },
             date: {
@@ -47,6 +52,7 @@ class BackupCommand extends CommandAbstract_1.CommandAbstract {
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const backup = new BackupAction_1.BackupAction(config, {
             packageNames: this.options.package,
+            packageTaskNames: this.options.packageTask,
             repositoryNames: this.options.repository,
             repositoryTypes: this.options.repositoryType,
             tags: this.options.tag,

package/Command/BackupSessionsCommand.js

@@ -24,7 +24,7 @@ class BackupSessionsCommand extends CommandAbstract_1.CommandAbstract {
             },
             tag: {
                 description: "Tags",
-                option: "--tag <values>",
+                option: "-t,--tag <values>",
                 parser: string_util_1.parseStringList,
             },
             limit: {

package/Command/ConfigCommand.d.ts

@@ -3,6 +3,7 @@ import { If } from "../util/ts-util";
 import { CommandAbstract } from "./CommandAbstract";
 export declare type ConfigCommandOptionsType<TResolved = false> = {
     package?: If<TResolved, string[]>;
+    packageTask?: If<TResolved, string[]>;
     repository?: If<TResolved, string[]>;
     repositoryType?: If<TResolved, RepositoryConfigType["type"][]>;
 };

package/Command/ConfigCommand.js

@@ -14,6 +14,11 @@ class ConfigCommand extends CommandAbstract_1.CommandAbstract {
                 option: "-p,--package <values>",
                 parser: string_util_1.parseStringList,
             },
+            packageTask: {
+                description: "Package task names",
+                option: "-pt,--package-task <values>",
+                parser: string_util_1.parseStringList,
+            },
             repository: {
                 description: "Repository names",
                 option: "-r,--repository <values>",
@@ -21,7 +26,7 @@ class ConfigCommand extends CommandAbstract_1.CommandAbstract {
             },
             repositoryType: {
                 description: "Repository types",
-                option: "-t,--repository-type <values>",
+                option: "-rt,--repository-type <values>",
                 parser: (v) => (0, string_util_1.parseStringList)(v),
             },
         });
@@ -30,6 +35,7 @@ class ConfigCommand extends CommandAbstract_1.CommandAbstract {
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const packages = (0, config_util_1.filterPackages)(config, {
             packageNames: this.options.package,
+            packageTaskNames: this.options.packageTask,
             repositoryNames: this.options.repository,
             repositoryTypes: this.options.repositoryType,
         });

package/Command/InitCommand.js

@@ -18,7 +18,7 @@ class InitCommand extends CommandAbstract_1.CommandAbstract {
             },
             repositoryType: {
                 description: "Repository types",
-                option: "-t,--repository-type <values>",
+                option: "-rt,--repository-type <values>",
                 parser: (v) => (0, string_util_1.parseStringList)(v),
             },
         });

package/Command/PruneCommand.js

@@ -81,12 +81,12 @@ class PruneCommand extends CommandAbstract_1.CommandAbstract {
             },
             repositoryType: {
                 description: "Repository types",
-                option: "-t,--repositoryType <values>",
+                option: "-rt,--repository-type <values>",
                 parser: (v) => (0, string_util_1.parseStringList)(v),
             },
             tag: {
                 description: "Tags",
-                option: "--tag <values>",
+                option: "-t,--tag <values>",
                 parser: string_util_1.parseStringList,
             },
             showAll: {

package/Command/RestoreCommand.d.ts

@@ -4,6 +4,7 @@ import { CommandAbstract } from "./CommandAbstract";
 export declare type RestoreCommandOptionsType<TResolved = false> = {
     id: string;
     package?: If<TResolved, string[]>;
+    packageTask?: If<TResolved, string[]>;
     repository?: If<TResolved, string[]>;
     repositoryType?: If<TResolved, RepositoryConfigType["type"][]>;
     tag?: If<TResolved, string[]>;

package/Command/RestoreCommand.js

@@ -21,6 +21,11 @@ class RestoreCommand extends CommandAbstract_1.CommandAbstract {
                 option: "-p,--package <values>",
                 parser: string_util_1.parseStringList,
             },
+            packageTask: {
+                description: "Package task names",
+                option: "-pt,--package-task <values>",
+                parser: string_util_1.parseStringList,
+            },
             repository: {
                 description: "Repository names",
                 option: "-r,--repository <values>",
@@ -28,12 +33,12 @@ class RestoreCommand extends CommandAbstract_1.CommandAbstract {
             },
             repositoryType: {
                 description: "Repository types",
-                option: "-t,--repository-type <values>",
+                option: "-rt,--repository-type <values>",
                 parser: (v) => (0, string_util_1.parseStringList)(v),
             },
             tag: {
                 description: "Tags",
-                option: "--tag <values>",
+                option: "-t,--tag <values>",
                 parser: string_util_1.parseStringList,
             },
         });
@@ -44,6 +49,7 @@ class RestoreCommand extends CommandAbstract_1.CommandAbstract {
         const restore = new RestoreAction_1.RestoreAction(config, {
             snapshotId: this.options.id,
             packageNames: this.options.package,
+            packageTaskNames: this.options.packageTask,
             repositoryNames: this.options.repository,
             repositoryTypes: this.options.repositoryType,
             tags: this.options.tag,

package/Command/RestoreSessionsCommand.js

@@ -24,7 +24,7 @@ class RestoreSessionsCommand extends CommandAbstract_1.CommandAbstract {
             },
             tag: {
                 description: "Tags",
-                option: "--tag <values>",
+                option: "-t,--tag <values>",
                 parser: string_util_1.parseStringList,
             },
             limit: {

package/Command/SnapshotsCommand.js

@@ -76,7 +76,7 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
             },
             tag: {
                 description: "Tags",
-                option: "--tag <values>",
+                option: "-t,--tag <values>",
                 parser: string_util_1.parseStringList,
             },
         });

package/SessionDriver/ConsoleSessionDriver.d.ts

@@ -26,10 +26,14 @@ export declare class ConsoleSessionDriver extends SessionDriverAbstract {
     protected rendering?: boolean;
     protected lastColumns?: number;
     protected startTime: number;
+    protected chron: {
+        start: () => number;
+        elapsed: (formatted?: boolean | undefined) => string | number;
+    };
     onInit(): Promise<void>;
-    onEnd(): Promise<void>;
+    onEnd(data?: Record<string, any>): Promise<void>;
     onRead(): Promise<ReadResultType[]>;
-    protected printMessage(message: MessageType): void;
+    protected printMessage(message: MessageType, endMessage: boolean): void;
     protected renderSpinner(text: string): string;
     protected renderMessage(message: MessageType): string;
     onWrite(data: WriteDataType): Promise<void>;

package/SessionDriver/ConsoleSessionDriver.js

@@ -3,6 +3,7 @@ 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 SessionDriverAbstract_1 = require("./SessionDriverAbstract");
 const chalk_1 = require("chalk");
 const sep = (0, chalk_1.grey)(`|`);
@@ -12,42 +13,28 @@ class ConsoleSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract
     constructor() {
         super(...arguments);
         this.prints = 0;
+        this.chron = (0, date_util_1.createChron)();
     }
     async onInit() {
-        this.startTime = Date.now();
+        this.chron.start();
         this.renderInterval = setInterval(() => {
             if (this.lastMessage)
-                this.printMessage(this.lastMessage);
+                this.printMessage(this.lastMessage, false);
         }, 100);
     }
-    async onEnd() {
+    async onEnd(data) {
         clearInterval(this.renderInterval);
         if (!this.options.verbose)
             process.stdout.write(cli_util_1.showCursorCommand);
-        const ellapsed = (Date.now() - this.startTime) / 1000;
-        let ellapsedUnit;
-        let ellapsedValue;
-        if (ellapsed > 60 * 60) {
-            ellapsedValue = ellapsed / 60 / 60;
-            ellapsedUnit = `hour`;
-        }
-        else if (ellapsed > 60) {
-            ellapsedValue = ellapsed / 60;
-            ellapsedUnit = `minute`;
-        }
-        else {
-            ellapsedValue = ellapsed;
-            ellapsedUnit = `second`;
-        }
-        if (ellapsedValue !== 1)
-            ellapsedUnit += `s`;
-        const message = `Completed in ${ellapsedValue.toFixed(2)} ${ellapsedUnit}`;
-        console.info(`\n${(0, chalk_1.grey)(message)}`);
+        (0, cli_util_1.logVars)({
+            ...data,
+            elapsed: this.chron.elapsed(true),
+        });
     }
     async onRead() {
         throw new AppError_1.AppError("Method not implemented");
     }
-    printMessage(message) {
+    printMessage(message, endMessage) {
         const text = this.renderMessage(message);
         if (this.options.verbose && this.lastMessageText === text) {
             return;
@@ -58,8 +45,10 @@ class ConsoleSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract
         else {
             const columns = process.stdout.columns;
             const line = this.renderSpinner(text);
-            const [truncatedLine, truncted] = (0, cli_util_1.truncate)(line, columns);
-            if (this.lastColumns && columns !== this.lastColumns && truncted)
+            const [truncatedLine, truncated] = endMessage
+                ? [line, false]
+                : (0, cli_util_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}`);
             this.lastColumns = columns;
@@ -170,10 +159,11 @@ class ConsoleSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract
         if (isHeader && data.action === SessionDriverAbstract_1.ActionEnum.End) {
             return;
         }
-        this.printMessage(message);
-        if (!this.options.verbose)
-            if (!hasProgress || data.action === SessionDriverAbstract_1.ActionEnum.End || isHeader)
-                process.stdout.write("\n");
+        const endMessage = !this.options.verbose &&
+            (!hasProgress || data.action === SessionDriverAbstract_1.ActionEnum.End || isHeader);
+        this.printMessage(message, endMessage);
+        if (endMessage)
+            process.stdout.write("\n");
     }
 }
 exports.ConsoleSessionDriver = ConsoleSessionDriver;

package/SessionDriver/SessionDriverAbstract.d.ts

@@ -73,6 +73,6 @@ export declare abstract class SessionDriverAbstract {
     });
     onInit(): Promise<void>;
     abstract onWrite(data: WriteDataType): Promise<void>;
-    onEnd(): Promise<void>;
+    onEnd(data?: Record<string, any>): Promise<void>;
     abstract onRead(data: ReadDataType, entity: EntityEnum): Promise<ReadResultType[]>;
 }

package/SessionDriver/SessionDriverAbstract.js

@@ -22,6 +22,6 @@ class SessionDriverAbstract {
         this.options = options;
     }
     async onInit() { }
-    async onEnd() { }
+    async onEnd(data) { }
 }
 exports.SessionDriverAbstract = SessionDriverAbstract;

package/SessionManager/BackupSessionManager.d.ts

@@ -27,7 +27,7 @@ export declare class BackupSessionManager {
         repositoryName: string;
     }): number;
     initDrivers(): Promise<void>;
-    endDrivers(): Promise<void>;
+    endDrivers(data?: Record<string, any>): Promise<void>;
     protected alter(data: WriteDataType): Promise<number>;
     readAll(options: BackupSessionsActionOptionsType): Promise<import("../SessionDriver/SessionDriverAbstract").ReadResultType[]>;
     init(input: Pick<BackupSessionEntity, "packageName" | "snapshotId" | "tags">): Promise<number>;

package/SessionManager/BackupSessionManager.js

@@ -27,10 +27,10 @@ class BackupSessionManager {
             await driver.onInit();
         }
     }
-    async endDrivers() {
+    async endDrivers(data) {
         const drivers = [this.options.driver, ...(this.options.altDrivers ?? [])];
         for (const driver of drivers) {
-            await driver.onEnd();
+            await driver.onEnd(data);
         }
     }
     async alter(data) {

package/Task/MysqlDumpTask.d.ts

@@ -8,7 +8,7 @@ export declare class MysqlDumpTask extends SqlDumpTaskAbstract<MysqlDumpTaskConf
     onDatabaseIsEmpty(name: string): Promise<boolean>;
     onCreateDatabase(database: TargetDatabaseType): Promise<void>;
     onExecQuery(query: string): Promise<import("../util/process-util").ExecResultType>;
-    onFetchTableNames(): Promise<string[]>;
+    onFetchTableNames(database: string): Promise<string[]>;
     onExport(tableNames: string[], output: string): Promise<void>;
     onImport(path: string, database: string): Promise<void>;
 }

package/Task/MysqlDumpTask.js

@@ -17,6 +17,7 @@ class MysqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
         const password = await this.fetchPassword();
         return [
             `--host=${this.config.hostname}`,
+            ...(this.config.port ? [`--port=${this.config.port}`] : []),
             `--user=${this.config.username}`,
             `--password=${password ?? ""}`,
             ...(database && this.config.database ? [this.config.database] : []),
@@ -57,14 +58,14 @@ class MysqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
             },
         });
     }
-    async onFetchTableNames() {
+    async onFetchTableNames(database) {
         return await this.fetchValues(`
       SELECT
         table_name 
       FROM
         information_schema.tables
       WHERE
-        table_schema = '${this.config.database}'
+        table_schema = '${database}'
 	`);
     }
     async onExport(tableNames, output) {
@@ -77,6 +78,7 @@ class MysqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
             await (0, process_util_1.exec)("mysqldump", [
                 ...(await this.buildConnectionArgs()),
                 "--lock-tables=false",
+                "--skip-add-drop-table=false",
                 ...tableNames,
             ], null, {
                 pipe: { stream: stream },

package/Task/PostgresqlDumpTask.d.ts

@@ -8,7 +8,7 @@ export declare class PostgresqlDumpTask extends SqlDumpTaskAbstract<PostgresqlDu
     onDatabaseIsEmpty(name: string): Promise<boolean>;
     onCreateDatabase(database: TargetDatabaseType): Promise<void>;
     onExecQuery(query: string): Promise<import("../util/process-util").ExecResultType>;
-    onFetchTableNames(): Promise<string[]>;
+    onFetchTableNames(database: string): Promise<string[]>;
     onExport(tableNames: string[], output: string): Promise<void>;
     onImport(path: string, database: string): Promise<void>;
 }

package/Task/PostgresqlDumpTask.js

@@ -60,14 +60,14 @@ class PostgresqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
             },
         });
     }
-    async onFetchTableNames() {
+    async onFetchTableNames(database) {
         return await this.fetchValues(`
       SELECT
         CONCAT(table_schema, '.', table_name)
       FROM
         information_schema.tables
       WHERE
-        table_catalog = '${this.config.database}' AND
+        table_catalog = '${database}' AND
         table_schema NOT IN ('pg_catalog', 'information_schema')
 	  `);
     }
@@ -80,8 +80,6 @@ class PostgresqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
             }),
             (0, process_util_1.exec)("pg_dump", [
                 ...(await this.buildConnectionArgs()),
-                "--clean",
-                "--if-exists",
                 ...(tableNames?.flatMap((v) => ["-t", v]) ?? []),
             ], null, {
                 pipe: { stream: stream },

package/Task/SqlDumpTaskAbstract.d.ts

@@ -26,11 +26,10 @@ export declare abstract class SqlDumpTaskAbstract<TConfig extends SqlDumpTaskCon
     fetchValues(query: string): Promise<string[]>;
     abstract onCreateDatabase(database: TargetDatabaseType): Promise<void>;
     abstract onDatabaseIsEmpty(databaseName: string): Promise<boolean>;
-    abstract onFetchTableNames(): Promise<string[]>;
+    abstract onFetchTableNames(database: string): Promise<string[]>;
     abstract onExecQuery(query: string): ReturnType<typeof exec>;
     abstract onExport(tableNames: string[], output: string): Promise<void>;
     abstract onImport(path: string, database: string): Promise<void>;
-    fetchTableNames(): Promise<string[]>;
     onBackup(data: BackupDataType): Promise<void>;
     onRestore(data: RestoreDataType): Promise<void>;
 }

package/Task/SqlDumpTaskAbstract.js

@@ -49,6 +49,39 @@ exports.sqlDumpTaskDefinition = {
         oneFileByTable: { type: "boolean" },
     },
 };
+function serializeSqlFile(input) {
+    if (input.database && input.table) {
+        return `${input.database}.${input.table}.table.sql`;
+    }
+    else if (input.database && !input.table) {
+        return `${input.database}.database.sql`;
+    }
+    else if (!input.database && input.table) {
+        return `${input.table}.table.sql`;
+    }
+    else {
+        throw new AppError_1.AppError(`Invalid sql file input: ${JSON.stringify(input)}`);
+    }
+}
+function parseSqlFile(fileName) {
+    if (!fileName.endsWith(".sql"))
+        return;
+    const regex = /^(.+)\.(table|database)\.sql$/;
+    const matches = regex.exec(fileName);
+    if (!matches)
+        return { fileName };
+    const [, name, type] = matches;
+    const lastName = name.split(".").pop();
+    if (type === "table") {
+        return { fileName, table: lastName };
+    }
+    else if (type === "database") {
+        return { fileName, database: lastName };
+    }
+    else {
+        throw new Error(`Invalid sql file type: ${type}`);
+    }
+}
 class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
     async fetchPassword() {
         if (typeof this.config.password === "string")
@@ -66,26 +99,23 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
             return result;
         }, []);
     }
-    async fetchTableNames() {
-        const tableNames = await this.onFetchTableNames();
+    async onBackup(data) {
+        this.verbose = data.options.verbose;
         const config = this.config;
-        return tableNames.filter((tableName) => {
+        const outputPath = data.package.path;
+        const allTableNames = await this.onFetchTableNames(this.config.database);
+        const tableNames = allTableNames.filter((tableName) => {
             if (config.includeTables && !(0, micromatch_1.isMatch)(tableName, config.includeTables))
                 return false;
             if (config.excludeTables && (0, micromatch_1.isMatch)(tableName, config.excludeTables))
                 return false;
             return true;
         });
-    }
-    async onBackup(data) {
-        this.verbose = data.options.verbose;
-        const outputPath = data.package.path;
-        const tableNames = await this.fetchTableNames();
         (0, assert_1.ok)(typeof outputPath === "string");
         if (!(await (0, fs_util_1.checkDir)(outputPath)))
             await (0, promises_1.mkdir)(outputPath, { recursive: true });
         if (!this.config.oneFileByTable) {
-            const outPath = (0, path_1.join)(outputPath, this.config.database) + ".database.sql";
+            const outPath = (0, path_1.join)(outputPath, serializeSqlFile({ database: this.config.database }));
             await this.onExport(tableNames, outPath);
         }
         else {
@@ -98,7 +128,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
                     step: tableName,
                 });
                 current++;
-                const outPath = (0, path_1.join)(outputPath, tableName) + ".table.sql";
+                const outPath = (0, path_1.join)(outputPath, serializeSqlFile({ table: tableName }));
                 await this.onExport([tableName], outPath);
             }
         }
@@ -125,20 +155,33 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
                 database: database.name,
             });
         }
-        if (!(await this.onDatabaseIsEmpty(database.name)))
+        const items = (await (0, promises_1.readdir)(restorePath))
+            .map(parseSqlFile)
+            .filter((v) => !!v);
+        // 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}`);
+        // Table check
+        const restoreTables = items
+            .filter((v) => v.table)
+            .map((v) => v.table);
+        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(", ")}`);
+        }
         await this.onCreateDatabase(database);
         if (this.verbose)
             (0, cli_util_1.logExec)("readdir", [restorePath]);
-        const files = (await (0, promises_1.readdir)(restorePath)).filter((name) => /\.sql$/i.test(name));
         let current = 0;
-        for (const file of files) {
-            const path = (0, path_1.join)(restorePath, file);
+        for (const item of items) {
+            const path = (0, path_1.join)(restorePath, item.fileName);
             data.onProgress({
-                total: files.length,
+                total: items.length,
                 current: current,
-                percent: (0, math_util_1.progressPercent)(files.length, current),
-                step: file,
+                percent: (0, math_util_1.progressPercent)(items.length, current),
+                step: item.fileName,
             });
             current++;
             await this.onImport(path, database.name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "dependencies": {
     "ajv": "^8.11.0",
     "async": "^3.2.4",

package/util/cli-util.d.ts

@@ -6,6 +6,7 @@ export declare const clearCommand = "\r\u001B[K";
 export declare const hideCursorCommand = "\u001B[?25l";
 export declare function renderSpinner(counter: number): string;
 export declare function renderProgressBar(progress: number, size?: number): string;
+export declare function logVars(data: Record<string, any>): void;
 export declare function logExec(command: string, argv?: string[], env?: NodeJS.ProcessEnv, logToStderr?: boolean): void;
 export declare function resultColumn(error: Error | null | string, state?: "started" | "ended"): "❌" | " ? " | "✅";
 export declare function errorColumn(error: Error | null | string, verbose: number): string;

package/util/cli-util.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.confirm = exports.truncate = exports.parseOptions = exports.errorColumn = exports.resultColumn = exports.logExec = exports.renderProgressBar = exports.renderSpinner = exports.hideCursorCommand = exports.clearCommand = exports.showCursorCommand = exports.spinnerChars = exports.clearLastLine = void 0;
+exports.confirm = exports.truncate = exports.parseOptions = exports.errorColumn = exports.resultColumn = exports.logExec = exports.logVars = exports.renderProgressBar = exports.renderSpinner = exports.hideCursorCommand = exports.clearCommand = exports.showCursorCommand = exports.spinnerChars = exports.clearLastLine = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const chalk_2 = require("chalk");
 const readline_1 = require("readline");
@@ -28,6 +28,18 @@ function renderProgressBar(progress, size = 10) {
     return completeChar.repeat(completedSize) + incompleteChar.repeat(restSize);
 }
 exports.renderProgressBar = renderProgressBar;
+function logVars(data) {
+    let first = true;
+    for (const key in data) {
+        if (first) {
+            console.log();
+            first = false;
+        }
+        const value = data[key];
+        console.log(`${chalk_1.default.cyan(key)}${chalk_1.default.grey(":")} ${chalk_1.default.white(value ?? "")}`);
+    }
+}
+exports.logVars = logVars;
 function logExec(command, argv = [], env, logToStderr) {
     const envText = env
         ? Object.keys(env)

package/util/datatruck/config-util.d.ts

@@ -5,6 +5,7 @@ export declare function findRepositoryOrFail(config: ConfigType, repositoryName:
 export declare function filterRepository(repository: RepositoryConfigType, action?: RepositoryConfigEnabledActionType): boolean;
 export declare function filterPackages(config: ConfigType, options: {
     packageNames?: string[];
+    packageTaskNames?: string[];
     repositoryNames?: string[];
     repositoryTypes?: string[];
     sourceAction?: RepositoryConfigEnabledActionType;

package/util/datatruck/config-util.js

@@ -22,6 +22,7 @@ function filterRepository(repository, action) {
 exports.filterRepository = filterRepository;
 function filterPackages(config, options) {
     const packagePatterns = (0, string_util_1.makePathPatterns)(options.packageNames);
+    const taskNamePatterns = (0, string_util_1.makePathPatterns)(options.packageTaskNames);
     return config.packages
         .map((pkg) => {
         pkg = Object.assign({}, pkg);
@@ -37,6 +38,8 @@ function filterPackages(config, options) {
         return pkg;
     })
         .filter((pkg) => {
+        if (taskNamePatterns && !(0, micromatch_1.isMatch)(pkg.task?.name ?? "", taskNamePatterns))
+            return false;
         return ((typeof pkg.enabled !== "boolean" || pkg.enabled) &&
             !!pkg.repositoryNames?.length &&
             (!packagePatterns || (0, micromatch_1.isMatch)(pkg.name, packagePatterns)));

package/util/date-util.d.ts

@@ -10,3 +10,7 @@ export declare type FilterByLastOptionsType = {
 export declare function filterByLast<TItem extends {
     date: string;
 }>(items: TItem[], options: FilterByLastOptionsType, reasons?: Record<number, string[]>): TItem[];
+export declare function createChron(): {
+    start: () => number;
+    elapsed: (formatted?: boolean | undefined) => string | number;
+};

package/util/date-util.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.filterByLast = void 0;
+exports.createChron = exports.filterByLast = void 0;
+const string_util_1 = require("./string-util");
 const dayjs_1 = __importDefault(require("dayjs"));
 const advancedFormat_1 = __importDefault(require("dayjs/plugin/advancedFormat"));
 const isoWeek_1 = __importDefault(require("dayjs/plugin/isoWeek"));
@@ -72,3 +73,18 @@ function filterByLast(items, options, reasons) {
     return items.filter((item) => validItems.includes(item));
 }
 exports.filterByLast = filterByLast;
+function createChron() {
+    let startTime;
+    return {
+        start: () => (startTime = Date.now()),
+        elapsed: (formatted) => {
+            if (!startTime)
+                throw new Error(`Chron was not started`);
+            const seconds = (Date.now() - startTime) / 1000;
+            if (formatted)
+                return (0, string_util_1.formatSeconds)(seconds);
+            return seconds;
+        },
+    };
+}
+exports.createChron = createChron;

package/util/process-util.js

@@ -68,10 +68,10 @@ async function exec(command, argv = [], options = null, settings = {}) {
             stderr: "",
             exitCode: 0,
         };
-        let finishListens = pipe ? 2 : 1;
+        let finishListeners = pipe?.stream instanceof fs_1.WriteStream ? 2 : 1;
         let streamError;
         const tryFinish = () => {
-            if (!--finishListens)
+            if (!--finishListeners)
                 finish();
         };
         const finish = () => {

package/util/string-util.d.ts

@@ -13,5 +13,6 @@ export declare type UriType = {
     path?: string;
 };
 export declare function formatUri(input: UriType, hidePassword?: boolean): string;
+export declare function formatSeconds(seconds: number): string;
 export declare function makePathPatterns(values: string[] | undefined): string[] | undefined;
 export declare function formatDateTime(datetime: string): string;

package/util/string-util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatDateTime = exports.makePathPatterns = exports.formatUri = exports.parseStringList = exports.render = exports.snakeCase = exports.lcfirst = exports.ucfirst = exports.serialize = void 0;
+exports.formatDateTime = exports.makePathPatterns = exports.formatSeconds = exports.formatUri = exports.parseStringList = exports.render = exports.snakeCase = exports.lcfirst = exports.ucfirst = exports.serialize = void 0;
 const AppError_1 = require("../Error/AppError");
 function serialize(message, data) {
     if (data)
@@ -67,6 +67,26 @@ function formatUri(input, hidePassword) {
     return uri;
 }
 exports.formatUri = formatUri;
+function formatSeconds(seconds) {
+    let unit;
+    let value;
+    if (seconds > 60 * 60) {
+        value = seconds / 60 / 60;
+        unit = `hour`;
+    }
+    else if (seconds > 60) {
+        value = seconds / 60;
+        unit = `minute`;
+    }
+    else {
+        value = seconds;
+        unit = `second`;
+    }
+    if (value !== 1)
+        unit += `s`;
+    return `${value.toFixed(2)} ${unit}`;
+}
+exports.formatSeconds = formatSeconds;
 function makePathPatterns(values) {
     return values?.flatMap((v) => [v, `${v}/**`]);
 }