feat: switch to use name status

package.json

@@ -34,10 +34,12 @@
   "dependencies": {
     "@actions/core": "1.10.0",
     "@actions/exec": "1.1.1",
+    "lodash": "^4.17.15",
     "micromatch": "^4.0.5"
   },
   "devDependencies": {
     "@types/jest": "29.5.2",
+    "@types/lodash": "^4.14.195",
     "@types/micromatch": "^4.0.2",
     "@types/node": "20.2.1",
     "@types/uuid": "9.0.2",
@@ -51,6 +53,6 @@
     "jest": "29.5.0",
     "prettier": "2.8.8",
     "ts-jest": "29.1.0",
-    "typescript": "5.1.3"
+    "typescript": "5.0.4"
   }
 }

src/changedFiles.ts

@@ -4,11 +4,13 @@ import {DiffResult} from './commitSha'
 import {Inputs} from './inputs'
 import {
   getDirnameMaxDepth,
-  gitDiff,
   gitRenamedFiles,
   gitSubmoduleDiffSHA,
-  jsonOutput
+  jsonOutput,
+  getAllChangedFiles,
+  ChangeTypeEnum
 } from './utils'
+import flatten from 'lodash/flatten'
 
 export const getRenamedFiles = async ({
   inputs,
@@ -68,30 +70,26 @@ export const getRenamedFiles = async ({
   return renamedFiles.join(inputs.oldNewFilesSeparator)
 }
 
-export const getDiffFiles = async ({
-  inputs,
+export type ChangedFiles = {
+  [key in ChangeTypeEnum]: string[]
+}
+
+export const getAllDiffFiles = async ({
   workingDirectory,
   hasSubmodule,
   diffResult,
-  diffFilter,
-  filePatterns = [],
   submodulePaths
 }: {
-  inputs: Inputs
   workingDirectory: string
   hasSubmodule: boolean
   diffResult: DiffResult
-  diffFilter: string
-  filePatterns?: string[]
   submodulePaths: string[]
-}): Promise<string> => {
-  let files = await gitDiff({
+}): Promise<ChangedFiles> => {
+  const files = await getAllChangedFiles({
     cwd: workingDirectory,
     sha1: diffResult.previousSha,
     sha2: diffResult.currentSha,
-    diff: diffResult.diff,
-    diffFilter,
-    filePatterns
+    diff: diffResult.diff
   })
 
   if (hasSubmodule) {
@@ -110,32 +108,107 @@ export const getDiffFiles = async ({
       )
 
       if (submoduleShaResult.currentSha && submoduleShaResult.previousSha) {
-        const submoduleFiles = await gitDiff({
+        const submoduleFiles = await getAllChangedFiles({
           cwd: submoduleWorkingDirectory,
           sha1: submoduleShaResult.previousSha,
           sha2: submoduleShaResult.currentSha,
           diff: diffResult.diff,
-          diffFilter,
           isSubmodule: true,
-          filePatterns,
           parentDir: submodulePath
         })
-        files.push(...submoduleFiles)
+
+        for (const changeType of Object.keys(
+          submoduleFiles
+        ) as ChangeTypeEnum[]) {
+          if (!files[changeType]) {
+            files[changeType] = []
+          }
+          files[changeType].push(...submoduleFiles[changeType])
+        }
+      }
+    }
+  }
+
+  return files
+}
+
+function* getChangeTypeFilesGenerator({
+  inputs,
+  changedFiles,
+  changeTypes
+}: {
+  inputs: Inputs
+  changedFiles: ChangedFiles
+  changeTypes: ChangeTypeEnum[]
+}): Generator<string> {
+  for (const changeType of changeTypes) {
+    const files = changedFiles[changeType] || []
+    for (const file of files) {
+      if (inputs.dirNames) {
+        yield getDirnameMaxDepth({
+          pathStr: file,
+          dirNamesMaxDepth: inputs.dirNamesMaxDepth,
+          excludeCurrentDir:
+            inputs.dirNamesExcludeRoot || inputs.dirNamesExcludeCurrentDir
+        })
+      } else {
+        yield file
       }
     }
   }
+}
+
+export const getChangeTypeFiles = async ({
+  inputs,
+  changedFiles,
+  changeTypes
+}: {
+  inputs: Inputs
+  changedFiles: ChangedFiles
+  changeTypes: ChangeTypeEnum[]
+}): Promise<string> => {
+  const files = [
+    ...new Set(getChangeTypeFilesGenerator({inputs, changedFiles, changeTypes}))
+  ]
+
+  if (inputs.json) {
+    return jsonOutput({value: files, shouldEscape: inputs.escapeJson})
+  }
+
+  return files.join(inputs.separator)
+}
 
-  if (inputs.dirNames) {
-    files = files.map(file =>
-      getDirnameMaxDepth({
+function* getAllChangeTypeFilesGenerator({
+  inputs,
+  changedFiles
+}: {
+  inputs: Inputs
+  changedFiles: ChangedFiles
+}): Generator<string> {
+  for (const file of flatten(Object.values(changedFiles))) {
+    if (inputs.dirNames) {
+      yield getDirnameMaxDepth({
         pathStr: file,
         dirNamesMaxDepth: inputs.dirNamesMaxDepth,
         excludeCurrentDir:
           inputs.dirNamesExcludeRoot || inputs.dirNamesExcludeCurrentDir
       })
-    )
-    files = [...new Set(files)]
+    } else {
+      yield file
+    }
   }
+}
+
+export const getAllChangeTypeFiles = async ({
+  inputs,
+  changedFiles
+}: {
+  inputs: Inputs
+  changedFiles: ChangedFiles
+}): Promise<string> => {
+  const files = [
+    ...new Set(getAllChangeTypeFilesGenerator({inputs, changedFiles}))
+  ]
 
   if (inputs.json) {
     return jsonOutput({value: files, shouldEscape: inputs.escapeJson})