From 543c1a25c6c1b4906734af8e1a90d01291c87a55 Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Fri, 22 Sep 2023 09:56:45 -0600 Subject: [PATCH] Updated use of deletedFilesPaths --- src/changedFilesOutput.ts | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/changedFilesOutput.ts b/src/changedFilesOutput.ts index 016c259f..4baf28c3 100644 --- a/src/changedFilesOutput.ts +++ b/src/changedFilesOutput.ts @@ -397,16 +397,24 @@ export const setOutputsAndGetModifiedAndChangedFilesStatus = async ({ inputs.dirNames && workingDirectory ) { - const deletedFilesPaths: string[] = [] + const newDeletedFilesPaths: string[] = [] for (const deletedPath of getArrayFromPaths(deletedFiles.paths, inputs)) { if (!(await exists(path.join(workingDirectory, deletedPath)))) { - deletedFilesPaths.push(deletedPath) + newDeletedFilesPaths.push(deletedPath) } } - deletedFiles.paths = deletedFilesPaths - deletedFiles.count = deletedFilesPaths.length.toString() + deletedFiles.paths = inputs.json + ? newDeletedFilesPaths + : newDeletedFilesPaths.join(inputs.separator) + deletedFiles.count = newDeletedFilesPaths.length.toString() } + const deletedFilesPaths: string[] = getArrayFromPaths( + deletedFiles.paths, + inputs + ) + const deletedFilesCount = deletedFilesPaths.length.toString() + await setOutput({ key: getOutputKey('deleted_files', outputPrefix), value: deletedFiles.paths, @@ -418,14 +426,14 @@ export const setOutputsAndGetModifiedAndChangedFilesStatus = async ({ await setOutput({ key: getOutputKey('deleted_files_count', outputPrefix), - value: deletedFiles.count, + value: deletedFilesCount, writeOutputFiles: inputs.writeOutputFiles, outputDir: inputs.outputDir }) await setOutput({ key: getOutputKey('any_deleted', outputPrefix), - value: deletedFiles.paths.length > 0 && filePatterns.length > 0, + value: deletedFilesPaths.length > 0 && filePatterns.length > 0, writeOutputFiles: inputs.writeOutputFiles, outputDir: inputs.outputDir, json: inputs.json @@ -442,11 +450,6 @@ export const setOutputsAndGetModifiedAndChangedFilesStatus = async ({ inputs ) - const deletedFilesPaths: string[] = getArrayFromPaths( - deletedFiles.paths, - inputs - ) - const otherDeletedFiles = allOtherDeletedFilesPaths.filter( filePath => !deletedFilesPaths.includes(filePath) )