@datatruck/cli 0.8.0 → 0.9.0

package/Task/MysqlDumpTask.d.ts

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

package/Task/MysqlDumpTask.js

@@ -68,7 +68,7 @@ class MysqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
         table_schema = '${database}'
 	`);
     }
-    async onExport(tableNames, output) {
+    async onExportTables(tableNames, output) {
         const stream = (0, fs_1.createWriteStream)(output);
         await Promise.all([
             new Promise((resolve, reject) => {
@@ -107,6 +107,36 @@ class MysqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
         if (!successFooter)
             throw new AppError_1.AppError("No end line found (incomplete backup)");
     }
+    async onExportStoredPrograms(output) {
+        const stream = (0, fs_1.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 this.buildConnectionArgs()),
+                "--lock-tables=false",
+                "--routines",
+                "--events",
+                "--skip-triggers",
+                "--no-create-info",
+                "--no-data",
+                "--no-create-db",
+                "--skip-opt",
+            ], null, {
+                pipe: { stream: stream },
+                log: {
+                    exec: this.verbose,
+                    stderr: this.verbose,
+                    allToStderr: true,
+                },
+                stderr: {
+                    toExitCode: true,
+                },
+            }),
+        ]);
+    }
     async onImport(path, database) {
         await (0, process_util_1.exec)("mysql", [...(await this.buildConnectionArgs(false)), database], null, {
             pipe: {

package/Task/PostgresqlDumpTask.d.ts

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

package/Task/PostgresqlDumpTask.js

@@ -71,7 +71,7 @@ class PostgresqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
         table_schema NOT IN ('pg_catalog', 'information_schema')
 	  `);
     }
-    async onExport(tableNames, output) {
+    async onExportTables(tableNames, output) {
         const stream = (0, fs_1.createWriteStream)(output);
         await Promise.all([
             new Promise((resolve, reject) => {
@@ -90,6 +90,9 @@ class PostgresqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
             }),
         ]);
     }
+    async onExportStoredPrograms() {
+        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, {
             log: this.verbose,

package/Task/SqlDumpTaskAbstract.d.ts

@@ -14,6 +14,7 @@ export declare type SqlDumpTaskConfigType = {
     port?: number;
     database: string;
     username: string;
+    storedPrograms?: boolean;
     targetDatabase?: TargetDatabaseType;
     includeTables?: string[];
     excludeTables?: string[];
@@ -28,7 +29,8 @@ export declare abstract class SqlDumpTaskAbstract<TConfig extends SqlDumpTaskCon
     abstract onDatabaseIsEmpty(databaseName: string): Promise<boolean>;
     abstract onFetchTableNames(database: string): Promise<string[]>;
     abstract onExecQuery(query: string): ReturnType<typeof exec>;
-    abstract onExport(tableNames: string[], output: string): Promise<void>;
+    abstract onExportTables(tableNames: string[], output: string): Promise<void>;
+    abstract onExportStoredPrograms(output: string): Promise<void>;
     abstract onImport(path: string, database: string): Promise<void>;
     onBackup(data: BackupDataType): Promise<void>;
     onRestore(data: RestoreDataType): Promise<void>;

package/Task/SqlDumpTaskAbstract.js

@@ -44,6 +44,7 @@ exports.sqlDumpTaskDefinition = {
                 collate: { type: "string" },
             },
         },
+        storedPrograms: { type: "boolean" },
         includeTables: (0, DefinitionEnum_1.makeRef)(DefinitionEnum_1.DefinitionEnum.stringListUtil),
         excludeTables: (0, DefinitionEnum_1.makeRef)(DefinitionEnum_1.DefinitionEnum.stringListUtil),
         oneFileByTable: { type: "boolean" },
@@ -116,7 +117,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
             await (0, promises_1.mkdir)(outputPath, { recursive: true });
         if (!this.config.oneFileByTable) {
             const outPath = (0, path_1.join)(outputPath, serializeSqlFile({ database: this.config.database }));
-            await this.onExport(tableNames, outPath);
+            await this.onExportTables(tableNames, outPath);
         }
         else {
             let current = 0;
@@ -129,9 +130,13 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
                 });
                 current++;
                 const outPath = (0, path_1.join)(outputPath, serializeSqlFile({ table: tableName }));
-                await this.onExport([tableName], outPath);
+                await this.onExportTables([tableName], outPath);
             }
         }
+        if (this.config.storedPrograms) {
+            const outPath = (0, path_1.join)(outputPath, "stored-programs.sql");
+            await this.onExportStoredPrograms(outPath);
+        }
     }
     async onRestore(data) {
         const restorePath = data.package.restorePath;

package/config.schema.json

@@ -713,6 +713,9 @@
             }
           }
         },
+        "storedPrograms": {
+          "type": "boolean"
+        },
         "includeTables": {
           "$ref": "#/definitions/stringlist-util"
         },

package/package.json

@@ -1,29 +1,25 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "dependencies": {
     "ajv": "^8.11.0",
     "async": "^3.2.4",
     "chalk": "^4.1.2",
     "cli-table3": "^0.6.2",
-    "commander": "^9.2.0",
-    "dayjs": "^1.11.2",
+    "commander": "^9.3.0",
+    "dayjs": "^1.11.3",
     "fast-glob": "^3.2.11",
     "micromatch": "^4.0.5",
     "sqlite": "^4.1.1",
     "sqlite3": "^5.0.8"
   },
   "optionalDependencies": {
-    "ts-node": "^10.7.0",
-    "yaml": "^2.1.0"
+    "ts-node": "^10.8.2",
+    "yaml": "^2.1.1"
   },
   "engine": {
     "node": ">=16.0.0"
   },
-  "bin": {
-    "datatruck": "bin.js",
-    "dtt": "bin.js"
-  },
   "description": "Tool for creating and managing backups",
   "homepage": "https://github.com/swordev/datatruck#readme",
   "bugs": {
@@ -38,5 +34,9 @@
     "name": "Juanra GM",
     "email": "juanrgm724@gmail.com",
     "url": "https://github.com/juanrgm"
+  },
+  "bin": {
+    "datatruck": "bin.js",
+    "dtt": "bin.js"
   }
 }

package/util/date-util.d.ts

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

package/util/entity-util.d.ts

@@ -1,4 +1,4 @@
 export declare function makeTableSelector<T>(tableName: string): {
-    (name?: keyof T | undefined): string;
+    (name?: keyof T): string;
     toString: any;
 };

package/util/fs-util.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Interface } from "readline";
 export declare function isLocalDir(path: string): boolean;
 export declare function isDirEmpty(path: string): Promise<boolean>;

package/util/process-util.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { SpawnOptions, ChildProcess } from "child_process";
 import { ReadStream, WriteStream } from "fs";
 export declare type ExecLogSettingsType = {

package/CHANGELOG.md

@@ -1,145 +0,0 @@
-# @datatruck/cli
-
-## 0.8.0
-
-### Minor Changes
-
-- [`8c421ab`](https://github.com/swordev/datatruck/commit/8c421ab0adb6f2d5bc81e91fa387c5daa848f411) Thanks [@juanrgm](https://github.com/juanrgm)! - Add `--package-task` option to snapshot command
-
-## 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
-
-- [`0ba6229`](https://github.com/swordev/datatruck/commit/0ba6229348c109a59783e72242ab7c0e61f25e36) Thanks [@juanrgm](https://github.com/juanrgm)! - Fix progress bar in restic repository
-
-## 0.6.0
-
-### Minor Changes
-
-- [`0c6877d`](https://github.com/swordev/datatruck/commit/0c6877d189761e75dd434b0a8d72b71621d024de) Thanks [@juanrgm](https://github.com/juanrgm)! - Show more progress stats
-
-* [`751e1f6`](https://github.com/swordev/datatruck/commit/751e1f6d6b33d3fa96eb40d998fdd140ce0e3875) Thanks [@juanrgm](https://github.com/juanrgm)! - Add `fileCopyConcurrency` option
-
-- [`05487e6`](https://github.com/swordev/datatruck/commit/05487e6a33f875a3afb7ff0815b16da6f2a41301) Thanks [@juanrgm](https://github.com/juanrgm)! - Parse InnoDB error in `MariadbTask` to avoid infinite wait
-
-### Patch Changes
-
-- [`b62a6f8`](https://github.com/swordev/datatruck/commit/b62a6f8a82409339afd65d4f96476eb57bbfb5a2) Thanks [@juanrgm](https://github.com/juanrgm)! - Resolve target/restore path in local repository
-
-## 0.5.0
-
-### Minor Changes
-
-- [`5aeb2af`](https://github.com/swordev/datatruck/commit/5aeb2afb96692e00bdba501b58df9cc0e02dceaa) Thanks [@juanrgm](https://github.com/juanrgm)! - Add `enabled` option to repository config
-
-* [`75de836`](https://github.com/swordev/datatruck/commit/75de8369356cf02ed3fd5c58b1f9bea66432cda8) Thanks [@juanrgm](https://github.com/juanrgm)! - Allow restic password without file
-
-## 0.4.0
-
-### Minor Changes
-
-- [`eeb00a6`](https://github.com/swordev/datatruck/commit/eeb00a69d75c91da40711ae79475612b1d5193b6) Thanks [@juanrgm](https://github.com/juanrgm)! - Add `tempDir` config option
-
-## 0.3.2
-
-### Patch Changes
-
-- [`8957c3b`](https://github.com/swordev/datatruck/commit/8957c3b5846606db8b825fef357445210f2a3ac3) Thanks [@juanrgm](https://github.com/juanrgm)! - Fix restic progress parser
-
-* [`2989718`](https://github.com/swordev/datatruck/commit/29897185e3d6659359d51ab2212351005137f86c) Thanks [@juanrgm](https://github.com/juanrgm)! - Show closing reason
-
-- [`b9e0843`](https://github.com/swordev/datatruck/commit/b9e0843c7970944cfd30a7d2a543f515adfa60e4) Thanks [@juanrgm](https://github.com/juanrgm)! - Show restic progress in megabytes
-
-## 0.3.1
-
-### Patch Changes
-
-- [`c3bb4c6`](https://github.com/swordev/datatruck/commit/c3bb4c609887c5525cf35487ea237750addb6e75) Thanks [@juanrgm](https://github.com/juanrgm)! - Fix restic stdout parser
-
-## 0.3.0
-
-### Minor Changes
-
-- [`d63fd25`](https://github.com/swordev/datatruck/commit/d63fd25ffa8d2e539d2125dfd6a3f55020086804) Thanks [@juanrgm](https://github.com/juanrgm)! - Add `snapshotDate` param
-
-* [`486ef4a`](https://github.com/swordev/datatruck/commit/486ef4add27ae1dbfd166b16c257522f43537ecd) Thanks [@juanrgm](https://github.com/juanrgm)! - Resolve params in `include` and `exclude`
-
-- [`617dae2`](https://github.com/swordev/datatruck/commit/617dae2c8ed90e6e65e8109f03cfad0e64bd7c02) Thanks [@juanrgm](https://github.com/juanrgm)! - Add `script` task
-
-### Patch Changes
-
-- [`d1b3ea9`](https://github.com/swordev/datatruck/commit/d1b3ea9c9540d30898c00490963523a4fbc68193) Thanks [@juanrgm](https://github.com/juanrgm)! - Avoid use gitignore if is not necessary in restic repository
-
-## 0.2.0
-
-### Minor Changes
-
-- [`120460c`](https://github.com/swordev/datatruck/commit/120460c8824cef4184e43f571a4cc0798b899b66) Thanks [@juanrgm](https://github.com/juanrgm)! - Enable `include` option in restic repository
-
-### Patch Changes
-
-- [`e30ede3`](https://github.com/swordev/datatruck/commit/e30ede371bc7ab3fc1cd47758fdac7a28e8e2705) Thanks [@juanrgm](https://github.com/juanrgm)! - Resolve `RESTIC_PASSWORD_FILE` path
-
-* [`8539d28`](https://github.com/swordev/datatruck/commit/8539d285b2c51d700aa811cd772d573fa0d613eb) Thanks [@juanrgm](https://github.com/juanrgm)! - Allow empty backup in restic repository
-
-## 0.1.0
-
-### Minor Changes
-
-- [`88d46cd`](https://github.com/swordev/datatruck/commit/88d46cd56293df4c6fc21a9ad61d6236ac91f325) Thanks [@juanrgm](https://github.com/juanrgm)! - Add `custom` output format
-
-### Patch Changes
-
-- [`24a1e5e`](https://github.com/swordev/datatruck/commit/24a1e5e86336e7a92556287e49548dc542f0e579) Thanks [@juanrgm](https://github.com/juanrgm)! - Update dependencies
-
-## 0.0.6
-
-### Patch Changes
-
-- [`8de6e6c`](https://github.com/swordev/datatruck/commit/8de6e6ceddb59635cb4634d884e7690eeaf59bac) Thanks [@juanrgm](https://github.com/juanrgm)! - Publish migrations
-
-## 0.0.5
-
-### Patch Changes
-
-- [`78cb0c1`](https://github.com/swordev/datatruck/commit/78cb0c17558543841cd7080dc4c672e6cbfd5634) Thanks [@juanrgm](https://github.com/juanrgm)! - Fix docker image
-
-## 0.0.4
-
-### Patch Changes
-
-- [`d9e534b`](https://github.com/swordev/datatruck/commit/d9e534bd968acf9cd1c93f20e6152c004cb1f23b) Thanks [@juanrgm](https://github.com/juanrgm)! - Fix package file read
-
-* [`b882c58`](https://github.com/swordev/datatruck/commit/b882c58183e9a75abc876645e18d7b67186dd662) Thanks [@juanrgm](https://github.com/juanrgm)! - Fix read of migrations
-
-## 0.0.3
-
-### Patch Changes
-
-- [`051a7da`](https://github.com/swordev/datatruck/commit/051a7da225fcfea1c30a4fbfa8aea1b8f5538367) Thanks [@juanrgm](https://github.com/juanrgm)! - Fix dist files
-
-## 0.0.2
-
-### Patch Changes
-
-- [`0911351`](https://github.com/swordev/datatruck/commit/09113517e1a77f2d2a1e19e4c3d9af7da1e28415) Thanks [@juanrgm](https://github.com/juanrgm)! - Publish docker image