@prantlf/jsonlint 11.4.0 → 11.5.0

package/README.md

@@ -122,6 +122,7 @@ Usage: `jsonlint [options] [<file, directory, pattern> ...]`
     -E, --extensions [ext]       file extensions to process for directory walk
                                   (default: ["json","JSON"])
     -i, --in-place               overwrite the input files
+    -j, --diff                   print difference instead of writing the output
     -k, --check                  check that the input is equal to the output
     -t, --indent [num|char]      number of spaces or specific characters
                                   to use for indentation (default: 2)
@@ -187,6 +188,8 @@ The configuration is an object with the following properties, described above, w
 | sort-keys | sortKeys |
 | extensions | |
 | in-place | inPlace |
+| diff | |
+| check | |
 | indent | |
 | compact | |
 | mode | |

package/lib/cli.js

@@ -21,6 +21,7 @@ const commander = require('commander')
   .option('-s, --sort-keys', 'sort object keys (not when prettifying)')
   .option('-E, --extensions [ext]', 'file extensions to process for directory walk', collectValues, ['json', 'JSON'])
   .option('-i, --in-place', 'overwrite the input files')
+  .option('-j, --diff', 'print difference instead of writing the output')
   .option('-k, --check', 'check that the input is equal to the output')
   .option('-t, --indent [num|char]', 'number of spaces or specific characters to use for indentation', 2)
   .option('-c, --compact', 'compact error display')
@@ -87,6 +88,7 @@ if (params.config === false) {
 }
 
 const extensions = options.extensions.map(extension => '.' + extension)
+let reported
 
 function convertConfig (config) {
   const result = {}
@@ -108,11 +110,17 @@ function mergeOptions (target, ...sources) {
   return target
 }
 
-function logNormalError (error, file) {
-  if (process.exitCode > 0) {
+function separateBlocks () {
+  if (reported) {
     console.log()
+  } else {
+    reported = true
   }
-  console.log('File:', file)
+}
+
+function logNormalError (error, file) {
+  separateBlocks()
+  console.info('File:', file)
   console.error(error.message)
 }
 
@@ -209,35 +217,82 @@ 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)
+    }
+  }
+}
+
+function diffContents (file, source, parsed) {
+  const { createTwoFilesPatch, structuredPatch } = require('diff')
+  const compact = options.quiet || options.compact
+  let diff, length
+  if (compact) {
+    diff = structuredPatch(`${file}.orig`, file, source, parsed, '', '', { context: 3 })
+    length = diff.hunks && diff.hunks.length
+  } else {
+    diff = createTwoFilesPatch(`${file}.orig`, file, source, parsed, '', '', { context: 3 })
+    length = diff.split(/\r?\n/).length - 4
+  }
+  if (length > 0) {
+    if (compact) {
+      const hunk = length === 1 ? 'hunk differs' : 'hunks differ'
+      console.info(`${file}: ${length} ${hunk}`)
+    } else {
+      separateBlocks()
+      console.info('File:', file)
+      console.log(diff)
+    }
+  } else {
+    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))
+  } else if (options.diff) {
+    diffContents(file, source, ensureLineBreak(parsed, source))
   } else {
     if (!(options.quiet || options.logFiles)) {
       console.log(parsed)
@@ -263,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)
     }
   }
 }
@@ -305,14 +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.quiet || options.logFiles)) {
-        console.log(parsed)
+      } else if (options.diff) {
+        diffContents(file, source, ensureLineBreak(parsed, source))
+      } else {
+        if (options.logFiles && options.compact) {
+          console.info(file)
+        }
+        if (!(options.quiet || options.logFiles)) {
+          console.log(parsed)
+        }
       }
     })
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prantlf/jsonlint",
-  "version": "11.4.0",
+  "version": "11.5.0",
   "description": "JSON/CJSON/JSON5 parser, syntax and schema validator and pretty-printer.",
   "author": "Ferdinand Prantl <prantlf@gmail.com> (http://prantl.tk)",
   "contributors": [