Merge pull request #45 from codelicia/user_choose_indentation

Let user choose indentation

Author: airtonzanon

README.md

@@ -28,17 +28,14 @@ Fix the code style of a file or multiple files:
     Usage: jsoncs [file]
 
     Options:
-       -f, --fix                Fix the file
-       -q, --quiet              Run in quiet mode
-       -v, --version            print version and exit
+       -f, --fix                fix json file
+       -q, --quiet              quiet mode
+       -v, --version            json code style version
+       -s, --spaces <integer>   quantity of spaces to indent the json (default: 2)
 
 ### Example
 
 * _RED_: wrong json
 * _BLUE_: correct json
 
 ![](./example.png)
-
-## TO-DO
-
-* Leave the code style to the user in a config file

lib/cli.js

@@ -21,6 +21,9 @@ program.
     "fix json file")
   .option("-q, --quiet",
     "quiet mode")
+  .option("-s, --spaces <integer>",
+    "quantity of spaces to indent the json",
+    2)
   .arguments("[json]")
   .action(function (json) {
     jsonFile = json;
@@ -36,21 +39,27 @@ function parse(path) {
   if (errors.includes(true)) {
     process.exit(1);
   }
-  
+
   process.exit(0);
 }
 
 function processFile(filePath) {
   try {
     const source = fs.readFileSync(filePath, "utf8");
-    const formatted = formatter.formatJson(source);
+    const indentation = parseInt(program.spaces);
+    const formatted = formatter.formatJson(source, indentation);
     const fileWithErrors = showDiff(program.quiet, source, formatted, filePath);
 
     errors.push(fileWithErrors);
 
     let fixedFile = fixJsonFile(program.fix, filePath, formatted);
     fixedFiles.push(fixedFile);
   } catch (e) {
+    if (typeof program.spaces != "number") {
+      console.log("-s / --spaces should receive integer as parameter");
+      process.exit(1);
+    }
+
     console.log("Couldn't read the file / directory");
     console.log("Try to:");
     console.log("  - use quotes (eg: jsoncs 'my/file.json')");
@@ -61,6 +70,9 @@ function processFile(filePath) {
 }
 
 function main(jsonFilePath) {
+  if (jsonFilePath == undefined) {
+    program.help();
+  }
   let filePath = path.normalize(jsonFilePath);
   parse(filePath);
 }

lib/formatter.js

@@ -6,10 +6,10 @@ var formatter = (function () {
     return new Array(count + 1).join(s);
   }
 
-  function formatJson(json) {
+  function formatJson(json, indentation) {
     var i = 0,
       il = 0,
-      tab = "  ",
+      tab = repeat(" ", indentation),
       newJson = "",
       indentLevel = 0,
       inString = false,

lib/modules.js

@@ -4,7 +4,7 @@ const glob = require("glob");
 
 const blue = "\x1b[34m";
 const red = "\x1b[31m";
-const withe = "\x1b[37m";
+const white = "\x1b[37m";
 
 module.exports = {
   getFiles: (path) => {
@@ -24,16 +24,16 @@ module.exports = {
     let diff = jsdiff.diffJson(source, formatted);
 
     diff.forEach((part) => {
-      let color = part.added ? blue : part.removed ? red : withe;
+      let color = part.added ? blue : part.removed ? red : white;
 
       if (part.added || part.removed) {
         quiet || console.log(color, part.value);
         fileWithErrors = true;
       }
     });
 
-    !fileWithErrors || console.log(withe, " ============== ");
-    !fileWithErrors || console.log(withe, filePath, "\n");
+    !fileWithErrors || console.log(white, " ============== ");
+    !fileWithErrors || console.log(white, filePath, "\n");
 
     return fileWithErrors;
   }

test/formatterTest.js

@@ -5,13 +5,15 @@ const formatter = require("../lib/formatter.js").formatter;
 test("format a simple json file", (assert) => {
   let actualJson = fs.readFileSync(__dirname + "/fixture/actual-json/1.json").toString();
   let expectedJson = fs.readFileSync(__dirname + "/fixture/expected-json/1.json").toString();
-  assert.equal(formatter.formatJson(actualJson), expectedJson);
+  const indetation = 2;
+  assert.equal(formatter.formatJson(actualJson, indetation), expectedJson);
   assert.end();
 });
 
 test("format a complex json file", (assert) => {
   let actualJson = fs.readFileSync(__dirname + "/fixture/actual-json/2.json").toString();
   let expectedJson = fs.readFileSync(__dirname + "/fixture/expected-json/2.json").toString();
-  assert.equal(formatter.formatJson(actualJson), expectedJson);
+  const indetation = 2;
+  assert.equal(formatter.formatJson(actualJson, indetation), expectedJson);
   assert.end();
 });