Skip to content

Commit a5941eb

Browse files
committed
Use eslint-config-metarhia and fix linting issues
Refs: metarhia/Metarhia#22 PR-URL: #379
1 parent 839b8e6 commit a5941eb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+731
-838
lines changed

.eslintrc.yml

Lines changed: 1 addition & 173 deletions
Original file line numberDiff line numberDiff line change
@@ -1,173 +1 @@
1-
env:
2-
es6: true
3-
node: true
4-
extends: 'eslint:recommended'
5-
globals:
6-
api: false
7-
rules:
8-
indent:
9-
- error
10-
- 2
11-
- SwitchCase: 1
12-
VariableDeclarator:
13-
var: 2
14-
let: 2
15-
const: 3
16-
MemberExpression: 1
17-
linebreak-style:
18-
- error
19-
- unix
20-
quotes:
21-
- error
22-
- single
23-
semi:
24-
- error
25-
- always
26-
eqeqeq:
27-
- error
28-
- always
29-
no-loop-func:
30-
- error
31-
strict:
32-
- error
33-
- global
34-
block-spacing:
35-
- error
36-
- always
37-
brace-style:
38-
- error
39-
- 1tbs
40-
- allowSingleLine: true
41-
camelcase:
42-
- error
43-
comma-style:
44-
- error
45-
- last
46-
comma-spacing:
47-
- error
48-
- before: false
49-
after: true
50-
eol-last:
51-
- error
52-
func-call-spacing:
53-
- error
54-
- never
55-
key-spacing:
56-
- error
57-
- beforeColon: false
58-
afterColon: true
59-
mode: minimum
60-
keyword-spacing:
61-
- error
62-
- before: true
63-
after: true
64-
overrides:
65-
function:
66-
after: false
67-
max-len:
68-
- error
69-
- code: 80
70-
ignoreUrls: true
71-
max-nested-callbacks:
72-
- error
73-
- max: 7
74-
new-cap:
75-
- error
76-
- newIsCap: true
77-
capIsNew: true
78-
properties: true
79-
new-parens:
80-
- error
81-
no-lonely-if:
82-
- error
83-
no-trailing-spaces:
84-
- error
85-
no-unneeded-ternary:
86-
- error
87-
no-whitespace-before-property:
88-
- error
89-
object-curly-spacing:
90-
- error
91-
- always
92-
operator-assignment:
93-
- error
94-
- always
95-
operator-linebreak:
96-
- error
97-
- after
98-
semi-spacing:
99-
- error
100-
- before: false
101-
after: true
102-
space-before-blocks:
103-
- error
104-
- always
105-
space-before-function-paren:
106-
- error
107-
- never
108-
space-in-parens:
109-
- error
110-
- never
111-
space-infix-ops:
112-
- error
113-
space-unary-ops:
114-
- error
115-
- words: true
116-
nonwords: false
117-
overrides:
118-
typeof: false
119-
no-unreachable:
120-
- error
121-
no-global-assign:
122-
- error
123-
no-self-compare:
124-
- error
125-
no-unmodified-loop-condition:
126-
- error
127-
no-constant-condition:
128-
- error
129-
- checkLoops: false
130-
no-console:
131-
- off
132-
no-useless-concat:
133-
- error
134-
no-useless-escape:
135-
- error
136-
no-shadow-restricted-names:
137-
- error
138-
no-use-before-define:
139-
- error
140-
- functions: false
141-
arrow-body-style:
142-
- error
143-
- as-needed
144-
arrow-spacing:
145-
- error
146-
no-confusing-arrow:
147-
- error
148-
- allowParens: true
149-
no-useless-computed-key:
150-
- error
151-
no-useless-rename:
152-
- error
153-
no-var:
154-
- error
155-
object-shorthand:
156-
- error
157-
- always
158-
prefer-arrow-callback:
159-
- error
160-
prefer-const:
161-
- error
162-
prefer-numeric-literals:
163-
- error
164-
prefer-rest-params:
165-
- error
166-
prefer-spread:
167-
- error
168-
rest-spread-spacing:
169-
- error
170-
- never
171-
template-curly-spacing:
172-
- error
173-
- never
1+
extends: 'metarhia'

lib/adapters.js

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
const common = require('metarhia-common');
44

5-
const callbackify = (
6-
// Convert source to callback-last contract
7-
source // promise or regular synchronous function
8-
// Returns: callback, function
9-
) => {
5+
// Convert source to callback-last contract
6+
// source - promise or regular synchronous function
7+
// Returns: callback, function
8+
const callbackify = source => {
109
if (typeof source === 'function') {
1110
return (...args) => {
1211
const callback = common.unsafeCallback(args);
@@ -27,11 +26,10 @@ const callbackify = (
2726
}
2827
};
2928

30-
const promisify = (
31-
// Convert async function to Promise object
32-
func // function, callback-last function
33-
// Returns: object, Promise instance
34-
) => {
29+
// Convert async function to Promise object
30+
// func - function, callback-last function
31+
// Returns: object, Promise instance
32+
const promisify = func => {
3533
const promisified = (...args) => {
3634
const promise = new Promise((resolve, reject) => {
3735
func(...args, (err, data) => {
@@ -44,11 +42,10 @@ const promisify = (
4442
return promisified;
4543
};
4644

47-
const promisifySync = (
48-
// Convert sync function to Promise object
49-
func // function, regular synchronous function
50-
// Returns: object, Promise instance
51-
) => (...args) => new Promise((resolve, reject) => {
45+
// Convert sync function to Promise object
46+
// func - function, regular synchronous function
47+
// Returns: object, Promise instance
48+
const promisifySync = func => (...args) => new Promise((resolve, reject) => {
5249
const result = func(...args);
5350
if (result instanceof Error) reject(result);
5451
else resolve(result);

lib/array.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ const each = (
147147
let count = 0;
148148
let errored = false;
149149

150-
const next = (err) => {
150+
const next = err => {
151151
if (errored) return;
152152
if (err) {
153153
errored = true;
@@ -181,7 +181,7 @@ const series = (
181181
done(null, items);
182182
return;
183183
}
184-
fn(items[i], (err) => {
184+
fn(items[i], err => {
185185
if (err) {
186186
done(err);
187187
return;

lib/chain.js

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ const async = op => {
1111
case 'series': return series;
1212
case 'find': return find;
1313
}
14+
return (items, fn, callback) => {
15+
callback(null, items.slice());
16+
};
1417
};
1518

1619
function ArrayChain(array) {
@@ -23,7 +26,7 @@ ArrayChain.prototype.execute = function(err) {
2326

2427
if (!item.op) {
2528
if (err) throw err;
26-
else return;
29+
else return null;
2730
}
2831

2932
const next = (err, data) => {
@@ -37,7 +40,7 @@ ArrayChain.prototype.execute = function(err) {
3740

3841
if (err) {
3942
this.execute(err);
40-
return;
43+
return null;
4144
}
4245

4346
if (item.isSync) {
@@ -47,6 +50,8 @@ ArrayChain.prototype.execute = function(err) {
4750
const op = async(item.op);
4851
op(this.array, item.fn, next);
4952
}
53+
54+
return null;
5055
};
5156

5257
ArrayChain.prototype.fetch = function(fn) {
@@ -90,15 +95,15 @@ const syncDelegates = {
9095
opNames: ['concat', 'slice', 'includes'],
9196
handler(op, ...args) {
9297
return this.array[op](...args);
93-
}
98+
},
9499
},
95100
modify: {
96101
opNames: ['reverse', 'sort', 'shift', 'unshift', 'push', 'pop'],
97102
handler(op, ...args) {
98103
this.array[op](...args);
99104
return this.array;
100-
}
101-
}
105+
},
106+
},
102107
};
103108

104109
for (const delegateType in syncDelegates) {
@@ -112,12 +117,9 @@ for (const delegateType in syncDelegates) {
112117
}
113118
}
114119

115-
const forArrayChain = (
116-
// Create an ArrayChain instance
117-
array // array, start mutations from this data
118-
// Returns: ArrayChain instance
119-
) => (
120-
new ArrayChain(array)
121-
);
120+
// Create an ArrayChain instance
121+
// array - array, start mutations from this data
122+
// Returns: ArrayChain instance
123+
const forArrayChain = array => new ArrayChain(array);
122124

123125
module.exports = { for: forArrayChain };

lib/collector.class.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,9 @@ class Collector {
115115
}
116116
}
117117

118-
const collect = (
119-
// Collector instance constructor
120-
expected // number or array of string,
121-
// Returns: Collector, instance
122-
) => (
123-
new Collector(expected)
124-
);
118+
// Collector instance constructor
119+
// expected - number or array of string,
120+
// Returns: Collector, instance
121+
const collect = expected => new Collector(expected);
125122

126123
module.exports = { collect };

lib/collector.functor.js

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
const TYPE_ERROR = 'Metasync: Collect unexpected type';
44
const COLLECT_TIMEOUT = 'Metasync: Collector timed out';
55

6-
const collect = (
7-
// Collector instance constructor
8-
expected // number or array of string, count or keys
9-
// Returns: functor, collector
10-
) => {
6+
// Collector instance constructor
7+
// expected - number or array of string, count or keys
8+
// Returns: functor, collector
9+
const collect = expected => {
1110
const isCount = typeof expected === 'number';
1211
const isKeys = Array.isArray(expected);
1312
if (!(isCount || isKeys)) throw new TypeError(TYPE_ERROR);
@@ -26,12 +25,12 @@ const collect = (
2625
const collector = (key, err, value) => {
2726
if (isDone) return collector;
2827
if (!isDistinct || !(key in data)) {
29-
if (!isCount && !keys.has(key)) return;
28+
if (!isCount && !keys.has(key)) return collector;
3029
count++;
3130
}
3231
if (err) {
3332
collector.finalize(err, data);
34-
return;
33+
return collector;
3534
}
3635
data[key] = value;
3736
if (expected === count) {
@@ -50,7 +49,7 @@ const collect = (
5049
return collector;
5150
},
5251

53-
timeout: (msec) => {
52+
timeout: msec => {
5453
if (msec) {
5554
timer = setTimeout(() => {
5655
const err = new Error(COLLECT_TIMEOUT);
@@ -61,9 +60,8 @@ const collect = (
6160
return collector;
6261
},
6362

64-
done: (
65-
callback // function, (error, data)
66-
) => {
63+
// callback - function, (error, data)
64+
done: callback => {
6765
onDone = callback;
6866
return collector;
6967
},
@@ -78,7 +76,7 @@ const collect = (
7876
distinct: (value = true) => {
7977
isDistinct = value;
8078
return collector;
81-
}
79+
},
8280
};
8381

8482
return Object.assign(collector, methods);

0 commit comments

Comments
 (0)