Skip to content

Commit ab3ab1c

Browse files
committed
fix path
1 parent 9367b5c commit ab3ab1c

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

bin/gendiff.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env node
22

33
import { program } from 'commander';
4-
import { chooseFormat } from '../src/formats/index.js'
4+
import { chooseFormat } from '../src/formats/index.js';
55
program
66
.name('gendiff')
77
.description('Compares two configuration files and shows a difference.')

src/fileParser.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ const getExtensionFile = (fileName) => {
1414
throw new Error(`не найдено расширение файла: ${fileName} `);
1515
};
1616

17-
const parseFile = (filePath) => {
17+
const fileParser = (filePath) => {
1818
const absolutePath = path.resolve(cwd(), filePath);
1919
const extensionFunc = getExtensionFile(filePath);
2020
const data = fs.readFileSync(absolutePath, 'utf-8');
2121

2222
return extensionFunc(data);
2323
};
2424

25-
export default parseFile;
25+
export default fileParser;

src/formats/index.js

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
import parseFile from '../src/fileParser.js';
2-
import diffFiles from '../src/diffFiles.js';
3-
import formatStylish from '../src/formats/styllish.js';
4-
import formatPlain from '../src/formats/plain.js';
5-
import formatJson from '../src/formats/json.js';
1+
import fileParser from '../fileParser.js';
2+
import diffFiles from '../diffFiles.js';
3+
import formatStylish from './styllish.js';
4+
import formatPlain from './plain.js';
5+
import formatJson from './json.js';
66

7-
export const chooseFormat = (filePath1, filePath2, format)=>{
8-
const file1 = parseFile(filePath1);
9-
const file2 = parseFile(filePath2);
10-
const getDIffFiles = diffFiles(file1, file2);
7+
export const chooseFormat = (filePath1, filePath2, format = 'stylish') => {
8+
const file1 = fileParser(filePath1);
9+
const file2 = fileParser(filePath2);
10+
const getDIffFiles = diffFiles(file1, file2);
1111

12-
let output;
13-
if (format === 'stylish') {
14-
output = formatStylish(getDIffFiles);
15-
} else if (format === 'plain') {
16-
output = formatPlain(getDIffFiles);
17-
} else if (format === 'json') {
18-
output = formatJson(getDIffFiles);
19-
} else {
20-
console.error(`Unknown format: ${format}`);
21-
}
12+
let output;
13+
if (format === 'stylish') {
14+
output = formatStylish(getDIffFiles);
15+
} else if (format === 'plain') {
16+
output = formatPlain(getDIffFiles);
17+
} else if (format === 'json') {
18+
output = formatJson(getDIffFiles);
19+
} else {
20+
console.error(`Unknown format: ${format}`);
21+
}
2222

23-
console.log(output);
24-
return output;
25-
}
23+
console.log(output);
24+
return output;
25+
};

0 commit comments

Comments
 (0)