lint-staged 10.0.7 → 10.0.8

package/lib/gitWorkflow.js

@@ -264,6 +264,7 @@ class GitWorkflow {
       // Restore meta information about ongoing git merge
       await this.restoreMergeStatus()
     } catch (error) {
+      ctx.gitRestoreOriginalStateError = true
       handleError(error, ctx)
     }
   }

package/lib/makeCmdTasks.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const resolveTaskFn = require('./resolveTaskFn')
+const { createError } = require('./validateConfig')
 
 const debug = require('debug')('lint-staged:make-cmd-tasks')
 
@@ -15,32 +16,34 @@ const debug = require('debug')('lint-staged:make-cmd-tasks')
  */
 module.exports = async function makeCmdTasks({ commands, files, gitDir, shell }) {
   debug('Creating listr tasks for commands %o', commands)
-  const commandsArray = Array.isArray(commands) ? commands : [commands]
+  const commandArray = Array.isArray(commands) ? commands : [commands]
   const cmdTasks = []
 
-  for (const cmd of commandsArray) {
+  for (const cmd of commandArray) {
     // command function may return array of commands that already include `stagedFiles`
     const isFn = typeof cmd === 'function'
     const resolved = isFn ? await cmd(files) : cmd
 
     const resolvedArray = Array.isArray(resolved) ? resolved : [resolved] // Wrap non-array command as array
 
-    // Function command should not be used as the task title as-is
-    // because the resolved string it might be very long
-    // Create a matching command array with [file] in place of file names
-    let mockCmdTasks
-    if (isFn) {
-      const mockFileList = Array(files.length).fill('[file]')
-      const resolved = await cmd(mockFileList)
-      mockCmdTasks = Array.isArray(resolved) ? resolved : [resolved]
-    }
-
-    for (const [i, command] of resolvedArray.entries()) {
+    for (const command of resolvedArray) {
       let title = isFn ? '[Function]' : command
-      if (isFn && mockCmdTasks[i]) {
-        // If command is a function, use the matching mock command as title,
-        // but since might include multiple [file] arguments, shorten to one
-        title = mockCmdTasks[i].replace(/\[file\].*\[file\]/, '[file]')
+
+      if (isFn) {
+        // If the function linter didn't return string | string[]  it won't work
+        // Do the validation here instead of `validateConfig` to skip evaluating the function multiple times
+        if (typeof command !== 'string') {
+          throw new Error(
+            createError(
+              title,
+              'Function task should return a string or an array of strings',
+              resolved
+            )
+          )
+        }
+
+        const [startOfFn] = command.split(' ')
+        title += ` ${startOfFn} ...` // Append function name, like `[Function] eslint ...`
       }
 
       cmdTasks.push({

package/lib/runAll.js

@@ -23,6 +23,40 @@ const getRenderer = ({ debug, quiet }) => {
   return 'update'
 }
 
+const MESSAGES = {
+  TASK_ERROR: 'Skipped because of errors from tasks.',
+  GIT_ERROR: 'Skipped because of previous git error.'
+}
+
+const shouldSkipApplyModifications = ctx => {
+  // Should be skipped in case of git errors
+  if (ctx.gitError) {
+    return MESSAGES.GIT_ERROR
+  }
+  // Should be skipped when tasks fail
+  if (ctx.taskError) {
+    return MESSAGES.TASK_ERROR
+  }
+}
+
+const shouldSkipRevert = ctx => {
+  // Should be skipped in case of unknown git errors
+  if (ctx.gitError && !ctx.gitApplyEmptyCommit && !ctx.gitApplyModificationsError) {
+    return MESSAGES.GIT_ERROR
+  }
+}
+
+const shouldSkipCleanup = ctx => {
+  // Should be skipped in case of unknown git errors
+  if (ctx.gitError && !ctx.gitApplyEmptyCommit && !ctx.gitApplyModificationsError) {
+    return MESSAGES.GIT_ERROR
+  }
+  // Should be skipped when reverting to original state fails
+  if (ctx.gitRestoreOriginalStateError) {
+    return MESSAGES.GIT_ERROR
+  }
+}
+
 /**
  * Executes all tasks and either resolves or rejects the promise
  *
@@ -39,7 +73,7 @@ const getRenderer = ({ debug, quiet }) => {
  * @param {Logger} logger
  * @returns {Promise}
  */
-module.exports = async function runAll(
+const runAll = async (
   {
     allowEmpty = false,
     config,
@@ -52,7 +86,7 @@ module.exports = async function runAll(
     concurrent = true
   },
   logger = console
-) {
+) => {
   debugLog('Running all linter scripts')
 
   const { gitDir, gitConfigDir } = await resolveGitRepo(cwd)
@@ -127,7 +161,7 @@ module.exports = async function runAll(
       task: () => new Listr(chunkListrTasks, { ...listrOptions, concurrent }),
       skip: (ctx = {}) => {
         // Skip if the first step (backup) failed
-        if (ctx.gitError) return 'Skipped because of previous git error.'
+        if (ctx.gitError) return MESSAGES.GIT_ERROR
         // Skip chunk when no every task is skipped (due to no matches)
         if (chunkListrTasks.every(task => task.skip())) return 'No tasks to run.'
         return false
@@ -151,15 +185,6 @@ module.exports = async function runAll(
 
   const git = new GitWorkflow({ allowEmpty, gitConfigDir, gitDir, stagedFileChunks })
 
-  // Running git reset or dropping the backup stash should be skipped
-  // when there are git errors NOT related to applying unstaged modifications.
-  // In the latter case, the original state is restored.
-  const cleanupNotSafe = ctx =>
-    ctx.gitError &&
-    !ctx.gitApplyEmptyCommit &&
-    !ctx.gitApplyModificationsError &&
-    'Skipped because of previous git error.'
-
   const runner = new Listr(
     [
       {
@@ -169,22 +194,19 @@ module.exports = async function runAll(
       ...listrTasks,
       {
         title: 'Applying modifications...',
-        skip: ctx => {
-          if (ctx.gitError) return 'Skipped because of previous git error.'
-          if (ctx.taskError) return 'Skipped because of errors from tasks.'
-        },
-        task: ctx => git.applyModifications(ctx)
+        task: ctx => git.applyModifications(ctx),
+        skip: shouldSkipApplyModifications
       },
       {
         title: 'Reverting to original state...',
+        task: ctx => git.restoreOriginalState(ctx),
         enabled: ctx => ctx.taskError || ctx.gitApplyEmptyCommit || ctx.gitApplyModificationsError,
-        skip: cleanupNotSafe,
-        task: ctx => git.restoreOriginalState(ctx)
+        skip: shouldSkipRevert
       },
       {
         title: 'Cleaning up...',
-        skip: cleanupNotSafe,
-        task: ctx => git.dropBackup(ctx)
+        task: ctx => git.dropBackup(ctx),
+        skip: shouldSkipCleanup
       }
     ],
     listrOptions
@@ -219,3 +241,11 @@ module.exports = async function runAll(
     throw error
   }
 }
+
+module.exports = runAll
+
+module.exports.shouldSkip = {
+  shouldSkipApplyModifications,
+  shouldSkipRevert,
+  shouldSkipCleanup
+}

package/lib/validateConfig.js

@@ -80,21 +80,6 @@ module.exports = function validateConfig(config) {
           )
         )
       }
-
-      entries.forEach(([, task]) => {
-        if (typeof task !== 'function') return
-        const resolved = task(['[filename]'])
-        if (typeof resolved === 'string') return
-        if (!Array.isArray(resolved) || resolved.some(subtask => typeof subtask !== 'string')) {
-          errors.push(
-            createError(
-              task,
-              'Function task should return a string or an array of strings',
-              resolved
-            )
-          )
-        }
-      })
     })
   }
 
@@ -104,3 +89,5 @@ module.exports = function validateConfig(config) {
 
   return config
 }
+
+module.exports.createError = createError

package/package.json

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