chore: refactor function (#1572)

Co-authored-by: GitHub Action <action@github.com> Co-authored-by: repo-ranger[bot] <39074581+repo-ranger[bot]@users.noreply.github.com>
tj-actions · Sep 16, 2023 · d8904df · d8904df
1 parent 662c03e
commit d8904df
Show file tree

Hide file tree

Showing 4 changed files with 128 additions and 127 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/changedFiles.ts b/src/changedFiles.ts
@@ -4,6 +4,7 @@ import type {RestEndpointMethodTypes} from '@octokit/rest'
 import flatten from 'lodash/flatten'
 import mm from 'micromatch'
 import * as path from 'path'
+import {setChangedFilesOutput} from './changedFilesOutput'
 
 import {DiffResult} from './commitSha'
 import {Inputs} from './inputs'
@@ -12,12 +13,79 @@ import {
   getAllChangedFiles,
   getDirnameMaxDepth,
   getDirNamesIncludeFilesPattern,
+  getFilteredChangedFiles,
   gitRenamedFiles,
   gitSubmoduleDiffSHA,
   isWindows,
   jsonOutput
 } from './utils'
 
+export const processChangedFiles = async ({
+  filePatterns,
+  allDiffFiles,
+  inputs,
+  yamlFilePatterns
+}: {
+  filePatterns: string[]
+  allDiffFiles: ChangedFiles
+  inputs: Inputs
+  yamlFilePatterns: Record<string, string[]>
+}): Promise<void> => {
+  if (filePatterns.length > 0) {
+    core.startGroup('changed-files-patterns')
+    const allFilteredDiffFiles = await getFilteredChangedFiles({
+      allDiffFiles,
+      filePatterns
+    })
+    core.debug(
+      `All filtered diff files: ${JSON.stringify(allFilteredDiffFiles)}`
+    )
+    await setChangedFilesOutput({
+      allDiffFiles,
+      allFilteredDiffFiles,
+      inputs,
+      filePatterns
+    })
+    core.info('All Done!')
+    core.endGroup()
+  }
+
+  if (Object.keys(yamlFilePatterns).length > 0) {
+    for (const key of Object.keys(yamlFilePatterns)) {
+      core.startGroup(`changed-files-yaml-${key}`)
+      const allFilteredDiffFiles = await getFilteredChangedFiles({
+        allDiffFiles,
+        filePatterns: yamlFilePatterns[key]
+      })
+      core.debug(
+        `All filtered diff files for ${key}: ${JSON.stringify(
+          allFilteredDiffFiles
+        )}`
+      )
+      await setChangedFilesOutput({
+        allDiffFiles,
+        allFilteredDiffFiles,
+        inputs,
+        filePatterns: yamlFilePatterns[key],
+        outputPrefix: key
+      })
+      core.info('All Done!')
+      core.endGroup()
+    }
+  }
+
+  if (filePatterns.length === 0 && Object.keys(yamlFilePatterns).length === 0) {
+    core.startGroup('changed-files-all')
+    await setChangedFilesOutput({
+      allDiffFiles,
+      allFilteredDiffFiles: allDiffFiles,
+      inputs
+    })
+    core.info('All Done!')
+    core.endGroup()
+  }
+}
+
 export const getRenamedFiles = async ({
   inputs,
   workingDirectory,

diff --git a/src/main.ts b/src/main.ts
@@ -2,13 +2,12 @@ import * as core from '@actions/core'
 import * as github from '@actions/github'
 import path from 'path'
 import {
-  ChangedFiles,
+  processChangedFiles,
   ChangeTypeEnum,
   getAllDiffFiles,
   getChangedFilesFromGithubAPI,
   getRenamedFiles
 } from './changedFiles'
-import {setChangedFilesOutput} from './changedFilesOutput'
 import {
   DiffResult,
   getSHAForNonPullRequestEvent,
@@ -18,7 +17,6 @@ import {Env, getEnv} from './env'
 import {getInputs, Inputs} from './inputs'
 import {
   getFilePatterns,
-  getFilteredChangedFiles,
   getRecoverFilePatterns,
   getSubmodulePath,
   getYamlFilePatterns,
@@ -31,73 +29,7 @@ import {
   verifyMinimumGitVersion
 } from './utils'
 
-const changedFilesOutput = async ({
-  filePatterns,
-  allDiffFiles,
-  inputs,
-  yamlFilePatterns
-}: {
-  filePatterns: string[]
-  allDiffFiles: ChangedFiles
-  inputs: Inputs
-  yamlFilePatterns: Record<string, string[]>
-}): Promise<void> => {
-  if (filePatterns.length > 0) {
-    core.startGroup('changed-files-patterns')
-    const allFilteredDiffFiles = await getFilteredChangedFiles({
-      allDiffFiles,
-      filePatterns
-    })
-    core.debug(
-      `All filtered diff files: ${JSON.stringify(allFilteredDiffFiles)}`
-    )
-    await setChangedFilesOutput({
-      allDiffFiles,
-      allFilteredDiffFiles,
-      inputs,
-      filePatterns
-    })
-    core.info('All Done!')
-    core.endGroup()
-  }
-
-  if (Object.keys(yamlFilePatterns).length > 0) {
-    for (const key of Object.keys(yamlFilePatterns)) {
-      core.startGroup(`changed-files-yaml-${key}`)
-      const allFilteredDiffFiles = await getFilteredChangedFiles({
-        allDiffFiles,
-        filePatterns: yamlFilePatterns[key]
-      })
-      core.debug(
-        `All filtered diff files for ${key}: ${JSON.stringify(
-          allFilteredDiffFiles
-        )}`
-      )
-      await setChangedFilesOutput({
-        allDiffFiles,
-        allFilteredDiffFiles,
-        inputs,
-        filePatterns: yamlFilePatterns[key],
-        outputPrefix: key
-      })
-      core.info('All Done!')
-      core.endGroup()
-    }
-  }
-
-  if (filePatterns.length === 0 && Object.keys(yamlFilePatterns).length === 0) {
-    core.startGroup('changed-files-all')
-    await setChangedFilesOutput({
-      allDiffFiles,
-      allFilteredDiffFiles: allDiffFiles,
-      inputs
-    })
-    core.info('All Done!')
-    core.endGroup()
-  }
-}
-
-const getChangedFilesFromLocalGit = async ({
+const getChangedFilesFromLocalGitHistory = async ({
   inputs,
   env,
   workingDirectory,
@@ -216,7 +148,7 @@ const getChangedFilesFromLocalGit = async ({
     })
   }
 
-  await changedFilesOutput({
+  await processChangedFiles({
     filePatterns,
     allDiffFiles,
     inputs,
@@ -267,7 +199,7 @@ const getChangedFilesFromRESTAPI = async ({
   core.debug(`All diff files: ${JSON.stringify(allDiffFiles)}`)
   core.info('All Done!')
 
-  await changedFilesOutput({
+  await processChangedFiles({
     filePatterns,
     allDiffFiles,
     inputs,
@@ -349,7 +281,7 @@ export async function run(): Promise<void> {
     }
 
     core.info('Using local .git directory')
-    await getChangedFilesFromLocalGit({
+    await getChangedFilesFromLocalGitHistory({
       inputs,
       env,
       workingDirectory,