@datatruck/cli 0.0.5 → 0.2.0

package/Action/SnapshotsAction.d.ts

@@ -19,6 +19,7 @@ export declare type SnapshotsActionOptionsType = {
     groupBy?: SnapshotGroupByType[];
 };
 export declare type SnapshotExtendedType = {
+    shortId: string;
     repositoryName: string;
     repositoryType: string;
 } & SnapshotResultType;

package/Action/SnapshotsAction.js

@@ -23,6 +23,7 @@ class SnapshotsAction {
             });
             const extentedItems = snapshots.map((item) => ({
                 ...item,
+                shortId: item.id.slice(0, 8),
                 repositoryName: repo.name,
                 repositoryType: repo.type,
             }));

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @datatruck/cli
 
+## 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

package/Command/SnapshotsCommand.js

@@ -8,15 +8,12 @@ const string_util_1 = require("../util/string-util");
 const CommandAbstract_1 = require("./CommandAbstract");
 class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
     onOptions() {
+        const groupByValues = ["packageName", "repositoryName", "repositoryType"];
         return this.returnsOptions({
             groupBy: {
                 option: "-g,--group-by <values>",
-                description: "Group by values",
-                parser: (v) => (0, string_util_1.parseStringList)(v, [
-                    "packageName",
-                    "repositoryName",
-                    "repositoryType",
-                ]),
+                description: `Group by values (${groupByValues.join(", ")})`,
+                parser: (v) => (0, string_util_1.parseStringList)(v, groupByValues),
             },
             id: {
                 option: "-i,--id <ids>",

package/Config/Config.js

@@ -7,6 +7,7 @@ exports.configDefinition = {
     required: ["repositories", "packages"],
     additionalProperties: false,
     properties: {
+        $schema: { type: "string" },
         repositories: {
             type: "array",
             items: (0, DefinitionEnum_1.makeRef)(DefinitionEnum_1.DefinitionEnum.repository),

package/Repository/ResticRepository.js

@@ -1,13 +1,18 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResticRepository = exports.resticPackageRepositoryDefinition = exports.resticRepositoryDefinition = exports.resticRepositoryName = void 0;
 const AppError_1 = require("../Error/AppError");
 const ResticUtil_1 = require("../util/ResticUtil");
+const cli_util_1 = require("../util/cli-util");
 const paths_util_1 = require("../util/datatruck/paths-util");
 const fs_util_1 = require("../util/fs-util");
 const string_util_1 = require("../util/string-util");
 const RepositoryAbstract_1 = require("./RepositoryAbstract");
 const assert_1 = require("assert");
+const fast_glob_1 = __importDefault(require("fast-glob"));
 const micromatch_1 = require("micromatch");
 const path_1 = require("path");
 exports.resticRepositoryName = "restic";
@@ -54,7 +59,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         if (this.env)
             return this.env;
         return (this.env = {
-            RESTIC_PASSWORD_FILE: this.config.passwordFile,
+            RESTIC_PASSWORD_FILE: (0, path_1.resolve)(this.config.passwordFile),
             RESTIC_REPOSITORY: await ResticUtil_1.ResticUtil.formatRepository(this.config.repository),
         });
     }
@@ -150,14 +155,28 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         const pkg = data.package;
         const sourcePath = data.targetPath ?? data.package.path;
         (0, assert_1.ok)(sourcePath);
-        const include = (await (0, paths_util_1.parsePaths)(pkg.include ?? [], {
+        const include = await (0, paths_util_1.parsePaths)(pkg.include ?? ["**"], {
             cwd: sourcePath,
             verbose: data.options.verbose,
-        })).map(path_1.normalize);
-        // https://github.com/restic/restic/issues/233
-        // https://github.com/restic/restic/pull/2311
-        if (include.length)
-            throw new AppError_1.AppError(`Include is not supported`);
+        });
+        const exclude = pkg.exclude
+            ? await (0, paths_util_1.parsePaths)(pkg.exclude, {
+                cwd: sourcePath,
+                verbose: data.options.verbose,
+            })
+            : undefined;
+        const stream = fast_glob_1.default.stream(include, {
+            cwd: sourcePath,
+            ignore: exclude,
+            dot: true,
+            onlyFiles: true,
+            markDirectories: true,
+        });
+        if (data.options.verbose)
+            (0, cli_util_1.logExec)(`Writing paths lists`);
+        const gitignorePath = await (0, fs_util_1.writeGitIgnoreList)({
+            paths: stream,
+        });
         if (data.options.tags?.some((tag) => tag.startsWith(ResticRepository.refPrefix)))
             throw new AppError_1.AppError(`Tag prefix is not allowed`);
         const packageTag = ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.PACKAGE, data.package.name);
@@ -170,15 +189,13 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         await restic.backup({
             cwd: sourcePath,
             paths: ["."],
+            allowEmptySnapshot: true,
+            excludeFile: [gitignorePath],
             parent: lastSnapshot?.id,
             // https://github.com/restic/restic/pull/3200
             ...((await restic.checkBackupSetPathSupport()) && {
                 setPaths: [`/datatruck/${data.package.name}`],
             }),
-            exclude: (await (0, paths_util_1.parsePaths)(pkg.exclude ?? [], {
-                cwd: sourcePath,
-                verbose: data.options.verbose,
-            })).map(path_1.normalize),
             tags: [
                 ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.ID, data.snapshot.id),
                 ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.SHORT_ID, data.snapshot.id.slice(0, 8)),

package/cli.js

@@ -63,7 +63,7 @@ program.version(version);
 program.description(description);
 program.option("-v,--verbose", "Verbose", (_, previous) => previous + 1, 0);
 program.option("-c,--config <path>", "Config path", process.env["DATATRUCK_CONFIG"] ?? (cwd.endsWith(path_1.sep) ? cwd : `${cwd}${path_1.sep}`));
-program.option("-o,--output-format <format>", "Output format (json, pjson, yaml, table)", "table");
+program.option("-o,--output-format <format>", "Output format (json, pjson, yaml, table, custom=$)", "table");
 makeCommand(CommandFactory_1.CommandEnum.config).alias("c");
 makeCommand(CommandFactory_1.CommandEnum.init).alias("i");
 makeCommand(CommandFactory_1.CommandEnum.snapshots).alias("s");

package/config.schema.json

@@ -0,0 +1,816 @@
+{
+  "definitions": {
+    "stringlist-util": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "repository": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "type",
+        "name"
+      ],
+      "properties": {
+        "type": {
+          "type": "string"
+        },
+        "name": {
+          "type": "string"
+        },
+        "config": {}
+      },
+      "anyOf": [
+        {
+          "if": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "const": "restic"
+              }
+            }
+          },
+          "then": {
+            "type": "object",
+            "properties": {
+              "config": {
+                "$ref": "#/definitions/restic-repository"
+              }
+            }
+          },
+          "else": false
+        },
+        {
+          "if": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "const": "local"
+              }
+            }
+          },
+          "then": {
+            "type": "object",
+            "properties": {
+              "config": {
+                "$ref": "#/definitions/local-repository"
+              }
+            }
+          },
+          "else": false
+        },
+        {
+          "if": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "const": "git"
+              }
+            }
+          },
+          "then": {
+            "type": "object",
+            "properties": {
+              "config": {
+                "$ref": "#/definitions/git-repository"
+              }
+            }
+          },
+          "else": false
+        }
+      ]
+    },
+    "package": {
+      "type": "object",
+      "required": [
+        "name"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "enabled": {
+          "type": "boolean"
+        },
+        "task": {
+          "$ref": "#/definitions/task"
+        },
+        "path": {
+          "type": "string"
+        },
+        "restorePath": {
+          "type": "string"
+        },
+        "restorePermissions": {
+          "type": "object",
+          "required": [
+            "uid",
+            "gid"
+          ],
+          "additionalProperties": false,
+          "properties": {
+            "uid": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "integer"
+                }
+              ]
+            },
+            "gid": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "integer"
+                }
+              ]
+            }
+          }
+        },
+        "include": {
+          "type": "array",
+          "items": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "$ref": "#/definitions/paths-object"
+              }
+            ]
+          }
+        },
+        "exclude": {
+          "type": "array",
+          "items": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "$ref": "#/definitions/paths-object"
+              }
+            ]
+          }
+        },
+        "repositoryNames": {
+          "$ref": "#/definitions/stringlist-util"
+        },
+        "repositoryConfigs": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/package-repository"
+          }
+        },
+        "prunePolicy": {
+          "$ref": "#/definitions/prune-policy"
+        }
+      }
+    },
+    "package-repository": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "type"
+      ],
+      "properties": {
+        "type": {
+          "type": "string"
+        },
+        "names": {
+          "$ref": "#/definitions/stringlist-util"
+        },
+        "config": {}
+      },
+      "anyOf": [
+        {
+          "if": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "const": "restic"
+              }
+            }
+          },
+          "then": {
+            "type": "object",
+            "properties": {
+              "config": {
+                "$ref": "#/definitions/restic-package-repository"
+              }
+            }
+          },
+          "else": false
+        },
+        {
+          "if": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "const": "local"
+              }
+            }
+          },
+          "then": {
+            "type": "object",
+            "properties": {
+              "config": {
+                "$ref": "#/definitions/local-package-repository"
+              }
+            }
+          },
+          "else": false
+        },
+        {
+          "if": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "const": "git"
+              }
+            }
+          },
+          "then": {
+            "type": "object",
+            "properties": {
+              "config": {
+                "$ref": "#/definitions/git-package-repository"
+              }
+            }
+          },
+          "else": false
+        }
+      ]
+    },
+    "task": {
+      "type": "object",
+      "required": [
+        "name"
+      ],
+      "properties": {
+        "name": {
+          "enum": [
+            "git",
+            "mariadb",
+            "mssql",
+            "mysql-dump",
+            "postgresql-dump"
+          ]
+        },
+        "config": {}
+      },
+      "anyOf": [
+        {
+          "if": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "const": "git"
+              }
+            }
+          },
+          "then": {
+            "type": "object",
+            "properties": {
+              "config": {
+                "$ref": "#/definitions/git-task"
+              }
+            }
+          },
+          "else": false
+        },
+        {
+          "if": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "const": "mariadb"
+              }
+            }
+          },
+          "then": {
+            "type": "object",
+            "properties": {
+              "config": {
+                "$ref": "#/definitions/mariadb-task"
+              }
+            }
+          },
+          "else": false
+        },
+        {
+          "if": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "const": "mssql"
+              }
+            }
+          },
+          "then": {
+            "type": "object",
+            "properties": {
+              "config": {
+                "$ref": "#/definitions/mssql-task"
+              }
+            }
+          },
+          "else": false
+        },
+        {
+          "if": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "const": "mysql-dump"
+              }
+            }
+          },
+          "then": {
+            "type": "object",
+            "properties": {
+              "config": {
+                "$ref": "#/definitions/mysql-dump-task"
+              }
+            }
+          },
+          "else": false
+        },
+        {
+          "if": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "const": "postgresql-dump"
+              }
+            }
+          },
+          "then": {
+            "type": "object",
+            "properties": {
+              "config": {
+                "$ref": "#/definitions/postgresql-dump-task"
+              }
+            }
+          },
+          "else": false
+        }
+      ]
+    },
+    "git-repository": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "repo"
+      ],
+      "properties": {
+        "repo": {
+          "type": "string"
+        },
+        "branch": {
+          "type": "string"
+        }
+      }
+    },
+    "git-package-repository": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {}
+    },
+    "local-repository": {
+      "type": "object",
+      "required": [
+        "outPath"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "outPath": {
+          "type": "string"
+        },
+        "compress": {
+          "type": "boolean"
+        }
+      }
+    },
+    "local-package-repository": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "compress": {
+          "anyOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "packs": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "required": [
+                      "include"
+                    ],
+                    "properties": {
+                      "include": {
+                        "$ref": "#/definitions/stringlist-util"
+                      },
+                      "exclude": {
+                        "$ref": "#/definitions/stringlist-util"
+                      },
+                      "onePackByResult": {
+                        "type": "boolean"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    "restic-repository": {
+      "type": "object",
+      "required": [
+        "passwordFile",
+        "repository"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "passwordFile": {
+          "type": "string"
+        },
+        "repository": {
+          "type": "object",
+          "additionalProperties": false,
+          "required": [
+            "backend"
+          ],
+          "properties": {
+            "name": {
+              "type": "string"
+            },
+            "env": {
+              "type": "object",
+              "patternProperties": {
+                ".+": {
+                  "type": "string"
+                }
+              }
+            },
+            "backend": {
+              "enum": [
+                "local",
+                "rest",
+                "sftp",
+                "s3",
+                "azure",
+                "gs",
+                "rclone"
+              ]
+            },
+            "protocol": {
+              "enum": [
+                "http",
+                "https"
+              ]
+            },
+            "host": {
+              "type": "string"
+            },
+            "username": {
+              "type": "string"
+            },
+            "passwordFile": {
+              "type": "string"
+            },
+            "port": {
+              "type": "integer"
+            },
+            "path": {
+              "type": "string"
+            }
+          }
+        }
+      }
+    },
+    "restic-package-repository": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {}
+    },
+    "git-task": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "command": {
+          "type": "string"
+        },
+        "includeModified": {
+          "anyOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "#/definitions/stringlist-util"
+            }
+          ]
+        },
+        "includeUntracked": {
+          "anyOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "#/definitions/stringlist-util"
+            }
+          ]
+        },
+        "includeIgnored": {
+          "anyOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "#/definitions/stringlist-util"
+            }
+          ]
+        },
+        "includeConfig": {
+          "type": "boolean"
+        }
+      }
+    },
+    "sqldump-task": {
+      "type": "object",
+      "required": [
+        "password",
+        "hostname",
+        "username",
+        "database"
+      ],
+      "properties": {
+        "password": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "object",
+              "additionalProperties": false,
+              "required": [
+                "path"
+              ],
+              "properties": {
+                "path": {
+                  "type": "string"
+                }
+              }
+            }
+          ]
+        },
+        "hostname": {
+          "type": "string"
+        },
+        "port": {
+          "type": "integer"
+        },
+        "username": {
+          "type": "string"
+        },
+        "database": {
+          "type": "string"
+        },
+        "targetDatabase": {
+          "type": "object",
+          "required": [
+            "name"
+          ],
+          "properties": {
+            "name": {
+              "type": "string"
+            },
+            "charset": {
+              "type": "string"
+            },
+            "collate": {
+              "type": "string"
+            }
+          }
+        },
+        "includeTables": {
+          "$ref": "#/definitions/stringlist-util"
+        },
+        "excludeTables": {
+          "$ref": "#/definitions/stringlist-util"
+        },
+        "oneFileByTable": {
+          "type": "boolean"
+        }
+      }
+    },
+    "mariadb-task": {
+      "type": "object",
+      "required": [
+        "hostname",
+        "username",
+        "password"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "command": {
+          "type": "string"
+        },
+        "hostname": {
+          "type": "string"
+        },
+        "username": {
+          "type": "string"
+        },
+        "password": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "object",
+              "additionalProperties": false,
+              "required": [
+                "path"
+              ],
+              "properties": {
+                "path": {
+                  "type": "string"
+                }
+              }
+            }
+          ]
+        },
+        "includeTables": {
+          "$ref": "#/definitions/stringlist-util"
+        },
+        "excludeTables": {
+          "$ref": "#/definitions/stringlist-util"
+        },
+        "includeDatabases": {
+          "$ref": "#/definitions/stringlist-util"
+        },
+        "excludeDatabases": {
+          "$ref": "#/definitions/stringlist-util"
+        }
+      }
+    },
+    "mssql-task": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "command": {
+          "type": "string"
+        },
+        "hostname": {
+          "type": "string"
+        },
+        "username": {
+          "type": "string"
+        },
+        "passwordFile": {
+          "type": "string"
+        },
+        "includeDatabases": {
+          "$ref": "#/definitions/stringlist-util"
+        },
+        "excludeDatabases": {
+          "$ref": "#/definitions/stringlist-util"
+        }
+      }
+    },
+    "mysql-dump-task": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/sqldump-task"
+        }
+      ]
+    },
+    "postgresql-dump-task": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/sqldump-task"
+        }
+      ]
+    },
+    "config": {
+      "type": "object",
+      "required": [
+        "repositories",
+        "packages"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "$schema": {
+          "type": "string"
+        },
+        "repositories": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/repository"
+          }
+        },
+        "packages": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/package"
+          }
+        }
+      }
+    },
+    "prune-policy": {
+      "type": "object",
+      "properties": {
+        "keepDaily": {
+          "type": "integer"
+        },
+        "keepHourly": {
+          "type": "integer"
+        },
+        "keepMinutely": {
+          "type": "integer"
+        },
+        "keepLast": {
+          "type": "integer"
+        },
+        "keepMonthly": {
+          "type": "integer"
+        },
+        "keepWeekly": {
+          "type": "integer"
+        },
+        "keepYearly": {
+          "type": "integer"
+        },
+        "groupBy": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "packageName",
+              "repositoryName",
+              "repositoryType"
+            ]
+          }
+        },
+        "tags": {
+          "$ref": "#/definitions/stringlist-util"
+        }
+      }
+    },
+    "paths-object": {
+      "type": "object",
+      "required": [
+        "type"
+      ],
+      "properties": {
+        "type": {
+          "type": "string"
+        }
+      },
+      "anyOf": [
+        {
+          "if": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "const": "spawn"
+              }
+            }
+          },
+          "then": {
+            "type": "object",
+            "required": [
+              "command"
+            ],
+            "properties": {
+              "command": {
+                "type": "string"
+              },
+              "args": {
+                "$ref": "#/definitions/stringlist-util"
+              }
+            }
+          },
+          "else": false
+        }
+      ]
+    }
+  },
+  "$ref": "#/definitions/config"
+}

package/migrations/001-initial.sql

@@ -0,0 +1,122 @@
+--------------------------------------------------------------------------------
+-- Up
+--------------------------------------------------------------------------------
+
+CREATE TABLE "backup_session" (
+	"id"	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	"creationDate"	TEXT NOT NULL,
+	"updatingDate"	TEXT,
+
+	"startDate"	TEXT,
+	"endDate"	TEXT,
+	"state"	TEXT,
+	"error"	TEXT,
+	"progressCurrent" INTEGER,
+	"progressTotal" INTEGER,
+	"progressPercent" INTEGER,
+	"progressStep" TEXT,
+	"progressStepPercent" INTEGER,
+
+	"snapshotId"	TEXT NOT NULL,
+	"packageName"	TEXT NOT NULL,
+	-- "componentName"	TEXT NOT NULL,
+	"tags"	TEXT
+);
+
+CREATE TABLE "backup_session_task" (
+	"id"	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	"creationDate"	TEXT NOT NULL,
+	"updatingDate"	TEXT,
+
+	"startDate"	TEXT,
+	"endDate"	TEXT,
+	"state"	TEXT,
+	"error"	TEXT,
+	"progressCurrent" INTEGER,
+	"progressTotal" INTEGER,
+	"progressPercent" INTEGER,
+	"progressStep" TEXT,
+	"progressStepPercent" INTEGER,
+
+	"sessionId"	INTEGER NOT NULL,
+	"taskName"	TEXT NOT NULL
+);
+
+CREATE TABLE "backup_session_repository" (
+	"id"	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	"creationDate"	TEXT NOT NULL,
+	"updatingDate"	TEXT,
+
+	"startDate"	TEXT,
+	"endDate"	TEXT,
+	"state"	TEXT,
+	"error"	TEXT,
+	"progressCurrent" INTEGER,
+	"progressTotal" INTEGER,
+	"progressPercent" INTEGER,
+	"progressStep" TEXT,
+	"progressStepPercent" INTEGER,
+
+	"sessionId"	INTEGER NOT NULL,
+	"repositoryName"	TEXT NOT NULL,
+	"repositoryType"	TEXT NOT NULL
+);
+
+CREATE TABLE "restore_session" (
+	"id"	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	"creationDate"	TEXT NOT NULL,
+	"updatingDate"	TEXT,
+
+	"startDate"	TEXT,
+	"endDate"	TEXT,
+	"state"	TEXT,
+	"error"	TEXT,
+	"progressCurrent" INTEGER,
+	"progressTotal" INTEGER,
+	"progressPercent" INTEGER,
+	"progressStep" TEXT,
+	"progressStepPercent" INTEGER,
+
+	"snapshotId"	TEXT NOT NULL,
+	"packageName"	TEXT NOT NULL -- ,
+	-- "componentName"	TEXT NOT NULL
+);
+
+CREATE TABLE "restore_session_task" (
+	"id"	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	"creationDate"	TEXT NOT NULL,
+	"updatingDate"	TEXT,
+
+	"startDate"	TEXT,
+	"endDate"	TEXT,
+	"state"	TEXT,
+	"error"	TEXT,
+	"progressCurrent" INTEGER,
+	"progressTotal" INTEGER,
+	"progressPercent" INTEGER,
+	"progressStep" TEXT,
+	"progressStepPercent" INTEGER,
+
+	"sessionId"	INTEGER NOT NULL,
+	"taskName"	TEXT NOT NULL
+);
+
+CREATE TABLE "restore_session_repository" (
+	"id"	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	"creationDate"	TEXT NOT NULL,
+	"updatingDate"	TEXT,
+
+	"startDate"	TEXT,
+	"endDate"	TEXT,
+	"state"	TEXT,
+	"error"	TEXT,
+	"progressCurrent" INTEGER,
+	"progressTotal" INTEGER,
+	"progressPercent" INTEGER,
+	"progressStep" TEXT,
+	"progressStepPercent" INTEGER,
+
+	"sessionId"	INTEGER NOT NULL,
+	"repositoryName"	TEXT NOT NULL,
+	"repositoryType"	TEXT NOT NULL
+);

package/package.json

@@ -1,22 +1,21 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.0.5",
+  "version": "0.2.0",
   "dependencies": {
-    "ajv": "^8.10.0",
+    "ajv": "^8.11.0",
     "chalk": "^4.1.2",
-    "cli-table3": "^0.6.1",
-    "commander": "^9.0.0",
-    "concurrently": "^7.0.0",
-    "dayjs": "^1.10.7",
+    "cli-table3": "^0.6.2",
+    "commander": "^9.2.0",
+    "dayjs": "^1.11.2",
     "fast-glob": "^3.2.11",
-    "fs-extra": "^10.0.1",
-    "micromatch": "^4.0.4",
-    "sqlite": "^4.0.23",
-    "sqlite3": "^5.0.2"
+    "fs-extra": "^10.1.0",
+    "micromatch": "^4.0.5",
+    "sqlite": "^4.1.1",
+    "sqlite3": "^5.0.8"
   },
   "optionalDependencies": {
-    "ts-node": "^10.5.0",
-    "yaml": "^1.10.2"
+    "ts-node": "^10.7.0",
+    "yaml": "^2.1.0"
   },
   "engine": {
     "node": ">=16.0.0"

package/util/DataFormat.d.ts

@@ -1,4 +1,4 @@
-export declare type FormatType = "json" | "pjson" | "table" | "yaml";
+export declare type FormatType = "json" | "pjson" | "table" | "yaml" | "custom";
 export declare class DataFormat<TItem extends Record<string, unknown>> {
     readonly options: {
         items: TItem[];

package/util/DataFormat.js

@@ -4,8 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataFormat = void 0;
+const AppError_1 = require("../Error/AppError");
 const cli_table3_1 = __importDefault(require("cli-table3"));
 const util_1 = require("util");
+const customPrefix = "custom=";
 class DataFormat {
     constructor(options) {
         this.options = options;
@@ -45,6 +47,16 @@ class DataFormat {
         else if (format === "yaml") {
             return this.formatToYaml();
         }
+        else if (format.startsWith(customPrefix)) {
+            const code = format.slice(customPrefix.length);
+            return runCustomCode(this.options.items, code);
+        }
+        else {
+            throw new AppError_1.AppError(`Invalid output format: ${format}`);
+        }
     }
 }
 exports.DataFormat = DataFormat;
+function runCustomCode($, __code) {
+    return eval(__code);
+}

package/util/ResticUtil.d.ts

@@ -1,4 +1,4 @@
-import { ExecSettingsInterface } from "./process-util";
+import { ExecResultType, ExecSettingsInterface } from "./process-util";
 import { UriType } from "./string-util";
 export declare type RepositoryType = {
     name?: string;
@@ -43,7 +43,7 @@ export declare class ResticUtil {
     static formatRepository(input: RepositoryType, hidePassword?: boolean): Promise<string>;
     exec(args: string[], settings?: ExecSettingsInterface, options?: {
         cwd?: string;
-    }): Promise<import("./process-util").ExecResultType>;
+    }): Promise<ExecResultType>;
     checkRepository(): Promise<boolean>;
     forget(options: {
         snapshotId?: string;
@@ -81,12 +81,14 @@ export declare class ResticUtil {
         paths: string[];
         setPaths?: string[];
         exclude?: string[];
+        excludeFile?: string[];
         parent?: string;
+        allowEmptySnapshot?: boolean;
         onStream?: (data: BackupStreamType) => Promise<void>;
-    }): Promise<import("./process-util").ExecResultType>;
+    }): Promise<ExecResultType>;
     restore(options: {
         id: string;
         target: string;
         onStream?: (data: BackupStreamType) => Promise<void>;
-    }): Promise<import("./process-util").ExecResultType>;
+    }): Promise<ExecResultType>;
 }

package/util/ResticUtil.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResticUtil = void 0;
+const fs_util_1 = require("./fs-util");
 const process_util_1 = require("./process-util");
 const string_util_1 = require("./string-util");
 const fs_extra_1 = require("fs-extra");
+const promises_1 = require("fs/promises");
 const path_1 = require("path");
 class ResticUtil {
     constructor(options) {
@@ -13,7 +15,7 @@ class ResticUtil {
         if (input.backend === "local") {
             if (typeof input.path !== "string")
                 throw new Error(`Invalid path at "${input.name}" repository: ${input.path}`);
-            return (0, path_1.normalize)(input.path);
+            return (0, path_1.resolve)(input.path);
         }
         if (input.passwordFile)
             input = {
@@ -36,7 +38,7 @@ class ResticUtil {
                     stderr: true,
                     colorize: true,
                     allToStderr: true,
-                    envNames: ["RESTIC_REPOSITORY"],
+                    envNames: ["RESTIC_REPOSITORY", "RESTIC_PASSWORD_FILE"],
                 }
                 : {},
             ...(settings ?? {}),
@@ -99,10 +101,11 @@ class ResticUtil {
         return result.stderr.includes("flag needs an argument");
     }
     async backup(options) {
-        return await this.exec([
+        const exec = async () => await this.exec([
             "backup",
             "--json",
             ...(options.exclude?.flatMap((v) => ["-e", v]) ?? []),
+            ...(options.excludeFile?.flatMap((v) => ["--exclude-file", v]) ?? []),
             ...(options.tags?.flatMap((v) => ["--tag", v]) ?? []),
             ...(options.setPaths?.flatMap((v) => ["--set-path", v]) ?? []),
             ...(options.parent ? ["--parent", options.parent] : []),
@@ -123,6 +126,25 @@ class ResticUtil {
         }, {
             cwd: options.cwd,
         });
+        try {
+            return await exec();
+        }
+        catch (error) {
+            if (options.allowEmptySnapshot &&
+                error.message.includes("unable to save snapshot: snapshot is empty")) {
+                const emptyPath = await (0, fs_util_1.mkTmpDir)("empty");
+                await (0, promises_1.writeFile)(`${emptyPath}/.empty`, "");
+                return await this.backup({
+                    ...options,
+                    cwd: emptyPath,
+                    allowEmptySnapshot: false,
+                    paths: ["."],
+                    exclude: [],
+                    excludeFile: [],
+                });
+            }
+            throw error;
+        }
     }
     async restore(options) {
         return await this.exec(["restore", "--json", options.id, "--target", options.target], {

package/util/fs-util.d.ts

@@ -23,6 +23,9 @@ export declare function readPartialFile(path: string, positions: [number, number
 export declare function checkFile(path: string): Promise<boolean>;
 export declare function checkDir(path: string): Promise<boolean>;
 export declare function forEachFile(dirPath: string, cb: (path: string, dir: boolean) => void, includeDir?: boolean): Promise<void>;
+export declare function writeGitIgnoreList(options: {
+    paths: NodeJS.ReadableStream | string[];
+}): Promise<string>;
 export declare function writePathLists(options: {
     paths: NodeJS.ReadableStream | string[];
     packs?: {

package/util/fs-util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writePathLists = exports.forEachFile = exports.checkDir = exports.checkFile = exports.readPartialFile = exports.mkTmpDir = exports.tmpDir = exports.sessionTmpDir = exports.parentTmpDir = exports.existsFile = exports.findFile = exports.parsePackageFile = exports.parseFile = exports.parseFileExtensions = exports.readdirIfExists = exports.writeJSONFile = exports.existsDir = exports.ensureEmptyDir = exports.mkdirIfNotExists = exports.isDirEmpty = exports.isLocalDir = void 0;
+exports.writePathLists = exports.writeGitIgnoreList = exports.forEachFile = exports.checkDir = exports.checkFile = exports.readPartialFile = exports.mkTmpDir = exports.tmpDir = exports.sessionTmpDir = exports.parentTmpDir = exports.existsFile = exports.findFile = exports.parsePackageFile = exports.parseFile = exports.parseFileExtensions = exports.readdirIfExists = exports.writeJSONFile = exports.existsDir = exports.ensureEmptyDir = exports.mkdirIfNotExists = exports.isDirEmpty = exports.isLocalDir = void 0;
 const path_util_1 = require("./path-util");
 const crypto_1 = require("crypto");
 const fs_1 = require("fs");
@@ -190,6 +190,40 @@ async function forEachFile(dirPath, cb, includeDir) {
     }
 }
 exports.forEachFile = forEachFile;
+async function writeGitIgnoreList(options) {
+    const tempDir = await mkTmpDir("gitignore-list");
+    const path = (0, path_1.join)(tempDir, `.gitignore`);
+    const stream = (0, fs_2.createWriteStream)(path);
+    const dirs = new Set();
+    stream.write("*\n");
+    for await (const value of options.paths) {
+        const dir = (0, path_1.dirname)(value.toString());
+        if (dir !== ".") {
+            let parentPath;
+            for (const value of dir.split("/")) {
+                if (!parentPath) {
+                    parentPath = `!${value}`;
+                }
+                else {
+                    parentPath += `/${value}`;
+                }
+                if (!dirs.has(parentPath)) {
+                    stream.write(`${parentPath}\n`);
+                    stream.write(`${parentPath.slice(1)}/*\n`);
+                    dirs.add(parentPath);
+                }
+            }
+        }
+        stream.write(`!${value}\n`);
+    }
+    await new Promise((resolve, reject) => {
+        stream.close();
+        stream.on("close", resolve);
+        stream.on("error", reject);
+    });
+    return path;
+}
+exports.writeGitIgnoreList = writeGitIgnoreList;
 async function writePathLists(options) {
     const tempDir = await mkTmpDir("path-lists");
     const includedPaths = [];