@datatruck/cli 0.34.5 → 0.35.1

package/config.schema.json

@@ -399,6 +399,63 @@
                   "name"
                 ]
               },
+              {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "type": "string",
+                    "const": "mongo-dump"
+                  },
+                  "config": {
+                    "type": "object",
+                    "properties": {
+                      "command": {
+                        "type": "string"
+                      },
+                      "hostname": {
+                        "type": "string"
+                      },
+                      "port": {
+                        "type": "number"
+                      },
+                      "username": {
+                        "type": "string"
+                      },
+                      "password": {
+                        "anyOf": [
+                          {
+                            "type": "object",
+                            "properties": {
+                              "path": {
+                                "type": "string"
+                              }
+                            },
+                            "additionalProperties": false,
+                            "required": [
+                              "path"
+                            ]
+                          },
+                          {
+                            "type": "string"
+                          }
+                        ]
+                      },
+                      "compress": {
+                        "type": "boolean"
+                      },
+                      "concurrency": {
+                        "type": "number"
+                      }
+                    },
+                    "additionalProperties": false
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "config",
+                  "name"
+                ]
+              },
               {
                 "type": "object",
                 "properties": {

package/lib/actions/InitAction.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InitAction = void 0;
 const config_1 = require("../utils/datatruck/config");
 const repository_1 = require("../utils/datatruck/repository");
+const string_1 = require("../utils/string");
 class InitAction {
     config;
     options;
@@ -12,14 +13,14 @@ class InitAction {
     }
     async exec() {
         const result = [];
+        const filterRepo = (0, string_1.createPatternFilter)(this.options.repositoryNames);
+        const filterRepoType = (0, string_1.createPatternFilter)(this.options.repositoryTypes);
         for (const repoConfig of this.config.repositories) {
             if (!(0, config_1.filterRepositoryByEnabled)(repoConfig, "init"))
                 continue;
-            if (this.options.repositoryNames &&
-                !this.options.repositoryNames.includes(repoConfig.name))
+            if (!filterRepo(repoConfig.name))
                 continue;
-            if (this.options.repositoryTypes &&
-                !this.options.repositoryTypes.includes(repoConfig.type))
+            if (!filterRepoType(repoConfig.type))
                 continue;
             const repo = (0, repository_1.createRepo)(repoConfig, this.options.verbose);
             let initError = null;

package/lib/actions/RestoreAction.js

@@ -59,6 +59,7 @@ const error_1 = require("../utils/error");
 const fs_1 = require("../utils/fs");
 const list_1 = require("../utils/list");
 const progress_1 = require("../utils/progress");
+const string_1 = require("../utils/string");
 const temp_1 = require("../utils/temp");
 const SnapshotsAction_1 = require("./SnapshotsAction");
 const assert_1 = require("assert");
@@ -74,12 +75,12 @@ class RestoreAction {
     }
     async findSnapshots() {
         const result = [];
+        const filterRepo = (0, string_1.createPatternFilter)(this.options.repositoryNames);
+        const filterRepoType = (0, string_1.createPatternFilter)(this.options.repositoryTypes);
         for (const repository of this.config.repositories) {
-            if (this.options.repositoryNames &&
-                !this.options.repositoryNames.includes(repository.name))
+            if (!filterRepo(repository.name))
                 continue;
-            if (this.options.repositoryTypes &&
-                !this.options.repositoryTypes.includes(repository.type))
+            if (!filterRepoType(repository.type))
                 continue;
             const snapshotsAction = new SnapshotsAction_1.SnapshotsAction(this.config, {
                 repositoryNames: [repository.name],

package/lib/actions/SnapshotsAction.js

@@ -4,6 +4,7 @@ exports.SnapshotsAction = void 0;
 const config_1 = require("../utils/datatruck/config");
 const repository_1 = require("../utils/datatruck/repository");
 const snapshot_1 = require("../utils/datatruck/snapshot");
+const string_1 = require("../utils/string");
 class SnapshotsAction {
     config;
     options;
@@ -15,14 +16,14 @@ class SnapshotsAction {
         if (!sourceAction)
             sourceAction = "snapshots";
         let result = [];
+        const filterRepo = (0, string_1.createPatternFilter)(this.options.repositoryNames);
+        const filterRepoType = (0, string_1.createPatternFilter)(this.options.repositoryTypes);
         for (const repoConfig of this.config.repositories) {
             if (!(0, config_1.filterRepositoryByEnabled)(repoConfig, sourceAction))
                 continue;
-            if (this.options.repositoryNames &&
-                !this.options.repositoryNames.includes(repoConfig.name))
+            if (!filterRepo(repoConfig.name))
                 continue;
-            if (this.options.repositoryTypes &&
-                !this.options.repositoryTypes.includes(repoConfig.type))
+            if (!filterRepoType(repoConfig.type))
                 continue;
             const repo = await (0, repository_1.createAndInitRepo)(repoConfig, this.options.verbose);
             const configPackageNames = this.config.packages.map((pkg) => pkg.name);

package/lib/repositories/DatatruckRepository.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatatruckRepository = exports.datatruckRepositoryName = void 0;
+const async_1 = require("../utils/async");
 const cli_1 = require("../utils/cli");
 const crypto_1 = require("../utils/crypto");
 const client_1 = require("../utils/datatruck/client");
+const config_1 = require("../utils/datatruck/config");
 const paths_1 = require("../utils/datatruck/paths");
 const error_1 = require("../utils/error");
 const fs_1 = require("../utils/fs");
@@ -14,7 +16,6 @@ const temp_1 = require("../utils/temp");
 const RepositoryAbstract_1 = require("./RepositoryAbstract");
 const assert_1 = require("assert");
 const promises_1 = require("fs/promises");
-const micromatch_1 = require("micromatch");
 const path_1 = require("path");
 exports.datatruckRepositoryName = "datatruck";
 class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
@@ -68,23 +69,26 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
             throw new error_1.AppError(`Repository (${this.repository.name}) out path does not exist: ${fs.resolvePath(".")}`);
         const snapshots = [];
         const snapshotNames = await fs.readdir(".");
-        const packagePatterns = (0, string_1.makePathPatterns)(data.options.packageNames);
-        const taskPatterns = (0, string_1.makePathPatterns)(data.options.packageTaskNames);
-        for (const snapshotName of snapshotNames) {
-            const snapshotNameData = DatatruckRepository.parseSnapshotName(snapshotName);
-            if (!snapshotNameData)
-                continue;
-            if (packagePatterns &&
-                !(0, micromatch_1.isMatch)(snapshotNameData.packageName, packagePatterns))
-                continue;
-            if (data.options.ids &&
-                !data.options.ids.some((id) => snapshotNameData.snapshotShortId.startsWith(id.slice(0, 8))))
-                continue;
-            const metaData = await fs.readFileIfExists(`${snapshotName}/meta.json`);
+        const filterPkg = (0, config_1.createPkgFilter)(data.options.packageNames);
+        const filterTask = (0, config_1.createTaskFilter)(data.options.packageTaskNames);
+        const filterId = (shortId) => !data.options.ids ||
+            data.options.ids.some((id) => shortId.startsWith(id.slice(0, 8)));
+        const preSnapshots = snapshotNames
+            .filter((snapshotName) => {
+            const data = DatatruckRepository.parseSnapshotName(snapshotName);
+            return (data && filterPkg(data.packageName) && filterId(data.snapshotShortId));
+        })
+            .map((name) => ({ name }));
+        await (0, async_1.runParallel)({
+            items: preSnapshots,
+            concurrency: 5,
+            async onItem({ item }) {
+                item.metaData = await fs.readFileIfExists(`${item.name}/meta.json`);
+            },
+        });
+        for (const { name, metaData } of preSnapshots) {
             const meta = !!metaData && (await DatatruckRepository.parseMetaData(metaData));
-            if (!meta)
-                continue;
-            if (taskPatterns && !(0, string_1.checkMatch)(meta.task, taskPatterns))
+            if (!meta || !filterTask(meta.task))
                 continue;
             if (data.options.ids &&
                 !data.options.ids.some((id) => meta.id.startsWith(id)))
@@ -93,7 +97,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 !data.options.tags.some((value) => data.options.tags?.includes(value)))
                 continue;
             snapshots.push({
-                originalId: snapshotName,
+                originalId: name,
                 id: meta.id,
                 date: meta.date,
                 packageName: meta.package,

package/lib/repositories/GitRepository.js

@@ -5,15 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GitRepository = exports.gitRepositoryName = void 0;
 const cli_1 = require("../utils/cli");
+const config_1 = require("../utils/datatruck/config");
 const paths_1 = require("../utils/datatruck/paths");
 const fs_1 = require("../utils/fs");
 const git_1 = require("../utils/git");
-const string_1 = require("../utils/string");
 const temp_1 = require("../utils/temp");
 const RepositoryAbstract_1 = require("./RepositoryAbstract");
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const promises_1 = require("fs/promises");
-const micromatch_1 = require("micromatch");
 const path_1 = require("path");
 exports.gitRepositoryName = "git";
 class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
@@ -104,11 +103,11 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
             dir: await (0, temp_1.mkTmpDir)(exports.gitRepositoryName, "repo", "snapshots"),
             log: data.options.verbose,
         });
-        const pkgPatterns = (0, string_1.makePathPatterns)(data.options.packageNames);
-        const pkgTaskPatterns = (0, string_1.makePathPatterns)(data.options.packageTaskNames);
         await git.clone({ repo: this.config.repo });
         const tagNames = data.options.ids?.map((id) => `${GitRepository.refPrefix}/*/${id}*`) || [`${GitRepository.refPrefix}/*`];
         const tags = await git.getTags(tagNames);
+        const filterPkg = (0, config_1.createPkgFilter)(data.options.packageNames);
+        const filterTask = (0, config_1.createTaskFilter)(data.options.packageTaskNames);
         return tags
             .reduce((result, tag) => {
             const parsedTag = tag.message
@@ -116,9 +115,9 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 : null;
             if (!parsedTag)
                 return result;
-            if (pkgPatterns && !(0, micromatch_1.isMatch)(parsedTag.package, pkgPatterns))
+            if (!filterPkg(parsedTag.package))
                 return result;
-            if (pkgTaskPatterns && !(0, string_1.checkMatch)(parsedTag.task, pkgTaskPatterns))
+            if (!filterTask(parsedTag.task))
                 return result;
             if (data.options.tags &&
                 !parsedTag.tags.some((value) => data.options.tags?.includes(value)))

package/lib/repositories/ResticRepository.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResticRepository = exports.resticRepositoryName = void 0;
 const cli_1 = require("../utils/cli");
+const config_1 = require("../utils/datatruck/config");
 const paths_1 = require("../utils/datatruck/paths");
 const error_1 = require("../utils/error");
 const fs_1 = require("../utils/fs");
@@ -15,7 +16,6 @@ const temp_1 = require("../utils/temp");
 const RepositoryAbstract_1 = require("./RepositoryAbstract");
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const promises_1 = require("fs/promises");
-const micromatch_1 = require("micromatch");
 const path_1 = require("path");
 exports.resticRepositoryName = "restic";
 class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
@@ -83,21 +83,21 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             env: await this.buildEnv(),
             log: data.options.verbose,
         });
-        const packagePatterns = (0, string_1.makePathPatterns)(data.options.packageNames);
-        const taskNamePatterns = (0, string_1.makePathPatterns)(data.options.packageTaskNames);
         const result = await restic.snapshots({
             json: true,
             tags: [
                 ...(data.options.ids?.map((id) => ResticRepository.buildSnapshotTag(id.length === 8 ? RepositoryAbstract_1.SnapshotTagEnum.SHORT_ID : RepositoryAbstract_1.SnapshotTagEnum.ID, id)) ?? []),
             ],
         });
+        const filterPkg = (0, config_1.createPkgFilter)(data.options.packageNames);
+        const filterTask = (0, config_1.createTaskFilter)(data.options.packageTaskNames);
         return result.reduce((items, item) => {
             const tag = ResticRepository.parseSnapshotTags(item.tags ?? []);
             if (!tag.id)
                 return items;
-            if (packagePatterns && !(0, micromatch_1.isMatch)(tag.package, packagePatterns))
+            if (!filterPkg(tag.package))
                 return items;
-            if (taskNamePatterns && !(0, string_1.checkMatch)(tag.task, taskNamePatterns))
+            if (!filterTask(tag.task))
                 return items;
             const itemTags = tag.tags ?? [];
             if (data.options.tags && !itemTags.some((t) => itemTags.includes(t)))

package/lib/tasks/MongoDumpTask.d.ts

@@ -0,0 +1,21 @@
+import { TaskBackupData, TaskRestoreData, TaskAbstract } from "./TaskAbstract";
+export type MongoDumpTaskConfig = {
+    command?: string;
+    hostname?: string;
+    port?: number;
+    username?: string;
+    password?: string | {
+        path: string;
+    };
+    compress?: boolean;
+    concurrency?: number;
+};
+export declare const mongodumpTaskName = "mongo-dump";
+export declare class MongoDumpTask extends TaskAbstract<MongoDumpTaskConfig> {
+    protected verbose?: boolean;
+    private get command();
+    backup(data: TaskBackupData): Promise<{
+        snapshotPath: string;
+    }>;
+    restore(data: TaskRestoreData): Promise<void>;
+}

package/lib/tasks/MongoDumpTask.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MongoDumpTask = exports.mongodumpTaskName = void 0;
+const async_process_1 = require("../utils/async-process");
+const fs_1 = require("../utils/fs");
+const temp_1 = require("../utils/temp");
+const TaskAbstract_1 = require("./TaskAbstract");
+exports.mongodumpTaskName = "mongo-dump";
+class MongoDumpTask extends TaskAbstract_1.TaskAbstract {
+    verbose;
+    get command() {
+        return this.config.command ?? "mongodump";
+    }
+    async backup(data) {
+        this.verbose = data.options.verbose;
+        const snapshotPath = data.package.path ??
+            (await (0, temp_1.mkTmpDir)(exports.mongodumpTaskName, "task", "backup", "snapshot"));
+        await (0, fs_1.mkdirIfNotExists)(snapshotPath);
+        await (0, fs_1.ensureEmptyDir)(snapshotPath);
+        const p = new async_process_1.AsyncProcess(this.command, [
+            ...(this.config.hostname ? ["/h", this.config.hostname] : []),
+            ...(this.config.port ? ["/p", this.config.port] : []),
+            ...(this.config.username ? ["/u", this.config.username] : []),
+            ...(this.config.compress ? ["/gzip"] : []),
+            ...(this.config.concurrency ? ["/j", this.config.concurrency] : []),
+            "/o",
+            snapshotPath,
+        ], {
+            $log: this.verbose,
+        });
+        const password = this.config.password !== undefined
+            ? (await (0, fs_1.fetchData)(this.config.password, (p) => p.path)) ?? ""
+            : "";
+        p.stdin.writable.write(`${password}\n`);
+        await p.stderr.parseLines((line) => {
+            data.onProgress({
+                absolute: {
+                    description: line.slice(0, 255),
+                },
+            });
+        });
+        return { snapshotPath };
+    }
+    async restore(data) {
+        throw new Error("Not implemented");
+    }
+}
+exports.MongoDumpTask = MongoDumpTask;

package/lib/tasks/MssqlTask.js

@@ -5,10 +5,10 @@ const async_process_1 = require("../utils/async-process");
 const config_1 = require("../utils/datatruck/config");
 const error_1 = require("../utils/error");
 const fs_1 = require("../utils/fs");
+const string_1 = require("../utils/string");
 const temp_1 = require("../utils/temp");
 const TaskAbstract_1 = require("./TaskAbstract");
 const promises_1 = require("fs/promises");
-const micromatch_1 = require("micromatch");
 const path_1 = require("path");
 exports.mssqlTaskName = "mssql";
 class MssqlTask extends TaskAbstract_1.TaskAbstract {
@@ -53,10 +53,10 @@ class MssqlTask extends TaskAbstract_1.TaskAbstract {
         if (data.package.path)
             throw new error_1.AppError(`'package.path' is required: ${data.package.path}`);
         const snapshotPath = await (0, temp_1.mkTmpDir)(exports.mssqlTaskName, "task", "backup", "snapshot");
-        const databaseNames = (await this.fetchDatabaseNames()).filter((databaseName) => (!this.config.includeDatabases ||
-            (0, micromatch_1.isMatch)(databaseName, this.config.includeDatabases)) &&
-            (!this.config.excludeDatabases ||
-                !(0, micromatch_1.isMatch)(databaseName, this.config.excludeDatabases)));
+        const databaseNames = (await this.fetchDatabaseNames()).filter((0, string_1.createPatternFilter)({
+            include: this.config.includeDatabases,
+            exclude: this.config.excludeDatabases,
+        }));
         for (const databaseName of databaseNames) {
             const databasePath = (0, path_1.join)(snapshotPath, `${databaseName}${MssqlTask.SUFFIX}`);
             await this.exec(`BACKUP DATABASE [${databaseName}] TO DISK='${databasePath}' WITH FORMAT`);

package/lib/tasks/PostgresqlDumpTask.js

@@ -64,14 +64,26 @@ class PostgresqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
         const dumpProcess = new async_process_1.AsyncProcess("pg_dump", [
             ...(await this.buildConnectionArgs(this.config.database)),
             ...(tableNames?.flatMap((v) => ["-t", v]) ?? []),
-        ], { $log: this.verbose });
+        ], {
+            $log: {
+                exec: this.verbose,
+                stderr: this.verbose,
+                allToStderr: true,
+            },
+        });
         await dumpProcess.stdout.pipe(output, onProgress);
     }
     async onExportStoredPrograms() {
         throw new Error(`Method not implemented: onExportStoredPrograms`);
     }
     async onImport(path, database) {
-        await async_process_1.AsyncProcess.exec("psql", [...(await this.buildConnectionArgs(database)), "-f", (0, path_1.normalize)(path)], { $log: this.verbose });
+        await async_process_1.AsyncProcess.exec("psql", [...(await this.buildConnectionArgs(database)), "-f", (0, path_1.normalize)(path)], {
+            $log: {
+                exec: this.verbose,
+                stderr: this.verbose,
+                allToStderr: true,
+            },
+        });
     }
 }
 exports.PostgresqlDumpTask = PostgresqlDumpTask;

package/lib/tasks/SqlDumpTaskAbstract.js

@@ -6,11 +6,11 @@ const config_1 = require("../utils/datatruck/config");
 const error_1 = require("../utils/error");
 const fs_1 = require("../utils/fs");
 const math_1 = require("../utils/math");
+const string_1 = require("../utils/string");
 const temp_1 = require("../utils/temp");
 const TaskAbstract_1 = require("./TaskAbstract");
 const assert_1 = require("assert");
 const promises_1 = require("fs/promises");
-const micromatch_1 = require("micromatch");
 const path_1 = require("path");
 function serializeSqlFile(input) {
     if (input.database && input.table) {
@@ -71,13 +71,10 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
         await (0, fs_1.ensureEmptyDir)(snapshotPath);
         const config = this.config;
         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;
-        });
+        const tableNames = allTableNames.filter((0, string_1.createPatternFilter)({
+            include: config.includeTables,
+            exclude: config.excludeTables,
+        }));
         (0, assert_1.ok)(typeof snapshotPath === "string");
         if (!(await (0, fs_1.existsDir)(snapshotPath)))
             await (0, promises_1.mkdir)(snapshotPath, { recursive: true });

package/lib/utils/async.d.ts

@@ -3,7 +3,7 @@ type ItemBuffer<T> = Map<T, AbortController>;
 export declare function runParallel<T>(options: {
     items: T[];
     concurrency: number;
-    onChange: (data: {
+    onChange?: (data: {
         buffer: ItemBuffer<T>;
         processed: number;
         proccesing: number;

package/lib/utils/async.js

@@ -12,7 +12,7 @@ async function runParallel(options) {
         const controller = new AbortController();
         buffer.set(item, controller);
         try {
-            await options.onChange({
+            await options.onChange?.({
                 processed,
                 proccesing: buffer.size,
                 buffer,
@@ -37,7 +37,7 @@ async function runParallel(options) {
             buffer.delete(item);
             processed++;
             await options.onFinished?.();
-            await options.onChange({
+            await options.onChange?.({
                 processed,
                 proccesing: buffer.size,
                 buffer,

package/lib/utils/datatruck/config-task-type.d.ts

@@ -1,5 +1,6 @@
 import type { GitTaskConfig, gitTaskName } from "../../tasks/GitTask";
 import type { MariadbTaskConfig, mariadbTaskName } from "../../tasks/MariadbTask";
+import { MongoDumpTaskConfig, mongodumpTaskName } from "../../tasks/MongoDumpTask";
 import type { MssqlTaskConfig, mssqlTaskName } from "../../tasks/MssqlTask";
 import type { MysqlDumpTaskConfig, mysqlDumpTaskName } from "../../tasks/MysqlDumpTask";
 import type { PostgresqlDumpTaskConfig, postgresqlDumpTaskName } from "../../tasks/PostgresqlDumpTask";
@@ -24,8 +25,12 @@ export type PostgresqlDumpTaskConfigItem = {
     name: typeof postgresqlDumpTaskName;
     config: PostgresqlDumpTaskConfig;
 };
+export type MongodumpTaskConfigItem = {
+    name: typeof mongodumpTaskName;
+    config: MongoDumpTaskConfig;
+};
 export type ScriptTaskConfigItem = {
     name: typeof scriptTaskName;
     config: ScriptTaskConfig;
 };
-export type TaskConfig = GitTaskConfigItem | MariadbTaskConfigItem | MssqlTaskConfigItem | MysqlDumpTaskConfigItem | PostgresqlDumpTaskConfigItem | ScriptTaskConfigItem;
+export type TaskConfig = GitTaskConfigItem | MariadbTaskConfigItem | MssqlTaskConfigItem | MysqlDumpTaskConfigItem | PostgresqlDumpTaskConfigItem | MongodumpTaskConfigItem | ScriptTaskConfigItem;

package/lib/utils/datatruck/config.d.ts

@@ -1,3 +1,4 @@
+import { Filter } from "../string";
 import type { Config } from "./config-type";
 import type { PackageConfig, RepositoryConfigEnabledAction, RepositoryConfig } from "./config-type";
 export declare function findRepositoryOrFail(config: Config, repositoryName: string): RepositoryConfig;
@@ -99,4 +100,6 @@ export declare const params: {
         database: string;
     };
 };
+export declare function createPkgFilter(patterns: string[] | undefined): Filter;
+export declare function createTaskFilter(patterns: string[] | undefined): Filter<string | undefined>;
 export {};

package/lib/utils/datatruck/config.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.params = exports.dbNameParams = exports.pkgRestorePathParams = exports.pkgExcludeParams = exports.pkgIncludeParams = exports.pkgPathParams = exports.resolvePackages = exports.resolvePackage = exports.resolveDatabaseName = exports.resolvePackagePath = exports.filterPackages = exports.filterRepositoryByEnabled = exports.ensureSameRepositoryType = exports.sortReposByType = exports.filterRepository = exports.findPackageRepositoryConfig = exports.findPackageOrFail = exports.findRepositoryOrFail = void 0;
+exports.createTaskFilter = exports.createPkgFilter = exports.params = exports.dbNameParams = exports.pkgRestorePathParams = exports.pkgExcludeParams = exports.pkgIncludeParams = exports.pkgPathParams = exports.resolvePackages = exports.resolvePackage = exports.resolveDatabaseName = exports.resolvePackagePath = exports.filterPackages = exports.filterRepositoryByEnabled = exports.ensureSameRepositoryType = exports.sortReposByType = exports.filterRepository = exports.findPackageRepositoryConfig = exports.findPackageOrFail = exports.findRepositoryOrFail = void 0;
 const error_1 = require("../error");
 const string_1 = require("../string");
 const temp_1 = require("../temp");
-const micromatch_1 = require("micromatch");
 function findRepositoryOrFail(config, repositoryName) {
     const repo = config.repositories.find((v) => v.name === repositoryName);
     if (!repo)
@@ -72,28 +71,26 @@ function filterRepositoryByEnabled(repository, action) {
 }
 exports.filterRepositoryByEnabled = filterRepositoryByEnabled;
 function filterPackages(config, options) {
-    const packagePatterns = (0, string_1.makePathPatterns)(options.packageNames);
-    const taskNamePatterns = (0, string_1.makePathPatterns)(options.packageTaskNames);
+    const filterRepo = (0, string_1.createPatternFilter)(options.repositoryNames);
+    const filterRepoType = (0, string_1.createPatternFilter)(options.repositoryTypes);
+    const filterTask = createTaskFilter(options.packageTaskNames);
+    const filterPkg = createPkgFilter(options.packageNames);
     return config.packages
         .map((pkg) => {
         pkg = Object.assign({}, pkg);
         pkg.repositoryNames = (pkg.repositoryNames ?? []).filter((name) => {
             const repo = findRepositoryOrFail(config, name);
-            if (!filterRepositoryByEnabled(repo, options?.sourceAction))
-                return false;
-            return ((!options.repositoryNames ||
-                options.repositoryNames.includes(name)) &&
-                (!options.repositoryTypes ||
-                    options.repositoryTypes.includes(repo.type)));
+            return (filterRepositoryByEnabled(repo, options?.sourceAction) &&
+                filterRepo(name) &&
+                filterRepoType(repo.type));
         });
         return pkg;
     })
         .filter((pkg) => {
-        if (taskNamePatterns && !(0, string_1.checkMatch)(pkg.task?.name, taskNamePatterns))
-            return false;
         return ((typeof pkg.enabled !== "boolean" || pkg.enabled) &&
             !!pkg.repositoryNames?.length &&
-            (!packagePatterns || (0, micromatch_1.isMatch)(pkg.name, packagePatterns)));
+            filterTask(pkg.task?.name) &&
+            filterPkg(pkg.name));
     });
 }
 exports.filterPackages = filterPackages;
@@ -166,3 +163,22 @@ exports.params = {
     pkgExclude: exports.pkgExcludeParams,
     dbName: exports.dbNameParams,
 };
+function createPkgFilter(patterns) {
+    if (patterns === undefined)
+        return () => true;
+    const map = (v) => (v[0] === "@" && !v.includes("/") ? `${v}/**` : v);
+    const { include, exclude } = (0, string_1.splitPatterns)(patterns, map);
+    return (subject) => (0, string_1.match)(subject, include, exclude);
+}
+exports.createPkgFilter = createPkgFilter;
+function createTaskFilter(patterns) {
+    if (patterns === undefined)
+        return () => true;
+    const { include, exclude } = (0, string_1.splitPatterns)(patterns);
+    return (subject) => {
+        if (!subject?.length)
+            subject = "<empty>";
+        return (0, string_1.match)(subject, include, exclude);
+    };
+}
+exports.createTaskFilter = createTaskFilter;

package/lib/utils/datatruck/task.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTask = void 0;
 const GitTask_1 = require("../../tasks/GitTask");
 const MariadbTask_1 = require("../../tasks/MariadbTask");
+const MongoDumpTask_1 = require("../../tasks/MongoDumpTask");
 const MssqlTask_1 = require("../../tasks/MssqlTask");
 const MysqlDumpTask_1 = require("../../tasks/MysqlDumpTask");
 const PostgresqlDumpTask_1 = require("../../tasks/PostgresqlDumpTask");
@@ -24,6 +25,9 @@ function createTask(task) {
     else if (task.name === MssqlTask_1.mssqlTaskName) {
         return new MssqlTask_1.MssqlTask(task.config ?? {});
     }
+    else if (task.name === MongoDumpTask_1.mongodumpTaskName) {
+        return new MongoDumpTask_1.MongoDumpTask(task.config ?? {});
+    }
     else if (task.name === ScriptTask_1.scriptTaskName) {
         return new ScriptTask_1.ScriptTask(task.config ?? {});
     }

package/lib/utils/mysql.js

@@ -62,8 +62,9 @@ async function createMysqlCli(options) {
             `user = "${options.username}"`,
             `password = "${password}"`,
         ];
-        await (0, promises_1.writeFile)((sqlConfigPath = (0, path_1.join)(dir, "mysql.conf")), data.join("\n"));
-        return sqlConfigPath;
+        const path = (0, path_1.join)(dir, "mysql.conf");
+        await (0, promises_1.writeFile)(path, data.join("\n"));
+        return (sqlConfigPath = path);
     }
     async function args() {
         return [`--defaults-file=${await createSqlConfig()}`];
@@ -84,7 +85,7 @@ async function createMysqlCli(options) {
         table_name
   `, [database]))
             .map((r) => r.table_name)
-            .filter((0, string_1.createMatchFilter)(include, exclude));
+            .filter((0, string_1.createPatternFilter)({ include, exclude }));
     }
     async function dump(input) {
         const process = new async_process_1.AsyncProcess("mysqldump", [

package/lib/utils/string.d.ts

@@ -11,11 +11,18 @@ export type Uri = {
     path?: string;
 };
 export declare function formatUri(input: Uri, hidePassword?: boolean): string;
-export declare function makePathPatterns(values: string[] | undefined): string[] | undefined;
+export declare function splitPatterns(patterns: string[], map?: (pattern: string) => string): {
+    include: string[] | undefined;
+    exclude: string[] | undefined;
+};
 export declare function match(path: string, include?: string[], exclude?: string[]): boolean;
+export type Filter<V = string> = (subject: V) => boolean;
+export declare function createPatternFilter(patterns: string[] | undefined): Filter;
+export declare function createPatternFilter(patterns: {
+    include?: string[];
+    exclude?: string[];
+} | undefined): Filter;
 export declare function endsWith(input: string, patterns: string[]): boolean;
-export declare function createMatchFilter(include?: string[], exclude?: string[]): (input: string) => boolean;
-export declare function checkMatch(subject: string | undefined, patterns: string[]): boolean;
 export declare function undefIfEmpty(input: string): string | undefined;
 export declare function compareJsons(a: any, b: any): boolean;
 export {};

package/lib/utils/string.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compareJsons = exports.undefIfEmpty = exports.checkMatch = exports.createMatchFilter = exports.endsWith = exports.match = exports.makePathPatterns = exports.formatUri = exports.parseStringList = exports.render = exports.snakeCase = void 0;
+exports.compareJsons = exports.undefIfEmpty = exports.endsWith = exports.createPatternFilter = exports.match = exports.splitPatterns = exports.formatUri = exports.parseStringList = exports.render = exports.snakeCase = void 0;
 const error_1 = require("./error");
 const micromatch_1 = require("micromatch");
 function snakeCase(value, char = "_") {
@@ -71,36 +71,44 @@ function formatUri(input, hidePassword) {
     return uri;
 }
 exports.formatUri = formatUri;
-function makePathPatterns(values) {
-    return values?.flatMap((v) => {
-        if (v === "*" || v === "**" || v === "<empty>" || v === "!<empty>") {
-            return [v];
+function splitPatterns(patterns, map) {
+    const include = [];
+    const exclude = [];
+    for (const pattern of patterns) {
+        if (pattern.startsWith("!")) {
+            const includePattern = pattern.slice(1);
+            exclude.push(map ? map(includePattern) : includePattern);
         }
         else {
-            return [v, `${v}/**`];
+            include.push(map ? map(pattern) : pattern);
         }
-    });
+    }
+    return {
+        include: include.length ? include : undefined,
+        exclude: exclude.length ? exclude : undefined,
+    };
 }
-exports.makePathPatterns = makePathPatterns;
+exports.splitPatterns = splitPatterns;
 function match(path, include, exclude) {
     return ((!include || (0, micromatch_1.isMatch)(path, include, { dot: true })) &&
         (!exclude || !(0, micromatch_1.isMatch)(path, exclude, { dot: true })));
 }
 exports.match = match;
+function createPatternFilter(patterns) {
+    if (patterns === undefined) {
+        return () => true;
+    }
+    else if (Array.isArray(patterns)) {
+        patterns = splitPatterns(patterns);
+    }
+    const { include, exclude } = patterns;
+    return (input) => match(input, include, exclude);
+}
+exports.createPatternFilter = createPatternFilter;
 function endsWith(input, patterns) {
     return patterns.some((pattern) => input.endsWith(pattern));
 }
 exports.endsWith = endsWith;
-function createMatchFilter(include, exclude) {
-    return (input) => match(input, include, exclude);
-}
-exports.createMatchFilter = createMatchFilter;
-function checkMatch(subject, patterns) {
-    if (!subject?.length)
-        subject = "<empty>";
-    return (0, micromatch_1.isMatch)(subject, patterns);
-}
-exports.checkMatch = checkMatch;
 function undefIfEmpty(input) {
     return input.length ? input : undefined;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.34.5",
+  "version": "0.35.1",
   "description": "Tool for creating and managing backups",
   "homepage": "https://github.com/swordev/datatruck#readme",
   "bugs": {