1.6.0

Add in the -q/--quiet option to the README.md so folks know its there.

README.md

@@ -21,15 +21,21 @@ jsonlint will either report a syntax error with details or pretty print the sour
 ### Options
 
     $ jsonlint -h
-    Usage: jsonlint <file> [options]
 
-    <file>		file to parse; otherwise uses stdin
+    usage: jsonlint <file> [options]
+
+    file     file to parse; otherwise uses stdin
 
     options:
-    -v, --version		print version and exit
-    -s, --sort-keys		sort object keys
-    -i, --in-place		overwrite the file
-    -t CHAR, --indent CHAR		character(s) to use for indentation
+       -v, --version            print version and exit
+       -s, --sort-keys          sort object keys
+       -i, --in-place           overwrite the file
+       -t CHAR, --indent CHAR   character(s) to use for indentation
+       -c, --compact            compact error display
+       -V, --validate           a JSON schema to use for validation
+       -e, --environment        which specification of JSON Schema the validation file uses
+       -q, --quiet              do not print the parsed json to STDOUT
+
 
 ## Module interface
 

lib/cli.js

@@ -4,6 +4,7 @@ var fs = require("fs");
 var path = require("path");
 var parser = require("./jsonlint").parser;
 var JSV = require("JSV").JSV;
+var formatter = require("./formatter.js").formatter;
 
 var options = require("nomnom")
   .script("jsonlint")
@@ -48,6 +49,18 @@ var options = require("nomnom")
         string: '-e, --environment',
         "default": "json-schema-draft-03",
         help: 'which specification of JSON Schema the validation file uses'
+    },
+    quiet: {
+        flag:  true,
+        key: "value",
+        string: '-q, --quiet',
+        "default": false,
+        help: 'do not print the parsed json to STDOUT'
+    },
+    forcePrettyPrint: {
+        flag:  true,
+        string: '-p, --pretty-print',
+        help: 'force pretty printing even if invalid'
     }
   }).parse();
 
@@ -60,10 +73,13 @@ if (options.compact) {
 }
 
 function parse (source) {
+  var parsed,
+      formatted;
+
   try {
-    var parsed = options.sort ?
-                  sortObject(parser.parse(source)) :
-                  parser.parse(source);
+    parsed = options.sort ?
+      sortObject(parser.parse(source)) :
+      parser.parse(source);
 
     if (options.validate) {
       var env = JSV.createEnvironment(options.env);
@@ -76,10 +92,31 @@ function parse (source) {
 
     return JSON.stringify(parsed,null,options.indent);
   } catch (e) {
-    if (! options.compact) {
+    if ( options.forcePrettyPrint ) {
+      /* From https://github.com/umbrae/jsonlintdotcom:
+       * If we failed to validate, run our manual formatter and then re-validate so that we
+       * can get a better line number. On a successful validate, we don't want to run our
+       * manual formatter because the automatic one is faster and probably more reliable.
+       */
+
+      try {
+        formatted = formatter.formatJson(source, options.indent);
+        // Re-parse so exception output gets better line numbers
+        parsed = parser.parse(formatted);
+      } catch (e) {
+        if (! options.compact) {
+          console.error(e);
+        }
+        return formatted;
+        process.exit(1);
+      }
+    } else {
+      if (! options.compact) {
         console.error(e);
+      }
+
+      process.exit(1);
     }
-    process.exit(1);
   }
 }
 
@@ -98,9 +135,9 @@ function main (args) {
     var json = path.normalize(options.file);
     source = parse(fs.readFileSync(json, "utf8"));
     if (options.inplace) {
-      fs.writeSync(fs.openSync(path,'w+'), source, 0, "utf8");
+      fs.writeSync(fs.openSync(json,'w+'), source, 0, "utf8");
     } else {
-      console.log(source);
+      if (! options.quiet) { console.log(source)};
     }
   } else {
     var stdin = process.openStdin();
@@ -110,7 +147,7 @@ function main (args) {
       source += chunk.toString('utf8');
     });
     stdin.on('end', function () {
-      console.log(parse(source));
+      if (! options.quiet) {console.log(parse(source))};
     });
   }
 }

lib/formatter.js

@@ -0,0 +1,92 @@
+#!/usr/bin/env node
+
+/**
+ * Manual formatter taken straight from https://github.com/umbrae/jsonlintdotcom
+**/
+
+/*jslint white: true, devel: true, onevar: true, browser: true, undef: true, nomen: true, regexp: true, plusplus: false, bitwise: true, newcap: true, maxerr: 50, indent: 4 */
+
+/**
+ * jsl.format - Provide json reformatting in a character-by-character approach, so that even invalid JSON may be reformatted (to the best of its ability).
+ *
+**/
+var formatter = (function () {
+
+    function repeat(s, count) {
+        return new Array(count + 1).join(s);
+    }
+
+    function formatJson(json, indentChars) {
+        var i           = 0,
+            il          = 0,
+            tab         = (typeof indentChars !== "undefined") ? indentChars : "    ",
+            newJson     = "",
+            indentLevel = 0,
+            inString    = false,
+            currentChar = null;
+
+        for (i = 0, il = json.length; i < il; i += 1) { 
+            currentChar = json.charAt(i);
+
+            switch (currentChar) {
+            case '{': 
+            case '[': 
+                if (!inString) { 
+                    newJson += currentChar + "\n" + repeat(tab, indentLevel + 1);
+                    indentLevel += 1; 
+                } else { 
+                    newJson += currentChar; 
+                }
+                break; 
+            case '}': 
+            case ']': 
+                if (!inString) { 
+                    indentLevel -= 1; 
+                    newJson += "\n" + repeat(tab, indentLevel) + currentChar; 
+                } else { 
+                    newJson += currentChar; 
+                } 
+                break; 
+            case ',': 
+                if (!inString) { 
+                    newJson += ",\n" + repeat(tab, indentLevel); 
+                } else { 
+                    newJson += currentChar; 
+                } 
+                break; 
+            case ':': 
+                if (!inString) { 
+                    newJson += ": "; 
+                } else { 
+                    newJson += currentChar; 
+                } 
+                break; 
+            case ' ':
+            case "\n":
+            case "\t":
+                if (inString) {
+                    newJson += currentChar;
+                }
+                break;
+            case '"': 
+                if (i > 0 && json.charAt(i - 1) !== '\\') {
+                    inString = !inString; 
+                }
+                newJson += currentChar; 
+                break;
+            default: 
+                newJson += currentChar; 
+                break;                    
+            } 
+        } 
+
+        return newJson; 
+    }
+
+    return { "formatJson": formatJson };
+
+}());
+
+if (typeof require !== 'undefined' && typeof exports !== 'undefined') {
+  exports.formatter = formatter;
+}

package.json

@@ -8,7 +8,7 @@
     "lint",
     "jsonlint"
   ],
-  "version": "1.5.0",
+  "version": "1.6.0",
   "preferGlobal": true,
   "repository": {
     "type": "git",