Skip to content

Commit 9f2ee62

Browse files
bigslycatbigslycat
committed
Update dependencies and code style
1 parent b92dafe commit 9f2ee62

29 files changed

+2081
-1447
lines changed

‎.eslintrc.yml

+9-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1-
extends:
2-
- airbnb-base
3-
- plugin:flowtype/recommended
1+
parser: babel-eslint
42

53
plugins:
64
- flowtype
5+
- prettier
6+
7+
extends:
8+
- airbnb-base
9+
- plugin:flowtype/recommended
10+
- plugin:prettier/recommended
711

812
env:
913
node: true
1014
browser: false
1115

1216
rules:
1317

18+
prettier/prettier: error
19+
1420
no-multi-assign: off
1521

1622
no-return-assign:
@@ -19,10 +25,6 @@ rules:
1925

2026
no-confusing-arrow: off
2127

22-
semi:
23-
- error
24-
- never
25-
2628
consistent-return: off
2729

2830
no-unused-expressions: off
@@ -71,10 +73,6 @@ rules:
7173
- never
7274
- annotationStyle: block
7375

74-
flowtype/semi:
75-
- error
76-
- never
77-
7876
flowtype/space-after-type-colon:
7977
- error
8078
- always

‎.prettierrc

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"printWidth": 80,
3+
"tabWidth": 2,
4+
"useTabs": false,
5+
"semi": true,
6+
"singleQuote": true,
7+
"trailingComma": "all",
8+
"bracketSpacing": true,
9+
"jsxBracketSameLine": true,
10+
"arrowParens": "avoid",
11+
"rangeStart": 0,
12+
"requirePragma": false,
13+
"insertPragma": false,
14+
"proseWrap": "preserve"
15+
}

‎__tests__/ValidationError.js

+49-31
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,63 @@
11
/* @flow */
22

3-
import { ValidationError } from '../src/ValidationError'
3+
import { ValidationError } from '../src/ValidationError';
44

55
describe('ValidationError', () => {
66
it('Have name, valueName, value, expectedTypes and message properties', () => {
7-
const error = new ValidationError('valueName', 'value', 'type')
7+
const error = new ValidationError('valueName', 'value', 'type');
88

9-
expect(error.name).toBe('ValidationError')
10-
expect(error.valueName).toBe('valueName')
11-
expect(error.value).toBe('value')
12-
expect(error.expectedTypes).toEqual(['type'])
13-
expect(error.message).toBe('valueName must be type, but "value" (string) given')
14-
})
9+
expect(error.name).toBe('ValidationError');
10+
expect(error.valueName).toBe('valueName');
11+
expect(error.value).toBe('value');
12+
expect(error.expectedTypes).toEqual(['type']);
13+
expect(error.message).toBe(
14+
'valueName must be type, but "value" (string) given',
15+
);
16+
});
1517

1618
it('Have factory of()', () => {
17-
const error = ValidationError.of('valueName', 'value', 'type')
19+
const error = ValidationError.of('valueName', 'value', 'type');
1820

19-
expect(error.name).toBe('ValidationError')
20-
expect(error.valueName).toBe('valueName')
21-
expect(error.value).toBe('value')
22-
expect(error.expectedTypes).toEqual(['type'])
23-
expect(error.message).toBe('valueName must be type, but "value" (string) given')
24-
})
21+
expect(error.name).toBe('ValidationError');
22+
expect(error.valueName).toBe('valueName');
23+
expect(error.value).toBe('value');
24+
expect(error.expectedTypes).toEqual(['type']);
25+
expect(error.message).toBe(
26+
'valueName must be type, but "value" (string) given',
27+
);
28+
});
2529

2630
it('Have name, valueName, value, expectedTypes and message properties', () => {
27-
const error = new ValidationError('valueName', 'value', 'type')
31+
const error = new ValidationError('valueName', 'value', 'type');
2832

29-
expect(error.name).toBe('ValidationError')
30-
expect(error.valueName).toBe('valueName')
31-
expect(error.value).toBe('value')
32-
expect(error.expectedTypes).toEqual(['type'])
33-
expect(error.message).toBe('valueName must be type, but "value" (string) given')
34-
})
33+
expect(error.name).toBe('ValidationError');
34+
expect(error.valueName).toBe('valueName');
35+
expect(error.value).toBe('value');
36+
expect(error.expectedTypes).toEqual(['type']);
37+
expect(error.message).toBe(
38+
'valueName must be type, but "value" (string) given',
39+
);
40+
});
3541

3642
it('Can receive 1 and more types', () => {
37-
const error1 = new ValidationError('valueName', 'value', 'type1')
38-
const error2 = new ValidationError('valueName', 'value', 'type1', 'type2')
39-
const error3 = new ValidationError('valueName', 'value', 'type1', 'type2', 'type3')
40-
41-
expect(error1.message).toBe('valueName must be type1, but "value" (string) given')
42-
expect(error2.message).toBe('valueName must be type1 or type2, but "value" (string) given')
43-
expect(error3.message).toBe('valueName must be type1, type2 or type3, but "value" (string) given')
44-
})
45-
})
43+
const error1 = new ValidationError('valueName', 'value', 'type1');
44+
const error2 = new ValidationError('valueName', 'value', 'type1', 'type2');
45+
const error3 = new ValidationError(
46+
'valueName',
47+
'value',
48+
'type1',
49+
'type2',
50+
'type3',
51+
);
52+
53+
expect(error1.message).toBe(
54+
'valueName must be type1, but "value" (string) given',
55+
);
56+
expect(error2.message).toBe(
57+
'valueName must be type1 or type2, but "value" (string) given',
58+
);
59+
expect(error3.message).toBe(
60+
'valueName must be type1, type2 or type3, but "value" (string) given',
61+
);
62+
});
63+
});

‎__tests__/contracts/array.js

+24-28
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,41 @@
11
/* @flow */
22

3-
import { isArray } from '../../src/contracts/array'
4-
import { ValidationError } from '../../src/ValidationError'
3+
import { isArray } from '../../src/contracts/array';
4+
import { ValidationError } from '../../src/ValidationError';
55

6-
const createError =
7-
(...types: string[]) =>
8-
(name: string, value: mixed) =>
9-
ValidationError.of(name, value, ...types)
6+
const createError = (...types: string[]) => (name: string, value: mixed) =>
7+
ValidationError.of(name, value, ...types);
108

119
describe('isArray', () => {
1210
describe('Creates new Contract for one Contracts or validation function', () => {
1311
it('Returns ValidationError when value is not Array', () => {
14-
const validate = jest.fn()
15-
const result: any = isArray(validate)('valueName', null)
12+
const validate = jest.fn();
13+
const result: any = isArray(validate)('valueName', null);
1614

17-
expect(result).toBeInstanceOf(ValidationError)
18-
expect(result.expectedTypes).toEqual(['Array'])
19-
expect(validate).toHaveBeenCalledTimes(0)
20-
})
15+
expect(result).toBeInstanceOf(ValidationError);
16+
expect(result.expectedTypes).toEqual(['Array']);
17+
expect(validate).toHaveBeenCalledTimes(0);
18+
});
2119

2220
it('Returns value when all validators not returns ValidationError', () => {
23-
const validate = jest.fn()
24-
const result: any = isArray(validate)('valueName', [1, 2, 3])
21+
const validate = jest.fn();
22+
const result: any = isArray(validate)('valueName', [1, 2, 3]);
2523

26-
expect(result).toEqual([1, 2, 3])
24+
expect(result).toEqual([1, 2, 3]);
2725
expect(validate.mock.calls).toEqual([
2826
['valueName[0]', 1],
2927
['valueName[1]', 2],
3028
['valueName[2]', 3],
31-
])
32-
})
29+
]);
30+
});
3331

3432
it('Returns ValidationError in other cases', () => {
35-
const validate = jest.fn(createError('type'))
36-
const result: any = isArray(validate)('valueName', [1, 2, 3])
37-
38-
expect(result).toBeInstanceOf(ValidationError)
39-
expect(result.expectedTypes).toEqual(['type'])
40-
expect(validate.mock.calls).toEqual([
41-
['valueName[0]', 1],
42-
])
43-
})
44-
})
45-
})
33+
const validate = jest.fn(createError('type'));
34+
const result: any = isArray(validate)('valueName', [1, 2, 3]);
35+
36+
expect(result).toBeInstanceOf(ValidationError);
37+
expect(result.expectedTypes).toEqual(['type']);
38+
expect(validate.mock.calls).toEqual([['valueName[0]', 1]]);
39+
});
40+
});
41+
});

‎__tests__/contracts/boolean.js

+23-19
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,32 @@
11
/* @flow */
22

3-
import { isBoolean } from '../../src/contracts/boolean'
4-
import { ValidationError } from '../../src/ValidationError'
3+
import { isBoolean } from '../../src/contracts/boolean';
4+
import { ValidationError } from '../../src/ValidationError';
55

66
describe('isBoolean contract', () => {
77
it('Returns value if value is boolean', () => {
8-
expect(isBoolean('true bool', true)).toBe(true)
9-
expect(isBoolean('false bool', false)).toBe(false)
10-
})
8+
expect(isBoolean('true bool', true)).toBe(true);
9+
expect(isBoolean('false bool', false)).toBe(false);
10+
});
1111

1212
it('Returns ValidationError instance in other cases', () => {
13-
expect(isBoolean('valueName', undefined)).toBeInstanceOf(ValidationError)
14-
expect(isBoolean('valueName', null)).toBeInstanceOf(ValidationError)
15-
expect(isBoolean('valueName', 'value')).toBeInstanceOf(ValidationError)
16-
expect(isBoolean('valueName', () => {})).toBeInstanceOf(ValidationError)
17-
expect(isBoolean('valueName', [])).toBeInstanceOf(ValidationError)
18-
expect(isBoolean('valueName', {})).toBeInstanceOf(ValidationError)
19-
expect(isBoolean('valueName', Symbol('symbol'))).toBeInstanceOf(ValidationError)
20-
expect(isBoolean('valueName', 1)).toBeInstanceOf(ValidationError)
21-
expect(isBoolean('valueName', new Map())).toBeInstanceOf(ValidationError)
22-
expect(isBoolean('valueName', new Set())).toBeInstanceOf(ValidationError)
23-
})
13+
expect(isBoolean('valueName', undefined)).toBeInstanceOf(ValidationError);
14+
expect(isBoolean('valueName', null)).toBeInstanceOf(ValidationError);
15+
expect(isBoolean('valueName', 'value')).toBeInstanceOf(ValidationError);
16+
expect(isBoolean('valueName', () => {})).toBeInstanceOf(ValidationError);
17+
expect(isBoolean('valueName', [])).toBeInstanceOf(ValidationError);
18+
expect(isBoolean('valueName', {})).toBeInstanceOf(ValidationError);
19+
expect(isBoolean('valueName', Symbol('symbol'))).toBeInstanceOf(
20+
ValidationError,
21+
);
22+
expect(isBoolean('valueName', 1)).toBeInstanceOf(ValidationError);
23+
expect(isBoolean('valueName', new Map())).toBeInstanceOf(ValidationError);
24+
expect(isBoolean('valueName', new Set())).toBeInstanceOf(ValidationError);
25+
});
2426

2527
it('expectedTypes property of ValidationError equals ["boolean"]', () => {
26-
expect((isBoolean('valueName', null): any).expectedTypes).toEqual(['boolean'])
27-
})
28-
})
28+
expect((isBoolean('valueName', null): any).expectedTypes).toEqual([
29+
'boolean',
30+
]);
31+
});
32+
});

‎__tests__/contracts/literal.js

+17-13
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
/* @flow */
22

3-
import { isLiteral } from '../../src/contracts/literal'
4-
import { ValidationError } from '../../src/ValidationError'
3+
import { isLiteral } from '../../src/contracts/literal';
4+
import { ValidationError } from '../../src/ValidationError';
55

66
describe('isLiteral', () => {
77
describe('Creates new Contract for string or number specific value', () => {
88
it('Returns value if value equals expected value', () => {
9-
expect(isLiteral('expected value')('valueName', 'expected value'))
10-
.toBe('expected value')
11-
})
9+
expect(isLiteral('expected value')('valueName', 'expected value')).toBe(
10+
'expected value',
11+
);
12+
});
1213

1314
it('Returns ValidationError instance in other cases', () => {
14-
expect(isLiteral('expected value')('valueName', 'invalid value'))
15-
.toBeInstanceOf(ValidationError)
16-
})
15+
expect(
16+
isLiteral('expected value')('valueName', 'invalid value'),
17+
).toBeInstanceOf(ValidationError);
18+
});
1719

1820
it('expectedTypes property of ValidationError equals [\'"<expected value>"\']', () => {
19-
expect((isLiteral('expected value')('valueName', 'invalid value'): any).expectedTypes)
20-
.toEqual(['"expected value"'])
21-
})
22-
})
23-
})
21+
expect(
22+
(isLiteral('expected value')('valueName', 'invalid value'): any)
23+
.expectedTypes,
24+
).toEqual(['"expected value"']);
25+
});
26+
});
27+
});

‎__tests__/contracts/null.js

+16-14
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
/* @flow */
22

3-
import { isNull } from '../../src/contracts/null'
4-
import { ValidationError } from '../../src/ValidationError'
3+
import { isNull } from '../../src/contracts/null';
4+
import { ValidationError } from '../../src/ValidationError';
55

66
describe('isNull contract', () => {
77
it('Returns value if value equals null', () => {
8-
expect(isNull('valueName', null)).toBe(null)
9-
})
8+
expect(isNull('valueName', null)).toBe(null);
9+
});
1010

1111
it('Returns ValidationError instance in other cases', () => {
12-
expect(isNull('valueName', undefined)).toBeInstanceOf(ValidationError)
13-
expect(isNull('valueName', 1)).toBeInstanceOf(ValidationError)
14-
expect(isNull('valueName', 'value')).toBeInstanceOf(ValidationError)
15-
expect(isNull('valueName', () => {})).toBeInstanceOf(ValidationError)
16-
expect(isNull('valueName', [])).toBeInstanceOf(ValidationError)
17-
expect(isNull('valueName', {})).toBeInstanceOf(ValidationError)
18-
})
12+
expect(isNull('valueName', undefined)).toBeInstanceOf(ValidationError);
13+
expect(isNull('valueName', 1)).toBeInstanceOf(ValidationError);
14+
expect(isNull('valueName', 'value')).toBeInstanceOf(ValidationError);
15+
expect(isNull('valueName', () => {})).toBeInstanceOf(ValidationError);
16+
expect(isNull('valueName', [])).toBeInstanceOf(ValidationError);
17+
expect(isNull('valueName', {})).toBeInstanceOf(ValidationError);
18+
});
1919

2020
it('expectedTypes property of ValidationError equals ["null"]', () => {
21-
expect((isNull('valueName', undefined): any).expectedTypes).toEqual(['null'])
22-
})
23-
})
21+
expect((isNull('valueName', undefined): any).expectedTypes).toEqual([
22+
'null',
23+
]);
24+
});
25+
});

0 commit comments

Comments
 (0)