refactor(cli): rename files

packages/cli/src/actions/BackupAction.ts

@@ -1,6 +1,3 @@
-import type { Config } from "../Config/Config";
-import { PackageConfig } from "../Config/PackageConfig";
-import { RepositoryConfig } from "../Config/RepositoryConfig";
 import { PreSnapshot } from "../repositories/RepositoryAbstract";
 import { DataFormat } from "../utils/DataFormat";
 import { renderError, renderObject, renderResult } from "../utils/cli";
@@ -9,6 +6,11 @@ import {
   findRepositoryOrFail,
   resolvePackages,
 } from "../utils/datatruck/config";
+import type {
+  Config,
+  PackageConfig,
+  RepositoryConfig,
+} from "../utils/datatruck/config-type";
 import { createRepo } from "../utils/datatruck/repository";
 import { createTask } from "../utils/datatruck/task";
 import { duration } from "../utils/date";

packages/cli/src/actions/ConfigAction.ts

@@ -1,8 +1,7 @@
-import type { Config } from "../Config/Config";
-import { RepositoryConfig } from "../Config/RepositoryConfig";
 import { GlobalOptions } from "../commands/CommandAbstract";
 import { configSchema } from "../config.schema";
 import { findRepositoryOrFail } from "../utils/datatruck/config";
+import type { Config, RepositoryConfig } from "../utils/datatruck/config-type";
 import { AppError } from "../utils/datatruck/error";
 import { findFile, parseFile, parseFileExtensions } from "../utils/fs";
 import { IfRequireKeys } from "../utils/ts";

packages/cli/src/actions/CopyAction.ts

@@ -1,4 +1,3 @@
-import type { Config } from "../Config/Config";
 import { Snapshot } from "../repositories/RepositoryAbstract";
 import { DataFormat } from "../utils/DataFormat";
 import { renderError, renderObject, renderResult } from "../utils/cli";
@@ -7,6 +6,7 @@ import {
   filterRepository,
   findRepositoryOrFail,
 } from "../utils/datatruck/config";
+import type { Config } from "../utils/datatruck/config-type";
 import { createRepo } from "../utils/datatruck/repository";
 import { groupAndFilter } from "../utils/datatruck/snapshot";
 import { duration } from "../utils/date";

packages/cli/src/actions/InitAction.ts

@@ -1,5 +1,5 @@
-import type { Config } from "../Config/Config";
 import { filterRepository } from "../utils/datatruck/config";
+import type { Config } from "../utils/datatruck/config-type";
 import { createRepo } from "../utils/datatruck/repository";
 import { IfRequireKeys } from "../utils/ts";
 

packages/cli/src/actions/PruneAction.ts

@@ -1,5 +1,4 @@
-import type { Config } from "../Config/Config";
-import { RepositoryConfig } from "../Config/RepositoryConfig";
+import type { Config, RepositoryConfig } from "../utils/datatruck/config-type";
 import { createRepo } from "../utils/datatruck/repository";
 import { groupAndFilter } from "../utils/datatruck/snapshot";
 import { KeepObject, createFilterByLastOptions } from "../utils/date";

packages/cli/src/actions/RestoreAction.ts

@@ -1,5 +1,3 @@
-import type { Config } from "../Config/Config";
-import { PackageConfig } from "../Config/PackageConfig";
 import { Snapshot } from "../repositories/RepositoryAbstract";
 import { TaskAbstract } from "../tasks/TaskAbstract";
 import { DataFormat } from "../utils/DataFormat";
@@ -9,6 +7,7 @@ import {
   findRepositoryOrFail,
   resolvePackage,
 } from "../utils/datatruck/config";
+import type { Config, PackageConfig } from "../utils/datatruck/config-type";
 import { createRepo } from "../utils/datatruck/repository";
 import { createTask } from "../utils/datatruck/task";
 import { duration } from "../utils/date";

packages/cli/src/actions/SnapshotsAction.ts

@@ -1,7 +1,9 @@
-import type { Config } from "../Config/Config";
-import { RepositoryConfigEnabledAction } from "../Config/RepositoryConfig";
 import { Snapshot } from "../repositories/RepositoryAbstract";
 import { filterRepository } from "../utils/datatruck/config";
+import type {
+  Config,
+  RepositoryConfigEnabledAction,
+} from "../utils/datatruck/config-type";
 import { createRepo } from "../utils/datatruck/repository";
 import { groupAndFilter } from "../utils/datatruck/snapshot";
 import { IfRequireKeys } from "../utils/ts";

packages/cli/src/commands/BackupCommand.ts

@@ -1,6 +1,6 @@
-import { RepositoryConfig } from "../Config/RepositoryConfig";
 import { BackupAction } from "../actions/BackupAction";
 import { ConfigAction } from "../actions/ConfigAction";
+import type { RepositoryConfig } from "../utils/datatruck/config-type";
 import { parseStringList } from "../utils/string";
 import { If } from "../utils/ts";
 import { CommandAbstract } from "./CommandAbstract";

packages/cli/src/commands/CommandAbstract.ts

@@ -1,6 +1,6 @@
-import { Config } from "../Config/Config";
 import { DataFormatType } from "../utils/DataFormat";
 import { OptionsConfig, parseOptions } from "../utils/cli";
+import type { Config } from "../utils/datatruck/config-type";
 import { ProgressMode } from "../utils/progress";
 import { Streams, createStreams } from "../utils/stream";
 import { If, SimilarObject } from "../utils/ts";

packages/cli/src/commands/ConfigCommand.ts

@@ -1,7 +1,7 @@
-import { RepositoryConfig } from "../Config/RepositoryConfig";
 import { ConfigAction } from "../actions/ConfigAction";
 import { DataFormat } from "../utils/DataFormat";
 import { filterPackages } from "../utils/datatruck/config";
+import type { RepositoryConfig } from "../utils/datatruck/config-type";
 import { parseStringList } from "../utils/string";
 import { If } from "../utils/ts";
 import { CommandAbstract } from "./CommandAbstract";

packages/cli/src/commands/InitCommand.ts

@@ -1,8 +1,8 @@
-import { RepositoryConfig } from "../Config/RepositoryConfig";
 import { ConfigAction } from "../actions/ConfigAction";
 import { InitAction } from "../actions/InitAction";
 import { DataFormat } from "../utils/DataFormat";
 import { renderError, renderResult } from "../utils/cli";
+import type { RepositoryConfig } from "../utils/datatruck/config-type";
 import { parseStringList } from "../utils/string";
 import { If } from "../utils/ts";
 import { CommandAbstract } from "./CommandAbstract";

packages/cli/src/commands/PruneCommand.ts

@@ -1,9 +1,9 @@
-import { RepositoryConfig } from "../Config/RepositoryConfig";
 import { ConfigAction } from "../actions/ConfigAction";
 import { PruneAction } from "../actions/PruneAction";
 import { SnapshotGroupByType } from "../actions/SnapshotsAction";
 import { DataFormat } from "../utils/DataFormat";
 import { confirm } from "../utils/cli";
+import type { RepositoryConfig } from "../utils/datatruck/config-type";
 import { KeepObject } from "../utils/date";
 import { parseStringList } from "../utils/string";
 import { If } from "../utils/ts";

packages/cli/src/commands/RestoreCommand.ts

@@ -1,6 +1,6 @@
-import { RepositoryConfig } from "../Config/RepositoryConfig";
 import { ConfigAction } from "../actions/ConfigAction";
 import { RestoreAction } from "../actions/RestoreAction";
+import type { RepositoryConfig } from "../utils/datatruck/config-type";
 import { parseStringList } from "../utils/string";
 import { If } from "../utils/ts";
 import { CommandAbstract } from "./CommandAbstract";

packages/cli/src/commands/SnapshotsCommand.ts

@@ -1,8 +1,8 @@
-import { RepositoryConfig } from "../Config/RepositoryConfig";
 import { ConfigAction } from "../actions/ConfigAction";
 import { SnapshotsAction } from "../actions/SnapshotsAction";
 import { DataFormat } from "../utils/DataFormat";
 import { formatBytes } from "../utils/bytes";
+import type { RepositoryConfig } from "../utils/datatruck/config-type";
 import { parseStringList } from "../utils/string";
 import { If } from "../utils/ts";
 import { CommandAbstract } from "./CommandAbstract";

packages/cli/src/index.ts

@@ -1,14 +1,20 @@
-export type { Config } from "./Config/Config";
-export type { PackageConfig } from "./Config/PackageConfig";
-export type { PackageRepositoryConfig } from "./Config/PackageRepositoryConfig";
-export type { PrunePolicyConfig } from "./Config/PrunePolicyConfig";
-
-export type { RepositoryConfig } from "./Config/RepositoryConfig";
+export type {
+  Config,
+  PackageConfig,
+  PackageConfigMeta,
+  DatatruckPolicyConfig,
+  DatatruckReportConfig,
+  DatatruckServerOptions,
+} from "./utils/datatruck/config-type";
+export type {
+  PackageRepositoryConfig,
+  RepositoryConfig,
+} from "./utils/datatruck/config-repository-type";
+export type { TaskConfig } from "./utils/datatruck/config-task-type";
 export { type ResticRepositoryConfig } from "./repositories/ResticRepository";
 export { type DatatruckRepositoryConfig } from "./repositories/DatatruckRepository";
 export { type GitRepositoryConfig } from "./repositories/GitRepository";
 
-export type { TaskConfig } from "./Config/TaskConfig";
 export { type GitTaskConfig } from "./tasks/GitTask";
 export { type MariadbTaskConfig } from "./tasks/MariadbTask";
 export { type MssqlTaskConfig } from "./tasks/MssqlTask";

packages/cli/src/repositories/RepositoryAbstract.ts

@@ -1,12 +1,14 @@
-import type { PackageConfig } from "../Config/PackageConfig";
-import type { RepositoryConfig } from "../Config/RepositoryConfig";
 import type { BackupActionOptions } from "../actions/BackupAction";
 import type { InitActionOptions } from "../actions/InitAction";
 import type { RestoreActionOptions } from "../actions/RestoreAction";
 import type {
   ExtendedSnapshot,
   SnapshotsActionOptions,
 } from "../actions/SnapshotsAction";
+import type {
+  PackageConfig,
+  RepositoryConfig,
+} from "../utils/datatruck/config-type";
 import { ensureFreeDiskSpace, type DiskStats } from "../utils/fs";
 import type { Progress } from "../utils/progress";
 

packages/cli/src/tasks/ScriptTask.ts

@@ -1,5 +1,5 @@
-import { PackageConfig } from "../Config/PackageConfig";
 import { PreSnapshot } from "../repositories/RepositoryAbstract";
+import type { PackageConfig } from "../utils/datatruck/config-type";
 import { ProcessEnv } from "../utils/process";
 import { SpawnStep, runSpawnSteps } from "../utils/spawnSteps";
 import { mkTmpDir } from "../utils/temp";

packages/cli/src/tasks/TaskAbstract.ts

@@ -1,7 +1,7 @@
-import { PackageConfig } from "../Config/PackageConfig";
 import { BackupActionOptions } from "../actions/BackupAction";
 import { RestoreActionOptions } from "../actions/RestoreAction";
 import { PreSnapshot } from "../repositories/RepositoryAbstract";
+import type { PackageConfig } from "../utils/datatruck/config-type";
 import { Progress } from "../utils/progress";
 
 type TaskCommonData = {

packages/cli/src/Config/RepositoryConfig.ts → packages/cli/src/utils/datatruck/config-repository-type.ts

@@ -1,28 +1,35 @@
-import {
+import type {
+  DatatruckPackageRepositoryConfig,
   DatatruckRepositoryConfig,
   datatruckRepositoryName,
-} from "../repositories/DatatruckRepository";
-import {
+} from "../../repositories/DatatruckRepository";
+import type {
+  GitPackageRepositoryConfig,
   GitRepositoryConfig,
   gitRepositoryName,
-} from "../repositories/GitRepository";
-import {
+} from "../../repositories/GitRepository";
+import type {
+  ResticPackageRepositoryConfig,
   ResticRepositoryConfig,
   resticRepositoryName,
-} from "../repositories/ResticRepository";
+} from "../../repositories/ResticRepository";
 
-export type RepositoryConfigType = RepositoryConfig["type"];
-
-export type RepositoryConfigEnabledAction =
-  | "backup"
-  | "init"
-  | "prune"
-  | "restore"
-  | "snapshots";
-
-export type RepositoryEnabledObject = {
-  [K in "defaults" | RepositoryConfigEnabledAction]?: boolean;
-};
+export type PackageRepositoryConfig = {
+  names?: string[];
+} & (
+  | {
+      type: typeof resticRepositoryName;
+      config: ResticPackageRepositoryConfig;
+    }
+  | {
+      type: typeof datatruckRepositoryName;
+      config: DatatruckPackageRepositoryConfig;
+    }
+  | {
+      type: typeof gitRepositoryName;
+      config: GitPackageRepositoryConfig;
+    }
+);
 
 export type ResticRepositoryConfigItem = {
   type: typeof resticRepositoryName;
@@ -39,6 +46,17 @@ export type GitRepositoryConfigItem = {
   config: GitRepositoryConfig;
 };
 
+export type RepositoryConfigEnabledAction =
+  | "backup"
+  | "init"
+  | "prune"
+  | "restore"
+  | "snapshots";
+
+export type RepositoryEnabledObject = {
+  [K in "defaults" | RepositoryConfigEnabledAction]?: boolean;
+};
+
 type CommonRepositoryConfig = {
   name: string;
   mirrorRepoNames?: string[];