add formatStylish

WisdomQuest · WisdomQuest · commit f614bc57b706 · 2025-02-12T12:52:46.000+04:00
diff --git a/README.md b/README.md
@@ -3,8 +3,11 @@
 
 [![Test Coverage](https://api.codeclimate.com/v1/badges/b3483509ed87517cea27/test_coverage)](https://codeclimate.com/github/WisdomQuest/frontend-project-46/test_coverage)
 
-Ascinema(lesson4)
+Ascinema(step 4)
 [![asciicast](https://asciinema.org/a/wHepNLn0QNSfYXf9OyHoPT4HJ.svg)](https://asciinema.org/a/wHepNLn0QNSfYXf9OyHoPT4HJ)
 
-Ascinema(lesson6)
-[![asciicast](https://asciinema.org/a/HxkkOQiIYxm2vO2JyCDFUd5sn.svg)](https://asciinema.org/a/HxkkOQiIYxm2vO2JyCDFUd5sn)
+Ascinema(step 6)
+[![asciicast](https://asciinema.org/a/HxkkOQiIYxm2vO2JyCDFUd5sn.svg)](https://asciinema.org/a/HxkkOQiIYxm2vO2JyCDFUd5sn)
+
+Ascinema(step 7)
+[![asciicast](https://asciinema.org/a/tiPXgEuuDoMZAupBaOi3jpOhM.svg)](https://asciinema.org/a/tiPXgEuuDoMZAupBaOi3jpOhM)
diff --git a/__fixtures__/expectDiffFiles.txt b/__fixtures__/expectDiffFiles.txt
@@ -1,8 +1,8 @@
-{
-  - follow: false
-    host: hexlet.io
-  - proxy: 123.234.53.22
-  - timeout: 50
-  + timeout: 20
-  + verbose: true
+{
+  - follow: false
+    host: hexlet.io
+  - proxy: 123.234.53.22
+  - timeout: 50
+  + timeout: 20
+  + verbose: true
 }
diff --git a/__fixtures__/expectDiffNestedStrucrure.txt b/__fixtures__/expectDiffNestedStrucrure.txt
@@ -0,0 +1,44 @@
+{
+    common: {
+      + follow: false
+        setting1: Value 1
+      - setting2: 200
+      - setting3: true
+      + setting3: null
+      + setting4: blah blah
+      + setting5: {
+            key5: value5
+        }
+        setting6: {
+            doge: {
+              - wow: 
+              + wow: so much
+            }
+            key: value
+          + ops: vops
+        }
+    }
+    group1: {
+      - baz: bas
+      + baz: bars
+        foo: bar
+      - nest: {
+            key: value
+        }
+      + nest: str
+    }
+  - group2: {
+        abc: 12345
+        deep: {
+            id: 45
+        }
+    }
+  + group3: {
+        deep: {
+            id: {
+                number: 45
+            }
+        }
+        fee: 100500
+    }
+}
diff --git a/__fixtures__/file1.json b/__fixtures__/file1.json
@@ -1,6 +1,26 @@
 {
-  "host": "hexlet.io",
-  "timeout": 50,
-  "proxy": "123.234.53.22",
-  "follow": false
+  "common": {
+    "setting1": "Value 1",
+    "setting2": 200,
+    "setting3": true,
+    "setting6": {
+      "key": "value",
+      "doge": {
+        "wow": ""
+      }
+    }
+  },
+  "group1": {
+    "baz": "bas",
+    "foo": "bar",
+    "nest": {
+      "key": "value"
+    }
+  },
+  "group2": {
+    "abc": 12345,
+    "deep": {
+      "id": 45
+    }
+  }
 }
diff --git a/__fixtures__/file1.yaml b/__fixtures__/file1.yaml
@@ -1,4 +1,17 @@
-host: hexlet.io
-timeout: 50
-proxy: 123.234.53.22
-follow: false
+common:
+  setting1: Value 1
+  setting2: 200
+  setting3: true
+  setting6:
+    key: value
+    doge:
+      wow: ''
+group1:
+  baz: bas
+  foo: bar
+  nest:
+    key: value
+group2:
+  abc: 12345
+  deep:
+    id: 45
diff --git a/__fixtures__/file11.json b/__fixtures__/file11.json
@@ -0,0 +1,6 @@
+{
+  "host": "hexlet.io",
+  "timeout": 50,
+  "proxy": "123.234.53.22",
+  "follow": false
+}
diff --git a/__fixtures__/file11.yaml b/__fixtures__/file11.yaml
@@ -0,0 +1,4 @@
+host: hexlet.io
+timeout: 50
+proxy: 123.234.53.22
+follow: false
diff --git a/__fixtures__/file2.json b/__fixtures__/file2.json
@@ -1,5 +1,31 @@
 {
-  "timeout": 20,
-  "verbose": true,
-  "host": "hexlet.io"
+  "common": {
+    "follow": false,
+    "setting1": "Value 1",
+    "setting3": null,
+    "setting4": "blah blah",
+    "setting5": {
+      "key5": "value5"
+    },
+    "setting6": {
+      "key": "value",
+      "ops": "vops",
+      "doge": {
+        "wow": "so much"
+      }
+    }
+  },
+  "group1": {
+    "foo": "bar",
+    "baz": "bars",
+    "nest": "str"
+  },
+  "group3": {
+    "deep": {
+      "id": {
+        "number": 45
+      }
+    },
+    "fee": 100500
+  }
 }
diff --git a/__fixtures__/file2.yaml b/__fixtures__/file2.yaml
@@ -0,0 +1,21 @@
+common:
+  follow: false
+  setting1: Value 1
+  setting3: null
+  setting4: blah blah
+  setting5:
+    key5: value5
+  setting6:
+    key: value
+    ops: vops
+    doge:
+      wow: so much
+group1:
+  foo: bar
+  baz: bars
+  nest: str
+group3:
+  deep:
+    id:
+      number: 45
+  fee: 100500
diff --git a/__fixtures__/file22.json b/__fixtures__/file22.json
@@ -0,0 +1,5 @@
+{
+  "timeout": 20,
+  "verbose": true,
+  "host": "hexlet.io"
+}
diff --git a/__fixtures__/file22.yml b/__fixtures__/file22.yml
diff --git a/__test__/diffFiles.test.js b/__test__/diffFiles.test.js
@@ -5,6 +5,7 @@ import compareFiles from '../src/diffFiles.js';
 import { fileURLToPath } from 'url';
 import { dirname } from 'path';
 import parseFile from '../src/fileParser.js';
+import formatStylish from '../src/formats/styllish.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -17,17 +18,17 @@ const readFile = (filename) =>
 const normalizedString = (str) => str.replace(/\r\n/g, '\n');
 
 test('compareFilesJson', () => {
-  const diffFiles = readFile('expectDiffFiles.txt');
+  const diffFiles = readFile('expectDiffNestedStrucrure.txt');
   const file1 = parseFile(getFixturePath('file1.json'));
   const file2 = parseFile(getFixturePath('file2.json'));
-  expect(compareFiles(file1, file2)).toEqual(normalizedString(diffFiles));
+  const getDIffFiles = compareFiles(file1, file2);
+  expect(formatStylish(getDIffFiles)).toEqual(normalizedString(diffFiles));
 });
 
 test('compareFilesYaml', () => {
-  const diffFiles = readFile('expectDiffFiles.txt');
+  const diffFiles = readFile('expectDiffNestedStrucrure.txt');
   const file1 = parseFile(getFixturePath('file1.yaml'));
-  const file2 = parseFile(getFixturePath('file2.yml'));
-  expect(compareFiles(file1, file2)).toEqual(normalizedString(diffFiles));
+  const file2 = parseFile(getFixturePath('file2.yaml'));
+  const getDIffFiles = compareFiles(file1, file2);
+  expect(formatStylish(getDIffFiles)).toEqual(normalizedString(diffFiles));
 });
-
-
diff --git a/bin/gendiff.js b/bin/gendiff.js
@@ -3,22 +3,34 @@
 import { program } from 'commander';
 import parseFile from '../src/fileParser.js';
 import diffFiles from '../src/diffFiles.js';
+import formatStylish from '../src/formats/styllish.js';
 
 program
   .name('gendiff')
   .description('Compares two configuration files and shows a difference.')
   .version('0.0.1')
   .usage('[options] <filepath1> <filepath2>')
   // .option('-V, --version', 'output the version number')
-  .option('-f, --format [type]', 'output format')
+  .option('-f, --format [type]', 'output format', 'stylish')
   .option('-h, --help', 'output usage information')
   .argument('<filepath1>', 'path to file 1')
   .argument('<filepath2>', 'path to file 2')
   .action((filePath1, filePath2) => {
     const file1 = parseFile(filePath1);
     const file2 = parseFile(filePath2);
+    const getDIffFiles = diffFiles(file1, file2);
+    const format = program.opts().format || 'stylish';
 
-   console.log(diffFiles(file1, file2));
+    let output;
+    if (format === 'stylish') {
+      output = formatStylish(getDIffFiles);
+    } else {
+      console.error(`Unknown format: ${format}`);
+      // eslint-disable-next-line no-undef
+      process.exit(1);
+    }
+
+    console.log(output);
   });
 
 // eslint-disable-next-line no-undef
diff --git a/demo.cast b/demo.cast
diff --git a/src/diffFiles.js b/src/diffFiles.js
diff --git a/src/formats/styllish.js b/src/formats/styllish.js
