@datatruck/cli 0.17.1 → 0.17.2

package/Task/SqlDumpTaskAbstract.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqlDumpTaskAbstract = exports.sqlDumpTaskDefinition = void 0;
 const AppError_1 = require("../Error/AppError");
 const DefinitionEnum_1 = require("../JsonSchema/DefinitionEnum");
-const cli_util_1 = require("../util/cli-util");
-const config_util_1 = require("../util/datatruck/config-util");
-const fs_util_1 = require("../util/fs-util");
-const math_util_1 = require("../util/math-util");
+const cli_1 = require("../utils/cli");
+const config_1 = require("../utils/datatruck/config");
+const fs_1 = require("../utils/fs");
+const math_1 = require("../utils/math");
 const TaskAbstract_1 = require("./TaskAbstract");
 const assert_1 = require("assert");
 const promises_1 = require("fs/promises");
@@ -114,7 +114,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
             return true;
         });
         (0, assert_1.ok)(typeof outputPath === "string");
-        if (!(await (0, fs_util_1.checkDir)(outputPath)))
+        if (!(await (0, fs_1.checkDir)(outputPath)))
             await (0, promises_1.mkdir)(outputPath, { recursive: true });
         if (!this.config.oneFileByTable) {
             const outPath = (0, path_1.join)(outputPath, serializeSqlFile({ database: this.config.database }));
@@ -144,7 +144,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
                     absolute: {
                         total: tableNames.length,
                         current: current,
-                        percent: (0, math_util_1.progressPercent)(tableNames.length, current),
+                        percent: (0, math_1.progressPercent)(tableNames.length, current),
                     },
                 });
                 const outPath = (0, path_1.join)(outputPath, serializeSqlFile({ table: tableName }));
@@ -159,7 +159,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
                         absolute: {
                             total: tableNames.length,
                             current: current,
-                            percent: (0, math_util_1.progressPercent)(tableNames.length, current),
+                            percent: (0, math_1.progressPercent)(tableNames.length, current),
                         },
                     });
                 });
@@ -181,7 +181,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
         this.verbose = data.options.verbose;
         (0, assert_1.ok)(typeof restorePath === "string");
         const database = {
-            name: (0, config_util_1.resolveDatabaseName)(this.config.database, {
+            name: (0, config_1.resolveDatabaseName)(this.config.database, {
                 packageName: data.package.name,
                 snapshotId: data.options.snapshotId,
                 snapshotDate: data.snapshot.date,
@@ -190,7 +190,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
             }),
         };
         if (this.config.targetDatabase) {
-            database.name = (0, config_util_1.resolveDatabaseName)(this.config.targetDatabase.name, {
+            database.name = (0, config_1.resolveDatabaseName)(this.config.targetDatabase.name, {
                 packageName: data.package.name,
                 snapshotId: data.options.snapshotId,
                 snapshotDate: data.snapshot.date,
@@ -198,7 +198,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
                 database: database.name,
             });
         }
-        const items = (await (0, fs_util_1.readDir)(restorePath))
+        const items = (await (0, fs_1.readDir)(restorePath))
             .map(parseSqlFile)
             .filter((v) => !!v);
         // Database check
@@ -216,7 +216,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
         }
         await this.onCreateDatabase(database);
         if (this.verbose)
-            (0, cli_util_1.logExec)("readdir", [restorePath]);
+            (0, cli_1.logExec)("readdir", [restorePath]);
         let current = 0;
         for (const item of items) {
             const path = (0, path_1.join)(restorePath, item.fileName);
@@ -228,7 +228,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
                 absolute: {
                     total: items.length,
                     current: current,
-                    percent: (0, math_util_1.progressPercent)(items.length, current),
+                    percent: (0, math_1.progressPercent)(items.length, current),
                 },
             });
             await this.onImport(path, database.name);

package/Task/TaskAbstract.d.ts

@@ -2,7 +2,7 @@ import { BackupActionOptionsType } from "../Action/BackupAction";
 import { RestoreActionOptionsType } from "../Action/RestoreAction";
 import { PackageConfigType } from "../Config/PackageConfig";
 import { SnapshotType } from "../Repository/RepositoryAbstract";
-import { Progress } from "../util/progress";
+import { Progress } from "../utils/progress";
 export type BackupDataType = {
     onProgress: (data: Progress) => Promise<void>;
     options: BackupActionOptionsType;

package/Task/TaskAbstract.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskAbstract = void 0;
-const fs_util_1 = require("../util/fs-util");
+const fs_1 = require("../utils/fs");
 class TaskAbstract {
     constructor(config) {
         this.config = config;
         this.tmpDirs = [];
     }
     async mkTmpDir(prefix, id) {
-        const dir = await (0, fs_util_1.mkTmpDir)(prefix, id);
+        const dir = await (0, fs_1.mkTmpDir)(prefix, id);
         this.tmpDirs.push(dir);
         return dir;
     }

package/cli.js

@@ -8,13 +8,13 @@ const ConfigAction_1 = require("./Action/ConfigAction");
 const AppError_1 = require("./Error/AppError");
 const CommandFactory_1 = require("./Factory/CommandFactory");
 const globalData_1 = __importDefault(require("./globalData"));
-const cli_util_1 = require("./util/cli-util");
-const fs_util_1 = require("./util/fs-util");
-const process_util_1 = require("./util/process-util");
-const string_util_1 = require("./util/string-util");
+const cli_1 = require("./utils/cli");
+const fs_1 = require("./utils/fs");
+const process_1 = require("./utils/process");
+const string_1 = require("./utils/string");
 const chalk_1 = require("chalk");
 const commander_1 = require("commander");
-const fs_1 = require("fs");
+const fs_2 = require("fs");
 const path_1 = require("path");
 function getGlobalOptions() {
     return program.opts();
@@ -72,7 +72,7 @@ function makeCommandAction(command) {
     };
 }
 const program = new commander_1.Command();
-const { version, description } = (0, fs_util_1.parsePackageFile)();
+const { version, description } = (0, fs_1.parsePackageFile)();
 const cwd = process.cwd();
 program.name("datatruck");
 program.version(version);
@@ -94,7 +94,7 @@ makeCommand(CommandFactory_1.CommandEnum.restoreSessions).alias("rs");
 makeCommand(CommandFactory_1.CommandEnum.cleanCache).alias("cc");
 function buildArgs(input, options) {
     const optionsArray = Object.keys(options).flatMap((name) => [
-        `--${(0, string_util_1.snakeCase)(name, "-")}`,
+        `--${(0, string_1.snakeCase)(name, "-")}`,
         options[name],
     ]);
     return [input, ...optionsArray];
@@ -103,16 +103,16 @@ exports.buildArgs = buildArgs;
 function parseArgs(args) {
     program.parse(args);
     const verbose = getGlobalOptions().verbose;
-    (0, process_util_1.onExit)((eventName, error) => {
+    (0, process_1.onExit)((eventName, error) => {
         if (eventName !== "exit") {
-            process.stdout.write(cli_util_1.showCursorCommand);
+            process.stdout.write(cli_1.showCursorCommand);
             console.info(`\nClosing... (reason: ${eventName})`);
             if (error instanceof Error)
                 console.error((0, chalk_1.red)(error.stack));
         }
         if (!verbose)
             try {
-                (0, fs_1.rmSync)((0, fs_util_1.sessionTmpDir)(), {
+                (0, fs_2.rmSync)((0, fs_1.sessionTmpDir)(), {
                     force: true,
                     recursive: true,
                     maxRetries: 5,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.17.1",
+  "version": "0.17.2",
   "dependencies": {
     "ajv": "^8.11.2",
     "async": "^3.2.4",

package/{util/GitUtil.d.ts → utils/Git.d.ts}

@@ -1,5 +1,5 @@
-import { ExecSettingsInterface } from "./process-util";
-export declare class GitUtil {
+import { ExecSettingsInterface } from "./process";
+export declare class Git {
     readonly options: {
         dir: string;
         log?: boolean;
@@ -8,22 +8,22 @@ export declare class GitUtil {
         dir: string;
         log?: boolean;
     });
-    exec(args: string[], settings?: ExecSettingsInterface, cwd?: boolean): Promise<import("./process-util").ExecResultType>;
+    exec(args: string[], settings?: ExecSettingsInterface, cwd?: boolean): Promise<import("./process").ExecResultType>;
     canBeInit(repo: string): Promise<boolean>;
     clone(options: {
         repo: string;
         branch?: string;
         orphan?: boolean;
-    }): Promise<import("./process-util").ExecResultType>;
+    }): Promise<import("./process").ExecResultType>;
     checkout(options: {
         branchName: string;
         orphan?: boolean;
-    }): Promise<import("./process-util").ExecResultType>;
+    }): Promise<import("./process").ExecResultType>;
     checkBranch(options: {
         name: string;
         repo?: string;
     }): Promise<boolean>;
-    removeAll(): Promise<import("./process-util").ExecResultType>;
+    removeAll(): Promise<import("./process").ExecResultType>;
     haveChanges(): Promise<boolean>;
     fetchCommitId(tag: string): Promise<string>;
     getTags(names?: string[]): Promise<{
@@ -31,8 +31,8 @@ export declare class GitUtil {
         message?: string | undefined;
     }[]>;
     addTag(name: string, message?: string): Promise<void>;
-    pushTags(): Promise<import("./process-util").ExecResultType>;
+    pushTags(): Promise<import("./process").ExecResultType>;
     push(options: {
         branchName: string;
-    }): Promise<import("./process-util").ExecResultType>;
+    }): Promise<import("./process").ExecResultType>;
 }

package/{util/GitUtil.js → utils/Git.js}

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GitUtil = void 0;
-const fs_util_1 = require("./fs-util");
-const process_util_1 = require("./process-util");
-class GitUtil {
+exports.Git = void 0;
+const fs_1 = require("./fs");
+const process_1 = require("./process");
+class Git {
     constructor(options) {
         this.options = options;
     }
     async exec(args, settings, cwd) {
-        return await (0, process_util_1.exec)("git", args, { cwd: cwd === false ? undefined : this.options.dir }, {
+        return await (0, process_1.exec)("git", args, { cwd: cwd === false ? undefined : this.options.dir }, {
             log: this.options.log,
             ...(settings ?? {}),
         });
     }
     async canBeInit(repo) {
-        return ((0, fs_util_1.isLocalDir)(repo) &&
-            (!(await (0, fs_util_1.checkDir)(repo)) || !(await (0, fs_util_1.readDir)(repo)).length));
+        return ((0, fs_1.isLocalDir)(repo) &&
+            (!(await (0, fs_1.checkDir)(repo)) || !(await (0, fs_1.readDir)(repo)).length));
     }
     async clone(options) {
         return await this.exec([
@@ -101,4 +101,4 @@ class GitUtil {
         ]);
     }
 }
-exports.GitUtil = GitUtil;
+exports.Git = Git;

package/{util/ResticUtil.d.ts → utils/Restic.d.ts}

@@ -1,5 +1,5 @@
-import { ExecResultType, ExecSettingsInterface } from "./process-util";
-import { UriType } from "./string-util";
+import { ExecResultType, ExecSettingsInterface } from "./process";
+import { UriType } from "./string";
 export type RepositoryType = {
     name?: string;
     env?: Record<string, string>;
@@ -36,7 +36,7 @@ export type BackupStreamType = {
     total_duration: number;
     snapshot_id: string;
 };
-export declare class ResticUtil {
+export declare class Restic {
     readonly options: {
         log?: boolean;
         env: Record<string, string>;

package/{util/ResticUtil.js → utils/Restic.js}

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ResticUtil = void 0;
-const fs_util_1 = require("./fs-util");
-const process_util_1 = require("./process-util");
-const string_util_1 = require("./string-util");
+exports.Restic = void 0;
+const fs_1 = require("./fs");
+const process_1 = require("./process");
+const string_1 = require("./string");
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
-class ResticUtil {
+class Restic {
     constructor(options) {
         this.options = options;
     }
@@ -24,10 +24,10 @@ class ResticUtil {
                     : (await (0, promises_1.readFile)(input.password.path)).toString(),
             };
         }
-        return `${input.backend}:${(0, string_util_1.formatUri)({ ...input, password: input.password }, hidePassword)}`;
+        return `${input.backend}:${(0, string_1.formatUri)({ ...input, password: input.password }, hidePassword)}`;
     }
     async exec(args, settings, options) {
-        return await (0, process_util_1.exec)("restic", args, {
+        return await (0, process_1.exec)("restic", args, {
             stdio: ["ignore", "pipe", "pipe"],
             env: { ...process.env, ...this.options.env },
             cwd: options?.cwd,
@@ -185,7 +185,7 @@ class ResticUtil {
         const progressInterval = options.progressInterval ?? 30000;
         async function progressRutine() {
             try {
-                const total_bytes = await (0, fs_util_1.fastFolderSizeAsync)(options.target);
+                const total_bytes = await (0, fs_1.fastFolderSizeAsync)(options.target);
                 options.onStream?.({
                     message_type: "restore-status",
                     total_bytes,
@@ -219,4 +219,4 @@ class ResticUtil {
         }
     }
 }
-exports.ResticUtil = ResticUtil;
+exports.Restic = Restic;

package/{util/datatruck/config-util.js → utils/datatruck/config.js}

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.params = exports.dbNameParams = exports.pkgRestorePathParams = exports.pkgExcludeParams = exports.pkgIncludeParams = exports.pkgPathParams = exports.resolvePackages = exports.resolvePackage = exports.resolveDatabaseName = exports.resolvePackagePath = exports.filterPackages = exports.filterRepository = exports.findRepositoryOrFail = void 0;
 const AppError_1 = require("../../Error/AppError");
-const fs_util_1 = require("../fs-util");
-const string_util_1 = require("../string-util");
+const fs_1 = require("../fs");
+const string_1 = require("../string");
 const micromatch_1 = require("micromatch");
 function findRepositoryOrFail(config, repositoryName) {
     const repo = config.repositories.find((v) => v.name === repositoryName);
@@ -21,8 +21,8 @@ function filterRepository(repository, action) {
 }
 exports.filterRepository = filterRepository;
 function filterPackages(config, options) {
-    const packagePatterns = (0, string_util_1.makePathPatterns)(options.packageNames);
-    const taskNamePatterns = (0, string_util_1.makePathPatterns)(options.packageTaskNames);
+    const packagePatterns = (0, string_1.makePathPatterns)(options.packageNames);
+    const taskNamePatterns = (0, string_1.makePathPatterns)(options.packageTaskNames);
     return config.packages
         .map((pkg) => {
         pkg = Object.assign({}, pkg);
@@ -38,7 +38,7 @@ function filterPackages(config, options) {
         return pkg;
     })
         .filter((pkg) => {
-        if (taskNamePatterns && !(0, string_util_1.checkMatch)(pkg.task?.name, taskNamePatterns))
+        if (taskNamePatterns && !(0, string_1.checkMatch)(pkg.task?.name, taskNamePatterns))
             return false;
         return ((typeof pkg.enabled !== "boolean" || pkg.enabled) &&
             !!pkg.repositoryNames?.length &&
@@ -47,16 +47,16 @@ function filterPackages(config, options) {
 }
 exports.filterPackages = filterPackages;
 function resolvePackagePath(value, params) {
-    return (0, string_util_1.render)(value, {
+    return (0, string_1.render)(value, {
         ...params,
         ...{
-            temp: (0, fs_util_1.tmpDir)("pkg"),
+            temp: (0, fs_1.tmpDir)("pkg"),
         },
     });
 }
 exports.resolvePackagePath = resolvePackagePath;
 function resolveDatabaseName(value, params) {
-    return (0, string_util_1.render)(value, params);
+    return (0, string_1.render)(value, params);
 }
 exports.resolveDatabaseName = resolveDatabaseName;
 function resolvePackage(pkg, params) {
@@ -67,9 +67,9 @@ function resolvePackage(pkg, params) {
         path: undefined,
     };
     if (pkg.include)
-        pkg.include = pkg.include.map((v) => typeof v === "string" ? (0, string_util_1.render)(v, pkgParams) : v);
+        pkg.include = pkg.include.map((v) => typeof v === "string" ? (0, string_1.render)(v, pkgParams) : v);
     if (pkg.exclude)
-        pkg.exclude = pkg.exclude.map((v) => typeof v === "string" ? (0, string_util_1.render)(v, pkgParams) : v);
+        pkg.exclude = pkg.exclude.map((v) => typeof v === "string" ? (0, string_1.render)(v, pkgParams) : v);
     if (pkg.path)
         pkg.path = resolvePackagePath(pkg.path, pkgParams);
     if (pkg.restorePath)

package/{util/datatruck/paths-util.js → utils/datatruck/paths.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parsePaths = void 0;
-const process_util_1 = require("../process-util");
+const process_1 = require("../process");
 async function parsePaths(values, options) {
     let paths = [];
     for (const value of values) {
@@ -9,7 +9,7 @@ async function parsePaths(values, options) {
             paths.push(value);
         }
         else if (value.type === "spawn") {
-            const spawnResult = await (0, process_util_1.exec)(value.command, value.args, { cwd: options.cwd }, { log: options.verbose, stderr: { save: true }, stdout: { save: true } });
+            const spawnResult = await (0, process_1.exec)(value.command, value.args, { cwd: options.cwd }, { log: options.verbose, stderr: { save: true }, stdout: { save: true } });
             const spawnFiles = [spawnResult.stderr, spawnResult.stdout].flatMap((text) => text
                 .split(/\r?\n/)
                 .map((v) => v.trim())

package/{util/datatruck/snapshot-util.d.ts → utils/datatruck/snapshot.d.ts}

@@ -1,4 +1,4 @@
 import { SnapshotGroupByType } from "../../Action/SnapshotsAction";
 import { SnapshotResultType } from "../../Repository/RepositoryAbstract";
-import { FilterByLastOptionsType } from "../date-util";
+import { FilterByLastOptionsType } from "../date";
 export declare function groupAndFilter<TSnapshot extends SnapshotResultType>(snapshots: TSnapshot[], groupByKey?: SnapshotGroupByType[], filter?: FilterByLastOptionsType | ((groupedSnapshots: TSnapshot[]) => FilterByLastOptionsType), reasons?: Record<number, string[]>): TSnapshot[];

package/{util/datatruck/snapshot-util.js → utils/datatruck/snapshot.js}

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.groupAndFilter = void 0;
-const date_util_1 = require("../date-util");
-const object_util_1 = require("../object-util");
+const date_1 = require("../date");
+const object_1 = require("../object");
 function groupAndFilter(snapshots, groupByKey, filter, reasons) {
     const grouped = groupByKey?.length
-        ? (0, object_util_1.groupBy)(snapshots, groupByKey)
+        ? (0, object_1.groupBy)(snapshots, groupByKey)
         : { "": snapshots };
     const result = [];
     for (const key in grouped) {
@@ -13,7 +13,7 @@ function groupAndFilter(snapshots, groupByKey, filter, reasons) {
             const groupReasons = reasons
                 ? {}
                 : undefined;
-            result.push(...(0, date_util_1.filterByLast)(grouped[key], typeof filter === "function" ? filter(grouped[key]) : filter, groupReasons));
+            result.push(...(0, date_1.filterByLast)(grouped[key], typeof filter === "function" ? filter(grouped[key]) : filter, groupReasons));
             if (groupReasons && reasons) {
                 for (const groupItemIndex in groupReasons) {
                     const snapshot = grouped[key][groupItemIndex];

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

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createChron = exports.filterByLast = void 0;
-const string_util_1 = require("./string-util");
+const string_1 = require("./string");
 const dayjs_1 = __importDefault(require("dayjs"));
 const advancedFormat_1 = __importDefault(require("dayjs/plugin/advancedFormat"));
 const isoWeek_1 = __importDefault(require("dayjs/plugin/isoWeek"));
@@ -82,7 +82,7 @@ function createChron() {
                 throw new Error(`Chron was not started`);
             const seconds = (Date.now() - startTime) / 1000;
             if (formatted)
-                return (0, string_util_1.formatSeconds)(seconds);
+                return (0, string_1.formatSeconds)(seconds);
             return seconds;
         },
     };

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

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (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;
 const globalData_1 = __importDefault(require("../globalData"));
-const path_util_1 = require("./path-util");
+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 +14,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 +40,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})`);
         }
@@ -100,8 +100,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 +119,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 +127,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 +153,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 +181,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 +261,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 +284,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 +368,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 +385,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,