Merge pull request #5 from mjurczyk/feature/4-missing-commas-in-arrays

Adjust output JSON

Author: mjurczyk

src/utils/console/pretty-print/index.js

@@ -3,7 +3,13 @@ import { prettyPrintString } from './pretty-print-string';
 import { prettyPrintArray } from './pretty-print-array';
 import { prettyPrintObject } from './pretty-print-object';
 
-export const prettyPrint = (key = null, value = '', indent = 0, colorOutput = false) => {
+export const prettyPrint = (
+  key = null,
+  value = '',
+  indent = 0,
+  colorOutput = false,
+  addComma = false
+) => {
   const isString = typeof value === 'string';
   const isArray = value instanceof Array;
   const isObject = value !== null && typeof value === 'object';
@@ -15,14 +21,14 @@ export const prettyPrint = (key = null, value = '', indent = 0, colorOutput = fa
   }
 
   if (isString) {
-    prettyPrintString(`"${value}"`, hasKey ? 0 : indent, colorOutput);
+    prettyPrintString(`"${value}"`, hasKey ? 0 : indent, colorOutput, addComma);
   } else if (isArray) {
-    prettyPrintArray(value, indent, colorOutput);
+    prettyPrintArray(value, indent, colorOutput, addComma);
   } else if (isObject) {
-    prettyPrintObject(value, indent, colorOutput);
+    prettyPrintObject(value, indent, colorOutput, addComma);
   } else if (isSymbol) {
-    prettyPrintString(Symbol.toString(), indent, colorOutput);
+    prettyPrintString(Symbol.toString(), indent, colorOutput, addComma);
   } else {
-    prettyPrintString(value, hasKey ? 0 : indent, colorOutput);
+    prettyPrintString(value, hasKey ? 0 : indent, colorOutput, addComma);
   }
 };

src/utils/console/pretty-print/pretty-print-array.js

@@ -1,16 +1,22 @@
 import 'colors';
+import R from 'ramda';
 import { print } from './print';
 import { getIndentation, indentStep } from './indent';
 import { prettyPrint } from './index';
 
-export const prettyPrintArray = (array = [], indent = 0, colorOutput = false) => {
+export const prettyPrintArray = (array = [], indent = 0, colorOutput = false, addComma = false) => {
   const messageIndent = getIndentation(indent);
+  const arrayLength = R.length(array) - 1;
 
   print('[').thenAddNewLine();
 
-  array.forEach((child) => {
-    prettyPrint(null, child, indent + indentStep, colorOutput);
+  array.forEach((child, index) => {
+    const isLast = index === arrayLength;
+
+    prettyPrint(null, child, indent + indentStep, colorOutput, !isLast);
   });
 
-  print(`${messageIndent}]`).thenAddNewLine();
+  print(`${messageIndent}]`)
+    .thenAddCommaIf(addComma)
+    .thenAddNewLine();
 };

src/utils/console/pretty-print/pretty-print-object.js

@@ -4,14 +4,19 @@ import { print } from './print';
 import { getIndentation, indentStep } from './indent';
 import { prettyPrint } from './index';
 
-export const prettyPrintObject = (object = {}, indent = 0, colorOutput = false) => {
+export const prettyPrintObject = (object = {}, indent = 0, colorOutput = false, addComma = false) => {
   const messageIndent = getIndentation(indent);
+  const objectKeysLength = R.compose(R.length, R.keys)(object) - 1;
 
   print('{').thenAddNewLine();
 
-  R.forEachObjIndexed((value, key) => {
-    prettyPrint(key, value, indent + indentStep, colorOutput);
+  R.addIndex(R.forEachObjIndexed)((value, key, object, index) => {
+    const isLast = index === objectKeysLength;
+
+    prettyPrint(key, value, indent + indentStep, colorOutput, !isLast);
   })(object);
 
-  print(`${messageIndent}}`).thenAddNewLine();
+  print(`${messageIndent}}`)
+    .thenAddCommaIf(addComma)
+    .thenAddNewLine();
 };

src/utils/console/pretty-print/pretty-print-string.js

@@ -2,9 +2,11 @@ import 'colors';
 import { print } from './print';
 import { getIndentation } from './indent';
 
-export const prettyPrintString = (string = '', indent = 0, colorOutput = false) => {
+export const prettyPrintString = (string = '', indent = 0, colorOutput = false, addComma = false) => {
   const messageIndent = getIndentation(indent);
   const color = colorOutput ? 'green' : 'white';
 
-  print(`${messageIndent}${string}`[color]).thenAddNewLine();
+  print(`${messageIndent}${string}`[color])
+    .thenAddCommaIf(addComma)
+    .thenAddNewLine();
 };

src/utils/console/pretty-print/print.js

@@ -1,9 +1,14 @@
-export const newLine = () => process.stdout.write('\n');
+export const addNewLine = () => process.stdout.write('\n');
+
+export const addComma = () => process.stdout.write(',');
 
 export const print = (message = '') => {
   process.stdout.write(`${message}`);
 
-  return {
-    thenAddNewLine: newLine
+  const chainable = {
+    thenAddNewLine: () => addNewLine() && chainable,
+    thenAddCommaIf: (condition) => !(condition && addComma()) && chainable
   };
+
+  return chainable;
 };

test/unit/utils/cli.spec.js

@@ -223,5 +223,13 @@ describe('utils/cli', () => {
 
       expect(cliScript).to.contain('json-viewer');
     }).timeout(scriptTimeout);
+
+    it('should output nothing when asked to set always-color flag', () => {
+      const cliScript = execSync(`cd ${process.cwd()} && cat package.json | babel-node "${mainScriptPath}" --always-color`, {
+        encoding: 'utf-8'
+      });
+
+      expect(cliScript).to.be.empty;
+    }).timeout(scriptTimeout);
   });
 });