@datatruck/cli 0.34.4 → 0.35.0

package/lib/utils/progress.js

@@ -13,6 +13,7 @@ class ProgressManager {
     interval = (0, date_1.createTimer)();
     intervalMs;
     keydownListener;
+    pendingProgress;
     tty;
     mode;
     constructor(options) {
@@ -66,19 +67,51 @@ class ProgressManager {
             this.keydownListener = undefined;
         }
     }
-    update(progress, cb) {
-        if (!this.mode)
+    create(input, delay = 1000) {
+        const update = (progress, force) => {
+            const text = this.renderProgress(progress, force);
+            if (typeof text === "string") {
+                if (typeof input === "function") {
+                    input(text);
+                }
+                else {
+                    input.output = text;
+                }
+            }
+        };
+        const updatePending = () => {
+            const pendingProgress = this.pendingProgress;
+            if (pendingProgress) {
+                this.pendingProgress = undefined;
+                update(pendingProgress, true);
+            }
+        };
+        const interval = setInterval(updatePending, delay);
+        return {
+            update,
+            [Symbol.dispose]: () => {
+                clearInterval(interval);
+                updatePending();
+            },
+        };
+    }
+    renderProgress(progress, force = false) {
+        if (!this.mode) {
             return;
-        if (this.mode === "interval") {
+        }
+        else if (this.mode === "interval") {
             if (this.interval) {
-                if (!this.interval.reset(this.intervalMs))
+                if (!this.interval.reset(this.intervalMs) && !force) {
+                    this.pendingProgress = progress;
                     return;
+                }
             }
             else {
                 this.interval = (0, date_1.createTimer)();
             }
         }
-        cb(renderProgress(progress, this.tty).join("\n"));
+        this.pendingProgress = undefined;
+        return renderProgress(progress, this.tty).join("\n");
     }
 }
 exports.ProgressManager = ProgressManager;

package/lib/utils/temp.d.ts

@@ -5,6 +5,7 @@ export declare function ensureFreeDiskTempSpace(size: number | string): Promise<
 export declare function isTmpDir(path: string): boolean;
 export declare function rmTmpDir(input: string | string[]): Promise<void>;
 export declare function tmpDir(...keys: [string, ...string[]]): string;
+export declare const collectors: Set<GargabeCollector>;
 export declare function mkTmpDir(...keys: [string, ...string[]]): Promise<string>;
 export declare function useTempDir(...keys: [string, ...string[]]): Promise<AsyncDisposable & {
     path: string;
@@ -12,15 +13,17 @@ export declare function useTempDir(...keys: [string, ...string[]]): Promise<Asyn
 export declare function useTempFile(path: string): AsyncDisposable & {
     path: string;
 };
-export declare class CleanupListener {
-    readonly paths: string[];
-    stop(): void;
-    dispose(): Promise<void>;
-}
 export declare class GargabeCollector {
-    protected listeners: Set<CleanupListener>;
-    get pending(): boolean;
-    cleanup(cb?: () => any): Promise<void>;
-    cleanupOnFinish(cb: () => any): Promise<void>;
-    cleanupIfFail(cb: () => any): Promise<CleanupListener>;
+    protected parent?: GargabeCollector | undefined;
+    readonly paths: Set<string>;
+    readonly children: Set<GargabeCollector>;
+    constructor(parent?: GargabeCollector | undefined);
+    pending(): boolean;
+    cleanup(): Promise<void>;
+    dispose(): Promise<void>;
+    disposeIfFail<T>(cb: () => Promise<T>): Promise<T>;
+    disposeOnFinish(): {
+        [Symbol.asyncDispose]: () => Promise<void>;
+    };
+    create(): GargabeCollector;
 }

package/lib/utils/temp.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.GargabeCollector = exports.CleanupListener = exports.useTempFile = exports.useTempDir = exports.mkTmpDir = exports.tmpDir = exports.rmTmpDir = exports.isTmpDir = exports.ensureFreeDiskTempSpace = exports.sessionTmpDir = exports.parentTmpDir = void 0;
+exports.GargabeCollector = exports.useTempFile = exports.useTempDir = exports.mkTmpDir = exports.collectors = exports.tmpDir = exports.rmTmpDir = exports.isTmpDir = exports.ensureFreeDiskTempSpace = exports.sessionTmpDir = exports.parentTmpDir = void 0;
 const globalData_1 = __importDefault(require("../globalData"));
 const fs_1 = require("./fs");
 const crypto_1 = require("crypto");
@@ -44,12 +44,15 @@ exports.rmTmpDir = rmTmpDir;
 function tmpDir(...keys) {
     const id = (0, crypto_1.randomUUID)().slice(0, 8);
     const path = (0, path_1.join)(sessionTmpDir(), [...keys, id].map(encodeURIComponent).join("-"));
-    for (const listener of listeners)
-        listener.paths.push(path);
+    if (exports.collectors.size) {
+        const lastListener = [...exports.collectors.values()].at(exports.collectors.size - 1);
+        if (lastListener)
+            lastListener.paths.add(path);
+    }
     return path;
 }
 exports.tmpDir = tmpDir;
-const listeners = new Set();
+exports.collectors = new Set();
 async function mkTmpDir(...keys) {
     const path = tmpDir(...keys);
     await (0, promises_1.mkdir)(path, { recursive: true });
@@ -81,53 +84,57 @@ function useTempFile(path) {
     };
 }
 exports.useTempFile = useTempFile;
-class CleanupListener {
-    paths = [];
-    stop() {
-        listeners.delete(this);
-    }
-    async dispose() {
-        this.stop();
-        await rmTmpDir(this.paths);
-    }
-}
-exports.CleanupListener = CleanupListener;
 class GargabeCollector {
-    listeners = new Set();
-    get pending() {
-        return this.listeners.size > 0;
+    parent;
+    paths = new Set();
+    children = new Set();
+    constructor(parent) {
+        this.parent = parent;
+        exports.collectors.add(this);
     }
-    async cleanup(cb) {
-        try {
-            await cb?.();
-        }
-        finally {
-            for (const listener of this.listeners) {
-                this.listeners.delete(listener);
-                await listener.dispose();
+    pending() {
+        if (this.paths.size)
+            return true;
+        for (const child of this.children)
+            if (child.pending())
+                return true;
+        return false;
+    }
+    async cleanup() {
+        for (const path of this.paths) {
+            try {
+                await rmTmpDir(path);
+                this.paths.delete(path);
             }
+            catch (_) { }
         }
+        for (const child of this.children)
+            await child.cleanup();
     }
-    async cleanupOnFinish(cb) {
-        const cleanup = new CleanupListener();
-        try {
-            await cb();
-        }
-        finally {
-            cleanup.dispose();
-        }
+    async dispose() {
+        await this.cleanup();
+        exports.collectors.delete(this);
     }
-    async cleanupIfFail(cb) {
-        const cleanup = new CleanupListener();
+    async disposeIfFail(cb) {
         try {
-            await cb();
+            return await cb();
         }
         catch (error) {
-            await cleanup.dispose();
+            await this.dispose();
             throw error;
         }
-        this.listeners.add(cleanup);
-        return cleanup;
+    }
+    disposeOnFinish() {
+        return {
+            [Symbol.asyncDispose]: async () => {
+                return this.dispose();
+            },
+        };
+    }
+    create() {
+        const gc = new GargabeCollector();
+        this.children.add(gc);
+        return gc;
     }
 }
 exports.GargabeCollector = GargabeCollector;

package/package.json

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