@datatruck/cli 0.7.0 → 0.8.0

package/Action/RestoreAction.js

@@ -60,6 +60,7 @@ class RestoreAction {
             const snapshots = await repoInstance.onSnapshots({
                 options: {
                     packageNames: this.options.packageNames,
+                    packageTaskNames: this.options.packageTaskNames,
                     ids: [this.options.snapshotId],
                     tags: this.options.tags,
                 },

package/Action/SnapshotsAction.d.ts

@@ -7,6 +7,7 @@ export declare type SnapshotsActionOptionsType = {
     ids?: string[];
     repositoryNames?: string[];
     packageNames?: string[];
+    packageTaskNames?: string[];
     repositoryTypes?: string[];
     verbose?: boolean;
     tags?: string[];

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @datatruck/cli
 
+## 0.8.0
+
+### Minor Changes
+
+- [`8c421ab`](https://github.com/swordev/datatruck/commit/8c421ab0adb6f2d5bc81e91fa387c5daa848f411) Thanks [@juanrgm](https://github.com/juanrgm)! - Add `--package-task` option to snapshot command
+
 ## 0.7.0
 
 ### Minor Changes

package/Command/SnapshotsCommand.d.ts

@@ -5,6 +5,7 @@ import { CommandAbstract } from "./CommandAbstract";
 export declare type SnapshotsCommandOptionsType<TResolved = false> = {
     id?: If<TResolved, string[]>;
     package?: If<TResolved, string[]>;
+    packageTask?: If<TResolved, string[]>;
     repository?: If<TResolved, string[]>;
     repositoryType?: If<TResolved, RepositoryConfigType["type"][]>;
     longId?: boolean;

package/Command/SnapshotsCommand.js

@@ -64,6 +64,11 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
                 description: "Package names",
                 parser: string_util_1.parseStringList,
             },
+            packageTask: {
+                description: "Package task names",
+                option: "-pt,--package-task <values>",
+                parser: string_util_1.parseStringList,
+            },
             repository: {
                 option: "-r,--repository <names>",
                 description: "Repository names",
@@ -87,6 +92,7 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
         const snapshots = new SnapshotsAction_1.SnapshotsAction(config, {
             ids: this.options.id,
             packageNames: this.options.package,
+            packageTaskNames: this.options.packageTask,
             repositoryNames: this.options.repository,
             repositoryTypes: this.options.repositoryType,
             last: this.options.last,
@@ -103,11 +109,19 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
         const dataFormat = new DataFormat_1.DataFormat({
             items: await snapshots.exec(),
             table: {
-                labels: ["Id.", "Date", "Package", "Repository", "Repository type"],
+                labels: [
+                    "Id.",
+                    "Date",
+                    "Package",
+                    "Task",
+                    "Repository",
+                    "Repository type",
+                ],
                 handler: (item) => [
                     this.options.longId ? item.id : item.id.slice(0, 8),
                     item.date.replace("T", " ").replace("Z", ""),
                     item.packageName,
+                    item.packageTaskName || "",
                     item.repositoryName,
                     item.repositoryType,
                 ],

package/Repository/GitRepository.js

@@ -111,6 +111,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
             log: data.options.verbose,
         });
         const pkgPatterns = (0, string_util_1.makePathPatterns)(data.options.packageNames);
+        const pkgTaskPatterns = (0, string_util_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);
@@ -123,6 +124,8 @@ 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))
+                return result;
             if (data.options.tags &&
                 !parsedTag.tags.some((value) => data.options.tags?.includes(value)))
                 return result;
@@ -131,6 +134,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 id: parsedTag.id,
                 date: parsedTag.date,
                 packageName: parsedTag.package,
+                packageTaskName: parsedTag.task,
                 tags: parsedTag.tags,
             });
             return result;
@@ -201,6 +205,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
             tags: data.options.tags ?? [],
             date: data.snapshot.date,
             package: data.package.name,
+            task: data.package.task?.name,
             version: nodePkg.version,
         });
         await git.addTag(meta.name, meta.message);

package/Repository/LocalRepository.d.ts

@@ -4,6 +4,7 @@ export declare type MetaDataType = {
     id: string;
     date: string;
     package: string;
+    task: string | undefined;
     tags: string[];
     version: string;
 };

package/Repository/LocalRepository.js

@@ -125,6 +125,7 @@ class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
         const snapshotNames = await (0, promises_1.readdir)(this.config.outPath);
         const snapshots = [];
         const packagePatterns = (0, string_util_1.makePathPatterns)(data.options.packageNames);
+        const taskPatterns = (0, string_util_1.makePathPatterns)(data.options.packageTaskNames);
         for (const snapshotName of snapshotNames) {
             const snapshotNameData = LocalRepository.parseSnapshotName(snapshotName);
             if (!snapshotNameData)
@@ -137,6 +138,8 @@ 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))
+                continue;
             if (data.options.ids &&
                 !data.options.ids.some((id) => meta.id.startsWith(id)))
                 continue;
@@ -148,6 +151,7 @@ class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 id: meta.id,
                 date: meta.date,
                 packageName: meta.package,
+                packageTaskName: meta.task,
                 tags: meta.tags,
             });
         }
@@ -288,6 +292,7 @@ class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
             date: data.snapshot.date,
             tags: data.options.tags ?? [],
             package: data.package.name,
+            task: data.package.task?.name,
             version: nodePkg.version,
         };
         if (data.options.verbose)

package/Repository/RepositoryAbstract.d.ts

@@ -11,6 +11,7 @@ export declare type SnapshotType = {
 export declare type SnapshotResultType = SnapshotType & {
     originalId: string;
     packageName: string;
+    packageTaskName: string | undefined;
     tags: string[];
 };
 export declare type ProgressDataType = {
@@ -24,7 +25,7 @@ export declare type InitDataType = {
     options: InitActionOptionsType;
 };
 export declare type SnapshotsDataType = {
-    options: Pick<SnapshotsActionOptionsType, "ids" | "packageNames" | "verbose" | "tags">;
+    options: Pick<SnapshotsActionOptionsType, "ids" | "packageNames" | "packageTaskNames" | "verbose" | "tags">;
 };
 export declare type BackupDataType<TPackageConfig> = {
     options: BackupActionOptionsType;
@@ -53,6 +54,7 @@ export declare enum SnapshotTagEnum {
     SHORT_ID = "shortId",
     DATE = "date",
     PACKAGE = "package",
+    TASK = "task",
     TAGS = "tags",
     VERSION = "version"
 }
@@ -61,6 +63,7 @@ export declare type SnapshotTagObjectType = {
     [SnapshotTagEnum.SHORT_ID]: string;
     [SnapshotTagEnum.DATE]: string;
     [SnapshotTagEnum.PACKAGE]: string;
+    [SnapshotTagEnum.TASK]: string | undefined;
     [SnapshotTagEnum.TAGS]: string[];
     [SnapshotTagEnum.VERSION]: string;
 };

package/Repository/RepositoryAbstract.js

@@ -7,6 +7,7 @@ var SnapshotTagEnum;
     SnapshotTagEnum["SHORT_ID"] = "shortId";
     SnapshotTagEnum["DATE"] = "date";
     SnapshotTagEnum["PACKAGE"] = "package";
+    SnapshotTagEnum["TASK"] = "task";
     SnapshotTagEnum["TAGS"] = "tags";
     SnapshotTagEnum["VERSION"] = "version";
 })(SnapshotTagEnum = exports.SnapshotTagEnum || (exports.SnapshotTagEnum = {}));

package/Repository/ResticRepository.d.ts

@@ -28,9 +28,9 @@ export declare class ResticRepository extends RepositoryAbstract<ResticRepositor
         name: SnapshotTagEnum;
         value: string;
     } | null;
-    static parseSnapshotTags(tags: string[]): Required<Partial<SnapshotTagObjectType> & {
+    static parseSnapshotTags(tags: string[]): SnapshotTagObjectType & {
         tags: string[];
-    }>;
+    };
     onGetSource(): string;
     onInit(data: InitDataType): Promise<void>;
     onSnapshots(data: SnapshotsDataType): Promise<SnapshotResultType[]>;

package/Repository/ResticRepository.js

@@ -126,6 +126,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             log: data.options.verbose,
         });
         const packagePatterns = (0, string_util_1.makePathPatterns)(data.options.packageNames);
+        const taskNamePatterns = (0, string_util_1.makePathPatterns)(data.options.packageTaskNames);
         const result = await restic.snapshots({
             json: true,
             tags: [
@@ -138,12 +139,15 @@ 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))
+                return items;
             const itemTags = tag.tags ?? [];
             if (data.options.tags && !itemTags.some((t) => itemTags.includes(t)))
                 return items;
             items.push({
                 originalId: item.id,
                 packageName: tag.package,
+                packageTaskName: tag.task,
                 date: tag.date,
                 id: tag.id,
                 tags: itemTags,
@@ -231,6 +235,11 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.DATE, data.snapshot.date),
                 ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.VERSION, nodePkg.version),
                 packageTag,
+                ...(data.package.task?.name
+                    ? [
+                        ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.TASK, data.package.task?.name),
+                    ]
+                    : []),
                 ...(data.options.tags ?? []),
             ],
             onStream: async (streamData) => {

package/package.json

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