add formats/json.js

Author: WisdomQuest

README.md

@@ -13,4 +13,7 @@ Ascinema(step 7)
 [![asciicast](https://asciinema.org/a/tiPXgEuuDoMZAupBaOi3jpOhM.svg)](https://asciinema.org/a/tiPXgEuuDoMZAupBaOi3jpOhM)
 
 Ascinema(step 8)
-[![asciicast](https://asciinema.org/a/wVFcRWLw25eVEgI4DCbmQsqQq.svg)](https://asciinema.org/a/wVFcRWLw25eVEgI4DCbmQsqQq)
+[![asciicast](https://asciinema.org/a/wVFcRWLw25eVEgI4DCbmQsqQq.svg)](https://asciinema.org/a/wVFcRWLw25eVEgI4DCbmQsqQq)
+
+Ascinema(step 9)
+[![asciicast](https://asciinema.org/a/qeVw07gBuHqRcRF10gR4dIv3g.svg)](https://asciinema.org/a/qeVw07gBuHqRcRF10gR4dIv3g)

__fixtures__/expectDiffFormatJson.txt

@@ -0,0 +1 @@
+[{"name": "common.follow", "value": false, "condition": "plus"},{"name": "common.setting2", "value": 200, "condition": "minus"},{"name": "common.setting3", "oldValue": true, "newValue": null, "condition": "changed"},{"name": "common.setting4", "value": "blah blah", "condition": "plus"},{"name": "common.setting5", "value": {"key5":"value5"}, "condition": "plus"},{"name": "common.setting6.doge.wow", "oldValue": "", "newValue": "so much", "condition": "changed"},{"name": "common.setting6.ops", "value": "vops", "condition": "plus"},{"name": "group1.baz", "oldValue": "bas", "newValue": "bars", "condition": "changed"},{"name": "group1.nest", "oldValue": {"key":"value"}, "newValue": "str", "condition": "changed"},{"name": "group2", "value": {"abc":12345,"deep":{"id":45}}, "condition": "minus"},{"name": "group3", "value": {"deep":{"id":{"number":45}},"fee":100500}, "condition": "plus"}]

__test__/diffFiles.test.js

@@ -7,6 +7,7 @@ import { dirname } from 'path';
 import parseFile from '../src/fileParser.js';
 import formatStylish from '../src/formats/styllish.js';
 import formatPlain from '../src/formats/plain.js';
+import formatJson from '../src/formats/json.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -44,7 +45,12 @@ test('compareFilesJsonFormatPlain', () => {
   expect(formatPlain(diffFilesJson)).toEqual(diffFilesFormatPlain);
 });
 
-test('compareFilesYamlFormatStylishPlain', () => {
-  const diffFilesFormatPlain = readFile('expectDiffFormatPlain.txt');
-  expect(formatPlain(diffFilesYaml)).toEqual(diffFilesFormatPlain);
+// test('compareFilesYamlFormatStylishPlain', () => {
+//   const diffFilesFormatPlain = readFile('expectDiffFormatPlain.txt');
+//   expect(formatPlain(diffFilesYaml)).toEqual(diffFilesFormatPlain);
+// });
+
+test('compareFilesFormatJson', () => {
+  const diffFilesFormatPlain = readFile('expectDiffFormatJson.txt');
+  expect(formatJson(diffFilesJson)).toEqual(diffFilesFormatPlain);
 });

bin/gendiff.js

@@ -5,7 +5,7 @@ import parseFile from '../src/fileParser.js';
 import diffFiles from '../src/diffFiles.js';
 import formatStylish from '../src/formats/styllish.js';
 import formatPlain from '../src/formats/plain.js';
-
+import formatJson from '../src/formats/json.js';
 
 program
   .name('gendiff')
@@ -28,6 +28,8 @@ program
       output = formatStylish(getDIffFiles);
     } else if (format === 'plain') {
       output = formatPlain(getDIffFiles);
+    } else if (format === 'json') {
+      output = formatJson(getDIffFiles);
     } else {
       console.error(`Unknown format: ${format}`);
       // eslint-disable-next-line no-undef

demo.cast

@@ -1,11 +1,12 @@
-{"version": 2, "width": 225, "height": 14, "timestamp": 1739443045, "env": {"SHELL": "/bin/bash", "TERM": "xterm-256color"}}
-[0.131436, "o", "\u001b[?2004h💻 \u001b[1;34mfrontend-project-46\u001b[m\u001b[32m (main)\u001b[00m $ "]
-[2.188625, "o", "gendiff "]
-[2.18965, "o", "-f plain"]
-[2.1915, "o", " __fixtures__"]
-[2.194056, "o", "/file1.json __fixtur"]
-[2.196402, "o", "es__/file2.json"]
-[3.021137, "o", "\r\n\u001b[?2004l\r"]
-[3.269762, "o", "Property 'common.follow' was added with value: false\r\nProperty 'common.setting2' was removed\r\nProperty 'common.setting3' was updated. From true to null\r\nProperty 'common.setting4' was added with value: 'blah blah'\r\nProperty 'common.setting5' was added with value: [complex value]\r\nProperty 'common.setting6.doge.wow' was updated. From '' to 'so much'\r\nProperty 'common.setting6.ops' was added with value: 'vops'\r\nProperty 'group1.baz' was updated. From 'bas' to 'bars'\r\nProperty 'group1.nest' was updated. From [complex value] to 'str'\r\nProperty 'group2' was removed\r\nProperty 'group3' was added with value: [complex value]\r\n"]
-[3.348678, "o", "\u001b[?2004h💻 \u001b[1;34mfrontend-project-46\u001b[m\u001b[32m (main)\u001b[00m $ "]
-[5.078226, "o", "\u001b[?2004l\r\r\nexit\r\n"]
+{"version": 2, "width": 262, "height": 25, "timestamp": 1739795643, "env": {"SHELL": "/bin/bash", "TERM": "xterm-256color"}}
+[0.139538, "o", "\u001b[?2004h💻 \u001b[1;34mfrontend-project-46\u001b[m\u001b[32m (main)\u001b[00m $ "]
+[1.159961, "o", "gendiff "]
+[1.163117, "o", "-f json __fixtures__"]
+[1.164295, "o", "/file1.json __"]
+[1.16461, "o", "fixture"]
+[1.164836, "o", "s__/f"]
+[1.165318, "o", "ile2.json"]
+[2.339947, "o", "\r\n\u001b[?2004l\r"]
+[2.603778, "o", "[{\"name\": \"common.follow\", \"value\": false, \"condition\": \"plus\"},{\"name\": \"common.setting2\", \"value\": 200, \"condition\": \"minus\"},{\"name\": \"common.setting3\", \"oldValue\": true, \"newValue\": null, \"condition\": \"changed\"},{\"name\": \"common.setting4\", \"value\": \"blah blah\", \"condition\": \"plus\"},{\"name\": \"common.setting5\", \"value\": {\"key5\":\"value5\"}, \"condition\": \"plus\"},{\"name\": \"common.setting6.doge.wow\", \"oldValue\": \"\", \"newValue\": \"so much\", \"condition\": \"changed\"},{\"name\": \"common.setting6.ops\", \"value\": \"vops\", \"condition\": \"plus\"},{\"name\": \"group1.baz\", \"oldValue\": \"bas\", \"newValue\": \"bars\", \"condition\": \"changed\"},{\"name\": \"group1.nest\", \"oldValue\": {\"key\":\"value\"}, \"newValue\": \"str\", \"condition\": \"changed\"},{\"name\": \"group2\", \"value\": {\"abc\":12345,\"deep\":{\"id\":45}}, \"condition\": \"minus\"},{\"name\": \"group3\", \"value\": {\"deep\":{\"id\":{\"number\":45}},\"fee\":100500}, \"condition\": \"plus\"}]\r\n"]
+[2.681521, "o", "\u001b[?2004h💻 \u001b[1;34mfrontend-project-46\u001b[m\u001b[32m (main)\u001b[00m $ "]
+[4.396333, "o", "\u001b[?2004l\r\r\nexit\r\n"]

src/formats/json.js

@@ -0,0 +1,40 @@
+import _ from 'lodash';
+import getPath from '../getPath.js';
+
+const checkBolleanNullNumber = (value) => {
+  if (_.isNull(value) || _.isBoolean(value) || _.isNumber(value)) {
+    return value;
+  }
+  return `"${value}"`;
+};
+
+const getValue = (elem) => {
+  if (elem.keyOld || elem.keyNew) {
+    return `"oldValue": ${formatValue(elem.keyOld)}, "newValue": ${formatValue(elem.keyNew)}`;
+  }
+  return `"value": ${formatValue(elem.value)}`;
+};
+
+const formatValue = (value) => {
+  if (_.isPlainObject(value)) {
+    return JSON.stringify(value);
+  }
+  return checkBolleanNullNumber(value);
+};
+
+const formatJson = (data, parentPath = '') => {
+  const iner = (data, parentPath) => data
+    .filter((elem) => elem.condition !== 'dash')
+    .map((elem) => {
+      const { condition, children } = elem;
+      const currentPath = getPath(elem, parentPath);
+      if (condition === 'unchanged') {
+        return `${iner(children, currentPath)}`;
+      }
+      return `{"name": "${currentPath}", ${getValue(elem)}, "condition": "${condition}"}`;
+    });
+  const result = iner(data, parentPath).join(',');
+  return `[${result}]`;
+};
+
+export default formatJson;

src/formats/plain.js

@@ -1,8 +1,5 @@
 import _ from 'lodash';
-
-const getPath = (data, parentPath = '') => {
-  return parentPath ? `${parentPath}.${data.name}` : data.name;
-};
+import getPath from '../getPath.js';
 
 const checkBolleanNull = (value) => {
   if (_.isNull(value) || _.isBoolean(value)) {

src/getPath.js

@@ -0,0 +1,3 @@
+export default (data, parentPath = '') => {
+  return parentPath ? `${parentPath}.${data.name}` : data.name;
+};