lint-staged 16.1.6 → 16.2.0

package/lib/resolveGitRepo.js

@@ -1,11 +1,10 @@
 import path from 'node:path'
 
-import debug from 'debug'
-
+import { createDebug } from './debug.js'
 import { execGit } from './execGit.js'
 import { normalizePath } from './normalizePath.js'
 
-const debugLog = debug('lint-staged:resolveGitRepo')
+const debugLog = createDebug('lint-staged:resolveGitRepo')
 
 /**
  * Relative path up to the repo top-level directory

package/lib/runAll.js

@@ -2,11 +2,11 @@
 
 import path from 'node:path'
 
-import chalk from 'chalk'
-import debug from 'debug'
 import { Listr } from 'listr2'
 
 import { chunkFiles } from './chunkFiles.js'
+import { blackBright } from './colors.js'
+import { createDebug } from './debug.js'
 import { execGit } from './execGit.js'
 import { generateTasks } from './generateTasks.js'
 import { getFunctionTask, isFunctionTask } from './getFunctionTask.js'
@@ -36,11 +36,11 @@ import {
   restoreOriginalStateEnabled,
   restoreOriginalStateSkipped,
   restoreUnstagedChangesSkipped,
-  shouldHidePartiallyStagedFiles,
+  shouldHideUnstagedFiles,
 } from './state.js'
 import { ConfigNotFoundError, GetStagedFilesError, GitError, GitRepoError } from './symbols.js'
 
-const debugLog = debug('lint-staged:runAll')
+const debugLog = createDebug('lint-staged:runAll')
 
 /**
  * @param {ReturnType<typeof getInitialState>} ctx context
@@ -54,15 +54,20 @@ const createError = (ctx, cause) =>
  *
  * @param {object} options
  * @param {boolean} [options.allowEmpty] - Allow empty commits when tasks revert all staged changes
+ * @param {Object} [options.color] - Enable ANSI colors in output
  * @param {boolean | number} [options.concurrent] - The number of tasks to run concurrently, or false to run tasks serially
  * @param {Object} [options.configObject] - Explicit config object from the js API
  * @param {string} [options.configPath] - Explicit path to a config file
+ * @param {boolean} [options.continueOnError] - Run all tasks to completion even if one fails
  * @param {string} [options.cwd] - Current working directory
  * @param {boolean} [options.debug] - Enable debug mode
  * @param {string} [options.diff] - Override the default "--staged" flag of "git diff" to get list of files
  * @param {string} [options.diffFilter] - Override the default "--diff-filter=ACMR" flag of "git diff" to get list of files
+ * @param {boolean} [options.failOnChanges] - Fail with exit code 1 when tasks modify tracked files
+ * @param {boolean} [options.hidePartiallyStaged] - Whether to hide unstaged changes from partially staged files before running tasks
+ * @param {boolean} [options.hideUnstaged] - Whether to hide all unstaged changes before running tasks
  * @param {number} [options.maxArgLength] - Maximum argument string length
- * @param {boolean} [options.quiet] - Disable lint-staged’s own console output
+ * @param {boolean} [options.quiet] - Disable lint-staged's own console output
  * @param {boolean} [options.relative] - Pass relative filepaths to tasks
  * @param {boolean} [options.revert] - revert to original state in case of errors
  * @param {boolean} [options.stash] - Enable the backup stash, and revert in case of errors
@@ -73,13 +78,18 @@ const createError = (ctx, cause) =>
 export const runAll = async (
   {
     allowEmpty = false,
+    color = false,
     concurrent = true,
     configObject,
     configPath,
+    continueOnError = false,
     cwd,
     debug = false,
     diff,
     diffFilter,
+    failOnChanges = false,
+    hidePartiallyStaged = true,
+    hideUnstaged = false,
     maxArgLength,
     quiet = false,
     relative = false,
@@ -87,7 +97,6 @@ export const runAll = async (
     stash = diff === undefined,
     // Cannot revert to original state without stash
     revert = stash,
-    hidePartiallyStaged = true,
     verbose = false,
   },
   logger = console
@@ -99,7 +108,12 @@ export const runAll = async (
   cwd = hasExplicitCwd ? path.resolve(cwd) : process.cwd()
   debugLog('Using working directory `%s`', cwd)
 
-  const ctx = getInitialState({ quiet, revert })
+  const ctx = getInitialState({
+    hidePartiallyStaged,
+    hideUnstaged,
+    quiet,
+    revert,
+  })
 
   const { topLevelDir, gitConfigDir } = await resolveGitRepo(cwd)
   if (!topLevelDir) {
@@ -121,12 +135,16 @@ export const runAll = async (
     logger.warn(skippingBackup(hasInitialCommit, diff))
   }
 
-  ctx.shouldHidePartiallyStaged = hidePartiallyStaged
   if (!ctx.shouldHidePartiallyStaged && !quiet) {
     logger.warn(SKIPPING_HIDE_PARTIALLY_CHANGED)
   }
 
-  const stagedFiles = await getStagedFiles({ cwd: topLevelDir, diff, diffFilter })
+  // Run staged files retrieval and config search in parallel since they're independent
+  const [stagedFiles, foundConfigs] = await Promise.all([
+    getStagedFiles({ cwd: topLevelDir, diff, diffFilter }),
+    searchConfigs({ configObject, configPath, cwd, topLevelDir }, logger),
+  ])
+
   if (!stagedFiles) {
     if (!quiet) ctx.output.push(FAILED_GET_STAGED_FILES)
     ctx.errors.add(GetStagedFilesError)
@@ -140,7 +158,6 @@ export const runAll = async (
     return ctx
   }
 
-  const foundConfigs = await searchConfigs({ configObject, configPath, cwd, topLevelDir }, logger)
   const numberOfConfigs = Object.keys(foundConfigs).length
 
   // Throw if no configurations were found
@@ -165,7 +182,7 @@ export const runAll = async (
     ctx,
     exitOnError: false,
     registerSignalListeners: false,
-    ...getRenderer({ debug, quiet }, logger),
+    ...getRenderer({ color, debug, quiet }, logger),
   }
 
   /**
@@ -203,6 +220,7 @@ export const runAll = async (
           (isFunctionTask(task.commands)
             ? getFunctionTask(task.commands, task.fileList)
             : getSpawnedTasks({
+                color,
                 commands: task.commands,
                 cwd: groupCwd,
                 files: task.fileList,
@@ -231,19 +249,19 @@ export const runAll = async (
             const fileCount = task.fileList.length
 
             return {
-              title: `${task.pattern}${chalk.dim(
+              title: `${task.pattern}${blackBright(
                 ` — ${fileCount} ${fileCount === 1 ? 'file' : 'files'}`
               )}`,
               task: async (ctx, task) =>
                 task.newListr(
                   subTasks,
                   // Subtasks should not run in parallel, and should exit on error
-                  { concurrent: false, exitOnError: true }
+                  { concurrent: false, exitOnError: !continueOnError }
                 ),
               skip: () => {
                 // Skip task when no files matched
                 if (fileCount === 0) {
-                  return `${task.pattern}${chalk.dim(' — no files')}`
+                  return `${task.pattern}${blackBright(' — no files')}`
                 }
                 return false
               },
@@ -256,15 +274,16 @@ export const runAll = async (
 
       listrTasks.push({
         title:
-          `${configName}${chalk.dim(` — ${files.length} ${files.length > 1 ? 'files' : 'file'}`)}` +
-          (chunkCount > 1 ? chalk.dim(` (chunk ${index + 1}/${chunkCount})...`) : ''),
-        task: (ctx, task) => task.newListr(chunkListrTasks, { concurrent, exitOnError: true }),
+          `${configName}${blackBright(` — ${files.length} ${files.length > 1 ? 'files' : 'file'}`)}` +
+          (chunkCount > 1 ? blackBright(` (chunk ${index + 1}/${chunkCount})...`) : ''),
+        task: (ctx, task) =>
+          task.newListr(chunkListrTasks, { concurrent, exitOnError: !continueOnError }),
         skip: () => {
           // Skip if the first step (backup) failed
           if (ctx.errors.has(GitError)) return SKIPPED_GIT_ERROR
           // Skip chunk when no every task is skipped (due to no matches)
           if (chunkListrTasks.every((task) => task.skip())) {
-            return `${configName}${chalk.dim(' — no tasks to run')}`
+            return `${configName}${blackBright(' — no tasks to run')}`
           }
           return false
         },
@@ -295,11 +314,12 @@ export const runAll = async (
 
   const git = new GitWorkflow({
     allowEmpty,
-    gitConfigDir,
-    topLevelDir,
-    matchedFileChunks,
     diff,
     diffFilter,
+    failOnChanges,
+    gitConfigDir,
+    matchedFileChunks,
+    topLevelDir,
   })
 
   const runner = new Listr(
@@ -311,7 +331,7 @@ export const runAll = async (
       {
         title: 'Hiding unstaged changes to partially staged files...',
         task: (ctx) => git.hideUnstagedChanges(ctx),
-        enabled: shouldHidePartiallyStagedFiles,
+        enabled: shouldHideUnstagedFiles,
       },
       {
         title: `Running tasks for ${diff ? 'changed' : 'staged'} files...`,
@@ -326,7 +346,7 @@ export const runAll = async (
       {
         title: 'Restoring unstaged changes to partially staged files...',
         task: (ctx) => git.restoreUnstagedChanges(ctx),
-        enabled: shouldHidePartiallyStagedFiles,
+        enabled: shouldHideUnstagedFiles,
         skip: restoreUnstagedChangesSkipped,
       },
       {

package/lib/searchConfigs.js

@@ -1,17 +1,17 @@
 /** @typedef {import('./index').Logger} Logger */
 
+import fs, { constants } from 'node:fs/promises'
 import path from 'node:path'
 
-import debug from 'debug'
-
 import { CONFIG_FILE_NAMES } from './configFiles.js'
+import { createDebug } from './debug.js'
 import { execGit } from './execGit.js'
 import { loadConfig } from './loadConfig.js'
 import { normalizePath } from './normalizePath.js'
 import { parseGitZOutput } from './parseGitZOutput.js'
 import { validateConfig } from './validateConfig.js'
 
-const debugLog = debug('lint-staged:searchConfigs')
+const debugLog = createDebug('lint-staged:searchConfigs')
 
 const EXEC_GIT = ['ls-files', '-z', '--full-name', '-t']
 
@@ -21,6 +21,87 @@ const numberOfLevels = (file) => file.split('/').length
 
 const sortDeepestParth = (a, b) => (numberOfLevels(a) > numberOfLevels(b) ? -1 : 1)
 
+/**
+ * Get all possible config files from git
+ *
+ * @param {object} options
+ * @param {string} options.cwd
+ * @param {string} options.topLevelDir
+ * @returns {Promise<string[]>}
+ */
+const listConfigFilesFromGit = async ({ cwd, topLevelDir }) =>
+  execGit(
+    [
+      ...EXEC_GIT,
+      '--cached', // show all tracked files
+      '--others', // show untracked files
+      '--exclude-standard', // apply standard git exclusions (.gitignore, etc.)
+      '--',
+      ...CONFIG_PATHSPEC,
+    ],
+    { cwd }
+  )
+    .then(parseGitZOutput)
+    .then((lines) => {
+      const possibleConfigFiles = lines
+        .flatMap((line) => {
+          /**
+           * Leave out lines starting with "S " to ignore not-checked-out files in a sparse repo.
+           * The "S" status means a tracked file that is "skip-worktree"
+           * @see https://git-scm.com/docs/git-ls-files#Documentation/git-ls-files.txt--t
+           */
+          if (line.startsWith('S ')) {
+            return []
+          }
+
+          const relativePath = line.replace(/^[HSMRCK?U] /, '')
+          const absolutePath = normalizePath(path.join(topLevelDir, relativePath))
+          return [absolutePath]
+        })
+        .sort(sortDeepestParth)
+
+      debugLog('Found possible config files from git:', possibleConfigFiles)
+
+      return possibleConfigFiles
+    })
+
+/**
+ * Get all possible config files from filesystem, starting from `cwd` and
+ * moving upwards if nothing is found.
+ *
+ * @param {object} options
+ * @param {string} options.cwd
+ * @param {string[]} [possibleConfigFiles]
+ * @returns {Promise<string[]>}
+ */
+export const listConfigFilesFromFs = async ({ cwd }) => {
+  debugLog('Listing possible configs from filesystem starting from "%s"...', cwd)
+
+  const results = await Promise.allSettled(
+    CONFIG_FILE_NAMES.map(async (f) => {
+      const filepath = path.join(cwd, f)
+      await fs.access(filepath, constants.F_OK)
+      return filepath
+    })
+  )
+
+  const possibleConfigFiles = results.flatMap((r) =>
+    r.status === 'fulfilled' ? [normalizePath(r.value)] : []
+  )
+
+  if (possibleConfigFiles.length > 0) {
+    debugLog('Found possible config files from filesystem:', possibleConfigFiles)
+    return possibleConfigFiles.sort((a, b) => a.localeCompare(b))
+  }
+
+  const parentDir = path.dirname(cwd)
+  if (parentDir === cwd) {
+    return [] /** Root-level / */
+  }
+
+  return listConfigFilesFromFs({ cwd: parentDir })
+}
+
 /**
  * Search all config files from the git repository, preferring those inside `cwd`.
  *
@@ -28,6 +109,7 @@ const sortDeepestParth = (a, b) => (numberOfLevels(a) > numberOfLevels(b) ? -1 :
  * @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.topLevelDir] - Top-level directory of the git repo
  * @param {Logger} logger
  *
  * @returns {Promise<{ [key: string]: { config: *, files: string[] } }>} found configs with filepath as key, and config as value
@@ -55,40 +137,10 @@ export const searchConfigs = async (
     return { [configPath]: validateConfig(config, filepath, logger) }
   }
 
-  /** Get all possible config files from git (both cached and uncommitted) */
-  const gitListedFiles = await execGit(
-    [
-      ...EXEC_GIT,
-      '--cached', // show all tracked files
-      '--others', // show untracked files
-      '--exclude-standard', // apply standard git exclusions (.gitignore, etc.)
-      '--',
-      ...CONFIG_PATHSPEC,
-    ],
-    { cwd }
-  ).then(parseGitZOutput)
-
-  debugLog('Git listed files matching config files:', gitListedFiles)
-
-  /** Sort possible config files so that deepest is first */
-  const possibleConfigFiles = gitListedFiles
-    .flatMap((line) => {
-      /**
-       * Leave out lines starting with "S " to ignore not-checked-out files in a sparse repo.
-       * The "S" status means a tracked file that is "skip-worktree"
-       * @see https://git-scm.com/docs/git-ls-files#Documentation/git-ls-files.txt--t
-       */
-      if (line.startsWith('S ')) {
-        return []
-      }
-
-      const relativePath = line.replace(/^[HSMRCK?U] /, '')
-      const absolutePath = normalizePath(path.join(topLevelDir, relativePath))
-      return [absolutePath]
-    })
-    .sort(sortDeepestParth)
-
-  debugLog('Found possible config files:', possibleConfigFiles)
+  let possibleConfigFiles = await listConfigFilesFromGit({ cwd, topLevelDir })
+  if (possibleConfigFiles.length === 0) {
+    possibleConfigFiles = await listConfigFilesFromFs({ cwd })
+  }
 
   /** Create object with key as config file, and value as null */
   const configs = possibleConfigFiles.reduce(
@@ -112,26 +164,13 @@ export const searchConfigs = async (
   )
 
   /** 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]) => Object.assign(acc, { [key]: value }), {})
-
-  /**
-   * Try to find a single config from parent directories
-   * to match old behavior before monorepo support
-   */
-  if (!Object.keys(foundConfigs).length) {
-    debugLog('Could not find config files inside "%s"', cwd)
-
-    const { config, filepath } = await loadConfig({ cwd }, logger)
-    if (config) {
-      debugLog('Found parent configuration file from "%s"', filepath)
-
-      foundConfigs[filepath] = validateConfig(config, filepath, logger)
-    } else {
-      debugLog('Could not find parent configuration files from "%s"', cwd)
+  const foundConfigs = Object.entries(configs).reduce((acc, [key, value]) => {
+    if (value) {
+      Object.assign(acc, { [key]: value })
     }
-  }
+
+    return acc
+  }, {})
 
   debugLog('Found %d config files', Object.keys(foundConfigs).length)
 

package/lib/state.js

@@ -2,27 +2,34 @@ import EventEmitter from 'events'
 
 import { GIT_ERROR, TASK_ERROR } from './messages.js'
 import {
+  ExitCodeError,
   GitError,
   RestoreOriginalStateError,
   RestoreUnstagedChangesError,
   TaskError,
 } from './symbols.js'
 
-export const getInitialState = ({ quiet = false, revert = true } = {}) => ({
+export const getInitialState = ({
+  hidePartiallyStaged = true,
+  hideUnstaged = false,
+  quiet = false,
+  revert = true,
+} = {}) => ({
   backupHash: null,
   errors: new Set([]),
   events: new EventEmitter(),
-  hasPartiallyStagedFiles: null,
+  hasFilesToHide: null,
   output: [],
   quiet,
   shouldBackup: null,
-  shouldHidePartiallyStaged: true,
+  shouldHidePartiallyStaged: hidePartiallyStaged,
+  shouldHideUnstaged: hideUnstaged,
   shouldRevert: revert,
   unstagedPatch: null,
 })
 
-export const shouldHidePartiallyStagedFiles = (ctx) =>
-  ctx.hasPartiallyStagedFiles && ctx.shouldHidePartiallyStaged
+export const shouldHideUnstagedFiles = (ctx) =>
+  (ctx.shouldHideUnstaged || ctx.shouldHidePartiallyStaged) && ctx.hasFilesToHide
 
 export const applyModificationsSkipped = (ctx) => {
   // Always apply back unstaged modifications when skipping revert or backup
@@ -52,11 +59,17 @@ export const restoreUnstagedChangesSkipped = (ctx) => {
 export const restoreOriginalStateEnabled = (ctx) =>
   !!ctx.shouldRevert &&
   !!ctx.shouldBackup &&
-  (ctx.errors.has(TaskError) || ctx.errors.has(RestoreUnstagedChangesError))
+  (ctx.errors.has(ExitCodeError) ||
+    ctx.errors.has(TaskError) ||
+    ctx.errors.has(RestoreUnstagedChangesError))
 
 export const restoreOriginalStateSkipped = (ctx) => {
   // Should be skipped in case of unknown git errors
-  if (ctx.errors.has(GitError) && !ctx.errors.has(RestoreUnstagedChangesError)) {
+  if (
+    ctx.errors.has(GitError) &&
+    !ctx.errors.has(RestoreUnstagedChangesError) &&
+    !ctx.errors.has(ExitCodeError)
+  ) {
     return GIT_ERROR
   }
 }

package/lib/symbols.js

@@ -25,3 +25,5 @@ export const RestoreOriginalStateError = Symbol('RestoreOriginalStateError')
 export const RestoreUnstagedChangesError = Symbol('RestoreUnstagedChangesError')
 
 export const TaskError = Symbol('TaskError')
+
+export const ExitCodeError = Symbol('ExitCodeError')

package/lib/validateConfig.js

@@ -2,13 +2,12 @@
 
 import { inspect } from 'node:util'
 
-import debug from 'debug'
-
+import { createDebug } from './debug.js'
 import { configurationError, failedToParseConfig } from './messages.js'
 import { ConfigEmptyError, ConfigFormatError } from './symbols.js'
 import { validateBraces } from './validateBraces.js'
 
-const debugLog = debug('lint-staged:validateConfig')
+const debugLog = createDebug('lint-staged:validateConfig')
 
 export const validateConfigLogic = (config, configPath, logger) => {
   debugLog('Validating config from `%s`...', configPath)

package/lib/validateOptions.js

@@ -2,12 +2,11 @@ import { constants } from 'node:fs'
 import fs from 'node:fs/promises'
 import path from 'node:path'
 
-import debug from 'debug'
-
+import { createDebug } from './debug.js'
 import { invalidOption } from './messages.js'
 import { InvalidOptionsError } from './symbols.js'
 
-const debugLog = debug('lint-staged:validateOptions')
+const debugLog = createDebug('lint-staged:validateOptions')
 
 /**
  * Validate lint-staged options, either from the Node.js API or the command line flags.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lint-staged",
-  "version": "16.1.6",
+  "version": "16.2.0",
   "description": "Lint files staged by git",
   "license": "MIT",
   "repository": {
@@ -13,8 +13,6 @@
   },
   "author": "Andrey Okonetchnikov <andrey@okonet.ru>",
   "maintainers": [
-    "Lufty Wiranda <lufty.wiranda@gmail.com>",
-    "Suhas Karanth <sudo.suhas@gmail.com>",
     "Iiro Jäppinen <iiro@jappinen.fi> (https://iiro.fi)"
   ],
   "funding": {
@@ -42,47 +40,43 @@
     "MIGRATION.md"
   ],
   "scripts": {
-    "lint": "eslint .",
-    "test": "cross-env NODE_OPTIONS=--experimental-vm-modules npx jest --coverage",
-    "test:watch": "npm run test -- --watch",
-    "typecheck": "tsc --noEmit --strict test/types/index.ts",
+    "lint": "eslint",
+    "test": "vitest",
+    "typecheck": "tsc",
     "version": "npx changeset version",
     "postversion": "npm i --package-lock-only && git commit -am \"chore(changeset): release\"",
     "tag": "npx changeset tag"
   },
   "dependencies": {
-    "chalk": "^5.6.0",
-    "commander": "^14.0.0",
-    "debug": "^4.4.1",
-    "lilconfig": "^3.1.3",
-    "listr2": "^9.0.3",
-    "micromatch": "^4.0.8",
-    "nano-spawn": "^1.0.2",
-    "pidtree": "^0.6.0",
-    "string-argv": "^0.3.2",
-    "yaml": "^2.8.1"
+    "commander": "14.0.1",
+    "listr2": "9.0.4",
+    "micromatch": "4.0.8",
+    "nano-spawn": "1.0.3",
+    "pidtree": "0.6.0",
+    "string-argv": "0.3.2",
+    "yaml": "2.8.1"
   },
   "devDependencies": {
     "@changesets/changelog-github": "0.5.1",
-    "@changesets/cli": "2.29.6",
+    "@changesets/cli": "2.29.7",
     "@commitlint/cli": "19.8.1",
     "@commitlint/config-conventional": "19.8.1",
-    "@eslint/js": "9.34.0",
+    "@eslint/js": "9.35.0",
+    "@vitest/coverage-v8": "3.2.4",
+    "@vitest/eslint-plugin": "1.3.12",
     "consolemock": "1.1.0",
     "cross-env": "10.0.0",
-    "eslint": "9.34.0",
+    "eslint": "9.35.0",
     "eslint-config-prettier": "10.1.8",
-    "eslint-plugin-jest": "29.0.1",
-    "eslint-plugin-n": "17.21.3",
+    "eslint-plugin-n": "17.23.1",
     "eslint-plugin-prettier": "5.5.4",
     "eslint-plugin-simple-import-sort": "12.1.1",
     "husky": "9.1.7",
-    "jest": "30.1.1",
-    "jest-snapshot-serializer-ansi": "2.2.1",
     "mock-stdin": "1.0.0",
     "prettier": "3.6.2",
     "semver": "7.7.2",
-    "typescript": "5.9.2"
+    "typescript": "5.9.2",
+    "vitest": "3.2.4"
   },
   "keywords": [
     "lint",