lint-staged 12.2.1 → 12.2.2

package/lib/getConfigGroups.js

@@ -2,10 +2,15 @@
 
 import path from 'path'
 
+import debug from 'debug'
+import objectInspect from 'object-inspect'
+
 import { loadConfig } from './loadConfig.js'
 import { ConfigNotFoundError } from './symbols.js'
 import { validateConfig } from './validateConfig.js'
 
+const debugLog = debug('lint-staged:getConfigGroups')
+
 /**
  * Return matched files grouped by their configuration.
  *
@@ -13,17 +18,27 @@ import { validateConfig } from './validateConfig.js'
  * @param {Object} [options.configObject] - Explicit config object from the js API
  * @param {string} [options.configPath] - Explicit path to a config file
  * @param {string} [options.cwd] - Current working directory
+ * @param {string} [options.files] - List of staged files
  * @param {Logger} logger
  */
-export const getConfigGroups = async ({ configObject, configPath, files }, logger = console) => {
+export const getConfigGroups = async (
+  { configObject, configPath, cwd, files },
+  logger = console
+) => {
+  debugLog('Grouping configuration files...')
+
   // Return explicit config object from js API
   if (configObject) {
+    debugLog('Using single direct configuration object...')
+
     const config = validateConfig(configObject, 'config object', logger)
     return { '': { config, files } }
   }
 
   // Use only explicit config path instead of discovering multiple
   if (configPath) {
+    debugLog('Using single configuration path...')
+
     const { config, filepath } = await loadConfig({ configPath }, logger)
 
     if (!config) {
@@ -35,6 +50,8 @@ export const getConfigGroups = async ({ configObject, configPath, files }, logge
     return { [configPath]: { config: validatedConfig, files } }
   }
 
+  debugLog('Grouping staged files by their directories...')
+
   // Group files by their base directory
   const filesByDir = files.reduce((acc, file) => {
     const dir = path.normalize(path.dirname(file))
@@ -48,33 +65,48 @@ export const getConfigGroups = async ({ configObject, configPath, files }, logge
     return acc
   }, {})
 
+  debugLog('Grouped staged files into %d directories:', Object.keys(filesByDir).length)
+  debugLog(objectInspect(filesByDir, { indent: 2 }))
+
   // Group files by their discovered config
   // { '.lintstagedrc.json': { config: {...}, files: [...] } }
   const configGroups = {}
 
-  await Promise.all(
-    Object.entries(filesByDir).map(([dir, files]) => {
-      // Discover config from the base directory of the file
-      return loadConfig({ cwd: dir }, logger).then(({ config, filepath }) => {
-        if (!config) return
+  debugLog('Searching config files...')
+
+  const searchConfig = async (cwd, files = []) => {
+    const { config, filepath } = await loadConfig({ cwd }, logger)
+    if (!config) {
+      debugLog('Found no config from "%s"!', cwd)
+      return
+    }
+
+    if (filepath in configGroups) {
+      debugLog('Found existing config "%s" from "%s"!', filepath, cwd)
+      // Re-use cached config and skip validation
+      configGroups[filepath].files.push(...files)
+    } else {
+      debugLog('Found new config "%s" from "%s"!', filepath, cwd)
 
-        if (filepath in configGroups) {
-          // Re-use cached config and skip validation
-          configGroups[filepath].files.push(...files)
-          return
-        }
+      const validatedConfig = validateConfig(config, filepath, logger)
+      configGroups[filepath] = { config: validatedConfig, files }
+    }
+  }
 
-        const validatedConfig = validateConfig(config, filepath, logger)
-        configGroups[filepath] = { config: validatedConfig, files }
-      })
-    })
-  )
+  // Start by searching from cwd
+  await searchConfig(cwd)
+
+  // 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/runAll.js

@@ -114,7 +114,7 @@ export const runAll = async (
     return ctx
   }
 
-  const configGroups = await getConfigGroups({ configObject, configPath, files }, logger)
+  const configGroups = await getConfigGroups({ configObject, configPath, cwd, files }, logger)
 
   // lint-staged 10 will automatically add modifications to index
   // Warn user when their command includes `git add`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lint-staged",
-  "version": "12.2.1",
+  "version": "12.2.2",
   "description": "Lint files staged by git",
   "license": "MIT",
   "repository": "https://github.com/okonet/lint-staged",