lint-staged 17.0.7 → 17.1.0

package/lib/parseGitZOutput.js

@@ -6,6 +6,6 @@
 export const parseGitZOutput = (input) =>
   input
     ? input
-        .replace(/\u0000$/, '') // eslint-disable-line no-control-regex
+        .replace(/\u0000$/, '') // oxlint-disable-line no-control-regex
         .split('\u0000')
     : []

package/lib/printTaskOutput.js

@@ -1,6 +1,6 @@
 /**
- * Handle logging of listr `ctx.output` to the specified `logger`
- * @param {Object} ctx - The listr initial state
+ * Handle logging of task `ctx.output` to the specified `logger`
+ * @param {Object} ctx - The context
  * @param {Object} logger - The logger
  */
 export const printTaskOutput = (ctx = {}, logger) => {

package/lib/runAll.js

@@ -2,29 +2,26 @@
 
 import path from 'node:path'
 
-import { Listr } from 'listr2'
-
 import { chunkFiles } from './chunkFiles.js'
 import { dim } from './colors.js'
 import { createDebug } from './debug.js'
 import { execGit } from './execGit.js'
+import * as figures from './figures.js'
 import { generateTasks } from './generateTasks.js'
 import { getAbortController } from './getAbortController.js'
 import { getFunctionTask, isFunctionTask } from './getFunctionTask.js'
-import { getRenderer } from './getRenderer.js'
 import { getSpawnedTasks } from './getSpawnedTasks.js'
 import { getStagedFiles } from './getStagedFiles.js'
 import { GitWorkflow } from './gitWorkflow.js'
 import { groupFilesByConfig } from './groupFilesByConfig.js'
 import {
-  DEPRECATED_GIT_ADD,
-  FAILED_GET_STAGED_FILES,
-  NO_STAGED_FILES,
-  NO_TASKS,
-  NOT_GIT_REPO,
-  SKIPPED_GIT_ERROR,
-  SKIPPING_HIDE_PARTIALLY_CHANGED,
+  deprecatedGitAdd,
+  failedGetStagedFiles,
+  noStagedFiles,
+  noTasks,
+  notGitRepo,
   skippingBackup,
+  skippingHidePartiallyChanged,
 } from './messages.js'
 import { normalizePath } from './normalizePath.js'
 import { resolveGitRepo } from './resolveGitRepo.js'
@@ -41,10 +38,24 @@ import {
   shouldRestoreUntrackedFiles,
   updateIndexSkipped,
 } from './state.js'
-import { ConfigNotFoundError, GetStagedFilesError, GitError, GitRepoError } from './symbols.js'
+import { ConfigNotFoundError, GetStagedFilesError, GitRepoError } from './symbols.js'
 
 const debugLog = createDebug('lint-staged:runAll')
 
+/**
+ * @param {Logger} logger
+ * @param {boolean} quiet
+ * @returns {Logger}
+ */
+const configureLogger = (logger, quiet) => {
+  if (quiet) {
+    const noop = () => {}
+    return { error: logger.error, log: noop, warn: noop }
+  }
+
+  return logger
+}
+
 /**
  * @param {ReturnType<typeof getInitialState>} ctx context
  * @param {unknown} cause error cause
@@ -57,13 +68,11 @@ const createError = (ctx, cause) =>
  *
  * @param {object} options
  * @param {boolean} [options.allowEmpty] - Allow empty commits when tasks revert all staged changes
- * @param {boolean} [options.color] - Enable or disable ANSI color codes 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
@@ -81,13 +90,11 @@ 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,
@@ -105,6 +112,8 @@ export const runAll = async (
   },
   logger = console
 ) => {
+  const thisLogger = configureLogger(logger, quiet)
+
   debugLog('Running all linter scripts...')
 
   // Resolve relative CWD option
@@ -123,7 +132,7 @@ export const runAll = async (
 
   const { topLevelDir, gitConfigDir } = await resolveGitRepo(cwd)
   if (!topLevelDir) {
-    if (!quiet) ctx.output.push(NOT_GIT_REPO)
+    if (!quiet) ctx.output.push(notGitRepo())
     ctx.errors.add(GitRepoError)
     throw createError(ctx, GitRepoError)
   }
@@ -137,22 +146,22 @@ export const runAll = async (
   // Lint-staged will create a backup stash only when there's an initial commit,
   // and when using the default list of staged files by default
   ctx.shouldBackup = hasInitialCommit && stash
-  if (!ctx.shouldBackup && !quiet) {
-    logger.warn(skippingBackup(hasInitialCommit, diff))
+  if (!ctx.shouldBackup) {
+    thisLogger.warn(skippingBackup(hasInitialCommit, diff))
   }
 
-  if (!ctx.shouldHidePartiallyStaged && !ctx.shouldHideUnstaged && !ctx.shouldHideAll && !quiet) {
-    logger.warn(SKIPPING_HIDE_PARTIALLY_CHANGED)
+  if (!ctx.shouldHidePartiallyStaged && !ctx.shouldHideUnstaged && !ctx.shouldHideAll) {
+    thisLogger.warn(skippingHidePartiallyChanged())
   }
 
   // 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),
+    searchConfigs({ configObject, configPath, cwd, topLevelDir }, thisLogger),
   ])
 
   if (!stagedFiles) {
-    if (!quiet) ctx.output.push(FAILED_GET_STAGED_FILES)
+    if (!quiet) ctx.output.push(failedGetStagedFiles())
     ctx.errors.add(GetStagedFilesError)
     throw createError(ctx, GetStagedFilesError)
   }
@@ -160,7 +169,7 @@ export const runAll = async (
 
   // If there are no files avoid executing any lint-staged logic
   if (stagedFiles.length === 0) {
-    if (!quiet) ctx.output.push(NO_STAGED_FILES)
+    if (!quiet) ctx.output.push(noStagedFiles())
     return ctx
   }
 
@@ -184,14 +193,7 @@ export const runAll = async (
   // Warn user when their command includes `git add`
   let hasDeprecatedGitAdd = false
 
-  const listrOptions = {
-    ctx,
-    exitOnError: false,
-    registerSignalListeners: false,
-    ...getRenderer({ color, debug, quiet }, logger),
-  }
-
-  const listrTasks = []
+  const tasks = []
 
   // Set of all staged files that matched a task glob. Values in a set are unique.
   /** @type {Set<import('./getStagedFiles.js').StagedFile>} */
@@ -215,13 +217,17 @@ export const runAll = async (
     }
 
     for (const [index, files] of stagedFileChunks.entries()) {
-      const chunkListrTasks = await Promise.all(
+      const taskChunk = await Promise.all(
         generateTasks({ config, cwd: groupCwd, files, relative }).map((task) =>
           (isFunctionTask(task.commands)
-            ? getFunctionTask(task.commands, task.fileList)
+            ? getFunctionTask({
+                abortController,
+                command: task.commands,
+                continueOnError,
+                files: task.fileList,
+              })
             : getSpawnedTasks({
                 abortController,
-                color,
                 commands: task.commands,
                 continueOnError,
                 cwd: groupCwd,
@@ -246,7 +252,7 @@ export const runAll = async (
             })
 
             hasDeprecatedGitAdd =
-              hasDeprecatedGitAdd || subTasks.some((subTask) => subTask.command === 'git add')
+              hasDeprecatedGitAdd || subTasks.some((subTask) => subTask.title.includes('git add'))
 
             const fileCount = task.fileList.length
 
@@ -254,17 +260,13 @@ export const runAll = async (
               title: `${task.pattern}${dim(
                 ` — ${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: !continueOnError }
-                ),
+              task: subTasks,
               skip: () => {
                 // Skip task when no files matched
                 if (fileCount === 0) {
                   return `${task.pattern}${dim(' — no files')}`
                 }
+
                 return false
               },
             }
@@ -272,33 +274,29 @@ export const runAll = async (
         )
       )
 
-      listrTasks.push({
+      tasks.push({
         title:
           `${configName}${dim(` — ${files.length} ${files.length > 1 ? 'files' : 'file'}`)}` +
           (chunkCount > 1 ? dim(` (chunk ${index + 1}/${chunkCount})...`) : ''),
-        task: (ctx, task) =>
-          task.newListr(chunkListrTasks, { concurrent, exitOnError: !continueOnError }),
+        task: taskChunk,
         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())) {
+          if (taskChunk.every((task) => task.skip())) {
             return `${configName}${dim(' — no tasks to run')}`
           }
+
           return false
         },
       })
     }
   }
 
-  if (hasDeprecatedGitAdd && !quiet) {
-    logger.warn(DEPRECATED_GIT_ADD)
+  if (hasDeprecatedGitAdd) {
+    thisLogger.warn(deprecatedGitAdd())
   }
 
-  // If all of the configured tasks should be skipped
-  // avoid executing any lint-staged logic
-  if (listrTasks.every((task) => task.skip())) {
-    if (!quiet) ctx.output.push(NO_TASKS)
+  if (tasks.every((task) => task.skip())) {
+    if (!quiet) ctx.output.push(noTasks())
     return ctx
   }
 
@@ -318,60 +316,62 @@ export const runAll = async (
     diffFilter,
     failOnChanges,
     gitConfigDir,
+    logger: thisLogger,
     matchedFileChunks,
     topLevelDir,
   })
 
-  const runner = new Listr(
-    [
-      {
-        title: ctx.shouldBackup ? 'Backing up original state...' : 'Preparing lint-staged...',
-        task: (ctx, task) => git.prepare(ctx, task),
-      },
-      {
-        title: 'Hiding unstaged changes to partially staged files...',
-        task: (ctx) => git.hidePartiallyStagedChanges(ctx),
-        enabled: shouldHidePartiallyStagedFiles,
-      },
-      {
-        title: `Running tasks for ${diff ? 'changed' : 'staged'} files...`,
-        task: (ctx, task) => git.runTasks(ctx, task, { listrTasks, concurrent }),
-        skip: () => listrTasks.every((task) => task.skip()),
-      },
-      {
-        title: 'Staging changes from tasks...',
-        task: (ctx) => git.updateIndex(ctx),
-        skip: updateIndexSkipped,
-      },
-      {
-        title: 'Restoring unstaged changes...',
-        task: (ctx) => git.restoreUnstagedChanges(ctx),
-        enabled: shouldRestoreUnstagedChanges,
-        skip: restoreUnstagedChangesSkipped,
-      },
-      {
-        title: 'Restoring untracked files...',
-        task: (ctx) => git.restoreUntrackedFiles(ctx),
-        enabled: shouldRestoreUntrackedFiles,
-        skip: restoreUnstagedChangesSkipped,
-      },
-      {
-        title: 'Reverting to original state because of errors...',
-        task: (ctx) => git.restoreOriginalState(ctx),
-        enabled: restoreOriginalStateEnabled,
-        skip: restoreOriginalStateSkipped,
-      },
-      {
-        title: 'Cleaning up temporary files...',
-        task: (ctx) => git.cleanup(ctx),
-        enabled: cleanupEnabled,
-        skip: cleanupSkipped,
-      },
-    ],
-    listrOptions
-  )
-
-  await runner.run()
+  await git.prepare(ctx)
+
+  if (shouldHidePartiallyStagedFiles(ctx)) {
+    await git.hidePartiallyStagedChanges(ctx)
+  }
+
+  if (abortController.signal.aborted || ctx.errors.size > 0) {
+    thisLogger.log(`${figures.cancelled()} ${dim(`Skipped running tasks…`)}`)
+  } else {
+    await git.runTasks(ctx, tasks, { abortController, concurrent })
+  }
+
+  if (updateIndexSkipped(ctx)) {
+    thisLogger.log(`${figures.cancelled()} ${dim('Skipped staging changes from tasks…')}`)
+  } else {
+    await git.updateIndex(ctx)
+  }
+
+  if (shouldRestoreUnstagedChanges(ctx)) {
+    if (restoreUnstagedChangesSkipped(ctx)) {
+      thisLogger.log(`${figures.cancelled()} ${dim('Skipped restoring unstaged changes…')}`)
+    } else {
+      await git.restoreUnstagedChanges(ctx)
+    }
+  }
+
+  if (shouldRestoreUntrackedFiles(ctx)) {
+    if (restoreUnstagedChangesSkipped(ctx)) {
+      thisLogger.log(`${figures.cancelled()} ${dim('Skipped restoring untracked files…')}`)
+    } else {
+      await git.restoreUntrackedFiles(ctx)
+    }
+  }
+
+  if (restoreOriginalStateEnabled(ctx)) {
+    if (restoreOriginalStateSkipped(ctx)) {
+      thisLogger.log(
+        `${figures.cancelled()} ${dim('Skipped reverting to original state because of errors…')}`
+      )
+    } else {
+      await git.restoreOriginalState(ctx)
+    }
+  }
+
+  if (cleanupEnabled(ctx)) {
+    if (cleanupSkipped(ctx)) {
+      thisLogger.log(`${figures.cancelled()} ${dim('Skipped cleaning up temporary files…')}`)
+    } else {
+      await git.cleanup(ctx)
+    }
+  }
 
   if (ctx.errors.size > 0) {
     throw createError(ctx)

package/lib/runParallelTasks.js

@@ -0,0 +1,112 @@
+import * as colors from './colors.js'
+import { createDebug } from './debug.js'
+import * as figures from './figures.js'
+
+const debugLog = createDebug('lint-staged:runParallelTasks')
+
+/** @param {Number | boolean} options.concurrent Boolean value for whether to run concurrently */
+export const parseConcurrency = (concurrent) => {
+  if (concurrent === false || concurrent < 1 || Number.isNaN(concurrent)) {
+    return 1
+  }
+
+  if (concurrent === true) {
+    return Infinity
+  }
+
+  return parseInt(concurrent)
+}
+
+/**
+ * @param {Object} ctx
+ * @param {Array} tasks
+ * @param {Object} options
+ * @param {AbortController} abortController
+ * @param {Number | boolean} [options.concurrent=true] Boolean value for whether to run concurrently,
+ * or a number value controls the number of concurrent executions
+ */
+export const runParallelTasks = async (
+  ctx,
+  tasks,
+  { abortController, concurrent = true, logger }
+) => {
+  const concurrency = parseConcurrency(concurrent)
+
+  debugLog('Running parallel tasks with concurrency:', concurrency)
+
+  const indent = tasks.length > 1 ? '    ' : '  '
+  const allPerGlobTasks = []
+
+  // the array of actual tasks is split per config and per glob
+  for (const perConfig of tasks) {
+    if (perConfig.skip()) {
+      debugLog('Skipped configuration:', perConfig.title)
+    } else {
+      debugLog('Running configuration:', perConfig.title)
+
+      if (tasks.length > 1) {
+        // display name of config only when there are multiple
+        logger?.log(colors.dim(`${indent}${perConfig.title}`))
+      }
+    }
+
+    for (const perGlob of perConfig.task) {
+      if (perGlob.skip()) {
+        debugLog('Skipped glob from configuration:', perConfig.title, perGlob.title)
+        continue
+      }
+
+      if (perConfig.skip()) {
+        continue // entire group is skipped, but debug logs still show above
+      }
+
+      debugLog('Running glob:', perGlob.title)
+      logger?.log(colors.dim(`${indent}  ${perGlob.title}`))
+
+      for (const task of perGlob.task) {
+        debugLog('Running task:', task.title)
+        logger?.log(colors.dim(`${indent}    ${figures.wip()} ${task.title}`))
+      }
+      // per-glob tasks run serially
+      allPerGlobTasks.push(perGlob.task)
+    }
+  }
+
+  logger?.log('') // empty line before all tasks
+
+  const runSequential = async (tasks) => {
+    for (const { title, task } of tasks) {
+      if (abortController.signal.aborted) {
+        debugLog('Skipped task because aborted:', title)
+        // Log all aborted tasks without actually running them
+        logger?.warn(`${figures.cancelled()} ${title}`)
+        continue
+      }
+
+      try {
+        debugLog('Running task:', title)
+        await task(ctx)
+        debugLog('Done running task:', title)
+        logger?.log(`${figures.done()} ${title}`)
+      } catch {
+        debugLog('Failed to run task:', title)
+        logger?.error(colors.red(`${figures.error()} ${title}`))
+      }
+    }
+  }
+
+  let next = 0
+  const worker = async () => {
+    while (next < allPerGlobTasks.length) {
+      const perGlobTasks = allPerGlobTasks[next++]
+      await runSequential(perGlobTasks)
+    }
+  }
+
+  const length = Math.min(allPerGlobTasks.length, concurrency)
+  debugLog('Running workers with concurrency:', length)
+  await Promise.all(Array.from({ length }, worker))
+  debugLog('Done running workers')
+
+  logger?.log('') // empty line after all tasks
+}

package/lib/state.js

@@ -1,4 +1,4 @@
-import { GIT_ERROR, TASK_ERROR } from './messages.js'
+import { gitError, taskError } from './messages.js'
 import {
   FailOnChangesError,
   GitError,
@@ -56,31 +56,31 @@ export const updateIndexSkipped = (ctx) => {
 
   // Should be skipped in case of git errors
   if (ctx.errors.has(GitError)) {
-    return GIT_ERROR
+    return gitError()
   }
 
   // Should be skipped when tasks fail
   if (ctx.errors.has(TaskError)) {
-    return TASK_ERROR
+    return taskError()
   }
 }
 
 export const restoreUnstagedChangesSkipped = (ctx) => {
   // Should be skipped in case of git errors
   if (ctx.errors.has(GitError)) {
-    return GIT_ERROR
+    return gitError()
   }
 
   // When complete reverting to original state is skipped,
   // we can still restore unstaged changes to make it easier
   // to do manually.
   if (!ctx.shouldRevert) {
-    false
+    return false
   }
 
   // Should be skipped when tasks fail
   if (ctx.errors.has(TaskError)) {
-    return TASK_ERROR
+    return taskError()
   }
 }
 
@@ -94,7 +94,7 @@ export const restoreOriginalStateEnabled = (ctx) =>
 export const restoreOriginalStateSkipped = (ctx) => {
   // Should be skipped in case of unknown git errors
   if (ctx.errors.has(GitError) && !ctx.errors.has(RestoreUnstagedChangesError)) {
-    return GIT_ERROR
+    return gitError()
   }
 }
 
@@ -106,13 +106,18 @@ export const cleanupSkipped = (ctx) => {
     return true
   }
 
+  /** Failed to restore hidden unstaged changes, shouldn't drop stash, @see restoreUnstagedChangesSkipped */
+  if (ctx.errors.has(RestoreUnstagedChangesError) && !ctx.shouldRevert) {
+    return gitError()
+  }
+
   // Should be skipped in case of unknown git errors
   if (restoreOriginalStateSkipped(ctx)) {
-    return GIT_ERROR
+    return gitError()
   }
 
   // Should be skipped when reverting to original state fails
   if (ctx.errors.has(RestoreOriginalStateError)) {
-    return GIT_ERROR
+    return gitError()
   }
 }

package/lib/validateOptions.js

@@ -17,6 +17,15 @@ const debugLog = createDebug('lint-staged:validateOptions')
 export const validateOptions = async (options = {}, logger) => {
   debugLog('Validating options...')
 
+  if (
+    options.concurrent !== undefined &&
+    typeof options.concurrent !== 'boolean' &&
+    (!Number.isInteger(options.concurrent) || Number.isNaN(options.concurrent))
+  ) {
+    logger.error(invalidOption('concurrent', `${options.concurrent}`, 'Must be boolean or integer'))
+    throw InvalidOptionsError
+  }
+
   /** Ensure the passed cwd option exists; it might also be relative */
   if (typeof options.cwd === 'string') {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lint-staged",
-  "version": "17.0.7",
+  "version": "17.1.0",
   "description": "Lint files staged by git",
   "license": "MIT",
   "repository": {
@@ -44,7 +44,7 @@
     "MIGRATION.md"
   ],
   "scripts": {
-    "lint": "eslint",
+    "lint": "oxfmt && oxlint",
     "test": "vitest",
     "typecheck": "tsc",
     "version": "npx changeset version",
@@ -52,8 +52,7 @@
     "tag": "npx changeset tag"
   },
   "dependencies": {
-    "listr2": "^10.2.1",
-    "picomatch": "^4.0.4",
+    "picomatch": "^4.0.5",
     "string-argv": "^0.3.2",
     "tinyexec": "^1.2.4"
   },
@@ -62,36 +61,32 @@
   },
   "devDependencies": {
     "@changesets/changelog-github": "0.7.0",
-    "@changesets/cli": "2.31.0",
-    "@commitlint/cli": "21.0.2",
-    "@commitlint/config-conventional": "21.0.2",
-    "@eslint/js": "10.0.1",
-    "@vitest/coverage-istanbul": "4.1.7",
-    "@vitest/eslint-plugin": "1.6.18",
+    "@changesets/cli": "2.31.1",
+    "@commitlint/cli": "21.2.1",
+    "@commitlint/config-conventional": "21.2.0",
+    "@vitest/coverage-istanbul": "4.1.10",
     "consolemock": "1.1.0",
     "cross-env": "10.1.0",
-    "eslint": "10.4.1",
-    "eslint-config-prettier": "10.1.8",
-    "eslint-plugin-n": "18.0.1",
-    "eslint-plugin-prettier": "5.5.6",
-    "eslint-plugin-simple-import-sort": "13.0.0",
     "husky": "9.1.7",
     "mock-stdin": "1.0.0",
-    "prettier": "3.8.3",
-    "semver": "7.8.1",
-    "vitest": "4.1.7"
+    "oxfmt": "0.59.0",
+    "oxlint": "1.74.0",
+    "semver": "7.8.5",
+    "vitest": "4.1.10"
   },
   "keywords": [
-    "lint",
-    "git",
-    "staged",
+    "check",
+    "code",
     "eslint",
+    "format",
+    "git",
+    "lint",
+    "oxlint",
+    "oxfmt",
     "prettier",
-    "stylelint",
-    "code",
     "quality",
-    "check",
-    "format",
+    "staged",
+    "stylelint",
     "validate"
   ]
 }