@datatruck/cli 0.17.1 → 0.17.2

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

@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (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");
+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");
 function logExecStdout(input) {
@@ -40,17 +40,17 @@ async function exec(command, argv = [], options = null, settings = {}) {
                     env[key] = value;
                 return env;
             }, {});
-            (0, cli_util_1.logExec)(command, pipe
+            (0, cli_1.logExec)(command, pipe
                 ? [
                     ...argv,
-                    pipe.stream instanceof fs_1.ReadStream ? "<" : ">",
+                    pipe.stream instanceof fs_2.ReadStream ? "<" : ">",
                     String(pipe.stream.path),
                 ]
                 : argv, logEnv, log.allToStderr);
         }
-        if (typeof options?.cwd === "string" && !(await (0, fs_util_1.checkDir)(options.cwd)))
+        if (typeof options?.cwd === "string" && !(await (0, fs_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 (pipe?.onReadProgress && pipe.stream instanceof fs_2.ReadStream) {
             const fileInfo = await (0, promises_1.stat)(pipe.stream.path);
             const totalBytes = fileInfo.size;
             let currentBytes = 0;
@@ -59,7 +59,7 @@ 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),
                 });
             });
         }
@@ -72,7 +72,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,7 +116,7 @@ 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)
@@ -136,7 +136,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 fs_2.ReadStream) {
                 if (!p.stdin)
                     throw new Error(`stdin is not defined`);
                 pipe.stream.pipe(p.stdin);
@@ -187,7 +187,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),