@datatruck/cli 0.5.0 → 0.6.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @datatruck/cli
 
+## 0.6.0
+
+### Minor Changes
+
+- [`0c6877d`](https://github.com/swordev/datatruck/commit/0c6877d189761e75dd434b0a8d72b71621d024de) Thanks [@juanrgm](https://github.com/juanrgm)! - Show more progress stats
+
+* [`751e1f6`](https://github.com/swordev/datatruck/commit/751e1f6d6b33d3fa96eb40d998fdd140ce0e3875) Thanks [@juanrgm](https://github.com/juanrgm)! - Add `fileCopyConcurrency` option
+
+- [`05487e6`](https://github.com/swordev/datatruck/commit/05487e6a33f875a3afb7ff0815b16da6f2a41301) Thanks [@juanrgm](https://github.com/juanrgm)! - Parse InnoDB error in `MariadbTask` to avoid infinite wait
+
+### Patch Changes
+
+- [`b62a6f8`](https://github.com/swordev/datatruck/commit/b62a6f8a82409339afd65d4f96476eb57bbfb5a2) Thanks [@juanrgm](https://github.com/juanrgm)! - Resolve target/restore path in local repository
+
 ## 0.5.0
 
 ### Minor Changes

package/Repository/GitRepository.js

@@ -13,7 +13,6 @@ const string_util_1 = require("../util/string-util");
 const RepositoryAbstract_1 = require("./RepositoryAbstract");
 const assert_1 = require("assert");
 const fast_glob_1 = __importDefault(require("fast-glob"));
-const fs_extra_1 = require("fs-extra");
 const promises_1 = require("fs/promises");
 const micromatch_1 = require("micromatch");
 const path_1 = require("path");
@@ -62,7 +61,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
             log: data.options.verbose,
         });
         if (await git.canBeInit(this.config.repo)) {
-            await (0, fs_extra_1.mkdir)(git.options.dir);
+            await (0, promises_1.mkdir)(git.options.dir);
             await git.exec(["init", "--bare", this.config.repo]);
         }
         const branchName = this.config.branch ?? "master";
@@ -182,7 +181,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
             const target = (0, path_1.join)(tmpPath, entry);
             const dir = (0, path_1.dirname)(target);
             if (!createdPaths.includes(dir)) {
-                await (0, fs_extra_1.mkdir)(dir, {
+                await (0, promises_1.mkdir)(dir, {
                     recursive: true,
                 });
                 createdPaths.push(dir);

package/Repository/LocalRepository.d.ts

@@ -10,6 +10,10 @@ export declare type MetaDataType = {
 export declare type LocalRepositoryConfigType = {
     outPath: string;
     compress?: boolean;
+    /**
+     * @default 1
+     */
+    fileCopyConcurrency?: number;
 };
 declare type CompressObjectType = {
     packs?: {

package/Repository/LocalRepository.js

@@ -16,11 +16,9 @@ const RepositoryAbstract_1 = require("./RepositoryAbstract");
 const assert_1 = require("assert");
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const fs_1 = require("fs");
-const fs_extra_1 = require("fs-extra");
 const promises_1 = require("fs/promises");
 const micromatch_1 = require("micromatch");
 const path_1 = require("path");
-const path_2 = require("path");
 const readline_1 = require("readline");
 exports.localRepositoryName = "local";
 exports.localRepositoryDefinition = {
@@ -62,6 +60,10 @@ exports.localPackageRepositoryDefinition = {
                 },
             ],
         },
+        fileCopyConcurrency: {
+            type: "integer",
+            minimum: 1,
+        },
     },
 };
 class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
@@ -111,11 +113,11 @@ class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
         if (data.options.verbose)
             (0, cli_util_1.logExec)(`Deleting ${snapshotPath}`);
         if (await (0, fs_util_1.checkDir)(snapshotPath))
-            await (0, fs_extra_1.rm)(snapshotPath, {
+            await (0, promises_1.rm)(snapshotPath, {
                 recursive: true,
             });
         if (await (0, fs_util_1.checkFile)(metaPath))
-            await (0, fs_extra_1.rm)(metaPath);
+            await (0, promises_1.rm)(metaPath);
     }
     async onSnapshots(data) {
         if (!(await (0, fs_util_1.checkDir)(this.config.outPath)))
@@ -173,8 +175,7 @@ class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
             snapshotDate: data.snapshot.date,
             packageName: data.package.name,
         });
-        const outPath = (0, path_1.join)(this.config.outPath, snapshotName);
-        const createdPaths = [];
+        const outPath = (0, path_1.resolve)((0, path_1.join)(this.config.outPath, snapshotName));
         const pkg = data.package;
         await (0, promises_1.mkdir)(outPath, {
             recursive: true,
@@ -260,35 +261,26 @@ class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
         }
         if (data.options.verbose)
             (0, cli_util_1.logExec)(`Copying files to ${outPath}`);
-        const reader = (0, readline_1.createInterface)({
-            input: (0, fs_1.createReadStream)(pathLists.path),
-        });
-        for await (const entry of reader) {
-            const source = (0, path_1.join)(sourcePath, entry);
-            const target = (0, path_1.join)(outPath, entry);
-            if (entry.endsWith("/")) {
-                await (0, promises_1.mkdir)(target, {
-                    recursive: true,
-                });
-            }
-            else {
+        await (0, fs_util_1.cpy)({
+            input: {
+                type: "pathList",
+                path: pathLists.path,
+                basePath: sourcePath,
+            },
+            targetPath: outPath,
+            concurrency: this.config.fileCopyConcurrency,
+            async onPath({ isDir, entryPath }) {
+                if (isDir)
+                    return;
                 currentFiles++;
                 await data.onProgress({
                     total: pathLists.total.all,
                     current: currentFiles,
                     percent: (0, math_util_1.progressPercent)(pathLists.total.all, currentFiles),
-                    step: entry,
+                    step: entryPath,
                 });
-                const dir = (0, path_2.dirname)(target);
-                if (!createdPaths.includes(dir)) {
-                    await (0, promises_1.mkdir)(dir, {
-                        recursive: true,
-                    });
-                    createdPaths.push(dir);
-                }
-                await (0, promises_1.copyFile)(source, target);
-            }
-        }
+            },
+        });
         const metaPath = `${outPath}.json`;
         const nodePkg = (0, fs_util_1.parsePackageFile)();
         const meta = {
@@ -303,8 +295,9 @@ class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
         await (0, promises_1.writeFile)(metaPath, LocalRepository.stringifyMetaData(meta));
     }
     async onRestore(data) {
-        const restorePath = data.targetPath ?? data.package.restorePath;
-        (0, assert_1.ok)(restorePath);
+        const relRestorePath = data.targetPath ?? data.package.restorePath;
+        (0, assert_1.ok)(relRestorePath);
+        const restorePath = (0, path_1.resolve)(relRestorePath);
         const [snapshot] = await this.onSnapshots({
             options: {
                 ids: [data.options.snapshotId],
@@ -325,19 +318,27 @@ class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
         }, true);
         if (data.options.verbose)
             (0, cli_util_1.logExec)(`Copying files to ${restorePath}`);
-        await (0, fs_extra_1.copy)(sourcePath, restorePath, {
-            filter: async (path) => {
-                const [firstFolder] = (0, path_1.relative)(sourcePath, path).split(path_1.sep);
-                const isZipFile = firstFolder.startsWith(".") && firstFolder.endsWith(".dd.zip");
+        await (0, fs_util_1.cpy)({
+            input: {
+                type: "glob",
+                sourcePath,
+            },
+            targetPath: restorePath,
+            concurrency: this.config.fileCopyConcurrency,
+            onPath: async ({ entryPath, entrySourcePath }) => {
+                const isRootFile = (0, path_1.basename)(entryPath) === entryPath;
+                const isZipFile = isRootFile &&
+                    entryPath.startsWith(".") &&
+                    entryPath.endsWith(".dd.zip");
                 await data.onProgress({
                     total: totalFiles,
                     current: Math.max(currentFiles, 0),
                     percent: (0, math_util_1.progressPercent)(totalFiles, Math.max(currentFiles, 0)),
-                    step: (0, path_1.relative)(sourcePath, path),
+                    step: entryPath,
                 });
                 if (isZipFile) {
                     await (0, zip_util_1.unzip)({
-                        input: path,
+                        input: entrySourcePath,
                         output: restorePath,
                         verbose: data.options.verbose,
                         onStream: async (stream) => await data.onProgress({

package/Repository/RepositoryAbstract.d.ts

@@ -14,10 +14,10 @@ export declare type SnapshotResultType = SnapshotType & {
     tags: string[];
 };
 export declare type ProgressDataType = {
-    total: number;
-    current: number;
-    percent: number;
-    step: string;
+    total?: number;
+    current?: number;
+    percent?: number;
+    step?: string;
     stepPercent?: number | null;
 };
 export declare type InitDataType = {

package/Repository/ResticRepository.js

@@ -190,6 +190,9 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             });
             if (data.options.verbose)
                 (0, cli_util_1.logExec)(`Writing paths lists`);
+            await data.onProgress({
+                step: "Writing excluded paths list...",
+            });
             gitignorePath = await (0, fs_util_1.writeGitIgnoreList)({
                 paths: stream,
             });
@@ -197,12 +200,19 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         if (data.options.tags?.some((tag) => tag.startsWith(ResticRepository.refPrefix)))
             throw new AppError_1.AppError(`Tag prefix is not allowed`);
         const packageTag = ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.PACKAGE, data.package.name);
+        await data.onProgress({
+            step: "Fetching last snapshot...",
+        });
         const [lastSnapshot] = await restic.snapshots({
             json: true,
             tags: [packageTag],
             latest: 1,
         });
         const nodePkg = (0, fs_util_1.parsePackageFile)();
+        let lastProgress;
+        await data.onProgress({
+            step: "Executing backup action...",
+        });
         await restic.backup({
             cwd: sourcePath,
             paths: ["."],
@@ -223,22 +233,19 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             ],
             onStream: async (streamData) => {
                 if (streamData.message_type === "status") {
-                    await data.onProgress({
-                        total: Number((streamData.total_bytes / 1024 / 1024).toFixed(2)),
-                        current: streamData.bytes_done
-                            ? Number((streamData.bytes_done / 1024 / 1024).toFixed(2))
-                            : 0,
+                    await data.onProgress((lastProgress = {
+                        total: streamData.total_files,
+                        current: streamData.files_done ?? 0,
                         percent: Number((streamData.percent_done * 100).toFixed(2)),
                         step: streamData.current_files?.join(", ") ?? "-",
-                    });
+                    }));
                 }
             },
         });
         await data.onProgress({
-            current: 100,
+            total: lastProgress?.total || 0,
+            current: lastProgress?.total || 0,
             percent: 100,
-            step: "",
-            total: 100,
         });
     }
     async onRestore(data) {

package/SessionDriver/ConsoleSessionDriver.js

@@ -82,18 +82,19 @@ class ConsoleSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract
         const parts = [
             `${padding}${message.textPrefix} [${(0, chalk_1.grey)(sessionId)}] ${message.text}`,
             badges,
-            ...(haveProgressBar
-                ? [
-                    (0, chalk_1.cyan)((0, cli_util_1.renderProgressBar)(message.progressPercent ?? 0, 10)),
-                    `${message.progressPercent?.toFixed(2)}%`,
-                    `${message.progressCurrent}/${message.progressTotal}`,
-                    message.progressStep,
-                    `${message.progressStepPercent
-                        ? (0, chalk_1.cyan)((0, cli_util_1.renderProgressBar)(message.progressStepPercent ?? 0, 10))
-                        : ""}`,
-                ].filter((v) => !!v?.length)
-                : []),
         ];
+        if (typeof message.progressPercent === "number") {
+            parts.push((0, chalk_1.cyan)((0, cli_util_1.renderProgressBar)(message.progressPercent ?? 0, 10)), `${message.progressPercent?.toFixed(2)}%`);
+        }
+        if (typeof message.progressCurrent === "number" ||
+            typeof message.progressTotal === "number") {
+            parts.push(`${message.progressCurrent ?? "?"}/${message.progressTotal ?? "?"}`);
+        }
+        if (typeof message.progressStep === "string")
+            parts.push(message.progressStep);
+        if (typeof message.progressStepPercent === "number") {
+            parts.push((0, chalk_1.cyan)((0, cli_util_1.renderProgressBar)(message.progressStepPercent ?? 0, 10)));
+        }
         return parts.join(` ${sep} `);
     }
     async onWrite(data) {

package/Task/GitTask.d.ts

@@ -18,6 +18,10 @@ export declare type GitTaskConfigType = {
      * @default true
      */
     includeConfig?: boolean;
+    /**
+     * @default 1
+     */
+    fileCopyConcurrency?: number;
 };
 export declare const gitTaskName = "git";
 export declare const gitTaskDefinition: JSONSchema7;

package/Task/GitTask.js

@@ -9,7 +9,6 @@ const process_util_1 = require("../util/process-util");
 const TaskAbstract_1 = require("./TaskAbstract");
 const assert_1 = require("assert");
 const fs_1 = require("fs");
-const fs_extra_1 = require("fs-extra");
 const promises_1 = require("fs/promises");
 const micromatch_1 = require("micromatch");
 const path_1 = require("path");
@@ -49,6 +48,10 @@ exports.gitTaskDefinition = {
         includeConfig: {
             type: "boolean",
         },
+        fileCopyConcurrency: {
+            type: "integer",
+            minimum: 1,
+        },
     },
 };
 class GitTask extends TaskAbstract_1.TaskAbstract {
@@ -69,6 +72,9 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
         (0, assert_1.ok)(typeof targetPath === "string");
         // Bundle
         const bundlePath = (0, path_1.join)(targetPath, "repo.bundle");
+        await data.onProgress({
+            step: "Creating bundle...",
+        });
         await (0, process_util_1.exec)(this.command, ["bundle", "create", bundlePath, "--all"], {
             cwd: path,
         }, {
@@ -152,40 +158,28 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
         for (const option of lsFilesConfig) {
             if (!option.include)
                 continue;
-            const createdPaths = [];
             const outPath = (0, path_1.join)(targetPath, `repo.${option.name}`);
             await (0, fs_util_1.mkdirIfNotExists)(outPath);
             if (data.options.verbose)
                 (0, cli_util_1.logExec)(`Copying ${option.name} files to ${outPath}`);
-            const reader = (0, readline_1.createInterface)({
-                input: (0, fs_1.createReadStream)(option.pathsPath),
-            });
-            for await (const entry of reader) {
-                const source = (0, path_1.join)(path, entry);
-                const target = (0, path_1.join)(outPath, entry);
-                if (entry.endsWith("/")) {
-                    await (0, promises_1.mkdir)(target, {
-                        recursive: true,
-                    });
-                }
-                else {
+            await (0, fs_util_1.cpy)({
+                input: {
+                    type: "pathList",
+                    path: option.pathsPath,
+                    basePath: path,
+                },
+                targetPath: outPath,
+                concurrency: this.config.fileCopyConcurrency,
+                onPath: async ({ entryPath }) => {
                     currentFiles++;
                     await data.onProgress({
                         total,
                         current: currentFiles,
                         percent: (0, math_util_1.progressPercent)(total, currentFiles),
-                        step: entry,
+                        step: entryPath,
                     });
-                    const dir = (0, path_1.dirname)(target);
-                    if (!createdPaths.includes(dir)) {
-                        await (0, promises_1.mkdir)(dir, {
-                            recursive: true,
-                        });
-                        createdPaths.push(dir);
-                    }
-                    await (0, promises_1.copyFile)(source, target);
-                }
-            }
+                },
+            });
             await (0, promises_1.rm)(option.pathsPath);
         }
     }
@@ -235,10 +229,15 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
             if (await (0, fs_util_1.checkDir)(sourcePath)) {
                 if (data.options.verbose)
                     (0, cli_util_1.logExec)(`Copying ${name} files to ${restorePath}`);
-                await (0, fs_extra_1.copy)(sourcePath, restorePath, {
-                    filter: async (path) => {
-                        await incrementProgress((0, path_1.relative)(sourcePath, path));
-                        return true;
+                await (0, fs_util_1.cpy)({
+                    input: {
+                        type: "glob",
+                        sourcePath,
+                    },
+                    targetPath: restorePath,
+                    concurrency: this.config.fileCopyConcurrency,
+                    onPath: async ({ entryPath }) => {
+                        await incrementProgress(entryPath);
                     },
                 });
             }

package/Task/MariadbTask.js

@@ -83,21 +83,30 @@ class MariadbTask extends TaskAbstract_1.TaskAbstract {
         await (0, fs_util_1.forEachFile)(sourcePath, () => {
             total++;
         });
-        const onData = async (lines) => {
-            const regex = /\[\d{1,}\] \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} Copying (.+) to/;
-            let path = lines
-                .split(/\r?\n/)
-                .reduce((result, line) => {
-                const matches = regex.exec(line);
-                if (matches) {
-                    current++;
-                    result.push(matches[1]);
+        let childProcess;
+        const onData = async (strLines) => {
+            const paths = [];
+            const pathRegex = /\[\d{1,}\] \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} Copying (.+) to/;
+            const lines = strLines.split(/\r?\n/);
+            let fatalError = false;
+            for (const line of lines) {
+                if (line.includes("[ERROR] InnoDB: Unsupported redo log format.") ||
+                    line.includes("Error: cannot read redo log header")) {
+                    fatalError = true;
                 }
-                return result;
-            }, [])
-                .pop();
-            if (path) {
-                path = (0, posix_1.normalize)(path);
+                else {
+                    const matches = pathRegex.exec(line);
+                    if (matches) {
+                        current++;
+                        paths.push(matches[1]);
+                    }
+                }
+            }
+            if (fatalError) {
+                childProcess.kill();
+            }
+            else if (paths.length) {
+                const path = (0, posix_1.normalize)(paths[0]);
                 await data.onProgress({
                     current,
                     percent: (0, math_util_1.progressPercent)(total, current),
@@ -108,6 +117,9 @@ class MariadbTask extends TaskAbstract_1.TaskAbstract {
         };
         await (0, process_util_1.exec)(command, args, undefined, {
             log: this.verbose,
+            onSpawn: (p) => {
+                childProcess = p;
+            },
             stdout: {
                 onData,
             },

package/Task/MssqlTask.js

@@ -8,7 +8,6 @@ const fs_util_1 = require("../util/fs-util");
 const process_util_1 = require("../util/process-util");
 const TaskAbstract_1 = require("./TaskAbstract");
 const assert_1 = require("assert");
-const fs_extra_1 = require("fs-extra");
 const promises_1 = require("fs/promises");
 const micromatch_1 = require("micromatch");
 const path_1 = require("path");
@@ -85,7 +84,7 @@ class MssqlTask extends TaskAbstract_1.TaskAbstract {
         const restorePath = data.package.restorePath;
         (0, assert_1.ok)(typeof restorePath === "string");
         await (0, fs_util_1.mkdirIfNotExists)(restorePath);
-        const files = await (0, fs_extra_1.readdir)(restorePath);
+        const files = await (0, promises_1.readdir)(restorePath);
         for (const file of files) {
             if (!file.endsWith(MssqlTask.SUFFIX))
                 continue;

package/Task/TaskAbstract.d.ts

@@ -3,10 +3,10 @@ import { RestoreActionOptionsType } from "../Action/RestoreAction";
 import { PackageConfigType } from "../Config/PackageConfig";
 import { SnapshotType } from "../Repository/RepositoryAbstract";
 export declare type ProgressDataType = {
-    total: number;
-    current: number;
-    percent: number;
-    step: string;
+    total?: number;
+    current?: number;
+    percent?: number;
+    step?: string;
     stepPercent?: number;
 };
 export declare type BackupDataType = {

package/config.schema.json

@@ -487,6 +487,10 @@
               }
             }
           ]
+        },
+        "fileCopyConcurrency": {
+          "type": "integer",
+          "minimum": 1
         }
       }
     },
@@ -615,6 +619,10 @@
         },
         "includeConfig": {
           "type": "boolean"
+        },
+        "fileCopyConcurrency": {
+          "type": "integer",
+          "minimum": 1
         }
       }
     },

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "dependencies": {
     "ajv": "^8.11.0",
+    "async": "^3.2.4",
     "chalk": "^4.1.2",
     "cli-table3": "^0.6.2",
     "commander": "^9.2.0",
     "dayjs": "^1.11.2",
     "fast-glob": "^3.2.11",
-    "fs-extra": "^10.1.0",
     "micromatch": "^4.0.5",
     "sqlite": "^4.1.1",
     "sqlite3": "^5.0.8"

package/util/GitUtil.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GitUtil = void 0;
 const fs_util_1 = require("./fs-util");
 const process_util_1 = require("./process-util");
-const fs_extra_1 = require("fs-extra");
+const promises_1 = require("fs/promises");
 class GitUtil {
     constructor(options) {
         this.options = options;
@@ -16,7 +16,7 @@ class GitUtil {
     }
     async canBeInit(repo) {
         return ((0, fs_util_1.isLocalDir)(repo) &&
-            (!(await (0, fs_util_1.checkDir)(repo)) || !(await (0, fs_extra_1.readdir)(repo)).length));
+            (!(await (0, fs_util_1.checkDir)(repo)) || !(await (0, promises_1.readdir)(repo)).length));
     }
     async clone(options) {
         return await this.exec([

package/util/ResticUtil.js

@@ -4,7 +4,6 @@ exports.ResticUtil = void 0;
 const fs_util_1 = require("./fs-util");
 const process_util_1 = require("./process-util");
 const string_util_1 = require("./string-util");
-const fs_extra_1 = require("fs-extra");
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
 class ResticUtil {
@@ -20,7 +19,7 @@ class ResticUtil {
         if (input.passwordFile)
             input = {
                 ...input,
-                password: (await (0, fs_extra_1.readFile)(input.passwordFile)).toString(),
+                password: (await (0, promises_1.readFile)(input.passwordFile)).toString(),
             };
         return `${input.backend}:${(0, string_util_1.formatUri)(input, hidePassword)}`;
     }

package/util/fs-util.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+import { Interface } from "readline";
 export declare function isLocalDir(path: string): boolean;
 export declare function isDirEmpty(path: string): Promise<boolean>;
 export declare function mkdirIfNotExists(path: string): Promise<string>;
@@ -44,3 +45,35 @@ export declare function writePathLists(options: {
         multipleStats: Record<string, number>;
     };
 }>;
+export declare function cpy(options: {
+    input: {
+        type: "glob";
+        sourcePath: string;
+        include?: string[];
+        exclude?: string[];
+    } | {
+        type: "stream";
+        basePath: string;
+        value: Interface;
+    } | {
+        type: "pathList";
+        path: string;
+        basePath: string;
+    };
+    targetPath: string;
+    /**
+     * @default 1
+     */
+    concurrency?: number;
+    onPath?: (data: {
+        isDir: boolean;
+        entryPath: string;
+        entrySourcePath: string;
+        entryTargetPath: string;
+        stats: {
+            paths: number;
+            files: number;
+            dirs: number;
+        };
+    }) => Promise<boolean | void>;
+}): Promise<void>;

package/util/fs-util.js

@@ -3,17 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writePathLists = exports.writeGitIgnoreList = exports.forEachFile = exports.checkDir = exports.checkFile = exports.readPartialFile = exports.mkTmpDir = exports.tmpDir = exports.sessionTmpDir = exports.parentTmpDir = exports.existsFile = exports.findFile = exports.parsePackageFile = exports.parseFile = exports.parseFileExtensions = exports.readdirIfExists = exports.writeJSONFile = exports.existsDir = exports.ensureEmptyDir = exports.mkdirIfNotExists = exports.isDirEmpty = exports.isLocalDir = void 0;
+exports.cpy = exports.writePathLists = exports.writeGitIgnoreList = exports.forEachFile = exports.checkDir = exports.checkFile = exports.readPartialFile = exports.mkTmpDir = exports.tmpDir = exports.sessionTmpDir = exports.parentTmpDir = exports.existsFile = exports.findFile = exports.parsePackageFile = exports.parseFile = exports.parseFileExtensions = exports.readdirIfExists = exports.writeJSONFile = exports.existsDir = exports.ensureEmptyDir = exports.mkdirIfNotExists = exports.isDirEmpty = exports.isLocalDir = void 0;
 const globalData_1 = __importDefault(require("../globalData"));
 const path_util_1 = require("./path-util");
+const async_1 = require("async");
 const crypto_1 = require("crypto");
+const fast_glob_1 = __importDefault(require("fast-glob"));
 const fs_1 = require("fs");
 const fs_2 = require("fs");
-const fs_extra_1 = require("fs-extra");
 const promises_1 = require("fs/promises");
 const micromatch_1 = require("micromatch");
 const path_1 = require("path");
 const path_2 = require("path");
+const readline_1 = require("readline");
 function isLocalDir(path) {
     return /^[\/\.]|([A-Z]:)/i.test(path);
 }
@@ -25,7 +27,7 @@ async function isDirEmpty(path) {
 exports.isDirEmpty = isDirEmpty;
 async function mkdirIfNotExists(path) {
     try {
-        await (0, fs_extra_1.mkdir)(path, {
+        await (0, promises_1.mkdir)(path, {
             recursive: true,
         });
     }
@@ -128,7 +130,7 @@ function tmpDir(prefix, id) {
 exports.tmpDir = tmpDir;
 async function mkTmpDir(prefix, id) {
     const path = tmpDir(prefix, id);
-    await (0, fs_extra_1.mkdir)(path, { recursive: true });
+    await (0, promises_1.mkdir)(path, { recursive: true });
     return path;
 }
 exports.mkTmpDir = mkTmpDir;
@@ -313,3 +315,70 @@ async function writePathLists(options) {
     };
 }
 exports.writePathLists = writePathLists;
+async function cpy(options) {
+    const stats = { paths: 0, files: 0, dirs: 0 };
+    const dirs = new Set();
+    const makeRecursiveDir = async (path) => {
+        if (!dirs.has(path)) {
+            stats.paths++;
+            stats.dirs++;
+            await (0, promises_1.mkdir)(path, {
+                recursive: true,
+            });
+            dirs.add(path);
+        }
+    };
+    const task = async (rawEntryPath, basePath) => {
+        const isDir = rawEntryPath.endsWith("/");
+        const entryPath = (0, path_1.normalize)(rawEntryPath);
+        const entrySourcePath = (0, path_1.resolve)((0, path_1.join)(basePath, rawEntryPath));
+        const entryTargetPath = (0, path_1.resolve)((0, path_1.join)(options.targetPath, rawEntryPath));
+        const onPathResult = await options?.onPath?.({
+            isDir,
+            entryPath,
+            entrySourcePath,
+            entryTargetPath,
+            stats,
+        });
+        if (onPathResult === false) {
+            return;
+        }
+        else if (isDir) {
+            await makeRecursiveDir(entryTargetPath);
+        }
+        else {
+            const dir = (0, path_1.dirname)(entryTargetPath);
+            await makeRecursiveDir(dir);
+            stats.files++;
+            await (0, promises_1.cp)(entrySourcePath, entryTargetPath);
+        }
+    };
+    const { input } = options;
+    if (input.type === "glob") {
+        const stream = await (0, fast_glob_1.default)(input.include || ["**"], {
+            cwd: input.sourcePath,
+            ignore: input.exclude,
+            dot: true,
+            onlyFiles: false,
+            markDirectories: true,
+        });
+        await (0, async_1.eachLimit)(stream, options.concurrency ?? 1, async (entryPath) => await task(entryPath, input.sourcePath));
+    }
+    else if (input.type === "stream") {
+        await (0, async_1.eachLimit)(input.value, options.concurrency ?? 1, async (entryPath) => await task(entryPath, input.basePath));
+    }
+    else if (input.type === "pathList") {
+        const stream = (0, readline_1.createInterface)({
+            input: (0, fs_1.createReadStream)(input.path),
+        });
+        await cpy({
+            ...options,
+            input: {
+                type: "stream",
+                value: stream,
+                basePath: input.basePath,
+            },
+        });
+    }
+}
+exports.cpy = cpy;