@datatruck/cli 0.11.2 → 0.11.5

package/Repository/GitRepository.js

@@ -124,7 +124,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 return result;
             if (pkgPatterns && !(0, micromatch_1.isMatch)(parsedTag.package, pkgPatterns))
                 return result;
-            if (pkgTaskPatterns && !(0, micromatch_1.isMatch)(parsedTag.task || "", pkgTaskPatterns))
+            if (pkgTaskPatterns && !(0, string_util_1.checkMatch)(parsedTag.task, pkgTaskPatterns))
                 return result;
             if (data.options.tags &&
                 !parsedTag.tags.some((value) => data.options.tags?.includes(value)))

package/Repository/LocalRepository.js

@@ -138,7 +138,7 @@ class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 continue;
             const metaPath = (0, path_1.join)(this.config.outPath, snapshotName);
             const meta = await LocalRepository.parseMetaData(metaPath);
-            if (taskPatterns && !(0, micromatch_1.isMatch)(meta.task || "", taskPatterns))
+            if (taskPatterns && !(0, string_util_1.checkMatch)(meta.task, taskPatterns))
                 continue;
             if (data.options.ids &&
                 !data.options.ids.some((id) => meta.id.startsWith(id)))

package/Repository/ResticRepository.js

@@ -13,6 +13,7 @@ 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 promises_1 = require("fs/promises");
 const micromatch_1 = require("micromatch");
 const path_1 = require("path");
 exports.resticRepositoryName = "restic";
@@ -139,7 +140,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 return items;
             if (packagePatterns && !(0, micromatch_1.isMatch)(tag.package, packagePatterns))
                 return items;
-            if (taskNamePatterns && !(0, micromatch_1.isMatch)(tag.task || "", taskNamePatterns))
+            if (taskNamePatterns && !(0, string_util_1.checkMatch)(tag.task, taskNamePatterns))
                 return items;
             const itemTags = tag.tags ?? [];
             if (data.options.tags && !itemTags.some((t) => itemTags.includes(t)))
@@ -174,7 +175,20 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         const sourcePath = data.targetPath ?? data.package.path;
         (0, assert_1.ok)(sourcePath);
         let gitignorePath;
-        if (pkg.include || pkg.exclude) {
+        if (!pkg.include && pkg.exclude) {
+            const exclude = await (0, paths_util_1.parsePaths)(pkg.exclude, {
+                cwd: sourcePath,
+                verbose: data.options.verbose,
+            });
+            await data.onProgress({
+                step: "Writing excluded paths list...",
+            });
+            const tmpDir = await (0, fs_util_1.mkTmpDir)("restic-exclude");
+            const ignoredContents = (0, fs_util_1.fastglobToGitIgnore)(exclude).join("\n");
+            gitignorePath = (0, path_1.join)(tmpDir, "ignored.txt");
+            await (0, promises_1.writeFile)(gitignorePath, ignoredContents);
+        }
+        else if (pkg.include || pkg.exclude) {
             const include = await (0, paths_util_1.parsePaths)(pkg.include ?? ["**"], {
                 cwd: sourcePath,
                 verbose: data.options.verbose,

package/cli.js

@@ -72,10 +72,9 @@ function makeCommandAction(command) {
     };
 }
 const program = new commander_1.Command();
-const { name, version, description } = (0, fs_util_1.parsePackageFile)();
-const [, subname] = name.split("/");
+const { version, description } = (0, fs_util_1.parsePackageFile)();
 const cwd = process.cwd();
-program.name(subname);
+program.name("datatruck");
 program.version(version);
 program.description(description);
 program.usage("dtt");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.11.2",
+  "version": "0.11.5",
   "dependencies": {
     "ajv": "^8.11.0",
     "async": "^3.2.4",

package/util/datatruck/config-util.js

@@ -38,7 +38,7 @@ function filterPackages(config, options) {
         return pkg;
     })
         .filter((pkg) => {
-        if (taskNamePatterns && !(0, micromatch_1.isMatch)(pkg.task?.name ?? "", taskNamePatterns))
+        if (taskNamePatterns && !(0, string_util_1.checkMatch)(pkg.task?.name, taskNamePatterns))
             return false;
         return ((typeof pkg.enabled !== "boolean" || pkg.enabled) &&
             !!pkg.repositoryNames?.length &&

package/util/fs-util.d.ts

@@ -29,6 +29,10 @@ export declare function checkFile(path: string): Promise<boolean>;
 export declare function checkDir(path: string): Promise<boolean>;
 export declare function readDir(path: string): Promise<string[]>;
 export declare function forEachFile(dirPath: string, cb: (path: string, dir: boolean) => void, includeDir?: boolean): Promise<void>;
+/**
+ * @experimental
+ */
+export declare function fastglobToGitIgnore(patterns: string[]): string[];
 export declare function writeGitIgnoreList(options: {
     paths: NodeJS.ReadableStream | string[];
 }): Promise<string>;

package/util/fs-util.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cpy = exports.updateFileStats = exports.copyFileWithStreams = exports.writePathLists = exports.writeGitIgnoreList = exports.forEachFile = exports.readDir = 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 = exports.isWSLSystem = void 0;
+exports.cpy = exports.updateFileStats = exports.copyFileWithStreams = exports.writePathLists = exports.writeGitIgnoreList = exports.fastglobToGitIgnore = exports.forEachFile = exports.readDir = 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 = exports.isWSLSystem = void 0;
 const globalData_1 = __importDefault(require("../globalData"));
 const path_util_1 = require("./path-util");
 const async_1 = require("async");
@@ -213,6 +213,15 @@ async function forEachFile(dirPath, cb, includeDir) {
     }
 }
 exports.forEachFile = forEachFile;
+/**
+ * @experimental
+ */
+function fastglobToGitIgnore(patterns) {
+    // https://github.com/mrmlnc/fast-glob#readme
+    // https://git-scm.com/docs/gitignore
+    return patterns.map((p) => (p.startsWith("/") ? p : `/${p}`));
+}
+exports.fastglobToGitIgnore = fastglobToGitIgnore;
 async function writeGitIgnoreList(options) {
     const tempDir = await mkTmpDir("gitignore-list");
     const path = (0, path_1.join)(tempDir, `.gitignore`);

package/util/string-util.d.ts

@@ -15,4 +15,5 @@ export declare type UriType = {
 export declare function formatUri(input: UriType, hidePassword?: boolean): string;
 export declare function formatSeconds(seconds: number): string;
 export declare function makePathPatterns(values: string[] | undefined): string[] | undefined;
+export declare function checkMatch(subject: string | undefined, patterns: string[]): boolean;
 export declare function formatDateTime(datetime: string): string;

package/util/string-util.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatDateTime = exports.makePathPatterns = exports.formatSeconds = exports.formatUri = exports.parseStringList = exports.render = exports.snakeCase = exports.lcfirst = exports.ucfirst = exports.serialize = void 0;
+exports.formatDateTime = exports.checkMatch = exports.makePathPatterns = exports.formatSeconds = exports.formatUri = exports.parseStringList = exports.render = exports.snakeCase = exports.lcfirst = exports.ucfirst = exports.serialize = void 0;
 const AppError_1 = require("../Error/AppError");
+const micromatch_1 = require("micromatch");
 function serialize(message, data) {
     if (data)
         return `${message} (${JSON.stringify(data, null, 2)})`;
@@ -88,9 +89,22 @@ function formatSeconds(seconds) {
 }
 exports.formatSeconds = formatSeconds;
 function makePathPatterns(values) {
-    return values?.flatMap((v) => [v, `${v}/**`]);
+    return values?.flatMap((v) => {
+        if (v === "*" || v === "**" || v === "<empty>" || v === "!<empty>") {
+            return [v];
+        }
+        else {
+            return [v, `${v}/**`];
+        }
+    });
 }
 exports.makePathPatterns = makePathPatterns;
+function checkMatch(subject, patterns) {
+    if (!subject?.length)
+        subject = "<empty>";
+    return (0, micromatch_1.isMatch)(subject, patterns);
+}
+exports.checkMatch = checkMatch;
 function formatDateTime(datetime) {
     const date = new Date(datetime);
     const [result] = new Date(date.getTime() - date.getTimezoneOffset() * 60000)