@datatruck/cli 0.34.1 → 0.34.2

package/lib/utils/fs.js

@@ -3,10 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.asFile = exports.groupFiles = exports.ensureFreeDiskSpace = exports.checkFreeDiskSpace = exports.fetchDiskStats = exports.initEmptyDir = exports.tryRm = exports.safeRename = exports.fetchData = exports.countFileLines = exports.createWriteStreamPool = exports.createFileScanner = exports.createProgress = exports.cpy = exports.readTextFile = exports.isNotFoundError = exports.updateFileStats = exports.copyFileWithStreams = exports.waitForClose = exports.writeGitIgnoreList = exports.fastglobToGitIgnore = exports.forEachFile = exports.readDir = exports.readPartialFile = exports.fastFolderSizeAsync = exports.findFile = exports.parsePackageFile = exports.parseFile = exports.include = exports.parseFileExtensions = exports.writeJSONFile = exports.existsFile = exports.existsDir = exports.safeStat = exports.ensureExistsDir = exports.ensureSingleFile = exports.ensureEmptyDir = exports.mkdirIfNotExists = exports.isLocalDir = exports.isEmptyDir = exports.isWSLSystem = void 0;
+exports.asFile = exports.groupFiles = exports.ensureFreeDiskSpace = exports.checkFreeDiskSpace = exports.fetchDiskStats = exports.initEmptyDir = exports.tryRm = exports.safeRename = exports.fetchData = exports.countFileLines = exports.createWriteStreamPool = exports.createFileScanner = exports.createProgress = exports.cpy = exports.readTextFile = exports.isNotFoundError = exports.updateFileStats = exports.copyFileWithStreams = exports.writeGitIgnoreList = exports.fastglobToGitIgnore = exports.forEachFile = exports.readDir = exports.readPartialFile = exports.fastFolderSizeAsync = exports.findFile = exports.parsePackageFile = exports.parseFile = exports.include = exports.parseFileExtensions = exports.writeJSONFile = exports.existsFile = exports.existsDir = exports.safeStat = exports.ensureExistsDir = exports.ensureSingleFile = exports.ensureEmptyDir = exports.mkdirIfNotExists = exports.isLocalDir = exports.isEmptyDir = exports.isWSLSystem = void 0;
 const pkg_1 = require("../pkg");
 const bytes_1 = require("./bytes");
 const math_1 = require("./math");
+const stream_1 = require("./stream");
 const string_1 = require("./string");
 const temp_1 = require("./temp");
 const async_1 = require("async");
@@ -246,13 +247,6 @@ async function writeGitIgnoreList(options) {
     return path;
 }
 exports.writeGitIgnoreList = writeGitIgnoreList;
-async function waitForClose(stream) {
-    return new Promise((resolve, reject) => {
-        stream.on("close", resolve);
-        stream.on("error", reject);
-    });
-}
-exports.waitForClose = waitForClose;
 async function copyFileWithStreams(source, target) {
     const r = (0, fs_1.createReadStream)(source);
     const w = (0, fs_2.createWriteStream)(target);
@@ -519,7 +513,7 @@ function createWriteStreamPool(options) {
             }
             await Promise.all(items
                 .filter((item) => !item.finished)
-                .map((item) => waitForClose(item.stream)));
+                .map((item) => (0, stream_1.waitForClose)(item.stream)));
         },
     };
 }

package/lib/utils/list.d.ts

@@ -1,10 +1,10 @@
 import { Timer } from "./date";
 import { ProgressManager } from "./progress";
-import { Streams } from "./stream";
+import { StdStreams } from "./stream";
 import { Listr, ListrGetRendererClassFromValue, ListrLogger, ListrTask, ListrTaskWrapper } from "listr2";
 export declare class List3Logger<Levels extends string = string> extends ListrLogger<Levels> {
     constructor(options?: {
-        streams?: Partial<Streams>;
+        streams?: Partial<StdStreams>;
     });
 }
 export type Listr3Context = Record<string, Record<string, any>>;
@@ -41,7 +41,7 @@ export type Listr3TaskResult<T extends Listr3Context> = {
 export type Listr3TaskResultEnd<T extends Listr3Context> = Listr3TaskResult<T> | List3SummaryResult;
 export declare class Listr3<T extends Listr3Context> extends Listr<void, "default", "simple"> {
     readonly $options: {
-        streams?: Streams;
+        streams?: StdStreams;
         progressManager?: ProgressManager;
     };
     readonly resultMap: Record<string, Listr3TaskResult<T>>;
@@ -49,7 +49,7 @@ export declare class Listr3<T extends Listr3Context> extends Listr<void, "defaul
     readonly logger: List3Logger;
     protected execTimer: Timer;
     constructor($options: {
-        streams?: Streams;
+        streams?: StdStreams;
         progressManager?: ProgressManager;
     });
     private serializeKeyIndex;

package/lib/utils/list.js

@@ -7,7 +7,7 @@ const stream_1 = require("./stream");
 const listr2_1 = require("listr2");
 class List3Logger extends listr2_1.ListrLogger {
     constructor(options = {}) {
-        const streams = (0, stream_1.createStreams)(options.streams);
+        const streams = (0, stream_1.createStdStreams)(options.streams);
         super({
             processOutput: new listr2_1.ProcessOutput(streams.stdout, streams.stderr),
         });

package/lib/utils/stream.d.ts

@@ -1,7 +1,13 @@
 /// <reference types="node" />
 import { Writable } from "stream";
-export type Streams = {
+export type StdStreams = {
     stdout: Writable;
     stderr: Writable;
 };
-export declare function createStreams(options?: Partial<Streams>): Streams;
+export declare function createStdStreams(options?: Partial<StdStreams>): StdStreams;
+export declare function waitForClose(stream: {
+    on(event: "close", cb: (...args: any[]) => any): any;
+} | {
+    on(event: "close", cb: (...args: any[]) => any): any;
+    on(event: "error", cb: (...args: any[]) => any): any;
+}): Promise<void>;

package/lib/utils/stream.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.34.1",
+  "version": "0.34.2",
   "description": "Tool for creating and managing backups",
   "homepage": "https://github.com/swordev/datatruck#readme",
   "bugs": {
@@ -37,7 +37,7 @@
     "fast-glob": "^3.3.2",
     "listr2": "^8.0.1",
     "micromatch": "^4.0.5",
-    "mysql2": "^3.6.5",
+    "mysql2": "^3.7.0",
     "tty-table": "^4.2.3",
     "yaml": "^2.3.4"
   },