Skip to content

Commit

Permalink
upgraded prettier @latest, reformatted code base
Browse files Browse the repository at this point in the history
  • Loading branch information
Marton Hipszki committed Oct 1, 2020
1 parent 818573a commit fe389ed
Show file tree
Hide file tree
Showing 17 changed files with 88 additions and 50 deletions.
2 changes: 1 addition & 1 deletion __mocks__/yargs.js
@@ -1,5 +1,5 @@
const yargs = jest.genMockFromModule('yargs');

yargs.parse = args => args;
yargs.parse = (args) => args;

module.exports = yargs;
18 changes: 14 additions & 4 deletions lib/__tests__/aggregator.spec.js
Expand Up @@ -3,15 +3,25 @@ import mockResult from './mock-result-factory';

test('aggregates errors and warnings by rule', () => {
const results = [
mockResult([['rule1', 1], ['rule2', 1]]),
mockResult([['rule2', 1], ['rule3', 2]]),
mockResult([['rule3', 2], ['rule4', 2], ['rule5', 2]])
mockResult([
['rule1', 1],
['rule2', 1],
]),
mockResult([
['rule2', 1],
['rule3', 2],
]),
mockResult([
['rule3', 2],
['rule4', 2],
['rule5', 2],
]),
];
expect(aggregate(results)).toEqual([
{ ruleId: 'rule1', errors: 0, warnings: 1 },
{ ruleId: 'rule2', errors: 0, warnings: 2 },
{ ruleId: 'rule3', errors: 2, warnings: 0 },
{ ruleId: 'rule4', errors: 1, warnings: 0 },
{ ruleId: 'rule5', errors: 1, warnings: 0 }
{ ruleId: 'rule5', errors: 1, warnings: 0 },
]);
});
8 changes: 4 additions & 4 deletions lib/__tests__/extract-messages.spec.js
Expand Up @@ -3,16 +3,16 @@ import extractMessagesFrom from '../extract-messages';
test('returns a flat array of messages of ESLint result objects', () => {
const results = [
{
messages: ['rule-1-message-1', 'rule-1-message-2']
messages: ['rule-1-message-1', 'rule-1-message-2'],
},
{
messages: ['rule-2-message-1']
}
messages: ['rule-2-message-1'],
},
];
const messages = extractMessagesFrom(results);
expect(messages).toEqual([
'rule-1-message-1',
'rule-1-message-2',
'rule-2-message-1'
'rule-2-message-1',
]);
});
2 changes: 1 addition & 1 deletion lib/__tests__/find-rule.spec.js
Expand Up @@ -3,7 +3,7 @@ import findRule from '../find-rule';
test('returns a rule if already included in summary', () => {
const summary = [{ ruleId: 'existing rule' }];
expect(findRule(summary, 'existing rule')).toEqual({
ruleId: 'existing rule'
ruleId: 'existing rule',
});
expect(findRule(summary, 'non-existing rule')).toBeUndefined();
});
48 changes: 38 additions & 10 deletions lib/__tests__/format-results.spec.js
Expand Up @@ -12,40 +12,68 @@ const argv = (prop = '', direction = '') => [
'--',
'--sort-by',
`${prop}`,
direction === 'desc' ? '--desc' : '--asc'
direction === 'desc' ? '--desc' : '--asc',
];

test('provides header, summary of rules and total', () => {
const results = [
mockResult([['rule1', 1], ['rule2', 1]]),
mockResult([['rule2', 1], ['rule3', 2]]),
mockResult([['rule3', 2], ['rule4', 2], ['rule5', 2]])
mockResult([
['rule1', 1],
['rule2', 1],
]),
mockResult([
['rule2', 1],
['rule3', 2],
]),
mockResult([
['rule3', 2],
['rule4', 2],
['rule5', 2],
]),
];
expect(stripAnsi(format(results, argv()))).toMatchSnapshot();
});

test('can sort summary by rule id', () => {
const results = [
mockResult([['rule2', 1], ['rule3', 2]]),
mockResult([['rule1', 1], ['rule2', 1]])
mockResult([
['rule2', 1],
['rule3', 2],
]),
mockResult([
['rule1', 1],
['rule2', 1],
]),
];
expect(stripAnsi(format(results, argv('rule')))).toMatchSnapshot();
expect(stripAnsi(format(results, argv('rule', 'desc')))).toMatchSnapshot();
});

test('can sort summary by num of errors', () => {
const results = [
mockResult([['rule2', 2], ['rule3', 2]]),
mockResult([['rule1', 1], ['rule2', 2]])
mockResult([
['rule2', 2],
['rule3', 2],
]),
mockResult([
['rule1', 1],
['rule2', 2],
]),
];
expect(stripAnsi(format(results, argv('errors')))).toMatchSnapshot();
expect(stripAnsi(format(results, argv('errors', 'desc')))).toMatchSnapshot();
});

test('can sort summary by num of warnings', () => {
const results = [
mockResult([['rule2', 1], ['rule3', 2]]),
mockResult([['rule1', 1], ['rule2', 1]])
mockResult([
['rule2', 1],
['rule3', 2],
]),
mockResult([
['rule1', 1],
['rule2', 1],
]),
];
expect(stripAnsi(format(results, argv('warnings')))).toMatchSnapshot();
expect(
Expand Down
2 changes: 1 addition & 1 deletion lib/__tests__/length-of-longest.spec.js
Expand Up @@ -5,7 +5,7 @@ test('returns length of specific prop in a set of objects', () => {
lengthOfLongest('value', [
{ value: '123' },
{ value: 1234 },
{ value: 'asdfasdf' }
{ value: 'asdfasdf' },
])
).toBe(8);
});
6 changes: 3 additions & 3 deletions lib/__tests__/mock-result-factory.js
@@ -1,5 +1,5 @@
module.exports = function resultFactory(failingRules) {
const messages = failingRules.map(function(rule) {
const messages = failingRules.map(function (rule) {
const ruleId = rule[0];
const severity = rule[1];
return {
Expand All @@ -9,10 +9,10 @@ module.exports = function resultFactory(failingRules) {
line: 1,
column: 1,
nodeType: 'Identifier',
source: "const foo = 'bar';"
source: "const foo = 'bar';",
};
});
return {
messages
messages,
};
};
2 changes: 1 addition & 1 deletion lib/__tests__/parse-cli-args.spec.js
Expand Up @@ -11,7 +11,7 @@ test('only parses CLI arguments after `--`', () => {
'.',
'--',
'--some-option',
'--other-option'
'--other-option',
])
).toEqual(['--some-option', '--other-option']);
});
10 changes: 5 additions & 5 deletions lib/__tests__/process-message.spec.js
Expand Up @@ -7,14 +7,14 @@ test('adds new rules to summary', () => {
).toContainEqual({
ruleId: 'new rule',
errors: 0,
warnings: 1
warnings: 1,
});
expect(
processMessage(summary, { ruleId: 'another rule', severity: 2 })
).toContainEqual({
ruleId: 'another rule',
errors: 1,
warnings: 0
warnings: 0,
});
});

Expand All @@ -25,21 +25,21 @@ test('updates errors / warnings of existing rules', () => {
).toContainEqual({
ruleId: 'rule',
errors: 0,
warnings: 2
warnings: 2,
});
expect(
processMessage(summary, { ruleId: 'rule', severity: 2 })
).toContainEqual({
ruleId: 'rule',
errors: 1,
warnings: 2
warnings: 2,
});
});

test('maps ruleId=null to `syntax error`', () => {
expect(processMessage([], { ruleId: null, severity: 2 })).toContainEqual({
ruleId: 'syntax error',
errors: 1,
warnings: 0
warnings: 0,
});
});
4 changes: 2 additions & 2 deletions lib/__tests__/sort-by-prop.spec.js
@@ -1,15 +1,15 @@
import sortBy from '../sort-by-prop';

test('sorts array by given property and direction', () => {
const createArray = (...values) => values.map(value => ({ value }));
const createArray = (...values) => values.map((value) => ({ value }));

let array = createArray('c', 'b', 'a', 'b');
sortBy('value', array, 'asc');
expect(array).toEqual([
{ value: 'a' },
{ value: 'b' },
{ value: 'b' },
{ value: 'c' }
{ value: 'c' },
]);

array = createArray('a', 'c', 'b');
Expand Down
2 changes: 1 addition & 1 deletion lib/aggregator.js
@@ -1,7 +1,7 @@
import extractMessages from './extract-messages';
import processMessage from './process-message';

const aggregate = results =>
const aggregate = (results) =>
extractMessages(results).reduce(processMessage, []);

export default aggregate;
2 changes: 1 addition & 1 deletion lib/extract-messages.js
@@ -1,4 +1,4 @@
const extractMessagesFrom = results =>
const extractMessagesFrom = (results) =>
results.reduce((messages, result) => messages.concat(result.messages), []);

export default extractMessagesFrom;
2 changes: 1 addition & 1 deletion lib/find-rule.js
@@ -1,4 +1,4 @@
const findRule = (summary, ruleId) =>
summary.find(rule => ruleId === rule.ruleId);
summary.find((rule) => ruleId === rule.ruleId);

export default findRule;
18 changes: 9 additions & 9 deletions lib/format-results.js
Expand Up @@ -6,18 +6,18 @@ import lengthOfLongest from './length-of-longest';
import sortBy from './sort-by-prop';
import aggregate from './aggregator';

const maxErrorLen = rules => lengthOfLongest('errors', rules);
const maxWarningLen = rules => lengthOfLongest('warnings', rules);
const maxRuleLen = rules => lengthOfLongest('ruleId', rules);
const maxErrorLen = (rules) => lengthOfLongest('errors', rules);
const maxWarningLen = (rules) => lengthOfLongest('warnings', rules);
const maxRuleLen = (rules) => lengthOfLongest('ruleId', rules);

const totalErrors = rules => sum('errors', rules);
const totalWarnings = rules => sum('warnings', rules);
const totalProblems = rules => totalErrors(rules) + totalWarnings(rules);
const totalErrors = (rules) => sum('errors', rules);
const totalWarnings = (rules) => sum('warnings', rules);
const totalProblems = (rules) => totalErrors(rules) + totalWarnings(rules);

const sparkles = String.fromCodePoint(0x2728);
const flames = String.fromCodePoint(0x1f525);

const constructHeader = rules => {
const constructHeader = (rules) => {
const errors = '0'.repeat(maxErrorLen(rules));
const warnings = '0'.repeat(maxWarningLen(rules));
const longestRule = '0'.repeat(maxRuleLen(rules));
Expand All @@ -27,7 +27,7 @@ const constructHeader = rules => {
return chalk`{bgBlue ${header}}`;
};

const constructSummary = rules =>
const constructSummary = (rules) =>
rules
.map((rule, i) => {
const errors = pad(rule.errors, maxErrorLen(rules));
Expand All @@ -38,7 +38,7 @@ const constructSummary = rules =>
})
.join('');

const constructTotal = rules =>
const constructTotal = (rules) =>
chalk`${flames} {red ${totalProblems(
rules
)} problems in total} (${totalErrors(rules)} {red errors}, ${totalWarnings(
Expand Down
2 changes: 1 addition & 1 deletion lib/parse-cli-args.js
@@ -1,6 +1,6 @@
const yargs = require('yargs');

const parse = argv => {
const parse = (argv) => {
const args = argv.slice(argv.indexOf('--') + 1);
return yargs.parse(args);
};
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -94,7 +94,7 @@
"husky": "^4.3.0",
"jest": "^24.8.0",
"lint-staged": "^10.4.0",
"prettier": "^1.18.2",
"prettier": "^2.1.2",
"strip-ansi": "^6.0.0"
},
"optionalDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Expand Up @@ -5189,10 +5189,10 @@ prepend-http@^2.0.0:
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=

prettier@^1.18.2:
version "1.18.2"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
prettier@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5"
integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==

pretty-format@^24.8.0:
version "24.8.0"
Expand Down

0 comments on commit fe389ed

Please sign in to comment.