@datatruck/cli 0.23.0 → 0.23.2

package/Repository/DatatruckRepository.js

@@ -193,9 +193,6 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
             onStreamPath: (key) => `files-${key}.txt`,
         });
         await scanner.start(async (entry) => {
-            if (entry.dirent.isDirectory() &&
-                !(await (0, fs_1.isEmptyDir)((0, path_1.join)(sourcePath, entry.path))))
-                return false;
             let packIndex = configPacks.findIndex((pack) => (0, string_1.match)(entry.path, pack.include, pack.exclude));
             if (packIndex === -1)
                 packIndex = defaultsPackIndex;

package/Task/MysqlDumpTask.js

@@ -31,6 +31,7 @@ class MysqlDumpTask extends TaskAbstract_1.TaskAbstract {
     async onBackup(data) {
         const sql = await (0, mysql_1.createMysqlCli)({
             ...this.config,
+            database: undefined,
             verbose: data.options.verbose,
         });
         const tableNames = await sql.fetchTableNames(this.config.database, this.config.includeTables, this.config.excludeTables);
@@ -48,7 +49,7 @@ class MysqlDumpTask extends TaskAbstract_1.TaskAbstract {
                 concurrency,
                 onChange: async ({ processed: proccesed, buffer }) => await data.onProgress({
                     relative: {
-                        description: "Exporting",
+                        description: buffer.size > 1 ? `Exporting (${buffer.size})` : "Exporting",
                         payload: [...buffer.keys()].join(", "),
                     },
                     absolute: {
@@ -147,6 +148,7 @@ class MysqlDumpTask extends TaskAbstract_1.TaskAbstract {
     async onRestore(data) {
         const sql = await (0, mysql_1.createMysqlCli)({
             ...this.config,
+            database: undefined,
             verbose: data.options.verbose,
         });
         const restorePath = data.package.restorePath;
@@ -191,18 +193,22 @@ class MysqlDumpTask extends TaskAbstract_1.TaskAbstract {
         if (data.options.verbose)
             (0, cli_1.logExec)("readdir", [restorePath]);
         const concurrency = this.config.concurrency ?? 1;
+        let processed = 0;
         await (0, async_1.runParallel)({
             items: files.filter((f) => !f.endsWith(suffix.tableData)),
             concurrency,
-            onChange: async ({ processed: proccesed, buffer }) => await data.onProgress({
+            onFinished: () => {
+                processed++;
+            },
+            onChange: async ({ buffer }) => await data.onProgress({
                 relative: {
-                    description: "Importing",
+                    description: buffer.size > 1 ? `Importing (${buffer.size})` : "Importing",
                     payload: [...buffer.keys()].join(", "),
                 },
                 absolute: {
                     total: files.length,
-                    current: proccesed,
-                    percent: (0, math_1.progressPercent)(files.length, proccesed),
+                    current: processed,
+                    percent: (0, math_1.progressPercent)(files.length, processed),
                 },
             }),
             onItem: async ({ item: file, controller }) => {
@@ -216,15 +222,18 @@ class MysqlDumpTask extends TaskAbstract_1.TaskAbstract {
         await (0, async_1.runParallel)({
             items: dataFiles,
             concurrency,
-            onChange: async ({ processed: proccesed, buffer }) => await data.onProgress({
+            onFinished: () => {
+                processed++;
+            },
+            onChange: async ({ buffer }) => await data.onProgress({
                 relative: {
-                    description: "Importing",
+                    description: buffer.size > 1 ? `Importing (${buffer.size})` : "Importing",
                     payload: [...buffer.keys()].join(", "),
                 },
                 absolute: {
                     total: files.length,
-                    current: proccesed,
-                    percent: (0, math_1.progressPercent)(files.length, proccesed),
+                    current: processed,
+                    percent: (0, math_1.progressPercent)(files.length, processed),
                 },
             }),
             onItem: async ({ item: file, controller }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.23.0",
+  "version": "0.23.2",
   "dependencies": {
     "@supercharge/promise-pool": "^3.1.0",
     "ajv": "^8.12.0",

package/utils/async.d.ts

@@ -9,11 +9,12 @@ export declare function runParallel<T>(options: {
         buffer: ItemBuffer<T>;
         processed: number;
         proccesing: number;
-    }) => Promise<void>;
+    }) => Promise<void> | void;
     onItem: (data: {
         item: T;
         index: number;
         controller: ControllerItem;
-    }) => Promise<void>;
+    }) => Promise<void> | void;
+    onFinished?: () => Promise<void> | void;
 }): Promise<void>;
 export {};

package/utils/async.js

@@ -36,6 +36,7 @@ async function runParallel(options) {
         finally {
             buffer.delete(item);
             processed++;
+            await options.onFinished?.();
             await options.onChange({
                 processed,
                 proccesing: buffer.size,

package/utils/tar.js

@@ -104,6 +104,7 @@ async function createTar(options) {
         }),
     };
     await (0, process_1.exec)("tar", [
+        "--no-recursion",
         "-C",
         toLocalPath(options.path),
         compress?.cores === 1 ? "-czvf" : "-cvf",