@datatruck/cli 0.28.0 → 0.29.1

package/utils/date.js

@@ -3,15 +3,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.duration = exports.createTimer = exports.filterByLast = void 0;
+exports.duration = exports.createTimer = exports.filterByLast = exports.createFilterByLastOptions = void 0;
 const dayjs_1 = __importDefault(require("dayjs"));
 const advancedFormat_1 = __importDefault(require("dayjs/plugin/advancedFormat"));
+const customParseFormat_1 = __importDefault(require("dayjs/plugin/customParseFormat"));
 const duration_1 = __importDefault(require("dayjs/plugin/duration"));
 const isoWeek_1 = __importDefault(require("dayjs/plugin/isoWeek"));
 dayjs_1.default.extend(isoWeek_1.default);
 dayjs_1.default.extend(advancedFormat_1.default);
 dayjs_1.default.extend(duration_1.default);
-function filterByLast(items, options, reasons) {
+dayjs_1.default.extend(customParseFormat_1.default);
+function createFilterByLastOptions(keep) {
+    return {
+        last: keep.keepLast,
+        lastMinutely: keep.keepMinutely,
+        lastHourly: keep.keepHourly,
+        lastDaily: keep.keepDaily,
+        lastMonthly: keep.keepMonthly,
+        lastWeekly: keep.keepWeekly,
+        lastYearly: keep.keepYearly,
+    };
+}
+exports.createFilterByLastOptions = createFilterByLastOptions;
+function filterByLast(items, options) {
     const filters = {
         last: { handler: (_, i) => i.toString(), value: options.last },
         lastMinutely: {
@@ -44,13 +58,13 @@ function filterByLast(items, options, reasons) {
         }
     }
     if (!someFilter)
-        return items;
+        return items.map((item) => ({ item, reasons: ["no-filter"] }));
+    const reasons = new Map();
     const validItems = items
         .slice(0)
         .sort((a, b) => b.date.localeCompare(a.date))
         .filter((item, index) => {
         const date = (0, dayjs_1.default)(item.date);
-        const itemIndex = items.indexOf(item);
         let success = false;
         for (const key in filters) {
             const object = filters[key];
@@ -58,12 +72,7 @@ function filterByLast(items, options, reasons) {
                 const value = object.handler(date, index);
                 if (value != object.last) {
                     success = true;
-                    if (reasons) {
-                        if (!reasons[itemIndex])
-                            reasons[itemIndex] = [];
-                        if (!reasons[itemIndex].includes(key))
-                            reasons[itemIndex].push(key);
-                    }
+                    reasons.set(item, (reasons.get(item) || new Set()).add(key));
                     object.last = value;
                     object.value--;
                 }
@@ -71,7 +80,12 @@ function filterByLast(items, options, reasons) {
         }
         return success;
     });
-    return items.filter((item) => validItems.includes(item));
+    return items
+        .filter((item) => validItems.includes(item))
+        .map((item) => ({
+        item,
+        reasons: [...(reasons.get(item) || [])],
+    }));
 }
 exports.filterByLast = filterByLast;
 function createTimer() {

package/utils/fs.js

@@ -384,7 +384,7 @@ function createProgress(options) {
         disposed: false,
         total: 0,
         current: 0,
-        update: async (description, path, increment = true) => {
+        update: (description, path, increment = true) => {
             if (progress.disposed)
                 return;
             if (path && increment)

package/utils/list.js

@@ -42,7 +42,7 @@ class Listr3 extends listr2_1.Listr {
         this.execTimer = (0, date_1.createTimer)();
     }
     serializeKeyIndex(keyIndex) {
-        return keyIndex
+        return typeof keyIndex !== "undefined"
             ? Array.isArray(keyIndex)
                 ? keyIndex.map((k) => k.toString())
                 : [keyIndex.toString()]

package/utils/progress.js

@@ -86,19 +86,26 @@ function renderProgressStats(stats, progressBar) {
     if (typeof stats.percent === "number") {
         if (progressBar)
             text.push((0, cli_1.renderProgressBar)(stats.percent));
-        text.push(`${stats.percent.toFixed(2)}%`);
+        text.push(`${stats.percent.toFixed(2).padStart(5, " ")}%`);
     }
     if (typeof stats.current === "number" || typeof stats.total === "number") {
-        const format = (value) => stats.format === "size" ? (0, bytes_1.default)(value) : value;
+        const format = (value) => stats.format === "size" ? (0, bytes_1.default)(value) : value.toString();
+        const pad = 8;
+        let values = [];
         if (typeof stats.current === "number" && typeof stats.total === "number") {
-            text.push(`${format(stats.current)}/${format(stats.total)}`);
+            values = [
+                format(stats.current).padStart(pad, " "),
+                format(stats.total).padEnd(pad, " "),
+            ];
         }
         else if (typeof stats.current === "number") {
-            text.push(`${format(stats.current)}`);
+            values = [format(stats.current).padStart(pad * 2 + 1)];
         }
         else if (typeof stats.total === "number") {
-            text.push(`?/${format(stats.total)}`);
+            values = ["?".padStart(pad, " "), format(stats.total).padEnd(pad, " ")];
         }
+        if (values.length)
+            text.push(values.join("/"));
     }
     if (stats.description && stats.payload) {
         text.push(`${stats.description}: ${stats.payload}`);

package/utils/tar.js

@@ -157,7 +157,9 @@ async function createTar(options) {
             ...env,
         },
     }, {
-        log: options.verbose ? { envNames: Object.keys(env) } : false,
+        log: options.verbose
+            ? { envNames: Object.keys(env), exec: true, stderr: true, stdout: true }
+            : false,
         ...(vendor === "bsdtar"
             ? {
                 stderr: options.onEntry