@datatruck/cli 0.37.0 → 0.38.1

package/lib/commands/SnapshotsCommand.d.ts

@@ -1,28 +1,245 @@
-import { SnapshotsAction } from "../actions/SnapshotsAction";
-import type { RepositoryConfig } from "../utils/datatruck/config-type";
-import { If } from "../utils/ts";
+import { InferOptions } from "../utils/options";
 import { CommandAbstract } from "./CommandAbstract";
-export type SnapshotsCommandOptions<TResolved = false> = {
-    id?: If<TResolved, string[]>;
-    host?: If<TResolved, string[]>;
-    package?: If<TResolved, string[]>;
-    packageTask?: If<TResolved, string[]>;
-    packageConfig?: boolean;
-    repository?: If<TResolved, string[]>;
-    repositoryType?: If<TResolved, RepositoryConfig["type"][]>;
-    longId?: boolean;
-    last?: If<TResolved, number>;
-    lastMinutely?: If<TResolved, number>;
-    lastHourly?: If<TResolved, number>;
-    lastDaily?: If<TResolved, number>;
-    lastWeekly?: If<TResolved, number>;
-    lastMonthly?: If<TResolved, number>;
-    lastYearly?: If<TResolved, number>;
-    groupBy?: If<TResolved, SnapshotsAction["options"]["groupBy"]>;
-    tag?: If<TResolved, string[]>;
+export declare const snapshotsCommandOptions: {
+    longId: {
+        description: string;
+    };
+    ids: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    repositoryNames: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    repositoryTypes: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    packageNames: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    packageTaskNames: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    tags: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    packageConfig: {
+        description: string;
+        shortFlag: string;
+    };
+    hostnames: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    groupBy: {
+        description: string;
+        shortFlag: string;
+        value: (v: string) => ("packageName" | "repositoryName" | "repositoryType" | "id")[];
+    };
+    last: {
+        description: string;
+        shortFlag: string;
+        value: "number";
+    };
+    lastMinutely: {
+        description: string;
+        value: "number";
+    };
+    lastDaily: {
+        description: string;
+        value: "number";
+    };
+    lastHourly: {
+        description: string;
+        value: "number";
+    };
+    lastMonthly: {
+        description: string;
+        value: "number";
+    };
+    lastWeekly: {
+        description: string;
+        value: "number";
+    };
+    lastYearly: {
+        description: string;
+        value: "number";
+    };
 };
-export declare class SnapshotsCommand extends CommandAbstract<SnapshotsCommandOptions<false>, SnapshotsCommandOptions<true>> {
-    optionsConfig(): import("../utils/cli").OptionsConfig<SnapshotsCommandOptions<false>, SnapshotsCommandOptions<true>>;
+export type SnapshotsCommandOptions = InferOptions<typeof snapshotsCommandOptions>;
+export declare class SnapshotsCommand extends CommandAbstract<typeof snapshotsCommandOptions> {
+    static config(): {
+        name: string;
+        alias: string;
+        options: {
+            longId: {
+                description: string;
+            };
+            ids: {
+                description: string;
+                shortFlag: string;
+                value: "array";
+            };
+            repositoryNames: {
+                description: string;
+                shortFlag: string;
+                value: "array";
+            };
+            repositoryTypes: {
+                description: string;
+                shortFlag: string;
+                value: "array";
+            };
+            packageNames: {
+                description: string;
+                shortFlag: string;
+                value: "array";
+            };
+            packageTaskNames: {
+                description: string;
+                shortFlag: string;
+                value: "array";
+            };
+            tags: {
+                description: string;
+                shortFlag: string;
+                value: "array";
+            };
+            packageConfig: {
+                description: string;
+                shortFlag: string;
+            };
+            hostnames: {
+                description: string;
+                shortFlag: string;
+                value: "array";
+            };
+            groupBy: {
+                description: string;
+                shortFlag: string;
+                value: (v: string) => ("packageName" | "repositoryName" | "repositoryType" | "id")[];
+            };
+            last: {
+                description: string;
+                shortFlag: string;
+                value: "number";
+            };
+            lastMinutely: {
+                description: string;
+                value: "number";
+            };
+            lastDaily: {
+                description: string;
+                value: "number";
+            };
+            lastHourly: {
+                description: string;
+                value: "number";
+            };
+            lastMonthly: {
+                description: string;
+                value: "number";
+            };
+            lastWeekly: {
+                description: string;
+                value: "number";
+            };
+            lastYearly: {
+                description: string;
+                value: "number";
+            };
+        };
+    };
+    get optionsConfig(): {
+        longId: {
+            description: string;
+        };
+        ids: {
+            description: string;
+            shortFlag: string;
+            value: "array";
+        };
+        repositoryNames: {
+            description: string;
+            shortFlag: string;
+            value: "array";
+        };
+        repositoryTypes: {
+            description: string;
+            shortFlag: string;
+            value: "array";
+        };
+        packageNames: {
+            description: string;
+            shortFlag: string;
+            value: "array";
+        };
+        packageTaskNames: {
+            description: string;
+            shortFlag: string;
+            value: "array";
+        };
+        tags: {
+            description: string;
+            shortFlag: string;
+            value: "array";
+        };
+        packageConfig: {
+            description: string;
+            shortFlag: string;
+        };
+        hostnames: {
+            description: string;
+            shortFlag: string;
+            value: "array";
+        };
+        groupBy: {
+            description: string;
+            shortFlag: string;
+            value: (v: string) => ("packageName" | "repositoryName" | "repositoryType" | "id")[];
+        };
+        last: {
+            description: string;
+            shortFlag: string;
+            value: "number";
+        };
+        lastMinutely: {
+            description: string;
+            value: "number";
+        };
+        lastDaily: {
+            description: string;
+            value: "number";
+        };
+        lastHourly: {
+            description: string;
+            value: "number";
+        };
+        lastMonthly: {
+            description: string;
+            value: "number";
+        };
+        lastWeekly: {
+            description: string;
+            value: "number";
+        };
+        lastYearly: {
+            description: string;
+            value: "number";
+        };
+    };
     exec(): Promise<{
         result: import("../actions/SnapshotsAction").ExtendedSnapshot[];
         exitCode: number;

package/lib/commands/SnapshotsCommand.js

@@ -1,117 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SnapshotsCommand = void 0;
+exports.SnapshotsCommand = exports.snapshotsCommandOptions = void 0;
 const ConfigAction_1 = require("../actions/ConfigAction");
 const SnapshotsAction_1 = require("../actions/SnapshotsAction");
 const bytes_1 = require("../utils/bytes");
 const data_format_1 = require("../utils/data-format");
-const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
+exports.snapshotsCommandOptions = {
+    ...SnapshotsAction_1.snapshotsActionOptions,
+    longId: {
+        description: "Show long id",
+    },
+};
 class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
-    optionsConfig() {
-        const groupByValues = [
-            "id",
-            "packageName",
-            "repositoryName",
-            "repositoryType",
-        ];
-        return this.castOptionsConfig({
-            groupBy: {
-                option: "-g,--group-by <values>",
-                description: `Group by values (${groupByValues.join(", ")})`,
-                parser: (v) => (0, string_1.parseStringList)(v, groupByValues),
-            },
-            longId: {
-                option: "--longId",
-                description: "Show long id",
-            },
-            id: {
-                option: "-i,--id <ids>",
-                description: "Filter by identifiers",
-                parser: string_1.parseStringList,
-            },
-            host: {
-                option: "-h,--host <names>",
-                description: "Filter by hostnames",
-                parser: string_1.parseStringList,
-            },
-            last: {
-                option: "-l,--last <number>",
-                description: "Filter by last snapshots",
-                parser: Number,
-            },
-            lastMinutely: {
-                option: "--lastMinutely <number>",
-                description: "Filter by last minutely",
-                parser: Number,
-            },
-            lastDaily: {
-                option: "--lastDaily <number>",
-                description: "Filter by last daily",
-                parser: Number,
-            },
-            lastHourly: {
-                option: "--lastHourly <number>",
-                description: "Filter by last hourly",
-                parser: Number,
-            },
-            lastMonthly: {
-                option: "--lastMonthly <number>",
-                description: "Filter by last monthly",
-                parser: Number,
-            },
-            lastWeekly: {
-                option: "--lastWeekly <number>",
-                description: "Filter by last weekly",
-                parser: Number,
-            },
-            lastYearly: {
-                option: "--lastYearly <number>",
-                description: "Filter by last yearly",
-                parser: Number,
-            },
-            package: {
-                option: "-p,--package <names>",
-                description: "Filter by package names",
-                parser: string_1.parseStringList,
-            },
-            packageTask: {
-                option: "-pt,--package-task <values>",
-                description: "Filter by task names",
-                parser: string_1.parseStringList,
-            },
-            packageConfig: {
-                description: "Filter by package config",
-                option: "-pc,--package-config",
-            },
-            repository: {
-                option: "-r,--repository <names>",
-                description: "Filter by repository names",
-                parser: string_1.parseStringList,
-            },
-            repositoryType: {
-                option: "-rt,--repository-type <names>",
-                description: "Filter by repository types",
-                parser: (v) => (0, string_1.parseStringList)(v),
-            },
-            tag: {
-                description: "Filter by tags",
-                option: "-t,--tag <values>",
-                parser: string_1.parseStringList,
-            },
-        });
+    static config() {
+        return {
+            name: "snapshots",
+            alias: "s",
+            options: exports.snapshotsCommandOptions,
+        };
+    }
+    get optionsConfig() {
+        return exports.snapshotsCommandOptions;
     }
     async exec() {
         const verbose = this.globalOptions.verbose ?? 0;
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const snapshots = new SnapshotsAction_1.SnapshotsAction(config, {
-            ids: this.options.id,
-            hostnames: this.options.host,
-            packageNames: this.options.package,
-            packageTaskNames: this.options.packageTask,
+            ids: this.options.ids,
+            hostnames: this.options.hostnames,
+            packageNames: this.options.packageNames,
+            packageTaskNames: this.options.packageTaskNames,
             packageConfig: this.options.packageConfig,
-            repositoryNames: this.options.repository,
-            repositoryTypes: this.options.repositoryType,
+            repositoryNames: this.options.repositoryNames,
+            repositoryTypes: this.options.repositoryTypes,
             last: this.options.last,
             lastMinutely: this.options.lastMinutely,
             lastHourly: this.options.lastHourly,
@@ -121,7 +43,7 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
             lastYearly: this.options.lastYearly,
             groupBy: this.options.groupBy,
             verbose: verbose > 0,
-            tags: this.options.tag,
+            tags: this.options.tags,
         });
         const result = await snapshots.exec();
         const dataFormat = new data_format_1.DataFormat({

package/lib/commands/StartServerCommand.d.ts

@@ -1,7 +1,14 @@
+import { InferOptions } from "../utils/options";
 import { CommandAbstract } from "./CommandAbstract";
-export type StartServerCommandOptions<TResolved = false> = {};
-export declare class StartServerCommand extends CommandAbstract<StartServerCommandOptions<false>, StartServerCommandOptions<true>> {
-    optionsConfig(): import("../utils/cli").OptionsConfig<StartServerCommandOptions<false>, StartServerCommandOptions<true>>;
+export declare const startServerOptions: {};
+export type StartServerOptions = InferOptions<typeof startServerOptions>;
+export declare class StartServerCommand extends CommandAbstract<typeof startServerOptions> {
+    static config(): {
+        name: string;
+        alias: string;
+        options: {};
+    };
+    get optionsConfig(): {};
     exec(): Promise<{
         exitCode: number;
     }>;

package/lib/commands/StartServerCommand.js

@@ -1,15 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StartServerCommand = void 0;
+exports.StartServerCommand = exports.startServerOptions = void 0;
 const ConfigAction_1 = require("../actions/ConfigAction");
 const cli_1 = require("../utils/cli");
 const cron_server_1 = require("../utils/datatruck/cron-server");
 const repository_server_1 = require("../utils/datatruck/repository-server");
 const error_1 = require("../utils/error");
 const CommandAbstract_1 = require("./CommandAbstract");
+exports.startServerOptions = {};
 class StartServerCommand extends CommandAbstract_1.CommandAbstract {
-    optionsConfig() {
-        return this.castOptionsConfig({});
+    static config() {
+        return {
+            name: "startServer",
+            alias: "start",
+            options: exports.startServerOptions,
+        };
+    }
+    get optionsConfig() {
+        return exports.startServerOptions;
     }
     async exec() {
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);

package/lib/repositories/DatatruckRepository.js

@@ -308,7 +308,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         const restorePath = (0, path_1.resolve)(relRestorePath);
         const [snapshot] = await this.fetchSnapshots({
             options: {
-                ids: [data.options.snapshotId],
+                ids: [data.options.id],
             },
         });
         if (!snapshot)

package/lib/repositories/GitRepository.js

@@ -50,7 +50,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
             log: data.options.verbose,
         });
         if (await git.canBeInit(this.config.repo)) {
-            await (0, promises_1.mkdir)(git.options.dir);
+            await (0, promises_1.mkdir)(git.options.dir, { recursive: true });
             await git.exec(["init", "--bare", this.config.repo]);
         }
         const branchName = this.config.branch ?? "master";
@@ -208,7 +208,10 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
             version: nodePkg.version,
             size: size.toString(),
         });
-        await git.addTag(meta.name, meta.message);
+        await git.addTag(meta.name, meta.message, {
+            userName: "datatruck",
+            userEmail: "datatruck@localhost",
+        });
         await git.push({ branchName });
         await git.pushTags();
         await (0, promises_1.rm)(tmpPath, { recursive: true });

package/lib/tasks/MssqlTask.js

@@ -76,7 +76,7 @@ class MssqlTask extends TaskAbstract_1.TaskAbstract {
                     action: "restore",
                     database: databaseName,
                     packageName: data.package.name,
-                    snapshotId: data.options.snapshotId,
+                    snapshotId: data.options.id,
                     snapshotDate: data.snapshot.date,
                 });
             const databasePath = (0, path_1.join)(snapshotPath, file);

package/lib/tasks/MysqlDumpTask.js

@@ -242,7 +242,7 @@ class MysqlDumpTask extends TaskAbstract_1.TaskAbstract {
             const snapshotPath = data.snapshotPath;
             const params = {
                 packageName: data.package.name,
-                snapshotId: data.options.snapshotId,
+                snapshotId: data.options.id,
                 snapshotDate: data.snapshot.date,
                 action: "restore",
                 database: undefined,

package/lib/tasks/SqlDumpTaskAbstract.js

@@ -153,7 +153,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
         const database = {
             name: (0, config_1.resolveDatabaseName)(this.config.database, {
                 packageName: data.package.name,
-                snapshotId: data.options.snapshotId,
+                snapshotId: data.options.id,
                 snapshotDate: data.snapshot.date,
                 action: "restore",
                 database: undefined,
@@ -162,7 +162,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
         if (this.config.targetDatabase && !data.options.initial) {
             database.name = (0, config_1.resolveDatabaseName)(this.config.targetDatabase.name, {
                 packageName: data.package.name,
-                snapshotId: data.options.snapshotId,
+                snapshotId: data.options.id,
                 snapshotDate: data.snapshot.date,
                 action: "restore",
                 database: database.name,

package/lib/utils/cli.d.ts

@@ -12,23 +12,6 @@ export declare function renderListTaskItem<T extends Record<string, any>>(item:
     }>["data"]) => string | number | string[] | Record<string, string | number>;
 }): string;
 export declare function renderObject(object: Record<string, any>, color?: boolean): string;
-export type OptionsConfig<T1, T2 extends {
-    [K in keyof T1]: unknown;
-}> = {
-    [K in keyof Required<T1>]: {
-        option?: string;
-        description: string;
-        required?: boolean;
-        defaults?: Exclude<T1[K], undefined>;
-        parser?: (value: Exclude<T1[K], undefined>) => Exclude<T2[K], undefined>;
-    };
-};
-export declare function parseOptions<T1, T2 extends {
-    [K in keyof T1]: unknown;
-}>(object: T1, options: OptionsConfig<T1, T2>): T2;
-export declare function stringifyOptions<T1, T2 extends {
-    [K in keyof T1]: unknown;
-}>(options: OptionsConfig<T1, T2>, object: any): string[];
 export declare function confirm(message: string): Promise<unknown>;
 export declare function waitForStdDrain(ms?: number): Promise<void>;
 export declare function colorizeValue(value: unknown, color?: typeof chalk.ForegroundColor): string;

package/lib/utils/cli.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logJson = exports.colorizeObject = exports.colorizeValue = exports.waitForStdDrain = exports.confirm = exports.stringifyOptions = exports.parseOptions = exports.renderObject = exports.renderListTaskItem = exports.renderError = exports.renderResult = exports.logExec = exports.renderProgressBar = exports.showCursorCommand = void 0;
+exports.logJson = exports.colorizeObject = exports.colorizeValue = exports.waitForStdDrain = exports.confirm = exports.renderObject = exports.renderListTaskItem = exports.renderError = exports.renderResult = exports.logExec = exports.renderProgressBar = exports.showCursorCommand = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const chalk_2 = require("chalk");
 const readline_1 = require("readline");
@@ -92,52 +92,6 @@ function renderObject(object, color) {
     return values.join(` `);
 }
 exports.renderObject = renderObject;
-function parseOptions(object, options) {
-    const result = {};
-    for (const key in options) {
-        const opt = options[key].option;
-        let defaultsValue;
-        let parser = options[key].parser;
-        if (typeof opt === "string") {
-            const isNegative = opt.startsWith("--no");
-            defaultsValue = isNegative ? true : options[key].defaults;
-        }
-        const value = object?.[key] ?? defaultsValue;
-        if (typeof value !== "undefined") {
-            result[key] = parser ? parser(value) : value;
-        }
-    }
-    return result;
-}
-exports.parseOptions = parseOptions;
-function stringifyOptions(options, object) {
-    const result = [];
-    const prepend = [];
-    for (const key in options) {
-        const fullOpt = options[key].option;
-        if (typeof fullOpt === "string") {
-            const [opt] = fullOpt.split(",");
-            const isNegative = fullOpt.startsWith("--no");
-            const isBool = !fullOpt.includes("<") && !fullOpt.includes("[");
-            const defaultsValue = isNegative ? true : options[key].defaults;
-            const value = object?.[key] ?? defaultsValue;
-            if (isBool) {
-                if (object[key])
-                    result.push(opt);
-            }
-            else if (value !== undefined) {
-                result.push(opt, `${value}`);
-            }
-        }
-        else {
-            const value = object?.[key];
-            if (value !== undefined)
-                prepend.push(value);
-        }
-    }
-    return [...prepend, ...result];
-}
-exports.stringifyOptions = stringifyOptions;
 function confirm(message) {
     const rl = (0, readline_1.createInterface)({
         input: process.stdin,

package/lib/utils/datatruck/command.d.ts

@@ -3,6 +3,7 @@ import { CleanCacheCommand } from "../../commands/CleanCacheCommand";
 import { GlobalOptions } from "../../commands/CommandAbstract";
 import { ConfigCommand } from "../../commands/ConfigCommand";
 import { CopyCommand } from "../../commands/CopyCommand";
+import { ExportCommand } from "../../commands/ExportCommand";
 import { InitCommand } from "../../commands/InitCommand";
 import { PruneCommand } from "../../commands/PruneCommand";
 import { RestoreCommand } from "../../commands/RestoreCommand";
@@ -10,7 +11,7 @@ import { RunCommand } from "../../commands/RunCommand";
 import { SnapshotsCommand } from "../../commands/SnapshotsCommand";
 import { StartServerCommand } from "../../commands/StartServerCommand";
 import { StdStreams } from "../stream";
-export declare const datatruckCommandMap: {
+export declare const datatruckCommands: {
     config: typeof ConfigCommand;
     init: typeof InitCommand;
     snapshots: typeof SnapshotsCommand;
@@ -21,11 +22,11 @@ export declare const datatruckCommandMap: {
     copy: typeof CopyCommand;
     cleanCache: typeof CleanCacheCommand;
     startServer: typeof StartServerCommand;
+    export: typeof ExportCommand;
 };
-export type DatatruckCommandMap = typeof datatruckCommandMap;
-export type InferDatatruckCommandOptions<T extends keyof DatatruckCommandMap> = InstanceType<DatatruckCommandMap[T]>["inputOptions"];
+export type DatatruckCommandMap = typeof datatruckCommands;
 export type InferDatatruckCommandResult<T extends keyof DatatruckCommandMap, R = Awaited<ReturnType<InstanceType<DatatruckCommandMap[T]>["exec"]>>> = "result" extends keyof R ? R["result"] : undefined;
-export declare function createCommand<T extends keyof DatatruckCommandMap>(name: T, globalOptions: GlobalOptions<true>, options: InferDatatruckCommandOptions<T>, streams?: Partial<StdStreams>, configPath?: string): BackupCommand | CopyCommand | PruneCommand | CleanCacheCommand | ConfigCommand | InitCommand | RestoreCommand | RunCommand | SnapshotsCommand | StartServerCommand;
+export declare function createCommand<T extends keyof DatatruckCommandMap>(name: T, globalOptions: GlobalOptions<true>, options: InstanceType<DatatruckCommandMap[T]>["options"], streams?: Partial<StdStreams>, configPath?: string): BackupCommand | CopyCommand | PruneCommand | CleanCacheCommand | ConfigCommand | ExportCommand | InitCommand | RestoreCommand | RunCommand | SnapshotsCommand | StartServerCommand;
 export declare function createCommands(globalOptions: GlobalOptions<true>): {
-    [K in keyof DatatruckCommandMap as `${K}`]: (options: InferDatatruckCommandOptions<K>) => Promise<InferDatatruckCommandResult<K>>;
+    [K in keyof DatatruckCommandMap as `${K}`]: (options: InstanceType<DatatruckCommandMap[K]>["options"]) => Promise<InferDatatruckCommandResult<K>>;
 };