@datatruck/cli 0.40.0 → 0.40.2

package/lib/utils/object.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StrictMap = exports.groupBy = exports.getErrorProperties = exports.pickProps = exports.omitProp = exports.merge = void 0;
+exports.StrictMap = void 0;
+exports.merge = merge;
+exports.omitProp = omitProp;
+exports.pickProps = pickProps;
+exports.getErrorProperties = getErrorProperties;
+exports.groupBy = groupBy;
 function merge(target, ...sources) {
     const isObject = (o) => typeof o === "object" && o !== null;
     for (const source of sources)
@@ -12,13 +17,11 @@ function merge(target, ...sources) {
         }
     return target;
 }
-exports.merge = merge;
 function omitProp(object, name) {
     const result = { ...object };
     delete result[name];
     return result;
 }
-exports.omitProp = omitProp;
 function pickProps(object, input) {
     const result = {};
     for (const name in input) {
@@ -27,7 +30,6 @@ function pickProps(object, input) {
     }
     return result;
 }
-exports.pickProps = pickProps;
 function getErrorProperties(error) {
     const alt = {};
     for (const key of Object.getOwnPropertyNames(error)) {
@@ -35,7 +37,6 @@ function getErrorProperties(error) {
     }
     return alt;
 }
-exports.getErrorProperties = getErrorProperties;
 function groupBy(items, keyOrCb, single) {
     const keyCb = typeof keyOrCb === "function"
         ? keyOrCb
@@ -64,7 +65,6 @@ function groupBy(items, keyOrCb, single) {
         }, {});
     }
 }
-exports.groupBy = groupBy;
 class StrictMap {
     serializeKey;
     constructor(serializeKey) {

package/lib/utils/options.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringifyOptions = exports.createCommand = void 0;
+exports.createCommand = createCommand;
+exports.stringifyOptions = stringifyOptions;
 const string_1 = require("./string");
 const commander_1 = require("commander");
 function createCommand(config, action) {
@@ -49,7 +50,9 @@ function createCommand(config, action) {
         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 parse = typeof option.value === "string"
+                    ? parsers[option.value]
+                    : option.value;
                 const cliValue = cliOptions[option.flag ?? name] ?? option.defaults;
                 if (cliValue !== undefined)
                     commandOptions[name] = parse ? parse(cliValue) : cliValue;
@@ -64,7 +67,6 @@ function createCommand(config, action) {
         return await action(options);
     });
 }
-exports.createCommand = createCommand;
 function stringifyOptions(options, object) {
     const result = [];
     const prepend = [];
@@ -92,4 +94,3 @@ function stringifyOptions(options, object) {
     }
     return [...prepend, ...result];
 }
-exports.stringifyOptions = stringifyOptions;

package/lib/utils/process.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Readable, Writable } from "stream";
 export type ProcessEnv = {
     [name: string]: string | undefined;

package/lib/utils/process.js

@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logProcess = exports.logStderr = exports.logStdout = void 0;
+exports.logStdout = logStdout;
+exports.logStderr = logStderr;
+exports.logProcess = logProcess;
 const cli_1 = require("./cli");
 const chalk_1 = __importDefault(require("chalk"));
 const stream_1 = require("stream");
@@ -13,11 +15,9 @@ function logStdout(input) {
         text += "\n";
     input.stderr ? process.stderr.write(text) : process.stdout.write(text);
 }
-exports.logStdout = logStdout;
 function logStderr(data, colorize) {
     process.stdout.write(colorize ? chalk_1.default.red(data) : data);
 }
-exports.logStderr = logStderr;
 async function logProcess(command, argv, options) {
     const logEnv = options.envNames?.reduce((env, key) => {
         const value = options?.env?.[key];
@@ -33,4 +33,3 @@ async function logProcess(command, argv, options) {
         ]
         : argv, logEnv, options.toStderr);
 }
-exports.logProcess = logProcess;

package/lib/utils/progress.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { Timer } from "./date";
 export type BasicProgress = {
     percent: number;

package/lib/utils/progress.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderProgressStats = exports.renderProgress = exports.ProgressManager = void 0;
+exports.ProgressManager = void 0;
+exports.renderProgress = renderProgress;
+exports.renderProgressStats = renderProgressStats;
 const bytes_1 = require("./bytes");
 const cli_1 = require("./cli");
 const date_1 = require("./date");
@@ -121,7 +123,6 @@ function renderProgress(progress, bar) {
         progress.relative && renderProgressStats(progress.relative, bar),
     ].filter((v) => !!v);
 }
-exports.renderProgress = renderProgress;
 function renderProgressStats(stats, progressBar) {
     const text = [];
     if (typeof stats.percent === "number") {
@@ -160,4 +161,3 @@ function renderProgressStats(stats, progressBar) {
     const sep = (0, chalk_1.grey)(`|`);
     return text.join(` ${sep} `);
 }
-exports.renderProgressStats = renderProgressStats;

package/lib/utils/reportSteps.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runReportSteps = exports.isReportStep = void 0;
+exports.isReportStep = isReportStep;
+exports.runReportSteps = runReportSteps;
 const error_1 = require("./error");
 const http_1 = require("./http");
 function isReportStep(step) {
     return step.type === "telegram" || step.type === "ntfy";
 }
-exports.isReportStep = isReportStep;
 async function runReportSteps(input, options) {
     const steps = Array.isArray(input) ? input : [input];
     for (const step of steps) {
@@ -39,4 +39,3 @@ async function runReportSteps(input, options) {
         }
     }
 }
-exports.runReportSteps = runReportSteps;

package/lib/utils/spawnSteps.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runSpawnSteps = exports.isSpawnStep = void 0;
+exports.isSpawnStep = isSpawnStep;
+exports.runSpawnSteps = runSpawnSteps;
 const async_process_1 = require("./async-process");
 const string_1 = require("./string");
 const temp_1 = require("./temp");
@@ -27,7 +28,6 @@ async function writeNodeScript(options) {
 function isSpawnStep(step) {
     return step.type === "process" || step.type === "node";
 }
-exports.isSpawnStep = isSpawnStep;
 async function runSpawnSteps(input, options) {
     const steps = Array.isArray(input) ? input : [input];
     for (const step of steps) {
@@ -70,4 +70,3 @@ async function runSpawnSteps(input, options) {
         }
     }
 }
-exports.runSpawnSteps = runSpawnSteps;

package/lib/utils/stream.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Writable } from "stream";
 export type StdStreams = {
     stdout: Writable;

package/lib/utils/stream.js

@@ -1,17 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.waitForClose = exports.createStdStreams = void 0;
+exports.createStdStreams = createStdStreams;
+exports.waitForClose = waitForClose;
 function createStdStreams(options = {}) {
     return {
         stdout: options.stdout ?? process.stdout,
         stderr: options.stderr ?? process.stderr,
     };
 }
-exports.createStdStreams = createStdStreams;
 async function waitForClose(stream) {
     return new Promise((resolve, reject) => {
         stream.on("close", resolve);
         stream.on("error", reject);
     });
 }
-exports.waitForClose = waitForClose;

package/lib/utils/string.js

@@ -1,16 +1,24 @@
 "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.camelize = exports.snakeCase = void 0;
+exports.snakeCase = snakeCase;
+exports.camelize = camelize;
+exports.render = render;
+exports.parseStringList = parseStringList;
+exports.formatUri = formatUri;
+exports.splitPatterns = splitPatterns;
+exports.match = match;
+exports.createPatternFilter = createPatternFilter;
+exports.endsWith = endsWith;
+exports.undefIfEmpty = undefIfEmpty;
+exports.compareJsons = compareJsons;
 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) {
@@ -41,7 +49,6 @@ function render(subject, data) {
         return ref.toString();
     });
 }
-exports.render = render;
 function parseStringList(value, validValues, defaultsValues) {
     const resultFallback = (defaultsValues === true ? validValues : defaultsValues) ?? [];
     const result = value
@@ -54,7 +61,6 @@ function parseStringList(value, validValues, defaultsValues) {
                 throw new error_1.AppError(`Invalid value: ${v}`);
     return result;
 }
-exports.parseStringList = parseStringList;
 function formatUri(input, hidePassword) {
     let uri = "";
     if (input.protocol) {
@@ -74,7 +80,6 @@ function formatUri(input, hidePassword) {
         uri += input.path;
     return uri;
 }
-exports.formatUri = formatUri;
 function splitPatterns(patterns, map) {
     const include = [];
     const exclude = [];
@@ -92,12 +97,10 @@ function splitPatterns(patterns, map) {
         exclude: exclude.length ? exclude : undefined,
     };
 }
-exports.splitPatterns = splitPatterns;
 function match(path, include, exclude) {
     return ((!include || (0, micromatch_1.isMatch)(path, include, { dot: true })) &&
         (!exclude || !(0, micromatch_1.isMatch)(path, exclude, { dot: true })));
 }
-exports.match = match;
 function createPatternFilter(patterns) {
     if (patterns === undefined) {
         return () => true;
@@ -108,16 +111,12 @@ function createPatternFilter(patterns) {
     const { include, exclude } = patterns;
     return (input) => match(input, include, exclude);
 }
-exports.createPatternFilter = createPatternFilter;
 function endsWith(input, patterns) {
     return patterns.some((pattern) => input.endsWith(pattern));
 }
-exports.endsWith = endsWith;
 function undefIfEmpty(input) {
     return input.length ? input : undefined;
 }
-exports.undefIfEmpty = undefIfEmpty;
 function compareJsons(a, b) {
     return JSON.stringify(a) === JSON.stringify(b);
 }
-exports.compareJsons = compareJsons;

package/lib/utils/tar.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractTar = exports.normalizeTarPath = exports.createTar = exports.checkPigzLib = exports.listTar = exports.getTarVendor = void 0;
+exports.getTarVendor = getTarVendor;
+exports.listTar = listTar;
+exports.checkPigzLib = checkPigzLib;
+exports.createTar = createTar;
+exports.normalizeTarPath = normalizeTarPath;
+exports.extractTar = extractTar;
 const async_process_1 = require("./async-process");
 const cli_1 = require("./cli");
 const fs_1 = require("./fs");
@@ -28,7 +33,6 @@ async function getTarVendor(cache = true, log = false) {
     };
     return (tarVendor = find());
 }
-exports.getTarVendor = getTarVendor;
 async function listTar(options) {
     const vendor = await getTarVendor(true, options.verbose);
     const p = new async_process_1.AsyncProcess("tar", [
@@ -40,7 +44,6 @@ async function listTar(options) {
         options.onEntry?.({ path: normalizeTarPath(path) });
     });
 }
-exports.listTar = listTar;
 let pigzLib;
 async function checkPigzLib(cache = true) {
     if (cache && pigzLib !== undefined)
@@ -55,7 +58,6 @@ async function checkPigzLib(cache = true) {
         return false;
     }
 }
-exports.checkPigzLib = checkPigzLib;
 async function resolveCores(input) {
     if (!(await checkPigzLib()))
         return 1;
@@ -140,7 +142,6 @@ async function createTar(options) {
         await p.waitForClose();
     }
 }
-exports.createTar = createTar;
 /**
  * Fix `tar.exe: Option --force-local is not supported`
  */
@@ -153,7 +154,6 @@ function toLocalPath(path) {
 function normalizeTarPath(path) {
     return path.endsWith("/") ? path.slice(0, -1) : path;
 }
-exports.normalizeTarPath = normalizeTarPath;
 async function extractTar(options) {
     let total = options.onEntry
         ? options.total ??
@@ -205,4 +205,3 @@ async function extractTar(options) {
         await p.waitForClose();
     }
 }
-exports.extractTar = extractTar;

package/lib/utils/temp.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export declare function parentTmpDir(): string;
 export declare function sessionTmpDir(): string;
 export declare function ensureFreeDiskTempSpace(size: number | string): Promise<void>;

package/lib/utils/temp.js

@@ -3,7 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GargabeCollector = exports.useTempFile = exports.useTempDir = exports.mkTmpDir = exports.collectors = exports.tmpDir = exports.rmTmpDir = exports.isTmpDir = exports.ensureFreeDiskTempSpace = exports.sessionTmpDir = exports.parentTmpDir = void 0;
+exports.GargabeCollector = exports.collectors = void 0;
+exports.parentTmpDir = parentTmpDir;
+exports.sessionTmpDir = sessionTmpDir;
+exports.ensureFreeDiskTempSpace = ensureFreeDiskTempSpace;
+exports.isTmpDir = isTmpDir;
+exports.rmTmpDir = rmTmpDir;
+exports.tmpDir = tmpDir;
+exports.mkTmpDir = mkTmpDir;
+exports.useTempDir = useTempDir;
+exports.useTempFile = useTempFile;
 const globalData_1 = __importDefault(require("../globalData"));
 const fs_1 = require("./fs");
 const crypto_1 = require("crypto");
@@ -14,21 +23,17 @@ Symbol.asyncDispose ??= Symbol("Symbol.asyncDispose");
 function parentTmpDir() {
     return (0, path_1.join)(globalData_1.default.tempDir, "datatruck-temp");
 }
-exports.parentTmpDir = parentTmpDir;
 function sessionTmpDir() {
     return (0, path_1.join)(parentTmpDir(), process.pid.toString());
 }
-exports.sessionTmpDir = sessionTmpDir;
 async function ensureFreeDiskTempSpace(size) {
     const path = sessionTmpDir();
     await (0, fs_1.mkdirIfNotExists)(sessionTmpDir());
     await (0, fs_1.ensureFreeDiskSpace)([path], size);
 }
-exports.ensureFreeDiskTempSpace = ensureFreeDiskTempSpace;
 function isTmpDir(path) {
     return path.startsWith(sessionTmpDir()) && path.includes("datatruck-temp");
 }
-exports.isTmpDir = isTmpDir;
 async function rmTmpDir(input) {
     if (typeof input === "string") {
         if (!isTmpDir(input))
@@ -40,7 +45,6 @@ async function rmTmpDir(input) {
             await rmTmpDir(path);
     }
 }
-exports.rmTmpDir = rmTmpDir;
 function tmpDir(...keys) {
     const id = (0, crypto_1.randomUUID)().slice(0, 8);
     const path = (0, path_1.join)(sessionTmpDir(), [...keys, id].map(encodeURIComponent).join("-"));
@@ -51,14 +55,12 @@ function tmpDir(...keys) {
     }
     return path;
 }
-exports.tmpDir = tmpDir;
 exports.collectors = new Set();
 async function mkTmpDir(...keys) {
     const path = tmpDir(...keys);
     await (0, promises_1.mkdir)(path, { recursive: true });
     return path;
 }
-exports.mkTmpDir = mkTmpDir;
 async function useTempDir(...keys) {
     const path = await mkTmpDir(...keys);
     return {
@@ -71,7 +73,6 @@ async function useTempDir(...keys) {
         },
     };
 }
-exports.useTempDir = useTempDir;
 function useTempFile(path) {
     return {
         path,
@@ -83,7 +84,6 @@ function useTempFile(path) {
         },
     };
 }
-exports.useTempFile = useTempFile;
 class GargabeCollector {
     parent;
     paths = new Set();

package/lib/utils/virtual-fs.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LocalFs = exports.AbstractFs = exports.resolvePath = void 0;
+exports.LocalFs = exports.AbstractFs = void 0;
+exports.resolvePath = resolvePath;
 const fs_1 = require("./fs");
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
@@ -8,7 +9,6 @@ function resolvePath(path) {
     const { pathname } = new URL(`file:///${path}`);
     return pathname;
 }
-exports.resolvePath = resolvePath;
 class AbstractFs {
     options;
     constructor(options) {

package/lib/utils/watcher.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createWatcher = void 0;
+exports.createWatcher = createWatcher;
 function createWatcher(options) {
     let prev;
     let interval;
@@ -31,4 +31,3 @@ function createWatcher(options) {
         },
     };
 }
-exports.createWatcher = createWatcher;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.40.0",
+  "version": "0.40.2",
   "description": "Tool for creating and managing backups",
   "homepage": "https://github.com/swordev/datatruck#readme",
   "bugs": {
@@ -27,25 +27,26 @@
   ],
   "dependencies": {
     "@supercharge/promise-pool": "^3.2.0",
-    "ajv": "^8.12.0",
-    "async": "^3.2.5",
+    "ajv": "^8.17.1",
+    "async": "^3.2.6",
     "chalk": "^4.1.2",
-    "commander": "^12.0.0",
-    "croner": "^8.0.2",
-    "dayjs": "^1.11.10",
+    "commander": "^12.1.0",
+    "croner": "^8.1.1",
+    "dayjs": "^1.11.13",
     "fast-folder-size": "^2.2.0",
     "fast-glob": "^3.3.2",
-    "listr2": "^8.2.1",
-    "micromatch": "^4.0.5",
-    "mongodb": "^6.5.0",
-    "mysql2": "^3.9.4",
+    "listr2": "^8.2.4",
+    "micromatch": "^4.0.8",
+    "mongodb": "^6.9.0",
+    "mysql2": "^3.11.3",
     "tty-table": "^4.2.3",
-    "yaml": "^2.4.1"
+    "undici": "^6.19.8",
+    "yaml": "^2.5.1"
   },
   "devDependencies": {
     "@types/async": "^3.2.24",
-    "@types/micromatch": "^4.0.6",
-    "mongodb-memory-server": "^9.1.8"
+    "@types/micromatch": "^4.0.9",
+    "mongodb-memory-server": "^10.0.1"
   },
   "optionalDependencies": {
     "ts-node": "^10.9.2"