@datatruck/cli 0.36.8 → 0.38.0

package/lib/utils/options.js

@@ -0,0 +1,94 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stringifyOptions = exports.createCommand = void 0;
+const string_1 = require("./string");
+const commander_1 = require("commander");
+function createCommand(config, action) {
+    const command = commander_1.program.createCommand(config.name);
+    const argumentOptions = [];
+    if (config.alias)
+        command.alias(config.alias);
+    for (const name in config.options) {
+        const option = config.options[name];
+        const flag = option.flag ?? name;
+        const description = `${option.description}${option.defaults ? ` (defaults: ${option.defaults})` : ""}`;
+        if (flag === false) {
+            const arg = new commander_1.Argument(name, description);
+            if (option.required) {
+                arg.argRequired();
+            }
+            else {
+                arg.argOptional();
+            }
+            command.addArgument(arg);
+            argumentOptions.push(name);
+        }
+        else if (typeof flag === "string") {
+            const flags = [
+                option.shortFlag ? `-${option.shortFlag},` : "",
+                `--${name}`,
+                option.value !== "boolean"
+                    ? option.value === "array"
+                        ? " <values>"
+                        : " <value>"
+                    : "",
+            ].join("");
+            const opt = new commander_1.Option(flags, description);
+            opt.makeOptionMandatory(!!option.required);
+            command.addOption(opt);
+        }
+    }
+    const parsers = {
+        number: Number,
+        array: string_1.parseStringList,
+    };
+    return command.action(async (...args) => {
+        const inlineValues = args.slice(0, argumentOptions.length);
+        const cliOptions = args[argumentOptions.length] || {};
+        const commandOptions = {};
+        for (const name in config.options) {
+            const option = config.options[name];
+            if (option.flag !== false) {
+                const parse = typeof option.value === "string" ? parsers[option.value] : undefined;
+                const cliValue = cliOptions[option.flag ?? name] ?? option.defaults;
+                commandOptions[name] = parse ? parse(cliValue) : cliValue;
+            }
+        }
+        const options = argumentOptions.reduce((result, inlineOption, index) => {
+            const value = inlineValues[index];
+            if (value !== undefined)
+                result[inlineOption] = value;
+            return result;
+        }, commandOptions);
+        return await action(options);
+    });
+}
+exports.createCommand = createCommand;
+function stringifyOptions(options, object) {
+    const result = [];
+    const prepend = [];
+    for (const key in options) {
+        const option = options[key];
+        const value = object[key];
+        if (value !== undefined)
+            continue;
+        if (option.flag === false) {
+            prepend.push(value);
+        }
+        else {
+            const flag = option.shortFlag
+                ? `-${option.shortFlag}`
+                : `--${option.flag ?? option.shortFlag}`;
+            if (option.value === "boolean") {
+                if (option.value)
+                    result.push(flag);
+            }
+            else {
+                result.push(flag);
+                result.push(`${value}`);
+            }
+        }
+    }
+    return [...prepend, ...result];
+}
+exports.stringifyOptions = stringifyOptions;

package/lib/utils/progress.js

@@ -67,7 +67,7 @@ class ProgressManager {
             this.keydownListener = undefined;
         }
     }
-    create(input, delay = 1000) {
+    create(input, delay = 1_000) {
         const update = (progress, force) => {
             const text = this.renderProgress(progress, force);
             if (typeof text === "string") {

package/lib/utils/restic.js

@@ -165,7 +165,7 @@ class Restic {
     }
     async restore(options) {
         let progressTimeout;
-        const progressInterval = options.progressInterval ?? 30000;
+        const progressInterval = options.progressInterval ?? 30_000;
         async function progressRutine() {
             try {
                 const total_bytes = await (0, fs_1.fastFolderSizeAsync)(options.target);

package/lib/utils/string.d.ts

@@ -1,7 +1,8 @@
 export declare function snakeCase(value: string, char?: string): string;
+export declare function camelize(input: string): string;
 export declare function render(subject: string, data: Record<string, string | undefined>): string;
 type NoInfer<T> = [T][T extends any ? 0 : never];
-export declare function parseStringList<T>(value: string | undefined, validValues?: T[], defaultsValues?: NoInfer<T>[] | true): T[];
+export declare function parseStringList<T = string>(value: string | undefined, validValues?: T[], defaultsValues?: NoInfer<T>[] | true): T[];
 export type Uri = {
     protocol?: "http" | "https";
     host?: string;

package/lib/utils/string.js

@@ -1,12 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compareJsons = exports.undefIfEmpty = exports.endsWith = exports.createPatternFilter = exports.match = exports.splitPatterns = exports.formatUri = exports.parseStringList = exports.render = exports.snakeCase = void 0;
+exports.compareJsons = exports.undefIfEmpty = exports.endsWith = exports.createPatternFilter = exports.match = exports.splitPatterns = exports.formatUri = exports.parseStringList = exports.render = exports.camelize = exports.snakeCase = void 0;
 const error_1 = require("./error");
 const micromatch_1 = require("micromatch");
 function snakeCase(value, char = "_") {
     return value.replace(/[A-Z]/g, (letter) => `${char}${letter.toLowerCase()}`);
 }
 exports.snakeCase = snakeCase;
+function camelize(input) {
+    return input.replace(/-./g, (x) => x[1].toUpperCase());
+}
+exports.camelize = camelize;
 function render(subject, data) {
     return subject.replace(/{([\w\./]*)}/g, function (match, name) {
         if (!name.length) {

package/lib/utils/watcher.js

@@ -22,7 +22,7 @@ function createWatcher(options) {
         start: () => {
             clearInterval(interval);
             rutine(true).finally(() => {
-                interval = setInterval(rutine, options.interval ?? 5000);
+                interval = setInterval(rutine, options.interval ?? 5_000);
             });
         },
         stop: () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.36.8",
+  "version": "0.38.0",
   "description": "Tool for creating and managing backups",
   "homepage": "https://github.com/swordev/datatruck#readme",
   "bugs": {
@@ -26,7 +26,7 @@
     "config.schema.json"
   ],
   "dependencies": {
-    "@supercharge/promise-pool": "^3.1.1",
+    "@supercharge/promise-pool": "^3.2.0",
     "ajv": "^8.12.0",
     "async": "^3.2.5",
     "chalk": "^4.1.2",
@@ -37,9 +37,9 @@
     "fast-glob": "^3.3.2",
     "listr2": "^8.0.2",
     "micromatch": "^4.0.5",
-    "mysql2": "^3.9.1",
+    "mysql2": "^3.9.3",
     "tty-table": "^4.2.3",
-    "yaml": "^2.3.4"
+    "yaml": "^2.4.1"
   },
   "devDependencies": {
     "@types/async": "^3.2.24",