@datatruck/cli 0.28.0 → 0.29.0

package/Action/PruneAction.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PruneAction = void 0;
 const RepositoryFactory_1 = require("../Factory/RepositoryFactory");
 const snapshot_1 = require("../utils/datatruck/snapshot");
+const date_1 = require("../utils/date");
 const object_1 = require("../utils/object");
 const SnapshotsAction_1 = require("./SnapshotsAction");
 class PruneAction {
@@ -36,43 +37,28 @@ class PruneAction {
         });
         const snapshots = await snapshotsAction.exec("prune");
         const snapshotsDeleted = [];
-        const reasons = {};
-        const idFilter = {
-            id: this.options.ids,
-        };
-        const keepFilter = {
-            last: this.options.keepLast,
-            lastMinutely: this.options.keepMinutely,
-            lastHourly: this.options.keepHourly,
-            lastDaily: this.options.keepDaily,
-            lastMonthly: this.options.keepMonthly,
-            lastWeekly: this.options.keepWeekly,
-            lastYearly: this.options.keepYearly,
-        };
-        const hasIdFilter = Object.values(idFilter).some((v) => typeof v !== "undefined");
-        const hasKeepFilter = Object.values(keepFilter).some((v) => typeof v !== "undefined");
+        const hasIdFilter = typeof this.options.ids !== "undefined";
+        const keepFilter = (0, date_1.createFilterByLastOptions)(this.options);
+        const hasKeepFilter = Object.values(keepFilter).some((v) => typeof v === "number");
         if (hasIdFilter && hasKeepFilter)
             throw new Error(`Snapshot id filter can not be used with 'keep' filters`);
-        const usePrunePolicyConfig = !hasKeepFilter && this.options.groupBy?.includes("packageName");
+        const prunePolicy = !hasIdFilter && !hasKeepFilter;
+        if (prunePolicy && !this.options.groupBy?.includes("packageName"))
+            throw new Error(`Policy config requires groupBy packageName`);
         const keepSnapshots = hasKeepFilter
-            ? (0, snapshot_1.groupAndFilter)(snapshots, this.options.groupBy, usePrunePolicyConfig
-                ? (groupedSnapshots) => {
-                    const [firstSnapshot] = groupedSnapshots;
-                    const packageName = firstSnapshot.packageName;
+            ? (0, snapshot_1.groupAndFilter)(snapshots, this.options.groupBy, keepFilter)
+            : prunePolicy
+                ? (0, snapshot_1.groupAndFilter)(snapshots, this.options.groupBy, (groups) => {
+                    const [snapshot] = groups;
+                    const packageName = snapshot.packageName;
                     const config = this.config.packages.find((pkg) => pkg.name === packageName);
-                    const prunePolicy = config?.prunePolicy ?? {};
-                    return {
-                        last: prunePolicy.keepLast,
-                        lastMinutely: prunePolicy.keepMinutely,
-                        lastHourly: prunePolicy.keepHourly,
-                        lastDaily: prunePolicy.keepDaily,
-                        lastMonthly: prunePolicy.keepMonthly,
-                        lastWeekly: prunePolicy.keepWeekly,
-                        lastYearly: prunePolicy.keepYearly,
-                    };
-                }
-                : keepFilter, reasons)
-            : [];
+                    const prunePolicy = config?.prunePolicy ?? this.config.prunePolicy ?? {};
+                    const hasPrunePolicy = Object.values(prunePolicy).some((v) => typeof v === "number");
+                    return hasPrunePolicy
+                        ? (0, date_1.createFilterByLastOptions)(prunePolicy)
+                        : "no-policy";
+                })
+                : [];
         const result = {
             total: snapshots.length,
             prune: 0,
@@ -80,13 +66,14 @@ class PruneAction {
         };
         let snapshotIndex = 0;
         for (const snapshot of snapshots) {
-            const prune = !keepSnapshots.includes(snapshot);
+            const keepSnapshot = keepSnapshots.find(({ item }) => item === snapshot);
+            const prune = !keepSnapshot;
             if (prune)
                 result.prune++;
             if (prune || this.options.returnsAll)
                 snapshotsDeleted.push({
                     ...snapshot,
-                    exclusionReasons: reasons[snapshotIndex],
+                    exclusionReasons: keepSnapshot?.reasons || [],
                 });
             snapshotIndex++;
         }

package/Action/RestoreAction.d.ts

@@ -17,7 +17,7 @@ export type RestoreActionOptions = {
     repositoryNames?: string[];
     repositoryTypes?: string[];
     verbose?: boolean;
-    restorePath?: boolean;
+    initial?: boolean;
     tty?: "auto" | boolean;
     progress?: "auto" | "interval" | boolean;
     progressInterval?: number;

package/Action/RestoreAction.js

@@ -69,7 +69,7 @@ class RestoreAction {
         let { snapshot, pkg, task } = data;
         const repoConfig = (0, config_1.findRepositoryOrFail)(this.config, snapshot.repositoryName);
         const repo = (0, RepositoryFactory_1.createRepo)(repoConfig);
-        if (!this.options.restorePath)
+        if (this.options.initial)
             pkg = { ...pkg, restorePath: pkg.path };
         let snapshotPath = pkg.restorePath ?? pkg.path;
         await data.gc.cleanupIfFail(async () => {
@@ -101,7 +101,7 @@ class RestoreAction {
             let title = item.key.slice(0, 1).toUpperCase() + item.key.slice(1);
             return item.key === "restore" && color ? chalk_1.default.cyan(title) : title;
         };
-        const renderData = (item, color) => {
+        const renderData = (item, color, result = []) => {
             const g = (v) => (color ? `${chalk_1.default.gray(`(${v})`)}` : `(${v})`);
             return item.key === "snapshots"
                 ? `${item.data.id.slice(0, 8)} ${g(`${item.data.packages} packages`)}`
@@ -109,7 +109,13 @@ class RestoreAction {
                     ? `${item.data.packageName} ${g(item.data.taskName)}`
                     : item.key === "restore"
                         ? `${item.data.packageName} ${g(item.data.repositoryName)}`
-                        : "";
+                        : item.key === "summary"
+                            ? (0, cli_1.renderObject)({
+                                errors: item.data.errors,
+                                restores: result.filter((r) => !r.error && r.key === "restore")
+                                    .length,
+                            })
+                            : "";
         };
         return new DataFormat_1.DataFormat({
             streams: options.streams,
@@ -123,11 +129,11 @@ class RestoreAction {
                     { value: "Error", width: 50 },
                 ],
                 rows: () => result.map((item) => [
-                    (0, cli_1.resultColumn)(item.error),
+                    (0, cli_1.renderResult)(item.error),
                     renderTitle(item, true),
-                    renderData(item, true),
+                    renderData(item, true, result),
                     (0, date_1.duration)(item.elapsed),
-                    (0, cli_1.errorColumn)(item.error, options.verbose),
+                    (0, cli_1.renderError)(item.error, options.verbose),
                 ]),
             },
         });

package/Action/SnapshotsAction.js

@@ -44,7 +44,7 @@ class SnapshotsAction {
             result.push(...extentedItems);
         }
         result = result.sort((a, b) => b.date.localeCompare(a.date));
-        return (0, snapshot_1.groupAndFilter)(result, this.options.groupBy, this.options);
+        return (0, snapshot_1.groupAndFilter)(result, this.options.groupBy, this.options).map(({ item }) => item);
     }
 }
 exports.SnapshotsAction = SnapshotsAction;

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @datatruck/cli
 
+## 0.29.0
+
+### Minor Changes
+
+- [`363fc0d`](https://github.com/swordev/datatruck/commit/363fc0d8158aba6ae6a171769ef01dcd0fd2de08) Thanks [@juanrgm](https://github.com/juanrgm)! - Add `--prune` option to the backup command
+
+- [`e47ed46`](https://github.com/swordev/datatruck/commit/e47ed46c47fc93d7d5f3b76935d425c6b42ae9a5) Thanks [@juanrgm](https://github.com/juanrgm)! - Add `--last` option to the copy command
+
+- [`0a760a2`](https://github.com/swordev/datatruck/commit/0a760a2038ff77966936b3a9a0a8e865f4dae4c4) Thanks [@juanrgm](https://github.com/juanrgm)! - Add global prune policy to the config
+
+### Patch Changes
+
+- [`1c5084d`](https://github.com/swordev/datatruck/commit/1c5084dab2058ab9699f1a908f2581cd03da0468) Thanks [@juanrgm](https://github.com/juanrgm)! - Rename `--no-restore-path` to `--initial`
+
+- [`5fe3e91`](https://github.com/swordev/datatruck/commit/5fe3e91e994238cf901e570c9b9ef8254d79afa1) Thanks [@juanrgm](https://github.com/juanrgm)! - Fix prune policy
+
+- [`bd4d42e`](https://github.com/swordev/datatruck/commit/bd4d42e0261f79bdb69dd55abc30ef8bb0bfdcd7) Thanks [@juanrgm](https://github.com/juanrgm)! - Fix reports
+
 ## 0.28.0
 
 ### Minor Changes

package/Command/BackupCommand.d.ts

@@ -10,6 +10,7 @@ export type BackupCommandOptions<TResolved = false> = {
     tag?: If<TResolved, string[]>;
     dryRun?: boolean;
     date?: string;
+    prune?: boolean;
 };
 export type BackupCommandResult = Unwrap<BackupAction["exec"]>;
 export declare class BackupCommand extends CommandAbstract<BackupCommandOptions<false>, BackupCommandOptions<true>> {

package/Command/BackupCommand.js

@@ -41,6 +41,10 @@ class BackupCommand extends CommandAbstract_1.CommandAbstract {
                 description: "Date time (ISO)",
                 option: "--date <value>",
             },
+            prune: {
+                description: "Prune backups",
+                option: "--prune",
+            },
         });
     }
     async onExec() {
@@ -59,6 +63,7 @@ class BackupCommand extends CommandAbstract_1.CommandAbstract {
             progress: this.globalOptions.progress,
             progressInterval: this.globalOptions.progressInterval,
             streams: this.streams,
+            prune: this.options.prune,
         });
         const result = await backup.exec();
         if (this.globalOptions.outputFormat)

package/Command/CopyCommand.d.ts

@@ -2,7 +2,8 @@ import { CopyAction } from "../Action/CopyAction";
 import { If, Unwrap } from "../utils/ts";
 import { CommandAbstract } from "./CommandAbstract";
 export type CopyCommandOptionsType<TResolved = false> = {
-    id: If<TResolved, string[]>;
+    id?: If<TResolved, string[]>;
+    last?: number;
     package?: If<TResolved, string[]>;
     packageTask?: If<TResolved, string[]>;
     repository: string;

package/Command/CopyCommand.js

@@ -11,9 +11,13 @@ class CopyCommand extends CommandAbstract_1.CommandAbstract {
             id: {
                 option: "-i,--id <ids>",
                 description: "Filter by identifiers",
-                required: true,
                 parser: string_1.parseStringList,
             },
+            last: {
+                option: "-l,--last <amount>",
+                description: "Last snapshots",
+                parser: Number,
+            },
             package: {
                 option: "-p,--package <names>",
                 description: "Filter by package names",
@@ -41,6 +45,7 @@ class CopyCommand extends CommandAbstract_1.CommandAbstract {
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const copy = new CopyAction_1.CopyAction(config, {
             ids: this.options.id,
+            last: this.options.last,
             packageNames: this.options.package,
             packageTaskNames: this.options.packageTask,
             repositoryName: this.options.repository,

package/Command/InitCommand.js

@@ -43,11 +43,11 @@ class InitCommand extends CommandAbstract_1.CommandAbstract {
                     { value: "Error", width: 50 },
                 ],
                 rows: () => response.map((item) => [
-                    (0, cli_1.resultColumn)(item.error),
+                    (0, cli_1.renderResult)(item.error),
                     item.repositoryName,
                     item.repositoryType,
                     item.repositorySource,
-                    (0, cli_1.errorColumn)(item.error, verbose),
+                    (0, cli_1.renderError)(item.error, verbose),
                 ]),
             },
         });

package/Command/PruneCommand.d.ts

@@ -1,21 +1,15 @@
 import { SnapshotGroupByType } from "../Action/SnapshotsAction";
 import { RepositoryConfigType } from "../Config/RepositoryConfig";
+import { KeepObject } from "../utils/date";
 import { If } from "../utils/ts";
 import { CommandAbstract } from "./CommandAbstract";
-export type PruneCommandOptions<TResolved = false> = {
+export type PruneCommandOptions<TResolved = false> = KeepObject & {
     id?: If<TResolved, string[]>;
     longId?: boolean;
     package?: If<TResolved, string[]>;
     repository?: If<TResolved, string[]>;
     repositoryType?: If<TResolved, RepositoryConfigType["type"][]>;
     tag?: If<TResolved, string[]>;
-    keepLast?: number;
-    keepMinutely?: number;
-    keepHourly?: number;
-    keepDaily?: number;
-    keepWeekly?: number;
-    keepMonthly?: number;
-    keepYearly?: number;
     groupBy?: If<TResolved, SnapshotGroupByType[]>;
     dryRun?: boolean;
     showAll?: boolean;

package/Command/RestoreCommand.d.ts

@@ -9,7 +9,7 @@ export type RestoreCommandOptionsType<TResolved = false> = {
     repository?: If<TResolved, string[]>;
     repositoryType?: If<TResolved, RepositoryConfigType["type"][]>;
     tag?: If<TResolved, string[]>;
-    restorePath?: boolean;
+    initial?: boolean;
 };
 export declare class RestoreCommand extends CommandAbstract<RestoreCommandOptionsType<false>, RestoreCommandOptionsType<true>> {
     onOptions(): import("../utils/cli").OptionsType<RestoreCommandOptionsType<false>, RestoreCommandOptionsType<true>>;

package/Command/RestoreCommand.js

@@ -18,9 +18,9 @@ class RestoreCommand extends CommandAbstract_1.CommandAbstract {
                 option: "-p,--package <values>",
                 parser: string_1.parseStringList,
             },
-            restorePath: {
-                description: "Disable restore path",
-                option: "--no-restore-path",
+            initial: {
+                description: "Initial restoring (disables restore path)",
+                option: "--initial",
             },
             packageTask: {
                 description: "Filter by package task names",
@@ -60,7 +60,7 @@ class RestoreCommand extends CommandAbstract_1.CommandAbstract {
             repositoryTypes: this.options.repositoryType,
             tags: this.options.tag,
             verbose: verbose > 0,
-            restorePath: this.options.restorePath,
+            initial: this.options.initial,
             tty: this.globalOptions.tty,
             progress: this.globalOptions.progress,
             progressInterval: this.globalOptions.progressInterval,

package/Config/Config.d.ts

@@ -2,6 +2,7 @@ import { FormatType } from "../utils/DataFormat";
 import { DatatruckServerOptions } from "../utils/datatruck/server";
 import { Step } from "../utils/steps";
 import { PackageConfigType } from "./PackageConfig";
+import { PrunePolicyConfigType } from "./PrunePolicyConfig";
 import { RepositoryConfigType } from "./RepositoryConfig";
 import type { JSONSchema7 } from "json-schema";
 export type ConfigType = {
@@ -11,6 +12,7 @@ export type ConfigType = {
     packages: PackageConfigType[];
     server?: DatatruckServerOptions;
     reports?: ReportConfig[];
+    prunePolicy?: PrunePolicyConfigType;
 };
 export type ReportConfig = {
     when?: "success" | "error";

package/Config/Config.js

@@ -60,5 +60,6 @@ exports.configDefinition = {
                 },
             },
         },
+        prunePolicy: (0, DefinitionEnum_1.makeRef)(DefinitionEnum_1.DefinitionEnum.prunePolicy),
     },
 };

package/Repository/DatatruckRepository.d.ts

@@ -12,6 +12,7 @@ export type MetaDataType = {
     tarStats?: Record<string, {
         files: number;
         size: number;
+        checksum: string;
     }>;
 };
 export type DatatruckRepositoryConfigType = {

package/Repository/DatatruckRepository.js

@@ -4,6 +4,7 @@ exports.DatatruckRepository = exports.datatruckPackageRepositoryDefinition = exp
 const AppError_1 = require("../Error/AppError");
 const DefinitionEnum_1 = require("../JsonSchema/DefinitionEnum");
 const cli_1 = require("../utils/cli");
+const crypto_1 = require("../utils/crypto");
 const client_1 = require("../utils/datatruck/client");
 const paths_1 = require("../utils/datatruck/paths");
 const fs_1 = require("../utils/fs");
@@ -213,6 +214,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 tarStats[packBasename] = {
                     files: stream.lines(packIndex),
                     size: 0,
+                    checksum: "",
                 };
                 const tarPath = (0, path_1.join)(outPath, packBasename);
                 await (0, tar_1.createTar)({
@@ -223,8 +225,11 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                     output: tarPath,
                     onEntry: async (data) => scanner.progress(pack.compress ? "Compressing" : "Packing", data.path),
                 });
+                scanner.progress("Fetching tar stats", (0, path_1.basename)(tarPath));
+                tarStats[packBasename].checksum = await (0, crypto_1.calcFileHash)(tarPath, "sha1");
                 tarStats[packBasename].size = (await (0, promises_1.stat)(tarPath)).size;
                 if (!fs.isLocal()) {
+                    scanner.progress("Uploading tar", (0, path_1.basename)(tarPath));
                     await fs.upload(tarPath, `${snapshotName}/${packBasename}`);
                     await (0, promises_1.rm)(tarPath);
                 }

package/Task/MysqlDumpTask.js

@@ -36,12 +36,6 @@ class MysqlDumpTask extends TaskAbstract_1.TaskAbstract {
     async backup(data) {
         const compressAndClean = this.config.compress
             ? async (path) => {
-                data.onProgress({
-                    relative: {
-                        description: "Compressing",
-                        payload: (0, path_1.basename)(path),
-                    },
-                });
                 await (0, tar_1.createTar)({
                     include: [(0, path_1.relative)(snapshotPath, path)],
                     output: `${path}.tar.gz`,
@@ -207,7 +201,7 @@ class MysqlDumpTask extends TaskAbstract_1.TaskAbstract {
         const database = {
             name: (0, config_1.resolveDatabaseName)(this.config.database, params),
         };
-        if (this.config.targetDatabase && data.options.restorePath)
+        if (this.config.targetDatabase && !data.options.initial)
             database.name = (0, config_1.resolveDatabaseName)(this.config.targetDatabase.name, {
                 ...params,
                 database: database.name,

package/Task/SqlDumpTaskAbstract.js

@@ -204,7 +204,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
                 database: undefined,
             }),
         };
-        if (this.config.targetDatabase && data.options.restorePath) {
+        if (this.config.targetDatabase && !data.options.initial) {
             database.name = (0, config_1.resolveDatabaseName)(this.config.targetDatabase.name, {
                 packageName: data.package.name,
                 snapshotId: data.options.snapshotId,

package/config.schema.json

@@ -1079,6 +1079,9 @@
               }
             }
           }
+        },
+        "prunePolicy": {
+          "$ref": "#/definitions/prune-policy"
         }
       }
     },

package/package.json

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

package/utils/cli.d.ts

@@ -2,8 +2,9 @@
 export declare const showCursorCommand = "\u001B[?25h";
 export declare function renderProgressBar(progress: number, size?: number, subprogress?: number): string;
 export declare function logExec(command: string, argv?: string[], env?: NodeJS.ProcessEnv, logToStderr?: boolean): void;
-export declare function resultColumn(error: Error | null | string | boolean | undefined, color?: boolean): string;
-export declare function errorColumn(error: Error | null | string | undefined, verbose?: number): string;
+export declare function renderResult(error: Error | null | string | boolean | undefined, color?: boolean): string;
+export declare function renderError(error: Error | null | string | undefined, verbose?: number): string;
+export declare function renderObject(object: Record<string, any>): string;
 export type OptionsType<T1, T2 extends {
     [K in keyof T1]: unknown;
 }> = {

package/utils/cli.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.confirm = exports.parseOptions = exports.errorColumn = exports.resultColumn = exports.logExec = exports.renderProgressBar = exports.showCursorCommand = void 0;
+exports.confirm = exports.parseOptions = exports.renderObject = exports.renderError = exports.renderResult = exports.logExec = exports.renderProgressBar = exports.showCursorCommand = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const chalk_2 = require("chalk");
 const readline_1 = require("readline");
@@ -48,7 +48,7 @@ function logExec(command, argv = [], env, logToStderr) {
         : console.info(text);
 }
 exports.logExec = logExec;
-function resultColumn(error, color = true) {
+function renderResult(error, color = true) {
     return error
         ? color
             ? chalk_1.default.red("Χ")
@@ -57,8 +57,8 @@ function resultColumn(error, color = true) {
             ? chalk_1.default.green("✓")
             : "✓";
 }
-exports.resultColumn = resultColumn;
-function errorColumn(error, verbose) {
+exports.renderResult = renderResult;
+function renderError(error, verbose) {
     let message = null;
     if (typeof error === "string") {
         message = error;
@@ -74,7 +74,14 @@ function errorColumn(error, verbose) {
     }
     return chalk_1.default.red(message.trim());
 }
-exports.errorColumn = errorColumn;
+exports.renderError = renderError;
+function renderObject(object) {
+    const values = [];
+    for (const key in object)
+        values.push(`${key}: ${(0, chalk_2.grey)(object[key])}`);
+    return values.join(` `);
+}
+exports.renderObject = renderObject;
 function parseOptions(object, options) {
     const result = {};
     for (const key in options) {

package/utils/crypto.d.ts

@@ -0,0 +1 @@
+export declare function calcFileHash(path: string, algorithm: string): Promise<string>;

package/utils/crypto.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calcFileHash = void 0;
+const crypto_1 = require("crypto");
+const fs_1 = require("fs");
+function calcFileHash(path, algorithm) {
+    return new Promise((resolve, reject) => {
+        const hash = (0, crypto_1.createHash)(algorithm);
+        (0, fs_1.createReadStream)(path)
+            .on("error", reject)
+            .on("data", (chunk) => hash.update(chunk))
+            .on("end", () => resolve(hash.digest("hex")));
+    });
+}
+exports.calcFileHash = calcFileHash;

package/utils/datatruck/snapshot.d.ts

@@ -1,4 +1,7 @@
 import { SnapshotGroupByType } from "../../Action/SnapshotsAction";
 import { Snapshot } from "../../Repository/RepositoryAbstract";
 import { FilterByLastOptionsType } from "../date";
-export declare function groupAndFilter<TSnapshot extends Snapshot>(snapshots: TSnapshot[], groupByKey?: SnapshotGroupByType[], filter?: FilterByLastOptionsType | ((groupedSnapshots: TSnapshot[]) => FilterByLastOptionsType), reasons?: Record<number, string[]>): TSnapshot[];
+export declare function groupAndFilter<TSnapshot extends Snapshot>(snapshots: TSnapshot[], groupKeys?: SnapshotGroupByType[], inFilter?: FilterByLastOptionsType | ((group: TSnapshot[]) => FilterByLastOptionsType | string)): {
+    item: TSnapshot;
+    reasons: string[];
+}[];

package/utils/datatruck/snapshot.js

@@ -3,29 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.groupAndFilter = void 0;
 const date_1 = require("../date");
 const object_1 = require("../object");
-function groupAndFilter(snapshots, groupByKey, filter, reasons) {
-    const grouped = groupByKey?.length
-        ? (0, object_1.groupBy)(snapshots, groupByKey)
+function groupAndFilter(snapshots, groupKeys, inFilter) {
+    const groups = groupKeys?.length
+        ? (0, object_1.groupBy)(snapshots, groupKeys)
         : { "": snapshots };
-    const result = [];
-    for (const key in grouped) {
-        if (filter) {
-            const groupReasons = reasons
-                ? {}
-                : undefined;
-            result.push(...(0, date_1.filterByLast)(grouped[key], typeof filter === "function" ? filter(grouped[key]) : filter, groupReasons));
-            if (groupReasons && reasons) {
-                for (const groupItemIndex in groupReasons) {
-                    const snapshot = grouped[key][groupItemIndex];
-                    const snapshotIndex = snapshots.indexOf(snapshot);
-                    reasons[snapshotIndex] = groupReasons[groupItemIndex];
-                }
-            }
-        }
-        else {
-            result.push(...grouped[key]);
-        }
+    const keep = [];
+    for (const key in groups) {
+        const filter = typeof inFilter === "function" ? inFilter(groups[key]) : inFilter || {};
+        keep.push(...(typeof filter === "string"
+            ? groups[key].map((item) => ({ item, reasons: [filter] }))
+            : (0, date_1.filterByLast)(groups[key], filter)));
     }
-    return snapshots.filter((snapshot) => result.includes(snapshot));
+    return snapshots
+        .map((snapshot) => keep.find((v) => v.item === snapshot))
+        .filter((v) => !!v);
 }
 exports.groupAndFilter = groupAndFilter;

package/utils/date.d.ts

@@ -7,9 +7,22 @@ export type FilterByLastOptionsType = {
     lastMonthly?: number;
     lastYearly?: number;
 };
+export type KeepObject = {
+    keepLast?: number;
+    keepMinutely?: number;
+    keepHourly?: number;
+    keepDaily?: number;
+    keepWeekly?: number;
+    keepMonthly?: number;
+    keepYearly?: number;
+};
+export declare function createFilterByLastOptions(keep: KeepObject): FilterByLastOptionsType;
 export declare function filterByLast<TItem extends {
     date: string;
-}>(items: TItem[], options: FilterByLastOptionsType, reasons?: Record<number, string[]>): TItem[];
+}>(items: TItem[], options: FilterByLastOptionsType): {
+    item: TItem;
+    reasons: string[];
+}[];
 export type Timer = {
     reset: (min?: number) => boolean;
     check: (min: number) => boolean;