From 7b4c8815e70e88a8814d1a9ca94bd1ccdf094f2b Mon Sep 17 00:00:00 2001 From: laohan <120936337@qq.com> Date: Tue, 24 May 2022 21:56:51 +0800 Subject: [PATCH] Fix `ProgressData#deletedCount` (#142) --- index.js | 16 +++++++--------- readme.md | 4 ++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/index.js b/index.js index 735aabe..472b93c 100644 --- a/index.js +++ b/index.js @@ -74,7 +74,9 @@ module.exports = async (patterns, {force, dryRun, cwd = process.cwd(), onProgres }); } - const mapper = async (file, fileIndex) => { + let deletedCount = 0; + + const mapper = async file => { file = path.resolve(cwd, file); if (!force) { @@ -85,10 +87,12 @@ module.exports = async (patterns, {force, dryRun, cwd = process.cwd(), onProgres await rimrafP(file, rimrafOptions); } + deletedCount += 1; + onProgress({ totalCount: files.length, - deletedCount: fileIndex, - percent: fileIndex / files.length + deletedCount, + percent: deletedCount / files.length }); return file; @@ -96,12 +100,6 @@ module.exports = async (patterns, {force, dryRun, cwd = process.cwd(), onProgres const removedFiles = await pMap(files, mapper, options); - onProgress({ - totalCount: files.length, - deletedCount: files.length, - percent: 1 - }); - removedFiles.sort((a, b) => a.localeCompare(b)); return removedFiles; diff --git a/readme.md b/readme.md index bfd47f4..eefdde8 100644 --- a/readme.md +++ b/readme.md @@ -127,8 +127,8 @@ await del(patterns, { ```js { - totalFiles: number, - deletedFiles: number, + totalCount: number, + deletedCount: number, percent: number } ```