fix: Do not print file names twice in the compact mode

Author: prantlf

lib/cli.js

@@ -120,7 +120,7 @@ function separateBlocks() {
 
 function logNormalError (error, file) {
   separateBlocks()
-  console.log('File:', file)
+  console.info('File:', file)
   console.error(error.message)
 }
 
@@ -217,21 +217,34 @@ function ensureLineBreak (parsed, source) {
 }
 
 function checkContents (file, source, parsed) {
-  const { createTwoFilesPatch } = require('diff')
+  const { createTwoFilesPatch, structuredPatch } = require('diff')
+  const structured = structuredPatch(`${file}.orig`, file, source, parsed, '', '', { context: 3 })
+  const length = structured.hunks && structured.hunks.length
   const diff = createTwoFilesPatch(`${file}.orig`, file, source, parsed, '', '', { context: 3 })
-  if (diff.split(/\r?\n/).length > 4) {
-    const err = new Error('Formatted output differs')
+  if (length > 0) {
+    const hunk = length === 1 ? 'hunk differs' : 'hunks differ'
+    const message = `${length} ${hunk}`
     if (options.compact) {
-      logCompactError(err, file)
+      console.error(`${file}: ${message}`)
     } else {
-      logNormalError(err, file)
+      separateBlocks()
+      console.info('File:', file)
+      console.error(message)
+    }
+    if (!options.quiet) {
+      console.log(diff)
     }
-    console.log(diff)
     if (options.continue) {
       process.exitCode = 1
     } else {
       process.exit(1)
     }
+  } else {
+    if (options.compact) {
+      console.info(`${file}: no difference`)
+    } else if (options.logFiles) {
+      console.info(file)
+    }
   }
 }
 
@@ -248,28 +261,33 @@ function diffContents(file, source, parsed) {
   }
   if (length > 0) {
     if (compact) {
-      const hunk = length === 1 ? 'hunk' : 'hunks'
+      const hunk = length === 1 ? 'hunk differs' : 'hunks differ'
       console.info(`${file}: ${length} ${hunk}`)
     } else {
       separateBlocks()
-      console.log('File:', file)
+      console.info('File:', file)
       console.log(diff)
     }
   } else {
-    if (compact) {
+    if (options.compact) {
       console.info(`${file}: no difference`)
+    } else if (options.logFiles) {
+      console.info(file)
     }
   }
 }
 
 function processFile (file) {
   file = normalize(file)
-  if (options.logFiles) {
-    console.log(file)
+  if (options.logFiles && !(options.compact || options.check || options.diff)) {
+    console.info(file)
   }
   const source = readFileSync(file, 'utf8')
   const parsed = processContents(source, file)
   if (options.inPlace) {
+    if (options.logFiles && options.compact) {
+      console.info(file)
+    }
     writeFileSync(file, ensureLineBreak(parsed, source))
   } else if (options.check) {
     checkContents(file, source, ensureLineBreak(parsed, source))
@@ -300,21 +318,21 @@ function processSource (src, checkExtension) {
       }
     }
   } catch ({ message }) {
-    console.log('WARN', message)
+    console.warn('WARN', message)
   }
 }
 
 function processPatterns (patterns) {
   const files = sync(patterns, { onlyFiles: true })
   if (!files.length) {
-    console.log('no files found')
+    console.error('no files found')
     process.exit(1)
   }
   for (const file of files) {
     try {
       processFile(file)
     } catch ({ message }) {
-      console.log('WARN', message)
+      console.warn('WARN', message)
     }
   }
 }
@@ -342,16 +360,21 @@ function main () {
     })
     stdin.on('end', () => {
       const file = '<stdin>'
-      if (options.logFiles) {
-        console.log(file)
+      if (options.logFiles && !(options.compact || options.check || options.diff)) {
+        console.info(file)
       }
       const parsed = processContents(source, file)
       if (options.check) {
         checkContents(file, source, ensureLineBreak(parsed, source))
       } else if (options.diff) {
         diffContents(file, source, ensureLineBreak(parsed, source))
-      } else if (!(options.quiet || options.logFiles)) {
-        console.log(parsed)
+      } else {
+        if (options.logFiles && options.compact) {
+          console.info(file)
+        }
+        if (!(options.quiet || options.logFiles)) {
+          console.log(parsed)
+        }
       }
     })
   }