@datatruck/cli 0.34.1 → 0.34.3

package/lib/actions/BackupAction.d.ts

@@ -1,10 +1,10 @@
 import { PreSnapshot } from "../repositories/RepositoryAbstract";
-import { DataFormat } from "../utils/DataFormat";
+import { DataFormat } from "../utils/data-format";
 import type { Config, PackageConfig, RepositoryConfig } from "../utils/datatruck/config-type";
 import { ReportListTaskContext } from "../utils/datatruck/report-list";
 import { Listr3TaskResultEnd } from "../utils/list";
 import { Progress, ProgressMode } from "../utils/progress";
-import { Streams } from "../utils/stream";
+import { StdStreams } from "../utils/stream";
 import { IfRequireKeys } from "../utils/ts";
 export type BackupActionOptions = {
     repositoryNames?: string[];
@@ -17,7 +17,7 @@ export type BackupActionOptions = {
     date?: string;
     tty?: "auto" | boolean;
     progress?: ProgressMode;
-    streams?: Streams;
+    streams?: StdStreams;
     prune?: boolean;
 };
 type Context = {
@@ -75,7 +75,7 @@ export declare class BackupAction<TRequired extends boolean = true> {
         bytes: number;
     }>;
     dataFormat(result: Listr3TaskResultEnd<Context>[], options?: {
-        streams?: Streams;
+        streams?: StdStreams;
         verbose?: number;
     }): DataFormat;
     exec(): Promise<(import("../utils/list").List3SummaryResult | import("../utils/list").Listr3TaskResult<Context>)[]>;

package/lib/actions/BackupAction.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BackupAction = void 0;
-const DataFormat_1 = require("../utils/DataFormat");
 const bytes_1 = require("../utils/bytes");
 const cli_1 = require("../utils/cli");
+const data_format_1 = require("../utils/data-format");
 const config_1 = require("../utils/datatruck/config");
 const report_list_1 = require("../utils/datatruck/report-list");
 const repository_1 = require("../utils/datatruck/repository");
@@ -132,7 +132,7 @@ class BackupAction {
                 }),
             });
         };
-        return new DataFormat_1.DataFormat({
+        return new data_format_1.DataFormat({
             streams: options.streams,
             json: result,
             list: () => result

package/lib/actions/CopyAction.d.ts

@@ -1,11 +1,11 @@
 import { RepositoryAbstract, Snapshot } from "../repositories/RepositoryAbstract";
-import { DataFormat } from "../utils/DataFormat";
+import { DataFormat } from "../utils/data-format";
 import type { Config, RepositoryConfig } from "../utils/datatruck/config-type";
 import { ReportListTaskContext } from "../utils/datatruck/report-list";
 import { Listr3TaskResultEnd } from "../utils/list";
 import { StrictMap } from "../utils/object";
 import { Progress, ProgressMode } from "../utils/progress";
-import { Streams } from "../utils/stream";
+import { StdStreams } from "../utils/stream";
 import { IfRequireKeys } from "../utils/ts";
 export type CopyActionOptions = {
     ids?: string[];
@@ -39,7 +39,7 @@ export declare class CopyAction<TRequired extends boolean = true> {
     readonly options: IfRequireKeys<TRequired, CopyActionOptions>;
     constructor(config: Config, options: IfRequireKeys<TRequired, CopyActionOptions>);
     dataFormat(result: Listr3TaskResultEnd<Context>[], options?: {
-        streams?: Streams;
+        streams?: StdStreams;
         verbose?: number;
     }): DataFormat;
     protected fetchSnapshots(repo: RepositoryAbstract<any>): Promise<Snapshot[]>;

package/lib/actions/CopyAction.js

@@ -49,9 +49,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CopyAction = void 0;
-const DataFormat_1 = require("../utils/DataFormat");
 const bytes_1 = require("../utils/bytes");
 const cli_1 = require("../utils/cli");
+const data_format_1 = require("../utils/data-format");
 const config_1 = require("../utils/datatruck/config");
 const report_list_1 = require("../utils/datatruck/report-list");
 const repository_1 = require("../utils/datatruck/repository");
@@ -95,7 +95,7 @@ class CopyAction {
                 }),
             });
         };
-        return new DataFormat_1.DataFormat({
+        return new data_format_1.DataFormat({
             streams: options.streams,
             json: result,
             table: {

package/lib/actions/RestoreAction.d.ts

@@ -1,10 +1,10 @@
 import { Snapshot } from "../repositories/RepositoryAbstract";
 import { TaskAbstract } from "../tasks/TaskAbstract";
-import { DataFormat } from "../utils/DataFormat";
+import { DataFormat } from "../utils/data-format";
 import type { Config, PackageConfig } from "../utils/datatruck/config-type";
 import { Listr3TaskResultEnd } from "../utils/list";
 import { Progress, ProgressMode } from "../utils/progress";
-import { Streams } from "../utils/stream";
+import { StdStreams } from "../utils/stream";
 import { GargabeCollector } from "../utils/temp";
 import { IfRequireKeys } from "../utils/ts";
 export type RestoreActionOptions = {
@@ -19,7 +19,7 @@ export type RestoreActionOptions = {
     initial?: boolean;
     tty?: "auto" | boolean;
     progress?: ProgressMode;
-    streams?: Streams;
+    streams?: StdStreams;
 };
 type RestoreSnapshot = Snapshot & {
     repositoryName: string;
@@ -53,7 +53,7 @@ export declare class RestoreAction<TRequired extends boolean = true> {
         snapshotPath: string | undefined;
     }>;
     dataFormat(result: Listr3TaskResultEnd<Context>[], options?: {
-        streams?: Streams;
+        streams?: StdStreams;
         verbose?: number;
     }): DataFormat;
     exec(): Promise<(import("../utils/list").List3SummaryResult | import("../utils/list").Listr3TaskResult<Context>)[]>;

package/lib/actions/RestoreAction.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RestoreAction = void 0;
-const DataFormat_1 = require("../utils/DataFormat");
 const cli_1 = require("../utils/cli");
+const data_format_1 = require("../utils/data-format");
 const config_1 = require("../utils/datatruck/config");
 const repository_1 = require("../utils/datatruck/repository");
 const task_1 = require("../utils/datatruck/task");
@@ -69,8 +69,6 @@ class RestoreAction {
         let { snapshot, pkg, task } = data;
         const repoConfig = (0, config_1.findRepositoryOrFail)(this.config, snapshot.repositoryName);
         const repo = await (0, repository_1.createAndInitRepo)(repoConfig, this.options.verbose);
-        if (this.options.initial)
-            pkg = { ...pkg, restorePath: pkg.path };
         let snapshotPath = pkg.restorePath ?? pkg.path;
         await data.gc.cleanupIfFail(async () => {
             if (task) {
@@ -117,7 +115,7 @@ class RestoreAction {
                 }),
             });
         };
-        return new DataFormat_1.DataFormat({
+        return new data_format_1.DataFormat({
             streams: options.streams,
             json: result,
             table: {
@@ -185,11 +183,13 @@ class RestoreAction {
                     },
                     exitOnError: false,
                     run: async (listTask) => {
-                        const pkg = (0, config_1.resolvePackage)((0, config_1.findPackageOrFail)(this.config, snapshot.packageName), {
+                        let pkg = (0, config_1.resolvePackage)((0, config_1.findPackageOrFail)(this.config, snapshot.packageName), {
                             snapshotId: options.snapshotId,
                             snapshotDate: snapshot.date,
                             action: "restore",
                         });
+                        if (this.options.initial)
+                            pkg = { ...pkg, restorePath: pkg.path };
                         const gc = new temp_1.GargabeCollector();
                         const task = pkg.task ? (0, task_1.createTask)(pkg.task) : undefined;
                         const restore = await this.restore({

package/lib/commands/CleanCacheCommand.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CleanCacheCommand = void 0;
 const CleanCacheAction_1 = require("../actions/CleanCacheAction");
-const DataFormat_1 = require("../utils/DataFormat");
 const bytes_1 = require("../utils/bytes");
+const data_format_1 = require("../utils/data-format");
 const CommandAbstract_1 = require("./CommandAbstract");
 class CleanCacheCommand extends CommandAbstract_1.CommandAbstract {
     optionsConfig() {
@@ -14,7 +14,7 @@ class CleanCacheCommand extends CommandAbstract_1.CommandAbstract {
             verbose: !!this.globalOptions.verbose,
         });
         const result = await cleanCache.exec();
-        const dataFormat = new DataFormat_1.DataFormat({
+        const dataFormat = new data_format_1.DataFormat({
             streams: this.streams,
             json: result,
             table: {

package/lib/commands/CommandAbstract.d.ts

@@ -1,8 +1,8 @@
-import { DataFormatType } from "../utils/DataFormat";
 import { OptionsConfig } from "../utils/cli";
+import { DataFormatType } from "../utils/data-format";
 import type { Config } from "../utils/datatruck/config-type";
 import { ProgressMode } from "../utils/progress";
-import { Streams } from "../utils/stream";
+import { StdStreams } from "../utils/stream";
 import { If, SimilarObject } from "../utils/ts";
 export type GlobalOptions<TResolved = false> = {
     config: string | Config;
@@ -19,8 +19,8 @@ export declare abstract class CommandAbstract<TUnresolvedOptions, TOptions exten
     readonly inputOptions: TUnresolvedOptions;
     readonly configPath?: string | undefined;
     readonly options: TOptions;
-    readonly streams: Streams;
-    constructor(globalOptions: GlobalOptions<true>, inputOptions: TUnresolvedOptions, streams?: Partial<Streams>, configPath?: string | undefined);
+    readonly streams: StdStreams;
+    constructor(globalOptions: GlobalOptions<true>, inputOptions: TUnresolvedOptions, streams?: Partial<StdStreams>, configPath?: string | undefined);
     abstract optionsConfig(): OptionsConfig<TUnresolvedOptions, TOptions>;
     protected castOptionsConfig(options: OptionsConfig<TUnresolvedOptions, TOptions>): OptionsConfig<TUnresolvedOptions, TOptions>;
     abstract exec(): Promise<{

package/lib/commands/CommandAbstract.js

@@ -14,7 +14,7 @@ class CommandAbstract {
         this.inputOptions = inputOptions;
         this.configPath = configPath;
         this.options = (0, cli_1.parseOptions)(inputOptions, this.optionsConfig());
-        this.streams = (0, stream_1.createStreams)(streams);
+        this.streams = (0, stream_1.createStdStreams)(streams);
     }
     castOptionsConfig(options) {
         return options;

package/lib/commands/ConfigCommand.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigCommand = void 0;
 const ConfigAction_1 = require("../actions/ConfigAction");
-const DataFormat_1 = require("../utils/DataFormat");
+const data_format_1 = require("../utils/data-format");
 const config_1 = require("../utils/datatruck/config");
 const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
@@ -44,7 +44,7 @@ class ConfigCommand extends CommandAbstract_1.CommandAbstract {
             repositoryNames: pkg.repositoryNames ?? [],
             taskName: pkg.task?.name,
         }));
-        const dataFormat = new DataFormat_1.DataFormat({
+        const dataFormat = new data_format_1.DataFormat({
             streams: this.streams,
             json: result,
             table: {

package/lib/commands/InitCommand.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InitCommand = void 0;
 const ConfigAction_1 = require("../actions/ConfigAction");
 const InitAction_1 = require("../actions/InitAction");
-const DataFormat_1 = require("../utils/DataFormat");
 const cli_1 = require("../utils/cli");
+const data_format_1 = require("../utils/data-format");
 const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
 class InitCommand extends CommandAbstract_1.CommandAbstract {
@@ -31,7 +31,7 @@ class InitCommand extends CommandAbstract_1.CommandAbstract {
             verbose: verbose > 0,
         });
         const result = await init.exec();
-        const dataFormat = new DataFormat_1.DataFormat({
+        const dataFormat = new data_format_1.DataFormat({
             streams: this.streams,
             json: result,
             table: {

package/lib/commands/PruneCommand.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PruneCommand = void 0;
 const ConfigAction_1 = require("../actions/ConfigAction");
 const PruneAction_1 = require("../actions/PruneAction");
-const DataFormat_1 = require("../utils/DataFormat");
 const cli_1 = require("../utils/cli");
+const data_format_1 = require("../utils/data-format");
 const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
 class PruneCommand extends CommandAbstract_1.CommandAbstract {
@@ -122,7 +122,7 @@ class PruneCommand extends CommandAbstract_1.CommandAbstract {
             returnsAll: this.options.showAll,
         });
         const result = await prune.exec();
-        const dataFormat = new DataFormat_1.DataFormat({
+        const dataFormat = new data_format_1.DataFormat({
             streams: this.streams,
             json: result,
             table: {

package/lib/commands/SnapshotsCommand.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SnapshotsCommand = void 0;
 const ConfigAction_1 = require("../actions/ConfigAction");
 const SnapshotsAction_1 = require("../actions/SnapshotsAction");
-const DataFormat_1 = require("../utils/DataFormat");
 const bytes_1 = require("../utils/bytes");
+const data_format_1 = require("../utils/data-format");
 const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
 class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
@@ -118,7 +118,7 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
             tags: this.options.tag,
         });
         const result = await snapshots.exec();
-        const dataFormat = new DataFormat_1.DataFormat({
+        const dataFormat = new data_format_1.DataFormat({
             streams: this.streams,
             json: result,
             table: {

package/lib/repositories/GitRepository.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GitRepository = exports.gitRepositoryName = void 0;
-const Git_1 = require("../utils/Git");
 const cli_1 = require("../utils/cli");
 const paths_1 = require("../utils/datatruck/paths");
 const fs_1 = require("../utils/fs");
+const git_1 = require("../utils/git");
 const string_1 = require("../utils/string");
 const temp_1 = require("../utils/temp");
 const RepositoryAbstract_1 = require("./RepositoryAbstract");
@@ -46,7 +46,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         return `${GitRepository.refPrefix}/${packageName}`;
     }
     async init(data) {
-        const git = new Git_1.Git({
+        const git = new git_1.Git({
             dir: (0, temp_1.tmpDir)(exports.gitRepositoryName, "repository", "init"),
             log: data.options.verbose,
         });
@@ -73,7 +73,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         }
     }
     async prune(data) {
-        const git = new Git_1.Git({
+        const git = new git_1.Git({
             dir: await (0, temp_1.mkTmpDir)(exports.gitRepositoryName, "repo", "prune"),
             log: data.options.verbose,
         });
@@ -96,7 +96,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         await git.exec(["push", "--delete", "origin", data.snapshot.originalId]);
     }
     async fetchSnapshots(data) {
-        const git = new Git_1.Git({
+        const git = new git_1.Git({
             dir: await (0, temp_1.mkTmpDir)(exports.gitRepositoryName, "repo", "snapshots"),
             log: data.options.verbose,
         });
@@ -137,7 +137,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         const path = pkg.path;
         const tmpPath = await (0, temp_1.mkTmpDir)(exports.gitRepositoryName, "repo", "backup");
         const branchName = GitRepository.buildBranchName(data.package.name);
-        const git = new Git_1.Git({
+        const git = new git_1.Git({
             dir: tmpPath,
             log: data.options.verbose,
         });
@@ -217,7 +217,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
             id: data.snapshot.id,
             package: data.package.name,
         });
-        const git = new Git_1.Git({
+        const git = new git_1.Git({
             dir: restorePath,
             log: data.options.verbose,
         });

package/lib/repositories/ResticRepository.d.ts

@@ -1,4 +1,4 @@
-import { ResticRepositoryUri } from "../utils/Restic";
+import { ResticRepositoryUri } from "../utils/restic";
 import { RepositoryAbstract, RepoBackupData, RepoInitData, RepoRestoreData, RepoFetchSnapshotsData, Snapshot, SnapshotTagObject, SnapshotTagEnum, RepoPruneData, RepoCopyData } from "./RepositoryAbstract";
 export type ResticRepositoryConfig = {
     password: string | {

package/lib/repositories/ResticRepository.js

@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResticRepository = exports.resticRepositoryName = void 0;
-const Restic_1 = require("../utils/Restic");
 const cli_1 = require("../utils/cli");
 const error_1 = require("../utils/datatruck/error");
 const paths_1 = require("../utils/datatruck/paths");
 const fs_1 = require("../utils/fs");
 const math_1 = require("../utils/math");
+const restic_1 = require("../utils/restic");
 const string_1 = require("../utils/string");
 const temp_1 = require("../utils/temp");
 const RepositoryAbstract_1 = require("./RepositoryAbstract");
@@ -28,7 +28,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             ...(typeof this.config.password === "string"
                 ? { RESTIC_PASSWORD: this.config.password }
                 : { RESTIC_PASSWORD_FILE: (0, path_1.resolve)(this.config.password.path) }),
-            RESTIC_REPOSITORY: await Restic_1.Restic.formatRepository(this.config.repository),
+            RESTIC_REPOSITORY: await restic_1.Restic.formatRepository(this.config.repository),
         });
     }
     static buildSnapshotTag(name, value) {
@@ -69,7 +69,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             return (0, fs_1.fetchDiskStats)(config.repository.path);
     }
     async init(data) {
-        const restic = new Restic_1.Restic({
+        const restic = new restic_1.Restic({
             env: await this.buildEnv(),
             log: data.options.verbose,
         });
@@ -79,7 +79,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             await restic.exec(["init"]);
     }
     async fetchSnapshots(data) {
-        const restic = new Restic_1.Restic({
+        const restic = new restic_1.Restic({
             env: await this.buildEnv(),
             log: data.options.verbose,
         });
@@ -115,7 +115,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         }, []);
     }
     async prune(data) {
-        const restic = new Restic_1.Restic({
+        const restic = new restic_1.Restic({
             env: await this.buildEnv(),
             log: data.options.verbose,
         });
@@ -125,7 +125,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         });
     }
     async backup(data) {
-        const restic = new Restic_1.Restic({
+        const restic = new restic_1.Restic({
             env: await this.buildEnv(),
             log: data.options.verbose,
         });
@@ -278,13 +278,13 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         });
         if (!snapshot)
             throw new error_1.AppError(`Snapshot not found`);
-        const restic = new Restic_1.Restic({
+        const restic = new restic_1.Restic({
             env: {
                 ...(await this.buildEnv()),
                 ...(typeof config.password === "string"
                     ? { RESTIC_PASSWORD2: config.password }
                     : { RESTIC_PASSWORD_FILE2: (0, path_1.resolve)(config.password.path) }),
-                RESTIC_REPOSITORY2: await Restic_1.Restic.formatRepository(config.repository),
+                RESTIC_REPOSITORY2: await restic_1.Restic.formatRepository(config.repository),
             },
             log: data.options.verbose,
         });
@@ -301,7 +301,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
     }
     async restore(data) {
         const restorePath = data.snapshotPath;
-        const restic = new Restic_1.Restic({
+        const restic = new restic_1.Restic({
             env: await this.buildEnv(),
             log: data.options.verbose,
         });

package/lib/tasks/GitTask.js

@@ -5,6 +5,7 @@ const async_process_1 = require("../utils/async-process");
 const cli_1 = require("../utils/cli");
 const fs_1 = require("../utils/fs");
 const math_1 = require("../utils/math");
+const stream_1 = require("../utils/stream");
 const temp_1 = require("../utils/temp");
 const TaskAbstract_1 = require("./TaskAbstract");
 const assert_1 = require("assert");
@@ -93,7 +94,7 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
                     }
                 }),
                 p.child.on("close", () => stream.end()),
-                (0, fs_1.waitForClose)(stream),
+                (0, stream_1.waitForClose)(stream),
             ]);
         }
         // Copy

package/lib/utils/async-process.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AsyncProcess = void 0;
 const cli_1 = require("./cli");
-const fs_1 = require("./fs");
 const math_1 = require("./math");
 const process_1 = require("./process");
+const stream_1 = require("./stream");
 const child_process_1 = require("child_process");
-const fs_2 = require("fs");
+const fs_1 = require("fs");
 const promises_1 = require("fs/promises");
 const readline_1 = require("readline");
 function resolveLogOptions(log) {
@@ -18,7 +18,7 @@ function ensureDir(cwd) {
     if (typeof cwd === "string") {
         let isDir = false;
         try {
-            isDir = (0, fs_2.statSync)(cwd).isDirectory();
+            isDir = (0, fs_1.statSync)(cwd).isDirectory();
         }
         catch (error) { }
         if (!isDir)
@@ -34,14 +34,14 @@ class StdIn {
     }
     async pipe(source, onProgress) {
         if (this.process["log"]?.exec) {
-            const path = source instanceof fs_2.ReadStream
+            const path = source instanceof fs_1.ReadStream
                 ? "path" in source
                     ? source.path
                     : "&readableStream"
                 : source;
             (0, cli_1.logExec)(`[${this.process.child.pid || 0}] < ${path}`);
         }
-        const stream = typeof source === "string" ? (0, fs_2.createReadStream)(source) : source;
+        const stream = typeof source === "string" ? (0, fs_1.createReadStream)(source) : source;
         const streamPath = stream.path.toString();
         if (onProgress) {
             const fileInfo = await (0, promises_1.stat)(streamPath);
@@ -59,8 +59,8 @@ class StdIn {
         stream.pipe(this.writable);
         await Promise.all([
             this.process.waitForClose(),
-            (0, fs_1.waitForClose)(stream),
-            (0, fs_1.waitForClose)(this.writable),
+            (0, stream_1.waitForClose)(stream),
+            (0, stream_1.waitForClose)(this.writable),
         ]);
     }
 }
@@ -90,7 +90,7 @@ class Std {
             if (line.length)
                 cb(line, ++total);
         });
-        await Promise.all([this.process.waitForClose(), (0, fs_1.waitForClose)(parser)]);
+        await Promise.all([this.process.waitForClose(), (0, stream_1.waitForClose)(parser)]);
         return total;
     }
     async pipe(out, onProgress) {
@@ -114,7 +114,7 @@ class Std {
         const stream = out instanceof StdIn
             ? out.writable
             : typeof out === "string"
-                ? (0, fs_2.createWriteStream)(out)
+                ? (0, fs_1.createWriteStream)(out)
                 : out;
         this.readable.pipe(stream);
         await Promise.all([
@@ -123,8 +123,8 @@ class Std {
                     stream.destroy();
                 return Promise.reject(error);
             }),
-            (0, fs_1.waitForClose)(stream),
-            (0, fs_1.waitForClose)(this.readable),
+            (0, stream_1.waitForClose)(stream),
+            (0, stream_1.waitForClose)(this.readable),
         ]);
     }
 }
@@ -194,8 +194,13 @@ class AsyncProcess {
         let exitCode = inExitCode ?? 32;
         if (!exitCode)
             return exitCode;
+        const lastStdError = this.lastStdError?.toString().trim().slice(0, 255);
         let result = this.options.$exitCode ?? true;
-        let message = inExitCode === null ? "Process killed" : `Process exit code: ${exitCode}`;
+        let message = (inExitCode === null
+            ? [`Process killed: ${this.command}`, lastStdError]
+            : [`Process exit code: ${exitCode} (${this.command})`, lastStdError])
+            .filter((v) => typeof v === "string" && v.length)
+            .join(" | ");
         if (typeof result === "function")
             result = result(exitCode);
         if (typeof result === "string") {
@@ -215,7 +220,7 @@ class AsyncProcess {
                 command: this.command,
                 argv: this.argv,
                 exitCode,
-                lastStdError: this.lastStdError?.toString().trim().slice(0, 255),
+                lastStdError,
             },
         });
     }

package/lib/utils/{DataFormat.d.ts → data-format.d.ts}

@@ -1,10 +1,10 @@
-import { Streams } from "./stream";
+import { StdStreams } from "./stream";
 import { Header } from "tty-table";
 export type DataFormatType = "json" | "list" | "pjson" | "table" | "yaml" | "custom" | "tpl";
 export declare const dataFormats: DataFormatType[];
 export declare class DataFormat {
     readonly options: {
-        streams?: Partial<Streams>;
+        streams?: Partial<StdStreams>;
         json: any;
         list?: () => string[];
         table?: {
@@ -12,9 +12,9 @@ export declare class DataFormat {
             rows: () => (string | number | null | undefined)[][];
         };
     };
-    protected streams: Streams;
+    protected streams: StdStreams;
     constructor(options: {
-        streams?: Partial<Streams>;
+        streams?: Partial<StdStreams>;
         json: any;
         list?: () => string[];
         table?: {

package/lib/utils/{DataFormat.js → data-format.js}

@@ -24,7 +24,7 @@ class DataFormat {
     streams;
     constructor(options) {
         this.options = options;
-        this.streams = (0, stream_1.createStreams)(options.streams);
+        this.streams = (0, stream_1.createStdStreams)(options.streams);
     }
     getJson() {
         return this.options.json;

package/lib/utils/datatruck/command.d.ts

@@ -8,7 +8,7 @@ import { PruneCommand } from "../../commands/PruneCommand";
 import { RestoreCommand } from "../../commands/RestoreCommand";
 import { SnapshotsCommand } from "../../commands/SnapshotsCommand";
 import { StartServerCommand } from "../../commands/StartServerCommand";
-import { Streams } from "../stream";
+import { StdStreams } from "../stream";
 export declare const datatruckCommandMap: {
     config: typeof ConfigCommand;
     init: typeof InitCommand;
@@ -23,7 +23,7 @@ export declare const datatruckCommandMap: {
 export type DatatruckCommandMap = typeof datatruckCommandMap;
 export type InferDatatruckCommandOptions<T extends keyof DatatruckCommandMap> = InstanceType<DatatruckCommandMap[T]>["inputOptions"];
 export type InferDatatruckCommandResult<T extends keyof DatatruckCommandMap, R = Awaited<ReturnType<InstanceType<DatatruckCommandMap[T]>["exec"]>>> = "result" extends keyof R ? R["result"] : undefined;
-export declare function createCommand<T extends keyof DatatruckCommandMap>(name: T, globalOptions: GlobalOptions<true>, options: InferDatatruckCommandOptions<T>, streams?: Partial<Streams>, configPath?: string): BackupCommand | CopyCommand | PruneCommand | CleanCacheCommand | ConfigCommand | InitCommand | RestoreCommand | SnapshotsCommand | StartServerCommand;
+export declare function createCommand<T extends keyof DatatruckCommandMap>(name: T, globalOptions: GlobalOptions<true>, options: InferDatatruckCommandOptions<T>, streams?: Partial<StdStreams>, configPath?: string): BackupCommand | CopyCommand | PruneCommand | CleanCacheCommand | ConfigCommand | InitCommand | RestoreCommand | SnapshotsCommand | StartServerCommand;
 export declare function createCommands(globalOptions: GlobalOptions<true>): {
     [K in keyof DatatruckCommandMap as `${K}`]: (options: InferDatatruckCommandOptions<K>) => Promise<InferDatatruckCommandResult<K>>;
 };

package/lib/utils/datatruck/config-type.d.ts

@@ -1,5 +1,5 @@
 import type { PruneActionsOptions } from "../../actions/PruneAction";
-import type { DataFormatType } from "../DataFormat";
+import type { DataFormatType } from "../data-format";
 import type { ReportStep } from "../reportSteps";
 import type { SpawnStep } from "../spawnSteps";
 import type { PackageRepositoryConfig, RepositoryConfigEnabledAction, RepositoryConfig } from "./config-repository-type";

package/lib/utils/fs.d.ts

@@ -38,12 +38,6 @@ export declare function writeGitIgnoreList(options: {
     paths: NodeJS.ReadableStream | string[];
     outDir: string;
 }): Promise<string>;
-export declare function waitForClose(stream: {
-    on(event: "close", cb: (...args: any[]) => any): any;
-} | {
-    on(event: "close", cb: (...args: any[]) => any): any;
-    on(event: "error", cb: (...args: any[]) => any): any;
-}): Promise<void>;
 export declare function copyFileWithStreams(source: string, target: string): Promise<unknown>;
 export declare function updateFileStats(path: string, fileInfo: Stats): Promise<void>;
 export declare function isNotFoundError(error: unknown): boolean;