@datatruck/cli 0.17.1 → 0.18.0

package/{util/fs-util.js → utils/fs.js}

@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cpy = exports.isNotFoundError = exports.updateFileStats = exports.copyFileWithStreams = exports.waitForClose = exports.writeGitIgnoreList = exports.fastglobToGitIgnore = exports.forEachFile = exports.readDir = exports.checkDir = exports.checkFile = exports.readPartialFile = exports.mkTmpDir = exports.fastFolderSizeAsync = exports.tmpDir = exports.rmTmpDir = exports.isTmpDir = exports.sessionTmpDir = exports.parentTmpDir = exports.existsFile = exports.findFile = exports.parsePackageFile = exports.parseFile = exports.parseFileExtensions = exports.readdirIfExists = exports.writeJSONFile = exports.existsDir = exports.ensureEmptyDir = exports.mkdirIfNotExists = exports.isDirEmpty = exports.isLocalDir = exports.pathIterator = exports.applyPermissions = exports.isEmptyDir = exports.isWSLSystem = void 0;
+exports.createFileScanner = exports.cpy = exports.isNotFoundError = exports.updateFileStats = exports.copyFileWithStreams = exports.waitForClose = exports.writeGitIgnoreList = exports.fastglobToGitIgnore = exports.forEachFile = exports.readDir = exports.checkDir = exports.checkFile = exports.readPartialFile = exports.mkTmpDir = exports.fastFolderSizeAsync = exports.tmpDir = exports.rmTmpDir = exports.isTmpDir = exports.sessionTmpDir = exports.parentTmpDir = exports.existsFile = exports.findFile = exports.parsePackageFile = exports.parseFile = exports.parseFileExtensions = exports.readdirIfExists = exports.writeJSONFile = exports.existsDir = exports.ensureEmptyDir = exports.mkdirIfNotExists = exports.isDirEmpty = exports.isLocalDir = exports.pathIterator = exports.applyPermissions = exports.isEmptyDir = exports.isWSLSystem = void 0;
 const globalData_1 = __importDefault(require("../globalData"));
-const path_util_1 = require("./path-util");
+const math_1 = require("./math");
+const path_1 = require("./path");
 const async_1 = require("async");
 const crypto_1 = require("crypto");
 const fast_folder_size_1 = __importDefault(require("fast-folder-size"));
@@ -14,8 +15,8 @@ const fs_1 = require("fs");
 const fs_2 = require("fs");
 const promises_1 = require("fs/promises");
 const os_1 = require("os");
-const path_1 = require("path");
 const path_2 = require("path");
+const path_3 = require("path");
 const readline_1 = require("readline");
 const util_1 = require("util");
 exports.isWSLSystem = (0, os_1.release)().includes("microsoft-standard-WSL");
@@ -40,7 +41,7 @@ async function applyPermissions(baseDir, permissionsPath) {
     });
     for await (const line of singleReader) {
         const [rpath, rawUid, rawGui, rawMode] = line.split(":");
-        const path = (0, path_1.join)(baseDir, rpath);
+        const path = (0, path_2.join)(baseDir, rpath);
         if (!path.startsWith(baseDir)) {
             throw new Error(`Entry path is out of the base dir: (${path}, ${baseDir})`);
         }
@@ -66,12 +67,9 @@ async function isDirEmpty(path) {
 }
 exports.isDirEmpty = isDirEmpty;
 async function mkdirIfNotExists(path) {
-    try {
-        await (0, promises_1.mkdir)(path, {
-            recursive: true,
-        });
-    }
-    catch (e) { }
+    await (0, promises_1.mkdir)(path, {
+        recursive: true,
+    });
     return path;
 }
 exports.mkdirIfNotExists = mkdirIfNotExists;
@@ -100,8 +98,8 @@ async function readdirIfExists(path) {
 exports.readdirIfExists = readdirIfExists;
 exports.parseFileExtensions = ["json", "js", "ts", "yaml", "yml"];
 async function parseFile(path, jsKey) {
-    if (!(0, path_2.isAbsolute)(path))
-        path = (0, path_1.join)(process.cwd(), path);
+    if (!(0, path_3.isAbsolute)(path))
+        path = (0, path_2.join)(process.cwd(), path);
     if (path.endsWith(".ts"))
         require("ts-node").register();
     if (path.endsWith(".yaml") || path.endsWith("yml")) {
@@ -119,7 +117,7 @@ async function parseFile(path, jsKey) {
 }
 exports.parseFile = parseFile;
 function parsePackageFile() {
-    return require(`${path_util_1.rootPath}/package.json`);
+    return require(`${path_1.rootPath}/package.json`);
 }
 exports.parsePackageFile = parsePackageFile;
 async function findFile(sourcePath, baseName, extensions, errorMessage = "Path not found") {
@@ -127,7 +125,7 @@ async function findFile(sourcePath, baseName, extensions, errorMessage = "Path n
     let path;
     if (info.isDirectory()) {
         for (const ext of extensions) {
-            const extPath = (0, path_1.join)(sourcePath, baseName) + "." + ext;
+            const extPath = (0, path_2.join)(sourcePath, baseName) + "." + ext;
             if (await existsFile(extPath)) {
                 path = extPath;
                 break;
@@ -153,11 +151,11 @@ async function existsFile(path) {
 }
 exports.existsFile = existsFile;
 function parentTmpDir() {
-    return (0, path_1.join)(globalData_1.default.tempDir, "datatruck-temp");
+    return (0, path_2.join)(globalData_1.default.tempDir, "datatruck-temp");
 }
 exports.parentTmpDir = parentTmpDir;
 function sessionTmpDir() {
-    return (0, path_1.join)(parentTmpDir(), process.pid.toString());
+    return (0, path_2.join)(parentTmpDir(), process.pid.toString());
 }
 exports.sessionTmpDir = sessionTmpDir;
 function isTmpDir(path) {
@@ -181,7 +179,7 @@ exports.rmTmpDir = rmTmpDir;
 function tmpDir(prefix, id) {
     if (!id)
         id = (0, crypto_1.randomUUID)().slice(0, 8);
-    return (0, path_1.join)(sessionTmpDir(), `${prefix}-${id}`);
+    return (0, path_2.join)(sessionTmpDir(), `${prefix}-${id}`);
 }
 exports.tmpDir = tmpDir;
 async function fastFolderSizeAsync(path) {
@@ -261,7 +259,7 @@ exports.readDir = readDir;
 async function forEachFile(dirPath, cb, includeDir) {
     const files = await readDir(dirPath);
     for (const file of files) {
-        const filePath = (0, path_1.join)(dirPath, file);
+        const filePath = (0, path_2.join)(dirPath, file);
         if ((await (0, promises_1.stat)(filePath)).isDirectory()) {
             if (includeDir)
                 cb(filePath, true);
@@ -284,12 +282,12 @@ function fastglobToGitIgnore(patterns, baseDir) {
 exports.fastglobToGitIgnore = fastglobToGitIgnore;
 async function writeGitIgnoreList(options) {
     const { outDir } = options;
-    const path = (0, path_1.join)(outDir, `.gitignore`);
+    const path = (0, path_2.join)(outDir, `.gitignore`);
     const stream = (0, fs_2.createWriteStream)(path);
     const dirs = new Set();
     stream.write("*\n");
     for await (const value of options.paths) {
-        const dir = (0, path_1.dirname)(value.toString());
+        const dir = (0, path_2.dirname)(value.toString());
         if (dir !== ".") {
             let parentPath;
             for (const value of dir.split("/")) {
@@ -368,9 +366,9 @@ async function cpy(options) {
     const task = async (rawEntryPath, basePath) => {
         [rawEntryPath] = rawEntryPath.split(":");
         const isDir = rawEntryPath.endsWith("/");
-        const entryPath = (0, path_1.normalize)(rawEntryPath);
-        const entrySourcePath = (0, path_1.resolve)((0, path_1.join)(basePath, rawEntryPath));
-        const entryTargetPath = (0, path_1.resolve)((0, path_1.join)(options.targetPath, rawEntryPath));
+        const entryPath = (0, path_2.normalize)(rawEntryPath);
+        const entrySourcePath = (0, path_2.resolve)((0, path_2.join)(basePath, rawEntryPath));
+        const entryTargetPath = (0, path_2.resolve)((0, path_2.join)(options.targetPath, rawEntryPath));
         const onPathResult = await options?.onPath?.({
             isDir,
             entryPath,
@@ -385,7 +383,7 @@ async function cpy(options) {
             await makeRecursiveDir(entryTargetPath);
         }
         else {
-            const dir = (0, path_1.dirname)(entryTargetPath);
+            const dir = (0, path_2.dirname)(entryTargetPath);
             await makeRecursiveDir(dir);
             await options.onProgress?.({
                 current: stats.files,
@@ -458,3 +456,64 @@ async function cpy(options) {
     return stats;
 }
 exports.cpy = cpy;
+async function createFileScanner(options) {
+    const object = {
+        total: 0,
+        current: 0,
+        progress: async (description, data) => {
+            await options.onProgress({
+                relative: {
+                    description,
+                    payload: data.path,
+                    percent: data.percent,
+                },
+                absolute: {
+                    total: object.total,
+                    current: object.current + data.current,
+                    percent: (0, math_1.progressPercent)(object.total, object.current + data.current),
+                },
+            });
+            if (data.type === "end") {
+                object.current += data.current;
+            }
+        },
+        updateProgress: async (end) => {
+            const currentTime = performance.now();
+            const diff = currentTime - lastTime;
+            if (end || diff > 1000) {
+                await options.onProgress({
+                    relative: {
+                        description: end ? "Scanned files" : "Scanning files",
+                        payload: object.total.toString(),
+                    },
+                });
+                lastTime = currentTime;
+            }
+        },
+        start: async (cb) => {
+            for await (const entry of pathIterator(stream)) {
+                if (!options.disableCounting)
+                    object.total++;
+                await object.updateProgress();
+                if (cb)
+                    await cb(entry);
+            }
+            if (!options.disableEndProgress)
+                await object.updateProgress(true);
+        },
+    };
+    await options.onProgress({
+        relative: {
+            description: "Scanning files",
+        },
+    });
+    const stream = fast_glob_1.default.stream(options.glob.include, {
+        dot: true,
+        markDirectories: true,
+        stats: true,
+        ...options.glob,
+    });
+    let lastTime = performance.now();
+    return object;
+}
+exports.createFileScanner = createFileScanner;

package/utils/process.d.ts

@@ -0,0 +1,107 @@
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+import { SpawnOptions, ChildProcess, ChildProcessByStdio } from "child_process";
+import { ReadStream, WriteStream } from "fs";
+import { Readable, Writable } from "stream";
+export type ExecLogSettingsType = {
+    colorize?: boolean;
+    exec?: boolean;
+    stdout?: boolean;
+    stderr?: boolean;
+    allToStderr?: boolean;
+    envNames?: string[];
+};
+export interface ExecSettingsInterface {
+    exec?: boolean;
+    pipe?: {
+        stream: WriteStream;
+        onWriteProgress?: (data: {
+            totalBytes: number;
+        }) => void;
+    } | {
+        stream: ReadStream;
+        onReadProgress?: (data: {
+            totalBytes: number;
+            currentBytes: number;
+            progress: number;
+        }) => void;
+    } | {
+        stream: Readable;
+    };
+    log?: ExecLogSettingsType | boolean;
+    onSpawn?: (p: ChildProcess) => any;
+    stdout?: {
+        save?: boolean;
+        parseLines?: boolean;
+        onData?: (data: string) => void;
+    };
+    stderr?: {
+        save?: boolean;
+        onData?: (data: string) => void;
+        toExitCode?: boolean;
+    };
+    onExitCodeError?: (data: ExecResultType, error: Error) => Error | false;
+}
+export declare function logExecStdout(input: {
+    data: string;
+    colorize?: boolean;
+    stderr?: boolean;
+    lineSalt?: boolean;
+}): void;
+export declare function logExecStderr(data: string, colorize?: boolean): void;
+export type ExecResultType = {
+    stdout: string;
+    stderr: string;
+    exitCode: number;
+};
+export type ParseStreamDataOptions<S extends boolean = boolean> = {
+    save?: S;
+    parseLines?: boolean;
+    log?: LogProcessOptions | boolean;
+    onData?: (data: string) => void;
+};
+export declare function parseStreamData<S extends boolean>(stream: Readable, options?: ParseStreamDataOptions<S>): Promise<S extends true ? string : undefined>;
+type OnExitCode = OnExitCodeValue | ((code: number) => OnExitCodeValue | void | undefined);
+type OnExitCodeValue = Error | string | number | boolean;
+export declare function waitForClose<O extends boolean, E extends boolean>(p: ChildProcess, options?: {
+    strict?: boolean;
+    stdout?: O;
+    stderr?: E;
+    onExitCode?: OnExitCode;
+}): Promise<{
+    exitCode: number;
+} & (O extends true ? {
+    stdout: string;
+} : {}) & (E extends true ? {
+    stderr: string;
+} : {})>;
+export type LogProcessOptions = {
+    envNames?: string[];
+    env?: Record<string, any>;
+    pipe?: Readable | Writable;
+    toStderr?: boolean;
+    colorize?: boolean;
+};
+export declare function logProcessExec(command: string, argv: any[], options: LogProcessOptions): Promise<void>;
+export type ProcessOptions<O1 extends boolean, O2 extends boolean> = {
+    $stdout?: Omit<ParseStreamDataOptions<O1>, "log">;
+    $stderr?: Omit<ParseStreamDataOptions<O2>, "log">;
+    $onExitCode?: OnExitCode;
+    $log?: boolean | {
+        exec?: boolean | LogProcessOptions;
+        stdout?: boolean | LogProcessOptions;
+        stderr?: boolean | LogProcessOptions;
+    };
+};
+export declare function createProcess<O1 extends boolean, O2 extends boolean>(command: string, argv?: (string | number)[], options?: SpawnOptions & ProcessOptions<O1, O2>): ChildProcessByStdio<Writable, Readable, Readable> & PromiseLike<{
+    exitCode: number;
+} & (O1 extends true ? {
+    stdout: string;
+} : {}) & (O2 extends true ? {
+    stderr: string;
+} : {})>;
+export declare function exec(command: string, argv?: string[], options?: SpawnOptions | null, settings?: ExecSettingsInterface): Promise<ExecResultType>;
+type EventNameType = "exit" | "SIGINT" | "SIGUSR1" | "SIGUSR2" | "SIGTERM" | "uncaughtException";
+export declare function onExit(cb: (eventName: EventNameType, ...args: any[]) => void): void;
+export {};

package/{util/process-util.js → utils/process.js}

@@ -3,15 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onExit = exports.exec = exports.logExecStderr = exports.logExecStdout = void 0;
-const cli_util_1 = require("./cli-util");
-const fs_util_1 = require("./fs-util");
-const math_util_1 = require("./math-util");
+exports.onExit = exports.exec = exports.createProcess = exports.logProcessExec = exports.waitForClose = exports.parseStreamData = exports.logExecStderr = exports.logExecStdout = void 0;
+const cli_1 = require("./cli");
+const fs_1 = require("./fs");
+const math_1 = require("./math");
 const chalk_1 = __importDefault(require("chalk"));
 const child_process_1 = require("child_process");
-const fs_1 = require("fs");
+const fs_2 = require("fs");
 const promises_1 = require("fs/promises");
 const readline_1 = require("readline");
+const stream_1 = require("stream");
 function logExecStdout(input) {
     let text = input.colorize ? chalk_1.default.grey(input.data) : input.data;
     if (input.lineSalt)
@@ -23,6 +24,152 @@ function logExecStderr(data, colorize) {
     process.stdout.write(colorize ? chalk_1.default.red(data) : data);
 }
 exports.logExecStderr = logExecStderr;
+function parseStreamData(stream, options = {}) {
+    const log = options.log === true ? {} : options.log;
+    let result;
+    if (options.save)
+        result = "";
+    return new Promise((resolve, reject) => {
+        const lines = options.parseLines;
+        const onData = (data) => {
+            if (options.onData)
+                options.onData(data.toString());
+            if (log)
+                logExecStdout({
+                    data: lines ? `${data}\n` : data.toString(),
+                    stderr: log.toStderr,
+                    colorize: log.colorize,
+                });
+            if (options?.save)
+                result += data.toString();
+        };
+        if (lines) {
+            const rl = (0, readline_1.createInterface)({
+                input: stream,
+            });
+            rl.on("line", onData).on("close", () => resolve(result));
+        }
+        else {
+            stream
+                .on("data", onData)
+                .on("error", reject)
+                .once("close", () => resolve(result));
+        }
+    });
+}
+exports.parseStreamData = parseStreamData;
+function waitForClose(p, options = {}) {
+    return new Promise((resolve, reject) => {
+        let result = {
+            exitCode: 1,
+        };
+        if (options.stdout) {
+            result.stdout = "";
+            p.stdout.on("data", (data) => (result.stdout += data.toString()));
+        }
+        p.once("error", reject).once("close", (exitCode) => {
+            if (exitCode) {
+                let onExitCode = options.onExitCode ?? true;
+                if (typeof onExitCode === "function") {
+                    onExitCode = onExitCode(exitCode);
+                }
+                if (typeof onExitCode === "string") {
+                    reject(new Error(onExitCode));
+                }
+                else if (typeof onExitCode === "number") {
+                    reject(new Error(`Exit code: ${onExitCode}`));
+                }
+                else if (onExitCode instanceof Error) {
+                    reject(onExitCode);
+                }
+                else if (onExitCode === false) {
+                    resolve({ ...result, exitCode: exitCode });
+                }
+                else {
+                    reject(new Error(`Exit code: ${exitCode}`));
+                }
+            }
+            else {
+                resolve({ ...result, exitCode: exitCode });
+            }
+        });
+    });
+}
+exports.waitForClose = waitForClose;
+async function logProcessExec(command, argv, options) {
+    const logEnv = options.envNames?.reduce((env, key) => {
+        const value = options?.env?.[key];
+        if (typeof value !== "undefined")
+            env[key] = value;
+        return env;
+    }, {});
+    (0, cli_1.logExec)(command, options.pipe
+        ? [
+            ...argv,
+            options.pipe instanceof stream_1.Readable ? "<" : ">",
+            "path" in options.pipe ? String(options.pipe.path) : "[stream]",
+        ]
+        : argv, logEnv, options.toStderr);
+}
+exports.logProcessExec = logProcessExec;
+function createProcess(command, argv = [], options = {}) {
+    const $log = options.$log === true
+        ? { exec: {}, stdout: {}, stderr: {} }
+        : options.$log || {};
+    if ($log.exec)
+        logProcessExec(command, argv, $log.exec === true ? {} : $log.exec);
+    if (typeof options.cwd === "string") {
+        let isDir = false;
+        try {
+            isDir = (0, fs_2.statSync)(options.cwd).isDirectory();
+        }
+        catch (error) { }
+        if (!isDir)
+            throw new Error(`Current working directory does not exist: ${options.cwd}`);
+    }
+    const handler = (0, child_process_1.spawn)(command, argv.map((v) => (typeof v === "number" ? v.toString() : v)), options ?? {});
+    const { $stdout, $stderr, $onExitCode } = options;
+    async function exec() {
+        const [stdout, stderr, result] = await Promise.all([
+            (!!$log.stdout || !!$stdout) &&
+                parseStreamData(handler.stdout, {
+                    log: $log.stdout,
+                    ...$stdout,
+                }),
+            (!!$log.stderr || !!$stderr) &&
+                parseStreamData(handler.stderr, {
+                    log: $log.stderr,
+                    ...$stderr,
+                }),
+            waitForClose(handler, {
+                onExitCode: $onExitCode,
+            }),
+        ]);
+        const endResult = {
+            exitCode: result.exitCode,
+        };
+        if (typeof stdout === "string")
+            endResult.stdout = stdout;
+        if (typeof stderr === "string")
+            endResult.stderr = stderr;
+        return endResult;
+    }
+    const promise = {
+        [Symbol.toStringTag]: "process",
+        then: function (onfulfilled, onrejected) {
+            return exec().then(onfulfilled, onrejected);
+        },
+        catch: function (onrejected) {
+            return exec().catch(onrejected);
+        },
+        finally: function (onfinally) {
+            return exec().finally(onfinally);
+        },
+    };
+    Object.assign(handler, promise);
+    return handler;
+}
+exports.createProcess = createProcess;
 async function exec(command, argv = [], options = null, settings = {}) {
     const pipe = settings.pipe;
     let log = {};
@@ -34,23 +181,16 @@ async function exec(command, argv = [], options = null, settings = {}) {
     }
     return new Promise(async (resolve, reject) => {
         if (log.exec) {
-            const logEnv = log.envNames?.reduce((env, key) => {
-                const value = options?.env?.[key];
-                if (typeof value !== "undefined")
-                    env[key] = value;
-                return env;
-            }, {});
-            (0, cli_util_1.logExec)(command, pipe
-                ? [
-                    ...argv,
-                    pipe.stream instanceof fs_1.ReadStream ? "<" : ">",
-                    String(pipe.stream.path),
-                ]
-                : argv, logEnv, log.allToStderr);
+            logProcessExec(command, argv, {
+                env: options?.env,
+                envNames: log.envNames,
+                pipe: pipe?.stream,
+                toStderr: log.allToStderr,
+            });
         }
-        if (typeof options?.cwd === "string" && !(await (0, fs_util_1.checkDir)(options.cwd)))
-            return reject(new Error(`Current working directory does not exist: ${options.cwd}`));
-        if (pipe?.onReadProgress && pipe.stream instanceof fs_1.ReadStream) {
+        if (typeof options?.cwd === "string" && !(await (0, fs_1.checkDir)(options.cwd)))
+            throw new Error(`Current working directory does not exist: ${options.cwd}`);
+        if (pipe?.stream instanceof fs_2.ReadStream && "onReadProgress" in pipe) {
             const fileInfo = await (0, promises_1.stat)(pipe.stream.path);
             const totalBytes = fileInfo.size;
             let currentBytes = 0;
@@ -59,12 +199,12 @@ async function exec(command, argv = [], options = null, settings = {}) {
                 pipe.onReadProgress?.({
                     totalBytes: totalBytes,
                     currentBytes: currentBytes,
-                    progress: (0, math_util_1.progressPercent)(totalBytes, currentBytes),
+                    progress: (0, math_1.progressPercent)(totalBytes, currentBytes),
                 });
             });
         }
         const p = (0, child_process_1.spawn)(command, argv, options ?? {});
-        settings.onSpawn?.(p);
+        await settings.onSpawn?.(p);
         let spawnError;
         const spawnData = {
             stdout: "",
@@ -72,7 +212,7 @@ async function exec(command, argv = [], options = null, settings = {}) {
             exitCode: 0,
         };
         let finishListeners = 1;
-        if (pipe?.stream instanceof fs_1.WriteStream)
+        if (pipe?.stream instanceof fs_2.WriteStream)
             finishListeners++;
         if (settings.stdout?.parseLines)
             finishListeners++;
@@ -116,12 +256,12 @@ async function exec(command, argv = [], options = null, settings = {}) {
                 streamError = error;
                 tryFinish();
             });
-            if (pipe.stream instanceof fs_1.WriteStream) {
+            if (pipe.stream instanceof fs_2.WriteStream) {
                 if (!p.stdout)
                     throw new Error(`stdout is not defined`);
                 if (!p.stderr)
                     throw new Error(`stderr is not defined`);
-                if (pipe.onWriteProgress) {
+                if ("onWriteProgress" in pipe && pipe.onWriteProgress) {
                     let totalBytes = 0;
                     p.stdout.on("data", (chunk) => {
                         totalBytes += chunk.length;
@@ -136,7 +276,7 @@ async function exec(command, argv = [], options = null, settings = {}) {
                 p.stderr.pipe(pipe.stream, { end: false });
                 p.on("close", tryFinish);
             }
-            else if (pipe.stream instanceof fs_1.ReadStream) {
+            else if (pipe.stream instanceof stream_1.Readable) {
                 if (!p.stdin)
                     throw new Error(`stdin is not defined`);
                 pipe.stream.pipe(p.stdin);
@@ -187,7 +327,7 @@ async function exec(command, argv = [], options = null, settings = {}) {
         }
         p.on("error", (error) => (spawnError = error)).on("close", (exitCode) => {
             spawnData.exitCode = exitCode ?? 0;
-            if (pipe?.stream instanceof fs_1.WriteStream)
+            if (pipe?.stream instanceof fs_2.WriteStream)
                 pipe.stream.end();
             tryFinish();
         });

package/{util/zip-util.js → utils/zip.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unzip = exports.zip = exports.listZip = exports.checkSSEOption = exports.buildArguments = void 0;
-const process_util_1 = require("./process-util");
+const process_1 = require("./process");
 const path_1 = require("path");
 function buildArguments(filters) {
     const args = [];
@@ -32,7 +32,7 @@ function buildArguments(filters) {
 exports.buildArguments = buildArguments;
 let checkSSEOptionResult;
 async function checkSSEOption(command = "7z") {
-    const result = await (0, process_util_1.exec)(command, [], {}, {
+    const result = await (0, process_1.exec)(command, [], {}, {
         stdout: {
             save: true,
         },
@@ -68,7 +68,7 @@ function parseListZipLine(line, buffer) {
 }
 async function listZip(data) {
     const buffer = {};
-    await (0, process_util_1.exec)(data.command ?? "7z", ["l", data.path, "-slt"], {}, {
+    await (0, process_1.exec)(data.command ?? "7z", ["l", data.path, "-slt"], {}, {
         log: {
             exec: data.verbose ?? false,
             stderr: data.verbose ?? false,
@@ -124,7 +124,7 @@ async function zip(data) {
         total: 0,
         type: "start",
     });
-    await (0, process_util_1.exec)(data.command ?? "7z", [
+    await (0, process_1.exec)(data.command ?? "7z", [
         "a",
         // https://sourceforge.net/p/sevenzip/bugs/2099/,
         // https://github.com/mcmilk/7-Zip/commit/87ba6f01ba3c5b2ce3186bddfe3d7d880639193c#diff-779d6b1bfa6196b288478f78ca96c4d4c6d7ac6cf8be15a28a20dabc9137ca36L515
@@ -192,7 +192,7 @@ async function unzip(data) {
         percent: 0,
         type: "start",
     });
-    const result = await (0, process_util_1.exec)(data.command ?? "7z", [
+    const result = await (0, process_1.exec)(data.command ?? "7z", [
         "x",
         "-bsp1",
         (0, path_1.normalize)(data.input),