@datatruck/cli 0.23.1 → 0.23.3

package/Repository/DatatruckRepository.d.ts

@@ -20,7 +20,7 @@ export type DatatruckRepositoryConfigType = {
 type PackObject = {
     name?: string;
     compress?: boolean | CompressOptions;
-    include: string[];
+    include?: string[];
     exclude?: string[];
     onePackByResult?: boolean;
 };

package/Repository/DatatruckRepository.js

@@ -37,7 +37,6 @@ exports.datatruckPackageRepositoryDefinition = {
             items: {
                 type: "object",
                 additionalProperties: false,
-                required: ["include"],
                 properties: {
                     name: { type: "string" },
                     compress: {
@@ -184,18 +183,16 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         const defaultsPack = {
             name: "defaults",
             compress: data.packageConfig?.compress ?? this.config.compress,
-            include: [],
         };
-        const packs = [...configPacks, defaultsPack];
+        const packs = [defaultsPack, ...configPacks];
         const defaultsPackIndex = packs.findIndex((p) => p === defaultsPack);
         const stream = (0, fs_1.createWriteStreamPool)({
             path: await this.mkTmpDir("files"),
             onStreamPath: (key) => `files-${key}.txt`,
         });
+        scanner.total++;
+        stream.writeLine(defaultsPackIndex, ".");
         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;
@@ -208,6 +205,10 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 });
                 packIndex = packs.length - 1;
             }
+            if (!stream.lines(packIndex)) {
+                scanner.total++;
+                stream.writeLine(packIndex, ".");
+            }
             stream.writeLine(packIndex, entry.path);
             return true;
         });

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);
@@ -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;

package/config.schema.json

@@ -479,9 +479,6 @@
           "items": {
             "type": "object",
             "additionalProperties": false,
-            "required": [
-              "include"
-            ],
             "properties": {
               "name": {
                 "type": "string"

package/package.json

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

package/utils/cli.js

@@ -21,6 +21,8 @@ function renderSpinner(counter) {
 }
 exports.renderSpinner = renderSpinner;
 function renderProgressBar(progress, size = 10, subprogress) {
+    if (progress > 100)
+        throw new Error(`Invalid progress value: ${progress}`);
     const completeChar = "\u2588";
     const incompleteChar = "\u2591";
     const completedSize = Math.round((progress * size) / 100);

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",