@datatruck/cli 0.36.8 → 0.38.0

package/lib/commands/ConfigCommand.js

@@ -1,43 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConfigCommand = void 0;
+exports.ConfigCommand = exports.configCommandOptions = void 0;
 const ConfigAction_1 = require("../actions/ConfigAction");
 const data_format_1 = require("../utils/data-format");
 const config_1 = require("../utils/datatruck/config");
 const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
+exports.configCommandOptions = {
+    packageNames: {
+        description: "Filter by package names",
+        shortFlag: "p",
+        value: "array",
+    },
+    packageTaskNames: {
+        description: "Filter by package task names",
+        shortFlag: "pt",
+        value: "array",
+    },
+    repositoryNames: {
+        description: "Filter by repository names",
+        shortFlag: "r",
+        value: "array",
+    },
+    repositoryTypes: {
+        description: "Filter by repository types",
+        shortFlag: "rt",
+        value: (string_1.parseStringList),
+    },
+};
 class ConfigCommand extends CommandAbstract_1.CommandAbstract {
-    optionsConfig() {
-        return this.castOptionsConfig({
-            package: {
-                description: "Filter by package names",
-                option: "-p,--package <values>",
-                parser: string_1.parseStringList,
-            },
-            packageTask: {
-                description: "Filter by package task names",
-                option: "-pt,--package-task <values>",
-                parser: string_1.parseStringList,
-            },
-            repository: {
-                description: "Filter by repository names",
-                option: "-r,--repository <values>",
-                parser: string_1.parseStringList,
-            },
-            repositoryType: {
-                description: "Filter by repository types",
-                option: "-rt,--repository-type <values>",
-                parser: (v) => (0, string_1.parseStringList)(v),
-            },
-        });
+    static config() {
+        return {
+            name: "config",
+            alias: "c",
+            options: exports.configCommandOptions,
+        };
+    }
+    get optionsConfig() {
+        return exports.configCommandOptions;
     }
     async exec() {
         const result = await ConfigAction_1.ConfigAction.fromGlobalOptionsWithPath(this.globalOptions);
         const packages = (0, config_1.filterPackages)(result.data, {
-            packageNames: this.options.package,
-            packageTaskNames: this.options.packageTask,
-            repositoryNames: this.options.repository,
-            repositoryTypes: this.options.repositoryType,
+            packageNames: this.options.packageNames,
+            packageTaskNames: this.options.packageTaskNames,
+            repositoryNames: this.options.repositoryNames,
+            repositoryTypes: this.options.repositoryTypes,
         });
         const summaryConfig = packages.flatMap((pkg) => ({
             packageName: pkg.name,

package/lib/commands/CopyCommand.d.ts

@@ -1,17 +1,110 @@
-import { If } from "../utils/ts";
+import { InferOptions } from "../utils/options";
 import { CommandAbstract } from "./CommandAbstract";
-export type CopyCommandOptions<TResolved = false> = {
-    id?: If<TResolved, string[]>;
-    last?: number;
-    package?: If<TResolved, string[]>;
-    packageTask?: If<TResolved, string[]>;
-    repository: string;
-    repository2?: If<TResolved, string[]>;
+export declare const copyCommandOptions: {
+    repositoryNames2: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    packageNames: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    packageTaskNames: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    ids: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    last: {
+        description: string;
+        shortFlag: string;
+        value: "number";
+    };
+    repositoryName: {
+        description: string;
+        shortFlag: string;
+        required: true;
+    };
 };
-export declare class CopyCommand extends CommandAbstract<CopyCommandOptions<false>, CopyCommandOptions<true>> {
-    optionsConfig(): import("../utils/cli").OptionsConfig<CopyCommandOptions<false>, CopyCommandOptions<true>>;
+export type CopyCommandOptions = InferOptions<typeof copyCommandOptions>;
+export declare class CopyCommand extends CommandAbstract<typeof copyCommandOptions> {
+    static config(): {
+        name: string;
+        alias: string;
+        options: {
+            repositoryNames2: {
+                description: string;
+                shortFlag: string;
+                value: "array";
+            };
+            packageNames: {
+                description: string;
+                shortFlag: string;
+                value: "array";
+            };
+            packageTaskNames: {
+                description: string;
+                shortFlag: string;
+                value: "array";
+            };
+            ids: {
+                description: string;
+                shortFlag: string;
+                value: "array";
+            };
+            last: {
+                description: string;
+                shortFlag: string;
+                value: "number";
+            };
+            repositoryName: {
+                description: string;
+                shortFlag: string;
+                required: true;
+            };
+        };
+    };
+    get optionsConfig(): {
+        repositoryNames2: {
+            description: string;
+            shortFlag: string;
+            value: "array";
+        };
+        packageNames: {
+            description: string;
+            shortFlag: string;
+            value: "array";
+        };
+        packageTaskNames: {
+            description: string;
+            shortFlag: string;
+            value: "array";
+        };
+        ids: {
+            description: string;
+            shortFlag: string;
+            value: "array";
+        };
+        last: {
+            description: string;
+            shortFlag: string;
+            value: "number";
+        };
+        repositoryName: {
+            description: string;
+            shortFlag: string;
+            required: true;
+        };
+    };
     exec(): Promise<{
         result: (import("../utils/list").List3SummaryResult | import("../utils/list").Listr3TaskResult<import("../actions/CopyAction").Context>)[];
         exitCode: number;
+        errors: Error[];
     }>;
 }

package/lib/commands/CopyCommand.js

@@ -1,66 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CopyCommand = void 0;
+exports.CopyCommand = exports.copyCommandOptions = void 0;
 const ConfigAction_1 = require("../actions/ConfigAction");
 const CopyAction_1 = require("../actions/CopyAction");
-const string_1 = require("../utils/string");
 const CommandAbstract_1 = require("./CommandAbstract");
+exports.copyCommandOptions = {
+    ...CopyAction_1.copyActionOptions,
+};
 class CopyCommand extends CommandAbstract_1.CommandAbstract {
-    optionsConfig() {
-        return this.castOptionsConfig({
-            id: {
-                option: "-i,--id <ids>",
-                description: "Filter by identifiers",
-                parser: string_1.parseStringList,
-            },
-            last: {
-                option: "-l,--last <amount>",
-                description: "Last snapshots",
-                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,
-            },
-            repository: {
-                option: "-r,--repository <name>",
-                description: "Filter by repository name",
-                required: true,
-            },
-            repository2: {
-                option: "-r2,--repository2 <names>",
-                description: "Filter by repository names",
-                parser: string_1.parseStringList,
-            },
-        });
+    static config() {
+        return {
+            name: "copy",
+            alias: "cp",
+            options: exports.copyCommandOptions,
+        };
+    }
+    get optionsConfig() {
+        return exports.copyCommandOptions;
     }
     async exec() {
         const verbose = this.globalOptions.verbose ?? 0;
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const copy = new CopyAction_1.CopyAction(config, {
-            ids: this.options.id,
+            ids: this.options.ids,
             last: this.options.last,
-            packageNames: this.options.package,
-            packageTaskNames: this.options.packageTask,
-            repositoryName: this.options.repository,
-            repositoryNames2: this.options.repository2,
+            packageNames: this.options.packageNames,
+            packageTaskNames: this.options.packageTaskNames,
+            repositoryName: this.options.repositoryName,
+            repositoryNames2: this.options.repositoryNames2,
             verbose: verbose > 0,
             tty: this.globalOptions.tty,
             progress: this.globalOptions.progress,
         });
-        const result = await copy.exec();
+        const data = await copy.exec();
         if (this.globalOptions.outputFormat)
             copy
-                .dataFormat(result, { streams: this.streams, verbose })
+                .dataFormat(data.result, {
+                verbose,
+                streams: this.streams,
+                errors: data.errors,
+            })
                 .log(this.globalOptions.outputFormat);
-        const exitCode = result.some((item) => item.error) ? 1 : 0;
-        return { result, exitCode };
+        return data;
     }
 }
 exports.CopyCommand = CopyCommand;

package/lib/commands/ExportCommand.d.ts

@@ -0,0 +1,143 @@
+import { InferOptions } from "../utils/options";
+import { CommandAbstract } from "./CommandAbstract";
+export declare const exportCommandOptions: {
+    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;
+    };
+    id: {
+        description: string;
+        shortFlag: string;
+        required: true;
+    };
+    outPath: {
+        description: string;
+        required: true;
+    };
+};
+export type ExportCommandOptions = InferOptions<typeof exportCommandOptions>;
+export declare class ExportCommand extends CommandAbstract<typeof exportCommandOptions> {
+    static config(): {
+        name: string;
+        options: {
+            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;
+            };
+            id: {
+                description: string;
+                shortFlag: string;
+                required: true;
+            };
+            outPath: {
+                description: string;
+                required: true;
+            };
+        };
+    };
+    get optionsConfig(): {
+        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;
+        };
+        id: {
+            description: string;
+            shortFlag: string;
+            required: true;
+        };
+        outPath: {
+            description: string;
+            required: true;
+        };
+    };
+    exec(): Promise<{
+        result: (import("../utils/list").List3SummaryResult | import("../utils/list").Listr3TaskResult<{
+            snapshots: {
+                id: string;
+                packages: number;
+            };
+            task: {
+                taskName: string;
+                packageName: string;
+            };
+            export: import("../actions/SnapshotsAction").ExtendedSnapshot;
+        }>)[];
+        exitCode: number;
+        errors: Error[];
+    }>;
+}

package/lib/commands/ExportCommand.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExportCommand = exports.exportCommandOptions = void 0;
+const ConfigAction_1 = require("../actions/ConfigAction");
+const ExportAction_1 = require("../actions/ExportAction");
+const CommandAbstract_1 = require("./CommandAbstract");
+exports.exportCommandOptions = {
+    ...ExportAction_1.exportActionOptions,
+};
+class ExportCommand extends CommandAbstract_1.CommandAbstract {
+    static config() {
+        return {
+            name: "export",
+            options: exports.exportCommandOptions,
+        };
+    }
+    get optionsConfig() {
+        return exports.exportCommandOptions;
+    }
+    async exec() {
+        const verbose = this.globalOptions.verbose ?? 0;
+        const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
+        const restore = new ExportAction_1.ExportAction(config, {
+            id: this.options.id,
+            packageNames: this.options.packageNames,
+            packageTaskNames: this.options.packageTaskNames,
+            packageConfig: this.options.packageConfig,
+            repositoryNames: this.options.repositoryNames,
+            repositoryTypes: this.options.repositoryTypes,
+            tags: this.options.tags,
+            outPath: this.options.outPath,
+            verbose: verbose > 0,
+        }, {
+            tty: this.globalOptions.tty,
+            progress: this.globalOptions.progress,
+            streams: this.streams,
+        });
+        const data = await restore.exec();
+        if (this.globalOptions.outputFormat)
+            restore
+                .dataFormat(data.result, {
+                verbose,
+                streams: this.streams,
+                errors: data.errors,
+            })
+                .log(this.globalOptions.outputFormat);
+        return data;
+    }
+}
+exports.ExportCommand = ExportCommand;

package/lib/commands/InitCommand.d.ts

@@ -1,12 +1,47 @@
-import type { RepositoryConfig } from "../utils/datatruck/config-type";
-import { If } from "../utils/ts";
+import { InferOptions } from "../utils/options";
 import { CommandAbstract } from "./CommandAbstract";
-export type InitCommandOptions<TResolved = false> = {
-    repository?: If<TResolved, string[]>;
-    repositoryType?: If<TResolved, RepositoryConfig["type"][]>;
+export declare const initCommandOptions: {
+    repositoryNames: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
+    repositoryTypes: {
+        description: string;
+        shortFlag: string;
+        value: "array";
+    };
 };
-export declare class InitCommand extends CommandAbstract<InitCommandOptions<false>, InitCommandOptions<true>> {
-    optionsConfig(): import("../utils/cli").OptionsConfig<InitCommandOptions<false>, InitCommandOptions<true>>;
+export type InitCommandOptions = InferOptions<typeof initCommandOptions>;
+export declare class InitCommand extends CommandAbstract<typeof initCommandOptions> {
+    static config(): {
+        name: string;
+        alias: string;
+        options: {
+            repositoryNames: {
+                description: string;
+                shortFlag: string;
+                value: "array";
+            };
+            repositoryTypes: {
+                description: string;
+                shortFlag: string;
+                value: "array";
+            };
+        };
+    };
+    get optionsConfig(): {
+        repositoryNames: {
+            description: string;
+            shortFlag: string;
+            value: "array";
+        };
+        repositoryTypes: {
+            description: string;
+            shortFlag: string;
+            value: "array";
+        };
+    };
     exec(): Promise<{
         result: {
             repositoryName: string;
@@ -15,5 +50,6 @@ export declare class InitCommand extends CommandAbstract<InitCommandOptions<fals
             error: Error | null;
         }[];
         exitCode: number;
+        errors: Error[];
     }>;
 }

package/lib/commands/InitCommand.js

@@ -1,36 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InitCommand = void 0;
+exports.InitCommand = exports.initCommandOptions = void 0;
 const ConfigAction_1 = require("../actions/ConfigAction");
 const InitAction_1 = require("../actions/InitAction");
 const cli_1 = require("../utils/cli");
 const data_format_1 = require("../utils/data-format");
-const string_1 = require("../utils/string");
+const error_1 = require("../utils/error");
 const CommandAbstract_1 = require("./CommandAbstract");
+exports.initCommandOptions = {
+    ...InitAction_1.initActionOptions,
+};
 class InitCommand extends CommandAbstract_1.CommandAbstract {
-    optionsConfig() {
-        return this.castOptionsConfig({
-            repository: {
-                description: "Filter by repository names",
-                option: "-r,--repository <values>",
-                parser: string_1.parseStringList,
-            },
-            repositoryType: {
-                description: "Filter by repository types",
-                option: "-rt,--repository-type <values>",
-                parser: (v) => (0, string_1.parseStringList)(v),
-            },
-        });
+    static config() {
+        return {
+            name: "init",
+            alias: "i",
+            options: exports.initCommandOptions,
+        };
+    }
+    get optionsConfig() {
+        return exports.initCommandOptions;
     }
     async exec() {
         const verbose = this.globalOptions.verbose ?? 0;
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const init = new InitAction_1.InitAction(config, {
-            repositoryNames: this.options.repository,
-            repositoryTypes: this.options.repositoryType,
+            repositoryNames: this.options.repositoryNames,
+            repositoryTypes: this.options.repositoryTypes,
             verbose: verbose > 0,
         });
         const result = await init.exec();
+        const exitCode = result.some((item) => item.error) ? 1 : 0;
+        const errors = result
+            .filter((item) => item.error && (verbose || !(item.error instanceof error_1.AppError)))
+            .map(({ error }) => error);
         const dataFormat = new data_format_1.DataFormat({
             streams: this.streams,
             json: result,
@@ -47,13 +50,13 @@ class InitCommand extends CommandAbstract_1.CommandAbstract {
                     item.repositoryName,
                     item.repositoryType,
                     item.repositorySource,
-                    (0, cli_1.renderError)(item.error, verbose),
+                    (0, cli_1.renderError)(item.error, errors.indexOf(item.error)),
                 ]),
             },
         });
         if (this.globalOptions.outputFormat)
             dataFormat.log(this.globalOptions.outputFormat);
-        return { result, exitCode: 0 };
+        return { result, exitCode, errors };
     }
 }
 exports.InitCommand = InitCommand;