lint-staged 12.3.2 → 12.3.5

package/lib/getConfigGroups.js

@@ -99,13 +99,6 @@ export const getConfigGroups = async (
   // Discover configs from the base directory of each file
   await Promise.all(Object.entries(filesByDir).map(([dir, files]) => searchConfig(dir, files)))
 
-  // Throw if no configurations were found
-  if (Object.keys(configGroups).length === 0) {
-    debugLog('Found no config groups!')
-    logger.error(`${ConfigNotFoundError.message}.`)
-    throw ConfigNotFoundError
-  }
-
   debugLog('Grouped staged files into %d groups!', Object.keys(configGroups).length)
 
   return configGroups

package/lib/getStagedFiles.js

@@ -3,6 +3,7 @@ import path from 'path'
 import normalize from 'normalize-path'
 
 import { execGit } from './execGit.js'
+import { parseGitZOutput } from './parseGitZOutput.js'
 
 export const getStagedFiles = async ({ cwd = process.cwd() } = {}) => {
   try {
@@ -14,15 +15,7 @@ export const getStagedFiles = async ({ cwd = process.cwd() } = {}) => {
 
     if (!lines) return []
 
-    // With `-z`, git prints `fileA\u0000fileB\u0000fileC\u0000` so we need to
-    // remove the last occurrence of `\u0000` before splitting
-    return (
-      lines
-        // eslint-disable-next-line no-control-regex
-        .replace(/\u0000$/, '')
-        .split('\u0000')
-        .map((file) => normalize(path.resolve(cwd, file)))
-    )
+    return parseGitZOutput(lines).map((file) => normalize(path.resolve(cwd, file)))
   } catch {
     return null
   }

package/lib/loadConfig.js

@@ -13,7 +13,7 @@ const debugLog = debug('lint-staged:loadConfig')
  * The list of files `lint-staged` will read configuration
  * from, in the declared order.
  */
-const searchPlaces = [
+export const searchPlaces = [
   'package.json',
   '.lintstagedrc',
   '.lintstagedrc.json',

package/lib/parseGitZOutput.js

@@ -0,0 +1,9 @@
+/**
+ * Return array of strings split from the output of `git <something> -z`.
+ * With `-z`, git prints `fileA\u0000fileB\u0000fileC\u0000` so we need to
+ * remove the last occurrence of `\u0000` before splitting
+ */
+export const parseGitZOutput = (input) =>
+  input
+    .replace(/\u0000$/, '') // eslint-disable-line no-control-regex
+    .split('\u0000')

package/lib/runAll.js

@@ -35,7 +35,8 @@ import {
   restoreOriginalStateSkipped,
   restoreUnstagedChangesSkipped,
 } from './state.js'
-import { GitRepoError, GetStagedFilesError, GitError } from './symbols.js'
+import { GitRepoError, GetStagedFilesError, GitError, ConfigNotFoundError } from './symbols.js'
+import { searchConfigs } from './searchConfigs.js'
 
 const debugLog = debug('lint-staged:runAll')
 
@@ -80,7 +81,8 @@ export const runAll = async (
   debugLog('Running all linter scripts...')
 
   // Resolve relative CWD option
-  cwd = cwd ? path.resolve(cwd) : process.cwd()
+  const hasExplicitCwd = !!cwd
+  cwd = hasExplicitCwd ? path.resolve(cwd) : process.cwd()
   debugLog('Using working directory `%s`', cwd)
 
   const ctx = getInitialState({ quiet })
@@ -120,6 +122,20 @@ export const runAll = async (
 
   const configGroups = await getConfigGroups({ configObject, configPath, cwd, files }, logger)
 
+  const hasExplicitConfig = configObject || configPath
+  const foundConfigs = hasExplicitConfig ? null : await searchConfigs(gitDir, logger)
+  const numberOfConfigs = hasExplicitConfig ? 1 : Object.keys(foundConfigs).length
+
+  // Throw if no configurations were found
+  if (numberOfConfigs === 0) {
+    ctx.errors.add(ConfigNotFoundError)
+    throw createError(ctx, ConfigNotFoundError)
+  }
+
+  debugLog('Found %d configs:\n%O', numberOfConfigs, foundConfigs)
+
+  const hasMultipleConfigs = numberOfConfigs > 1
+
   // lint-staged 10 will automatically add modifications to index
   // Warn user when their command includes `git add`
   let hasDeprecatedGitAdd = false
@@ -138,21 +154,25 @@ export const runAll = async (
   const matchedFiles = new Set()
 
   for (const [configPath, { config, files }] of Object.entries(configGroups)) {
+    const relativeConfig = normalize(path.relative(cwd, configPath))
     const stagedFileChunks = chunkFiles({ baseDir: gitDir, files, maxArgLength, relative })
 
+    // Use actual cwd if it's specified, or there's only a single config file.
+    // Otherwise use the directory of the config file for each config group,
+    // to make sure tasks are separated from each other.
+    const groupCwd = hasMultipleConfigs && !hasExplicitCwd ? path.dirname(configPath) : cwd
+
     const chunkCount = stagedFileChunks.length
     if (chunkCount > 1) {
       debugLog('Chunked staged files from `%s` into %d part', configPath, chunkCount)
     }
 
     for (const [index, files] of stagedFileChunks.entries()) {
-      const relativeConfig = normalize(path.relative(cwd, configPath))
-
       const chunkListrTasks = await Promise.all(
-        generateTasks({ config, cwd, files, relative }).map((task) =>
+        generateTasks({ config, cwd: groupCwd, files, relative }).map((task) =>
           makeCmdTasks({
             commands: task.commands,
-            cwd,
+            cwd: groupCwd,
             files: task.fileList,
             gitDir,
             renderer: listrOptions.renderer,
@@ -161,7 +181,14 @@ export const runAll = async (
           }).then((subTasks) => {
             // Add files from task to match set
             task.fileList.forEach((file) => {
-              matchedFiles.add(file)
+              // Make sure relative files are normalized to the
+              // group cwd, because other there might be identical
+              // relative filenames in the entire set.
+              const normalizedFile = path.isAbsolute(file)
+                ? file
+                : normalize(path.join(groupCwd, file))
+
+              matchedFiles.add(normalizedFile)
             })
 
             hasDeprecatedGitAdd =

package/lib/searchConfigs.js

@@ -0,0 +1,69 @@
+/** @typedef {import('./index').Logger} Logger */
+
+import { basename, join } from 'path'
+
+import normalize from 'normalize-path'
+
+import { execGit } from './execGit.js'
+import { loadConfig, searchPlaces } from './loadConfig.js'
+import { parseGitZOutput } from './parseGitZOutput.js'
+import { validateConfig } from './validateConfig.js'
+
+const EXEC_GIT = ['ls-files', '-z', '--full-name']
+
+const filterPossibleConfigFiles = (file) => searchPlaces.includes(basename(file))
+
+const numberOfLevels = (file) => file.split('/').length
+
+const sortDeepestParth = (a, b) => (numberOfLevels(a) > numberOfLevels(b) ? -1 : 1)
+
+/**
+ * Search all config files from the git repository
+ *
+ * @param {string} gitDir
+ * @param {Logger} logger
+ * @returns {Promise<{ [key: string]: * }>} found configs with filepath as key, and config as value
+ */
+export const searchConfigs = async (gitDir = process.cwd(), logger) => {
+  /** Get all possible config files known to git */
+  const cachedFiles = parseGitZOutput(await execGit(EXEC_GIT, { cwd: gitDir })).filter(
+    filterPossibleConfigFiles
+  )
+
+  /** Get all possible config files from uncommitted files */
+  const otherFiles = parseGitZOutput(
+    await execGit([...EXEC_GIT, '--others', '--exclude-standard'], { cwd: gitDir })
+  ).filter(filterPossibleConfigFiles)
+
+  /** Sort possible config files so that deepest is first */
+  const possibleConfigFiles = [...cachedFiles, ...otherFiles]
+    .map((file) => join(gitDir, file))
+    .map((file) => normalize(file))
+    .sort(sortDeepestParth)
+
+  /** Create object with key as config file, and value as null */
+  const configs = possibleConfigFiles.reduce(
+    (acc, configPath) => Object.assign(acc, { [configPath]: null }),
+    {}
+  )
+
+  /** Load and validate all configs to the above object */
+  await Promise.all(
+    possibleConfigFiles
+      .map((configPath) => loadConfig({ configPath }, logger))
+      .map((promise) =>
+        promise.then(({ config, filepath }) => {
+          if (config) {
+            configs[filepath] = validateConfig(config, filepath, logger)
+          }
+        })
+      )
+  )
+
+  /** Get validated configs from the above object, without any `null` values (not found) */
+  const foundConfigs = Object.entries(configs)
+    .filter(([, value]) => !!value)
+    .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {})
+
+  return foundConfigs
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lint-staged",
-  "version": "12.3.2",
+  "version": "12.3.5",
   "description": "Lint files staged by git",
   "license": "MIT",
   "repository": "https://github.com/okonet/lint-staged",
@@ -18,7 +18,10 @@
   },
   "type": "module",
   "bin": "./bin/lint-staged.js",
-  "exports": "./lib/index.js",
+  "exports": {
+    ".": "./lib/index.js",
+    "./package.json": "./package.json"
+  },
   "files": [
     "bin",
     "lib"