fix name

Author: WisdomQuest

__test__/diffFiles.test.js

@@ -3,7 +3,7 @@ import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import { dirname } from 'path';
-import { chooseFormat } from '../src/formats/index.js';
+import { chooseFormat } from '../src/formatters/index.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);

bin/gendiff.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { program } from 'commander';
-import { chooseFormat } from '../src/formats/index.js';
+import { chooseFormat } from '../src/formatters/index.js';
 program
   .name('gendiff')
   .description('Compares two configuration files and shows a difference.')
@@ -13,7 +13,7 @@ program
   .argument('<filepath1>', 'path to file 1')
   .argument('<filepath2>', 'path to file 2')
   .action((filePath1, filePath2, options) => {
-    chooseFormat(filePath1, filePath2, options.format);
+    console.log(chooseFormat(filePath1, filePath2, options.format));
   });
 
 // eslint-disable-next-line no-undef

src/formats/plain.js

@@ -20,6 +20,5 @@ export const chooseFormat = (filePath1, filePath2, format = 'stylish') => {
     console.error(`Unknown format: ${format}`);
   }
 
-  console.log(output);
   return output;
 };

src/formats/index.js renamed to src/formatters/index.js

@@ -1,13 +1,6 @@
 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)}`;
@@ -16,10 +9,12 @@ const getValue = (elem) => {
 };
 
 const formatValue = (value) => {
-  if (_.isPlainObject(value)) {
+  if (_.isNull(value) || _.isBoolean(value) || _.isNumber(value)) {
+    return value;
+  }else if (_.isPlainObject(value)) {
     return JSON.stringify(value);
   }
-  return checkBolleanNullNumber(value);
+  return `"${value}"`;
 };
 
 const formatJson = (data, parentPath = '') => {

src/formats/json.js renamed to src/formatters/json.js

@@ -0,0 +1,60 @@
+import _ from 'lodash';
+import getPath from '../getPath.js';
+
+const formatValue = (value) => {
+  if (_.isNull(value) || _.isBoolean(value)|| _.isNumber(value)) {
+    return value;
+  } else if(_.isObject(value)) {
+    return `[complex value]`;
+  }
+  return `'${value}'`;
+};
+
+// const getValue = (data) => {
+//   if (data.condition === 'changed') {
+//     return `${
+//       _.isObject(data.keyOld)
+//         ? `[complex value]`
+//         : `${checkBolleanNull(data.keyOld)}`
+//     } to ${
+//       _.isObject(data.keyNew)
+//         ? `[complex value]`
+//         : `${checkBolleanNull(data.keyNew)}`
+//     }`;
+//   } else if (_.isObject(data.value)) {
+//     return `[complex value]`;
+//   }
+
+//   return checkBolleanNull(data.value);
+// };
+
+// const getValue = (data) => {
+//   return _.isObject(data) ? `[complex value]` : formatValue(data);
+// };
+
+
+const formatPlain = (data, parentPath = '') => {
+  const lines = data.map((elem) => {
+    const { condition, children } = elem;
+    const currentPath = getPath(elem, parentPath);
+
+    switch (condition) {
+      case 'plus':
+        return `Property '${currentPath}' was added with value: ${formatValue(
+          elem.value
+        )}`;
+      case 'minus':
+        return `Property '${currentPath}' was removed`;
+      case 'changed':
+        return `Property '${currentPath}' was updated. From ${formatValue(elem.keyOld)} to ${formatValue(elem.keyNew)}`;
+      case 'unchanged':
+        return `${formatPlain(children, currentPath)}`;
+      default:
+        return '';
+    }
+  });
+  const result = _.compact(lines);
+  return result.join('\n');
+};
+
+export default formatPlain;