refactor(cli): rename files

swordev · Dec 13, 2023 · 78a4b88 · 78a4b88
1 parent 2ced436
commit 78a4b88
Show file tree

Hide file tree

Showing 21 changed files with 120 additions and 110 deletions.
diff --git a/packages/cli/src/Action/BackupAction.ts b/packages/cli/src/Action/BackupAction.ts
@@ -1,8 +1,6 @@
 import type { Config } from "../Config/Config";
 import { PackageConfig } from "../Config/PackageConfig";
 import { RepositoryConfig } from "../Config/RepositoryConfig";
-import { createRepo } from "../Factory/RepositoryFactory";
-import { createTask } from "../Factory/TaskFactory";
 import { PreSnapshot } from "../Repository/RepositoryAbstract";
 import { DataFormat } from "../utils/DataFormat";
 import { renderError, renderObject, renderResult } from "../utils/cli";
@@ -11,6 +9,8 @@ import {
   findRepositoryOrFail,
   resolvePackages,
 } from "../utils/datatruck/config";
+import { createRepo } from "../utils/datatruck/repository";
+import { createTask } from "../utils/datatruck/task";
 import { duration } from "../utils/date";
 import { ensureExistsDir } from "../utils/fs";
 import { Listr3, Listr3TaskResultEnd } from "../utils/list";
@@ -184,32 +184,38 @@ export class BackupAction<TRequired extends boolean = true> {
             `${item.data.pruned}/${item.data.total}`,
           )}`
         : item.key === "snapshot"
-        ? item.data.id
-        : item.key === "task"
-        ? `${item.data.packageName} ${g(item.data.taskName)}`
-        : item.key === "backup"
-        ? `${item.data.packageName} ${g(item.data.repositoryName)}`
-        : item.key === "copy"
-        ? `${item.data.packageName} ${g(item.data.mirrorRepositoryName)}`
-        : item.key === "summary"
-        ? renderObject(
-            {
-              errors: item.data.errors,
-              backups: result.filter((r) => !r.error && r.key === "backup")
-                .length,
-              copies: result.filter((r) => !r.error && r.key === "copy").length,
-              prunes: result
-                .filter((r) => !r.error && r.key === "prune")
-                .reduce((result, item) => {
-                  if (item.key === "prune") result += item.data.pruned;
-                  return result;
-                }, 0),
-            },
-            color,
-          )
-        : item.key === "report"
-        ? item.data.type
-        : "";
+          ? item.data.id
+          : item.key === "task"
+            ? `${item.data.packageName} ${g(item.data.taskName)}`
+            : item.key === "backup"
+              ? `${item.data.packageName} ${g(item.data.repositoryName)}`
+              : item.key === "copy"
+                ? `${item.data.packageName} ${g(
+                    item.data.mirrorRepositoryName,
+                  )}`
+                : item.key === "summary"
+                  ? renderObject(
+                      {
+                        errors: item.data.errors,
+                        backups: result.filter(
+                          (r) => !r.error && r.key === "backup",
+                        ).length,
+                        copies: result.filter(
+                          (r) => !r.error && r.key === "copy",
+                        ).length,
+                        prunes: result
+                          .filter((r) => !r.error && r.key === "prune")
+                          .reduce((result, item) => {
+                            if (item.key === "prune")
+                              result += item.data.pruned;
+                            return result;
+                          }, 0),
+                      },
+                      color,
+                    )
+                  : item.key === "report"
+                    ? item.data.type
+                    : "";
     };
     return new DataFormat({
       streams: options.streams,

diff --git a/packages/cli/src/Action/ConfigAction.ts b/packages/cli/src/Action/ConfigAction.ts
@@ -1,9 +1,9 @@
 import { GlobalOptions } from "../Command/CommandAbstract";
 import type { Config } from "../Config/Config";
 import { RepositoryConfig } from "../Config/RepositoryConfig";
-import { AppError } from "../Error/AppError";
 import { configSchema } from "../config.schema";
 import { findRepositoryOrFail } from "../utils/datatruck/config";
+import { AppError } from "../utils/datatruck/error";
 import { findFile, parseFile, parseFileExtensions } from "../utils/fs";
 import { IfRequireKeys } from "../utils/ts";
 import Ajv from "ajv";

diff --git a/packages/cli/src/Action/CopyAction.ts b/packages/cli/src/Action/CopyAction.ts
@@ -1,5 +1,4 @@
 import type { Config } from "../Config/Config";
-import { createRepo } from "../Factory/RepositoryFactory";
 import { Snapshot } from "../Repository/RepositoryAbstract";
 import { DataFormat } from "../utils/DataFormat";
 import { renderError, renderObject, renderResult } from "../utils/cli";
@@ -8,6 +7,7 @@ import {
   filterRepository,
   findRepositoryOrFail,
 } from "../utils/datatruck/config";
+import { createRepo } from "../utils/datatruck/repository";
 import { groupAndFilter } from "../utils/datatruck/snapshot";
 import { duration } from "../utils/date";
 import { Listr3, Listr3TaskResultEnd } from "../utils/list";
@@ -74,26 +74,26 @@ export class CopyAction<TRequired extends boolean = true> {
       return item.key === "snapshots"
         ? item.data.snapshots.length
         : item.key === "copy"
-        ? `${item.data.packageName} ${g(
-            [
-              item.data.snapshotId.slice(0, 8),
-              item.data.mirrorRepositoryName,
-            ].join(" "),
-          )}`
-        : item.key === "summary"
-        ? renderObject(
-            {
-              errors: item.data.errors,
-              copied: items.filter(
-                (i) => i.key === "copy" && !i.error && !i.data.skipped,
-              ).length,
-              skipped: items.filter(
-                (i) => i.key === "copy" && !i.error && i.data.skipped,
-              ).length,
-            },
-            color,
-          )
-        : "";
+          ? `${item.data.packageName} ${g(
+              [
+                item.data.snapshotId.slice(0, 8),
+                item.data.mirrorRepositoryName,
+              ].join(" "),
+            )}`
+          : item.key === "summary"
+            ? renderObject(
+                {
+                  errors: item.data.errors,
+                  copied: items.filter(
+                    (i) => i.key === "copy" && !i.error && !i.data.skipped,
+                  ).length,
+                  skipped: items.filter(
+                    (i) => i.key === "copy" && !i.error && i.data.skipped,
+                  ).length,
+                },
+                color,
+              )
+            : "";
     };
     return new DataFormat({
       streams: options.streams,

diff --git a/packages/cli/src/Action/InitAction.ts b/packages/cli/src/Action/InitAction.ts
@@ -1,6 +1,6 @@
 import type { Config } from "../Config/Config";
-import { createRepo } from "../Factory/RepositoryFactory";
 import { filterRepository } from "../utils/datatruck/config";
+import { createRepo } from "../utils/datatruck/repository";
 import { IfRequireKeys } from "../utils/ts";
 
 export type InitActionOptions = {

diff --git a/packages/cli/src/Action/PruneAction.ts b/packages/cli/src/Action/PruneAction.ts
@@ -1,6 +1,6 @@
 import type { Config } from "../Config/Config";
 import { RepositoryConfig } from "../Config/RepositoryConfig";
-import { createRepo } from "../Factory/RepositoryFactory";
+import { createRepo } from "../utils/datatruck/repository";
 import { groupAndFilter } from "../utils/datatruck/snapshot";
 import { KeepObject, createFilterByLastOptions } from "../utils/date";
 import { groupBy } from "../utils/object";
@@ -82,22 +82,22 @@ export class PruneAction<TRequired extends boolean = true> {
     const keepSnapshots = hasKeepFilter
       ? groupAndFilter(snapshots, this.options.groupBy, keepFilter)
       : prunePolicy
-      ? groupAndFilter(snapshots, this.options.groupBy, (groups) => {
-          const [snapshot] = groups;
-          const packageName = snapshot.packageName;
-          const config = this.config.packages.find(
-            (pkg) => pkg.name === packageName,
-          );
-          const prunePolicy =
-            config?.prunePolicy ?? this.config.prunePolicy ?? {};
-          const hasPrunePolicy = Object.values(prunePolicy).some(
-            (v) => typeof v === "number",
-          );
-          return hasPrunePolicy
-            ? createFilterByLastOptions(prunePolicy)
-            : "no-policy";
-        })
-      : [];
+        ? groupAndFilter(snapshots, this.options.groupBy, (groups) => {
+            const [snapshot] = groups;
+            const packageName = snapshot.packageName;
+            const config = this.config.packages.find(
+              (pkg) => pkg.name === packageName,
+            );
+            const prunePolicy =
+              config?.prunePolicy ?? this.config.prunePolicy ?? {};
+            const hasPrunePolicy = Object.values(prunePolicy).some(
+              (v) => typeof v === "number",
+            );
+            return hasPrunePolicy
+              ? createFilterByLastOptions(prunePolicy)
+              : "no-policy";
+          })
+        : [];
 
     const result: PruneResult = {
       total: snapshots.length,

diff --git a/packages/cli/src/Action/RestoreAction.ts b/packages/cli/src/Action/RestoreAction.ts
@@ -1,7 +1,5 @@
 import type { Config } from "../Config/Config";
 import { PackageConfig } from "../Config/PackageConfig";
-import { createRepo } from "../Factory/RepositoryFactory";
-import { createTask } from "../Factory/TaskFactory";
 import { Snapshot } from "../Repository/RepositoryAbstract";
 import { TaskAbstract } from "../Task/TaskAbstract";
 import { DataFormat } from "../utils/DataFormat";
@@ -11,6 +9,8 @@ import {
   findRepositoryOrFail,
   resolvePackage,
 } from "../utils/datatruck/config";
+import { createRepo } from "../utils/datatruck/repository";
+import { createTask } from "../utils/datatruck/task";
 import { duration } from "../utils/date";
 import { ensureFreeDiskSpace, initEmptyDir } from "../utils/fs";
 import { Listr3, Listr3TaskResultEnd } from "../utils/list";
@@ -180,19 +180,20 @@ export class RestoreAction<TRequired extends boolean = true> {
       return item.key === "snapshots"
         ? `${item.data.id.slice(0, 8)} ${g(`${item.data.packages} packages`)}`
         : item.key === "task"
-        ? `${item.data.packageName} ${g(item.data.taskName)}`
-        : item.key === "restore"
-        ? `${item.data.packageName} ${g(item.data.repositoryName)}`
-        : item.key === "summary"
-        ? renderObject(
-            {
-              errors: item.data.errors,
-              restores: result.filter((r) => !r.error && r.key === "restore")
-                .length,
-            },
-            color,
-          )
-        : "";
+          ? `${item.data.packageName} ${g(item.data.taskName)}`
+          : item.key === "restore"
+            ? `${item.data.packageName} ${g(item.data.repositoryName)}`
+            : item.key === "summary"
+              ? renderObject(
+                  {
+                    errors: item.data.errors,
+                    restores: result.filter(
+                      (r) => !r.error && r.key === "restore",
+                    ).length,
+                  },
+                  color,
+                )
+              : "";
     };
     return new DataFormat({
       streams: options.streams,

diff --git a/packages/cli/src/Action/SnapshotsAction.ts b/packages/cli/src/Action/SnapshotsAction.ts
@@ -1,8 +1,8 @@
 import type { Config } from "../Config/Config";
 import { RepositoryConfigEnabledAction } from "../Config/RepositoryConfig";
-import { createRepo } from "../Factory/RepositoryFactory";
 import { Snapshot } from "../Repository/RepositoryAbstract";
 import { filterRepository } from "../utils/datatruck/config";
+import { createRepo } from "../utils/datatruck/repository";
 import { groupAndFilter } from "../utils/datatruck/snapshot";
 import { IfRequireKeys } from "../utils/ts";
 

diff --git a/packages/cli/src/Repository/DatatruckRepository.ts b/packages/cli/src/Repository/DatatruckRepository.ts
@@ -1,7 +1,7 @@
-import { AppError } from "../Error/AppError";
 import { logExec } from "../utils/cli";
 import { calcFileHash } from "../utils/crypto";
 import { createFs } from "../utils/datatruck/client";
+import { AppError } from "../utils/datatruck/error";
 import { BackupPathsOptions, parseBackupPaths } from "../utils/datatruck/paths";
 import {
   createFileScanner,

diff --git a/packages/cli/src/Repository/ResticRepository.ts b/packages/cli/src/Repository/ResticRepository.ts
@@ -1,6 +1,6 @@
-import { AppError } from "../Error/AppError";
 import { ResticRepositoryUri, Restic } from "../utils/Restic";
 import { logExec } from "../utils/cli";
+import { AppError } from "../utils/datatruck/error";
 import { BackupPathsOptions, parseBackupPaths } from "../utils/datatruck/paths";
 import {
   fastglobToGitIgnore,

diff --git a/packages/cli/src/Task/MssqlTask.ts b/packages/cli/src/Task/MssqlTask.ts
@@ -1,5 +1,5 @@
-import { AppError } from "../Error/AppError";
 import { resolveDatabaseName } from "../utils/datatruck/config";
+import { AppError } from "../utils/datatruck/error";
 import { readDir } from "../utils/fs";
 import { exec } from "../utils/process";
 import { mkTmpDir } from "../utils/temp";

diff --git a/packages/cli/src/Task/MysqlDumpTask.ts b/packages/cli/src/Task/MysqlDumpTask.ts
@@ -1,10 +1,10 @@
-import { AppError } from "../Error/AppError";
 import { runParallel } from "../utils/async";
 import { logExec } from "../utils/cli";
 import {
   ResolveDatabaseNameParams,
   resolveDatabaseName,
 } from "../utils/datatruck/config";
+import { AppError } from "../utils/datatruck/error";
 import {
   ensureEmptyDir,
   ensureSingleFile,

diff --git a/packages/cli/src/Task/SqlDumpTaskAbstract.ts b/packages/cli/src/Task/SqlDumpTaskAbstract.ts
@@ -1,6 +1,6 @@
-import { AppError } from "../Error/AppError";
 import { logExec } from "../utils/cli";
 import { resolveDatabaseName } from "../utils/datatruck/config";
+import { AppError } from "../utils/datatruck/error";
 import {
   ensureEmptyDir,
   existsDir,

diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.ts
@@ -1,6 +1,5 @@
 import { ConfigAction } from "./Action/ConfigAction";
 import { GlobalOptions } from "./Command/CommandAbstract";
-import { AppError } from "./Error/AppError";
 import globalData from "./globalData";
 import { DataFormatType } from "./utils/DataFormat";
 import { OptionsConfig, showCursorCommand } from "./utils/cli";
@@ -9,6 +8,7 @@ import {
   InferDatatruckCommandOptions,
   createCommand,
 } from "./utils/datatruck/command";
+import { AppError } from "./utils/datatruck/error";
 import { onExit } from "./utils/exit";
 import { parsePackageFile } from "./utils/fs";
 import { snakeCase } from "./utils/string";

diff --git a/packages/cli/src/utils/DataFormat.ts b/packages/cli/src/utils/DataFormat.ts
@@ -1,4 +1,4 @@
-import { AppError } from "../Error/AppError";
+import { AppError } from "./datatruck/error";
 import { Streams, createStreams } from "./stream";
 import TtyTable, { Header } from "tty-table";
 import { formatWithOptions } from "util";

diff --git a/packages/cli/src/utils/datatruck/command.ts b/packages/cli/src/utils/datatruck/command.ts
@@ -8,8 +8,8 @@ import { PruneCommand } from "../../Command/PruneCommand";
 import { RestoreCommand } from "../../Command/RestoreCommand";
 import { SnapshotsCommand } from "../../Command/SnapshotsCommand";
 import { StartServerCommand } from "../../Command/StartServerCommand";
-import { AppError } from "../../Error/AppError";
 import { Streams } from "../stream";
+import { AppError } from "./error";
 import { Writable } from "stream";
 
 export const datatruckCommandMap = {

diff --git a/packages/cli/src/utils/datatruck/config.ts b/packages/cli/src/utils/datatruck/config.ts
@@ -4,9 +4,9 @@ import {
   RepositoryConfigEnabledAction,
   RepositoryConfig,
 } from "../../Config/RepositoryConfig";
-import { AppError } from "../../Error/AppError";
 import { checkMatch, makePathPatterns, render } from "../string";
 import { tmpDir } from "../temp";
+import { AppError } from "./error";
 import { isMatch } from "micromatch";
 
 export function findRepositoryOrFail(config: Config, repositoryName: string) {

diff --git a/packages/cli/src/Error/AppError.ts → packages/cli/src/utils/datatruck/error.ts b/packages/cli/src/Error/AppError.ts → packages/cli/src/utils/datatruck/error.ts
diff --git a/...ages/cli/src/Factory/RepositoryFactory.ts → ...ges/cli/src/utils/datatruck/repository.ts b/...ages/cli/src/Factory/RepositoryFactory.ts → ...ges/cli/src/utils/datatruck/repository.ts
@@ -1,15 +1,18 @@
-import type { RepositoryConfig } from "../Config/RepositoryConfig";
-import { AppError } from "../Error/AppError";
+import type { RepositoryConfig } from "../../Config/RepositoryConfig";
 import {
   DatatruckRepository,
   datatruckRepositoryName,
-} from "../Repository/DatatruckRepository";
-import { GitRepository, gitRepositoryName } from "../Repository/GitRepository";
-import type { RepositoryAbstract } from "../Repository/RepositoryAbstract";
+} from "../../Repository/DatatruckRepository";
+import {
+  GitRepository,
+  gitRepositoryName,
+} from "../../Repository/GitRepository";
+import type { RepositoryAbstract } from "../../Repository/RepositoryAbstract";
 import {
   ResticRepository,
   resticRepositoryName,
-} from "../Repository/ResticRepository";
+} from "../../Repository/ResticRepository";
+import { AppError } from "./error";
 
 export function createRepo(
   repository: RepositoryConfig,