@datatruck/cli 0.17.0 → 0.17.2

package/Action/BackupAction.d.ts

@@ -5,7 +5,7 @@ import { AppError } from "../Error/AppError";
 import { SnapshotType } from "../Repository/RepositoryAbstract";
 import { BackupSessionManager } from "../SessionManager/BackupSessionManager";
 import { TaskAbstract } from "../Task/TaskAbstract";
-import { IfRequireKeys } from "../util/ts-util";
+import { IfRequireKeys } from "../utils/ts";
 export type BackupActionOptionsType = {
     repositoryNames?: string[];
     repositoryTypes?: string[];

package/Action/BackupAction.js

@@ -4,8 +4,8 @@ exports.BackupAction = void 0;
 const AppError_1 = require("../Error/AppError");
 const RepositoryFactory_1 = require("../Factory/RepositoryFactory");
 const TaskFactory_1 = require("../Factory/TaskFactory");
-const config_util_1 = require("../util/datatruck/config-util");
-const fs_util_1 = require("../util/fs-util");
+const config_1 = require("../utils/datatruck/config");
+const fs_1 = require("../utils/fs");
 const crypto_1 = require("crypto");
 class BackupAction {
     constructor(config, options = {}) {
@@ -20,14 +20,14 @@ class BackupAction {
             date: this.options.date ?? new Date().toISOString(),
         };
         await session.initDrivers();
-        let packages = (0, config_util_1.filterPackages)(this.config, {
+        let packages = (0, config_1.filterPackages)(this.config, {
             packageNames: this.options.packageNames,
             packageTaskNames: this.options.packageTaskNames,
             repositoryNames: this.options.repositoryNames,
             repositoryTypes: this.options.repositoryTypes,
             sourceAction: "backup",
         });
-        packages = (0, config_util_1.resolvePackages)(packages, {
+        packages = (0, config_1.resolvePackages)(packages, {
             snapshotId: snapshot.id,
             snapshotDate: snapshot.date,
             action: "backup",
@@ -44,7 +44,7 @@ class BackupAction {
                     taskName: pkg.task.name,
                 });
             for (const repositoryName of pkg.repositoryNames ?? []) {
-                const repo = (0, config_util_1.findRepositoryOrFail)(this.config, repositoryName);
+                const repo = (0, config_1.findRepositoryOrFail)(this.config, repositoryName);
                 await session.initRepository({
                     sessionId: sessionId,
                     repositoryName: repositoryName,
@@ -208,7 +208,7 @@ class BackupAction {
         const allMirrorRepoNames = [];
         const repoNames = repositoryNames ?? [];
         for (const repoName of repoNames) {
-            const repo = (0, config_util_1.findRepositoryOrFail)(this.config, repoName);
+            const repo = (0, config_1.findRepositoryOrFail)(this.config, repoName);
             if (repo.mirrorRepoNames)
                 mirrorRepoMap[repoName] = repo.mirrorRepoNames.filter((mirrorRepoName) => {
                     allMirrorRepoNames.push(mirrorRepoName);
@@ -250,23 +250,23 @@ class BackupAction {
             }
             const { repoNames, mirrors } = this.splitRepositories(pkg.repositoryNames ?? []);
             for (const repoName of repoNames) {
-                const repo = (0, config_util_1.findRepositoryOrFail)(this.config, repoName);
+                const repo = (0, config_1.findRepositoryOrFail)(this.config, repoName);
                 const { tmpDirs } = await this.backup(session, pkg, repo, snapshot, targetPath);
                 if (!this.options.verbose)
-                    await (0, fs_util_1.rmTmpDir)(tmpDirs);
+                    await (0, fs_1.rmTmpDir)(tmpDirs);
             }
             if (!this.options.verbose) {
-                await (0, fs_util_1.rmTmpDir)(taskTmpDirs);
-                if (pkg.path && (0, fs_util_1.isTmpDir)(pkg.path)) {
-                    await (0, fs_util_1.rmTmpDir)(pkg.path);
+                await (0, fs_1.rmTmpDir)(taskTmpDirs);
+                if (pkg.path && (0, fs_1.isTmpDir)(pkg.path)) {
+                    await (0, fs_1.rmTmpDir)(pkg.path);
                 }
             }
             for (const mirror of mirrors) {
-                const repo = (0, config_util_1.findRepositoryOrFail)(this.config, mirror.sourceName);
-                const mirrorRepo = (0, config_util_1.findRepositoryOrFail)(this.config, mirror.name);
+                const repo = (0, config_1.findRepositoryOrFail)(this.config, mirror.sourceName);
+                const mirrorRepo = (0, config_1.findRepositoryOrFail)(this.config, mirror.name);
                 const { tmpDirs } = await this.copyBackup(session, pkg, repo, mirrorRepo, snapshot);
                 if (!this.options.verbose)
-                    await (0, fs_util_1.rmTmpDir)(tmpDirs);
+                    await (0, fs_1.rmTmpDir)(tmpDirs);
             }
             const error = this.getError(pkg);
             if (error)

package/Action/BackupSessionsAction.d.ts

@@ -1,7 +1,7 @@
 import type { ConfigType } from "../Config/Config";
 import { ReadDataType } from "../SessionDriver/SessionDriverAbstract";
 import { BackupSessionManager } from "../SessionManager/BackupSessionManager";
-import { IfRequireKeys } from "../util/ts-util";
+import { IfRequireKeys } from "../utils/ts";
 export type BackupSessionsActionOptionsType = ReadDataType & {
     verbose?: boolean;
 };

package/Action/CleanCacheAction.d.ts

@@ -1,4 +1,4 @@
-import { IfRequireKeys } from "../util/ts-util";
+import { IfRequireKeys } from "../utils/ts";
 export type CleanCacheActionOptionsType = {
     verbose?: boolean;
 };

package/Action/CleanCacheAction.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CleanCacheAction = void 0;
-const fs_util_1 = require("../util/fs-util");
+const fs_1 = require("../utils/fs");
 const promises_1 = require("fs/promises");
 class CleanCacheAction {
     constructor(options) {
         this.options = options;
     }
     async exec() {
-        const path = (0, fs_util_1.parentTmpDir)();
-        if (await (0, fs_util_1.existsDir)(path))
+        const path = (0, fs_1.parentTmpDir)();
+        if (await (0, fs_1.existsDir)(path))
             await (0, promises_1.rm)(path, {
                 recursive: true,
             });

package/Action/ConfigAction.d.ts

@@ -1,6 +1,6 @@
 import { GlobalOptionsType } from "../Command/CommandAbstract";
 import type { ConfigType } from "../Config/Config";
-import { IfRequireKeys } from "../util/ts-util";
+import { IfRequireKeys } from "../utils/ts";
 export type ConfigActionOptionsType = {
     path: string;
     verbose?: boolean;

package/Action/ConfigAction.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigAction = void 0;
 const AppError_1 = require("../Error/AppError");
 const JsonSchema_1 = require("../JsonSchema/JsonSchema");
-const config_util_1 = require("../util/datatruck/config-util");
-const fs_util_1 = require("../util/fs-util");
+const config_1 = require("../utils/datatruck/config");
+const fs_1 = require("../utils/fs");
 const ajv_1 = __importDefault(require("ajv"));
 const assert_1 = require("assert");
 const path_1 = require("path");
@@ -64,7 +64,7 @@ class ConfigAction {
                 pkg.repositoryNames ?? config.repositories.map((repo) => repo.name);
             (0, assert_1.ok)(Array.isArray(pkg.repositoryNames));
             for (const repoName of pkg.repositoryNames)
-                (0, config_util_1.findRepositoryOrFail)(config, repoName);
+                (0, config_1.findRepositoryOrFail)(config, repoName);
             return pkg;
         });
         return config;
@@ -83,8 +83,8 @@ class ConfigAction {
         }
     }
     async exec() {
-        const path = await (0, fs_util_1.findFile)(this.options.path, "datatruck.config", fs_util_1.parseFileExtensions, "Config path not found");
-        const config = await (0, fs_util_1.parseFile)(path, "config");
+        const path = await (0, fs_1.findFile)(this.options.path, "datatruck.config", fs_1.parseFileExtensions, "Config path not found");
+        const config = await (0, fs_1.parseFile)(path, "config");
         ConfigAction.validate(config);
         ConfigAction.check(config);
         return {

package/Action/InitAction.d.ts

@@ -1,5 +1,5 @@
 import type { ConfigType } from "../Config/Config";
-import { IfRequireKeys } from "../util/ts-util";
+import { IfRequireKeys } from "../utils/ts";
 export type InitActionOptionsType = {
     repositoryNames?: string[];
     repositoryTypes?: string[];

package/Action/InitAction.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InitAction = void 0;
 const RepositoryFactory_1 = require("../Factory/RepositoryFactory");
-const config_util_1 = require("../util/datatruck/config-util");
+const config_1 = require("../utils/datatruck/config");
 class InitAction {
     constructor(config, options) {
         this.config = config;
@@ -11,7 +11,7 @@ class InitAction {
     async exec() {
         const result = [];
         for (const repo of this.config.repositories) {
-            if (!(0, config_util_1.filterRepository)(repo, "init"))
+            if (!(0, config_1.filterRepository)(repo, "init"))
                 continue;
             if (this.options.repositoryNames &&
                 !this.options.repositoryNames.includes(repo.name))

package/Action/PruneAction.d.ts

@@ -1,6 +1,6 @@
 import type { ConfigType } from "../Config/Config";
 import { RepositoryConfigType } from "../Config/RepositoryConfig";
-import { IfRequireKeys } from "../util/ts-util";
+import { IfRequireKeys } from "../utils/ts";
 import { SnapshotExtendedType, SnapshotsActionOptionsType } from "./SnapshotsAction";
 export type PruneActionsOptionsType = {
     ids?: string[];

package/Action/PruneAction.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PruneAction = void 0;
 const RepositoryFactory_1 = require("../Factory/RepositoryFactory");
-const snapshot_util_1 = require("../util/datatruck/snapshot-util");
-const object_util_1 = require("../util/object-util");
+const snapshot_1 = require("../utils/datatruck/snapshot");
+const object_1 = require("../utils/object");
 const SnapshotsAction_1 = require("./SnapshotsAction");
 class PruneAction {
     constructor(config, options) {
@@ -11,7 +11,7 @@ class PruneAction {
         this.options = options;
     }
     async confirm(snapshots) {
-        const repository = (0, object_util_1.groupBy)(this.config.repositories, "name", true);
+        const repository = (0, object_1.groupBy)(this.config.repositories, "name", true);
         for (const snapshot of snapshots) {
             if (!snapshot.exclusionReasons?.length) {
                 const repoInstance = (0, RepositoryFactory_1.RepositoryFactory)(repository[snapshot.repositoryName]);
@@ -38,7 +38,7 @@ class PruneAction {
         };
         const hasInputFilter = Object.values(inputFilter).some(Number);
         const usePrunePolicyConfig = !hasInputFilter && this.options.groupBy?.includes("packageName");
-        const keepSnapshots = (0, snapshot_util_1.groupAndFilter)(snapshots, this.options.groupBy, usePrunePolicyConfig
+        const keepSnapshots = (0, snapshot_1.groupAndFilter)(snapshots, this.options.groupBy, usePrunePolicyConfig
             ? (groupedSnapshots) => {
                 const [firstSnapshot] = groupedSnapshots;
                 const packageName = firstSnapshot.packageName;

package/Action/RestoreAction.d.ts

@@ -5,7 +5,7 @@ import { AppError } from "../Error/AppError";
 import { SnapshotResultType } from "../Repository/RepositoryAbstract";
 import { RestoreSessionManager } from "../SessionManager/RestoreSessionManager";
 import { TaskAbstract } from "../Task/TaskAbstract";
-import { IfRequireKeys } from "../util/ts-util";
+import { IfRequireKeys } from "../utils/ts";
 export type RestoreActionOptionsType = {
     snapshotId: string;
     tags?: string[];

package/Action/RestoreAction.js

@@ -4,11 +4,11 @@ exports.RestoreAction = void 0;
 const AppError_1 = require("../Error/AppError");
 const RepositoryFactory_1 = require("../Factory/RepositoryFactory");
 const TaskFactory_1 = require("../Factory/TaskFactory");
-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 object_util_1 = require("../util/object-util");
-const process_util_1 = require("../util/process-util");
+const cli_1 = require("../utils/cli");
+const config_1 = require("../utils/datatruck/config");
+const fs_1 = require("../utils/fs");
+const object_1 = require("../utils/object");
+const process_1 = require("../utils/process");
 const SnapshotsAction_1 = require("./SnapshotsAction");
 const assert_1 = require("assert");
 const os_1 = require("os");
@@ -40,7 +40,7 @@ class RestoreAction {
                     taskName: pkg.task.name,
                 });
             for (const repositoryName of pkg.repositoryNames ?? []) {
-                const repo = (0, config_util_1.findRepositoryOrFail)(this.config, repositoryName);
+                const repo = (0, config_1.findRepositoryOrFail)(this.config, repositoryName);
                 await session.initRepository({
                     sessionId: sessionId,
                     repositoryName: repositoryName,
@@ -146,11 +146,11 @@ class RestoreAction {
         try {
             if (typeof pkg.restorePath !== "string")
                 throw new AppError_1.AppError("Restore path is not defined");
-            await (0, fs_util_1.mkdirIfNotExists)(pkg.restorePath);
-            if (!(await (0, fs_util_1.isDirEmpty)(pkg.restorePath)))
+            await (0, fs_1.mkdirIfNotExists)(pkg.restorePath);
+            if (!(await (0, fs_1.isDirEmpty)(pkg.restorePath)))
                 throw new AppError_1.AppError(`Restore path is not empty: ${pkg.restorePath}`);
             if (this.options.verbose)
-                (0, cli_util_1.logExec)(`restorePath=${pkg.restorePath}`);
+                (0, cli_1.logExec)(`restorePath=${pkg.restorePath}`);
             repoInstance = (0, RepositoryFactory_1.RepositoryFactory)(repo);
             await repoInstance.onRestore({
                 package: pkg,
@@ -167,7 +167,7 @@ class RestoreAction {
                 },
             });
             if (pkg.restorePermissions && (0, os_1.platform)() !== "win32")
-                await (0, process_util_1.exec)("chown", [
+                await (0, process_1.exec)("chown", [
                     "-R",
                     `${pkg.restorePermissions.uid}:${pkg.restorePermissions.gid}`,
                     pkg.restorePath,
@@ -176,7 +176,7 @@ class RestoreAction {
                 });
         }
         catch (error) {
-            (0, object_util_1.push)(this.repoErrors, pkg.name, (repoError = error));
+            (0, object_1.push)(this.repoErrors, pkg.name, (repoError = error));
         }
         await session.endRepository({
             id: repositoryId,
@@ -209,11 +209,11 @@ class RestoreAction {
         const snapshots = this.groupSnapshots(await this.findSnapshots());
         if (!snapshots.length)
             throw new AppError_1.AppError("None snapshot found");
-        let packages = (0, config_util_1.filterPackages)(this.config, {
+        let packages = (0, config_1.filterPackages)(this.config, {
             ...this.options,
             sourceAction: "restore",
         });
-        packages = (0, config_util_1.resolvePackages)(packages, {
+        packages = (0, config_1.resolvePackages)(packages, {
             snapshotId: this.options.snapshotId,
             snapshotDate: snapshots[0].date,
             action: "restore",
@@ -223,7 +223,7 @@ class RestoreAction {
         let sessionErrors = 0;
         for (const [snapshot, pkg] of snapshotAndConfigs) {
             (0, assert_1.ok)(pkg);
-            const repo = (0, config_util_1.findRepositoryOrFail)(this.config, snapshot.repositoryName);
+            const repo = (0, config_1.findRepositoryOrFail)(this.config, snapshot.repositoryName);
             const id = session.findId({
                 packageName: pkg.name,
             });
@@ -244,10 +244,10 @@ class RestoreAction {
                 await this.task(session, pkg, taskInstance, snapshot, targetPath);
             }
             if (!this.options.verbose) {
-                await (0, fs_util_1.rmTmpDir)(taskInstance?.tmpDirs || []);
-                await (0, fs_util_1.rmTmpDir)(tmpDirs);
-                if (pkg.restorePath && (0, fs_util_1.isTmpDir)(pkg.restorePath))
-                    await (0, fs_util_1.rmTmpDir)(pkg.restorePath);
+                await (0, fs_1.rmTmpDir)(taskInstance?.tmpDirs || []);
+                await (0, fs_1.rmTmpDir)(tmpDirs);
+                if (pkg.restorePath && (0, fs_1.isTmpDir)(pkg.restorePath))
+                    await (0, fs_1.rmTmpDir)(pkg.restorePath);
             }
             const error = this.getError(pkg);
             await session.end({

package/Action/RestoreSessionsAction.d.ts

@@ -1,7 +1,7 @@
 import type { ConfigType } from "../Config/Config";
 import { ReadDataType } from "../SessionDriver/SessionDriverAbstract";
 import { RestoreSessionManager } from "../SessionManager/RestoreSessionManager";
-import { IfRequireKeys } from "../util/ts-util";
+import { IfRequireKeys } from "../utils/ts";
 export type RestoreSessionsActionOptionsType = ReadDataType & {
     verbose?: boolean;
 };

package/Action/SnapshotsAction.d.ts

@@ -1,7 +1,7 @@
 import type { ConfigType } from "../Config/Config";
 import { RepositoryConfigEnabledActionType } from "../Config/RepositoryConfig";
 import { SnapshotResultType } from "../Repository/RepositoryAbstract";
-import { IfRequireKeys } from "../util/ts-util";
+import { IfRequireKeys } from "../utils/ts";
 export type SnapshotGroupByType = keyof Pick<SnapshotExtendedType, "packageName" | "repositoryName" | "repositoryType">;
 export type SnapshotsActionOptionsType = {
     ids?: string[];

package/Action/SnapshotsAction.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SnapshotsAction = void 0;
 const RepositoryFactory_1 = require("../Factory/RepositoryFactory");
-const config_util_1 = require("../util/datatruck/config-util");
-const snapshot_util_1 = require("../util/datatruck/snapshot-util");
+const config_1 = require("../utils/datatruck/config");
+const snapshot_1 = require("../utils/datatruck/snapshot");
 class SnapshotsAction {
     constructor(config, options) {
         this.config = config;
@@ -14,7 +14,7 @@ class SnapshotsAction {
             sourceAction = "snapshots";
         let result = [];
         for (const repo of this.config.repositories) {
-            if (!(0, config_util_1.filterRepository)(repo, sourceAction))
+            if (!(0, config_1.filterRepository)(repo, sourceAction))
                 continue;
             if (this.options.repositoryNames &&
                 !this.options.repositoryNames.includes(repo.name))
@@ -42,7 +42,7 @@ class SnapshotsAction {
             result.push(...extentedItems);
         }
         result = result.sort((a, b) => b.date.localeCompare(a.date));
-        return (0, snapshot_util_1.groupAndFilter)(result, this.options.groupBy, this.options);
+        return (0, snapshot_1.groupAndFilter)(result, this.options.groupBy, this.options);
     }
 }
 exports.SnapshotsAction = SnapshotsAction;

package/Command/BackupCommand.d.ts

@@ -1,5 +1,5 @@
 import { RepositoryConfigType } from "../Config/RepositoryConfig";
-import { If } from "../util/ts-util";
+import { If } from "../utils/ts";
 import { CommandAbstract } from "./CommandAbstract";
 export type BackupCommandOptionsType<TResolved = false> = {
     package?: If<TResolved, string[]>;
@@ -11,6 +11,6 @@ export type BackupCommandOptionsType<TResolved = false> = {
     date?: string;
 };
 export declare class BackupCommand extends CommandAbstract<BackupCommandOptionsType<false>, BackupCommandOptionsType<true>> {
-    onOptions(): import("../util/cli-util").OptionsType<BackupCommandOptionsType<false>, BackupCommandOptionsType<true>>;
+    onOptions(): import("../utils/cli").OptionsType<BackupCommandOptionsType<false>, BackupCommandOptionsType<true>>;
     onExec(): Promise<0 | 1>;
 }

package/Command/BackupCommand.js

@@ -7,7 +7,7 @@ const AppError_1 = require("../Error/AppError");
 const ConsoleSessionDriver_1 = require("../SessionDriver/ConsoleSessionDriver");
 const SqliteSessionDriver_1 = require("../SessionDriver/SqliteSessionDriver");
 const BackupSessionManager_1 = require("../SessionManager/BackupSessionManager");
-const string_util_1 = require("../util/string-util");
+const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
 class BackupCommand extends CommandAbstract_1.CommandAbstract {
     onOptions() {
@@ -19,27 +19,27 @@ class BackupCommand extends CommandAbstract_1.CommandAbstract {
             package: {
                 description: "Filter by package names",
                 option: "-p,--package <values>",
-                parser: string_util_1.parseStringList,
+                parser: string_1.parseStringList,
             },
             packageTask: {
                 description: "Filter by package task names",
                 option: "-pt,--package-task <values>",
-                parser: string_util_1.parseStringList,
+                parser: string_1.parseStringList,
             },
             repository: {
                 description: "Filter by repository names",
                 option: "-r,--repository <values>",
-                parser: string_util_1.parseStringList,
+                parser: string_1.parseStringList,
             },
             repositoryType: {
                 description: "Filter by repository types",
                 option: "-rt,--repository-type <values>",
-                parser: (v) => (0, string_util_1.parseStringList)(v),
+                parser: (v) => (0, string_1.parseStringList)(v),
             },
             tag: {
                 description: "Filter by tags",
                 option: "-t,--tag <values>",
-                parser: string_util_1.parseStringList,
+                parser: string_1.parseStringList,
             },
             date: {
                 description: "Date time (ISO)",

package/Command/BackupSessionsCommand.d.ts

@@ -1,4 +1,4 @@
-import { If } from "../util/ts-util";
+import { If } from "../utils/ts";
 import { CommandAbstract } from "./CommandAbstract";
 export type BackupSessionsCommandOptionsType<TResolved = false> = {
     package?: If<TResolved, string[]>;
@@ -7,6 +7,6 @@ export type BackupSessionsCommandOptionsType<TResolved = false> = {
     limit?: number;
 };
 export declare class BackupSessionsCommand extends CommandAbstract<BackupSessionsCommandOptionsType<false>, BackupSessionsCommandOptionsType<true>> {
-    onOptions(): import("../util/cli-util").OptionsType<BackupSessionsCommandOptionsType<false>, BackupSessionsCommandOptionsType<true>>;
+    onOptions(): import("../utils/cli").OptionsType<BackupSessionsCommandOptionsType<false>, BackupSessionsCommandOptionsType<true>>;
     onExec(): Promise<number>;
 }

package/Command/BackupSessionsCommand.js

@@ -5,9 +5,9 @@ const BackupSessionsAction_1 = require("../Action/BackupSessionsAction");
 const ConfigAction_1 = require("../Action/ConfigAction");
 const SqliteSessionDriver_1 = require("../SessionDriver/SqliteSessionDriver");
 const BackupSessionManager_1 = require("../SessionManager/BackupSessionManager");
-const DataFormat_1 = require("../util/DataFormat");
-const cli_util_1 = require("../util/cli-util");
-const string_util_1 = require("../util/string-util");
+const DataFormat_1 = require("../utils/DataFormat");
+const cli_1 = require("../utils/cli");
+const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
 class BackupSessionsCommand extends CommandAbstract_1.CommandAbstract {
     onOptions() {
@@ -15,17 +15,17 @@ class BackupSessionsCommand extends CommandAbstract_1.CommandAbstract {
             package: {
                 description: "Filter by package names",
                 option: "-p,--package <values>",
-                parser: string_util_1.parseStringList,
+                parser: string_1.parseStringList,
             },
             repository: {
                 description: "Filter by repository names",
                 option: "-r,--repository <values>",
-                parser: string_util_1.parseStringList,
+                parser: string_1.parseStringList,
             },
             tag: {
                 description: "Filter by tags",
                 option: "-t,--tag <values>",
-                parser: string_util_1.parseStringList,
+                parser: string_1.parseStringList,
             },
             limit: {
                 description: "Limit",
@@ -67,14 +67,14 @@ class BackupSessionsCommand extends CommandAbstract_1.CommandAbstract {
                     "",
                 ],
                 handler: (item) => [
-                    (0, cli_util_1.resultColumn)(item.error, item.state),
+                    (0, cli_1.resultColumn)(item.error, item.state),
                     item.id,
                     item.snapshotId.slice(0, 8),
-                    (0, string_util_1.formatDateTime)(item.creationDate),
+                    (0, string_1.formatDateTime)(item.creationDate),
                     item.repositoryName,
                     item.repositoryType,
                     item.packageName,
-                    (0, cli_util_1.errorColumn)(item.error, verbose),
+                    (0, cli_1.errorColumn)(item.error, verbose),
                 ],
             },
         });

package/Command/CleanCacheCommand.d.ts

@@ -1,6 +1,6 @@
 import { CommandAbstract } from "./CommandAbstract";
 export type CleanCacheCommandOptionsType<TResolved = false> = {};
 export declare class CleanCacheCommand extends CommandAbstract<CleanCacheCommandOptionsType<false>, CleanCacheCommandOptionsType<true>> {
-    onOptions(): import("../util/cli-util").OptionsType<CleanCacheCommandOptionsType<false>, CleanCacheCommandOptionsType<true>>;
+    onOptions(): import("../utils/cli").OptionsType<CleanCacheCommandOptionsType<false>, CleanCacheCommandOptionsType<true>>;
     onExec(): Promise<number>;
 }

package/Command/CleanCacheCommand.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CleanCacheCommand = void 0;
 const CleanCacheAction_1 = require("../Action/CleanCacheAction");
-const fs_util_1 = require("../util/fs-util");
+const fs_1 = require("../utils/fs");
 const CommandAbstract_1 = require("./CommandAbstract");
 class CleanCacheCommand extends CommandAbstract_1.CommandAbstract {
     onOptions() {
@@ -12,7 +12,7 @@ class CleanCacheCommand extends CommandAbstract_1.CommandAbstract {
         const action = new CleanCacheAction_1.CleanCacheAction({
             verbose: !!this.globalOptions.verbose,
         });
-        console.info(`Cleaning ${(0, fs_util_1.parentTmpDir)()}...`);
+        console.info(`Cleaning ${(0, fs_1.parentTmpDir)()}...`);
         await action.exec();
         return 0;
     }

package/Command/CommandAbstract.d.ts

@@ -1,7 +1,7 @@
 import { ConfigType } from "../Config/Config";
-import { FormatType } from "../util/DataFormat";
-import { OptionsType } from "../util/cli-util";
-import { SimilarObject } from "../util/ts-util";
+import { FormatType } from "../utils/DataFormat";
+import { OptionsType } from "../utils/cli";
+import { SimilarObject } from "../utils/ts";
 export type GlobalOptionsType<TResolved = false> = {
     config: string | ConfigType;
     outputFormat?: FormatType;

package/Command/CommandAbstract.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandAbstract = void 0;
-const cli_util_1 = require("../util/cli-util");
+const cli_1 = require("../utils/cli");
 class CommandAbstract {
     constructor(globalOptions, options) {
         this.globalOptions = globalOptions;
-        this.options = (0, cli_util_1.parseOptions)(options, this.onOptions());
+        this.options = (0, cli_1.parseOptions)(options, this.onOptions());
     }
     returnsOptions(options) {
         return options;

package/Command/ConfigCommand.d.ts

@@ -1,5 +1,5 @@
 import { RepositoryConfigType } from "../Config/RepositoryConfig";
-import { If } from "../util/ts-util";
+import { If } from "../utils/ts";
 import { CommandAbstract } from "./CommandAbstract";
 export type ConfigCommandOptionsType<TResolved = false> = {
     package?: If<TResolved, string[]>;
@@ -13,6 +13,6 @@ export type ConfigCommandLogType = {
     taskName: string | undefined;
 }[];
 export declare class ConfigCommand extends CommandAbstract<ConfigCommandOptionsType<false>, ConfigCommandOptionsType<true>> {
-    onOptions(): import("../util/cli-util").OptionsType<ConfigCommandOptionsType<false>, ConfigCommandOptionsType<true>>;
+    onOptions(): import("../utils/cli").OptionsType<ConfigCommandOptionsType<false>, ConfigCommandOptionsType<true>>;
     onExec(): Promise<number>;
 }

package/Command/ConfigCommand.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigCommand = void 0;
 const ConfigAction_1 = require("../Action/ConfigAction");
-const DataFormat_1 = require("../util/DataFormat");
-const config_util_1 = require("../util/datatruck/config-util");
-const string_util_1 = require("../util/string-util");
+const DataFormat_1 = require("../utils/DataFormat");
+const config_1 = require("../utils/datatruck/config");
+const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
 class ConfigCommand extends CommandAbstract_1.CommandAbstract {
     onOptions() {
@@ -12,28 +12,28 @@ class ConfigCommand extends CommandAbstract_1.CommandAbstract {
             package: {
                 description: "Filter by package names",
                 option: "-p,--package <values>",
-                parser: string_util_1.parseStringList,
+                parser: string_1.parseStringList,
             },
             packageTask: {
                 description: "Filter by package task names",
                 option: "-pt,--package-task <values>",
-                parser: string_util_1.parseStringList,
+                parser: string_1.parseStringList,
             },
             repository: {
                 description: "Filter by repository names",
                 option: "-r,--repository <values>",
-                parser: string_util_1.parseStringList,
+                parser: string_1.parseStringList,
             },
             repositoryType: {
                 description: "Filter by repository types",
                 option: "-rt,--repository-type <values>",
-                parser: (v) => (0, string_util_1.parseStringList)(v),
+                parser: (v) => (0, string_1.parseStringList)(v),
             },
         });
     }
     async onExec() {
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
-        const packages = (0, config_util_1.filterPackages)(config, {
+        const packages = (0, config_1.filterPackages)(config, {
             packageNames: this.options.package,
             packageTaskNames: this.options.packageTask,
             repositoryNames: this.options.repository,