refactor: extract matchFiles and add unit tests

iiroj · iiroj · commit b392a9ffecd9 · 2026-03-14T11:47:21.000+02:00
diff --git a/lib/generateTasks.js b/lib/generateTasks.js
@@ -1,8 +1,7 @@
 import path from 'node:path'
 
-import picomatch from 'picomatch'
-
 import { createDebug } from './debug.js'
+import { matchFiles } from './matchFiles.js'
 import { normalizePath } from './normalizePath.js'
 
 const debugLog = createDebug('lint-staged:generateTasks')
@@ -30,28 +29,15 @@ export const generateTasks = ({ config, cwd = process.cwd(), files, relative = f
 
     // Only worry about children of the CWD unless the pattern explicitly
     // specifies that it concerns a parent directory.
-    const filteredFiles = relativeFiles.filter((file) => {
+    const includedFiles = relativeFiles.filter((file) => {
       if (isParentDirPattern) return true
       return !file.filepath.startsWith('..') && !path.isAbsolute(file.filepath)
     })
 
-    const isMatch = picomatch(pattern, {
-      cwd,
-      dot: true,
-      // If the pattern doesn't look like a path, enable `matchBase` to
-      // match against filenames in every directory. This makes `*.js`
-      // match both `test.js` and `subdirectory/test.js`.
-      matchBase: !pattern.includes('/'),
-      posixSlashes: true,
-      strictBrackets: true,
-    })
-
-    const fileList = filteredFiles
-      .filter((file) => isMatch(file.filepath))
-      .map((file) => ({
-        filepath: normalizePath(relative ? file.filepath : path.resolve(cwd, file.filepath)),
-        status: file.status,
-      }))
+    const fileList = matchFiles(includedFiles, pattern, cwd).map((file) => ({
+      filepath: normalizePath(relative ? file.filepath : path.resolve(cwd, file.filepath)),
+      status: file.status,
+    }))
 
     const task = { pattern, commands, fileList }
     debugLog('Generated task: \n%O', task)
diff --git a/lib/matchFiles.js b/lib/matchFiles.js
@@ -0,0 +1,22 @@
+import picomatch from 'picomatch'
+
+/**
+ * Match list of files against a pattern.
+ *
+ * @param {string} pattern
+ * @param {import('./getStagedFiles.js').StagedFile[]} files
+ */
+export const matchFiles = (files, pattern, cwd = process.cwd()) => {
+  const isMatch = picomatch(pattern, {
+    cwd,
+    dot: true,
+    // If the pattern doesn't look like a path, enable `matchBase` to
+    // match against filenames in every directory. This makes `*.js`
+    // match both `test.js` and `subdirectory/test.js`.
+    matchBase: !pattern.includes('/'),
+    posixSlashes: true,
+    strictBrackets: true,
+  })
+
+  return files.filter((file) => isMatch(file.filepath))
+}
diff --git a/test/unit/matchFiles.spec.js b/test/unit/matchFiles.spec.js
