Skip to content
This repository was archived by the owner on May 1, 2025. It is now read-only.

Commit 0a28bd0

Browse files
author
Hans Kristian Flaatten
committed
fix(eslint): resolve ESLint validation errors
1 parent a5f7147 commit 0a28bd0

File tree

5 files changed

+47
-44
lines changed

5 files changed

+47
-44
lines changed

‎examples/app.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/* eslint import/no-extraneous-dependencies: ["error", {"devDependencies": true}] */
2+
23
'use strict';
34

45
const express = require('express');

‎examples/db.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/* eslint import/no-extraneous-dependencies: ["error", {"devDependencies": true}] */
2+
23
'use strict';
34

45
const EventEmitter = require('events').EventEmitter;

‎examples/test.js‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/* eslint import/no-extraneous-dependencies: ["error", {"devDependencies": true}] */
2+
23
'use strict';
34

45
const assert = require('assert');
@@ -9,48 +10,48 @@ const app = request(require('./app'));
910
const db = require('./db');
1011

1112
describe('Example App', () => {
12-
before(done => {
13+
before((done) => {
1314
if (db.db) { return done(); }
1415
return db.once('ready', done);
1516
});
1617

17-
before(done => {
18+
before((done) => {
1819
db.db.dropDatabase(done);
1920
});
2021

21-
before(done => {
22+
before((done) => {
2223
db.db.collection('places').createIndex({ geojson: '2dsphere' }, done);
2324
});
2425

25-
before(done => {
26+
before((done) => {
2627
db.db.collection('places').insertMany(data, done);
2728
});
2829

2930
const url = '/api/places';
3031

31-
it('returns all them places', done => {
32+
it('returns all them places', (done) => {
3233
app.get(url)
3334
.expect(200)
34-
.expect(res => {
35+
.expect((res) => {
3536
assert.equal(res.body.length, 3);
3637
})
3738
.end(done);
3839
});
3940

40-
it('returns places matching name', done => {
41+
it('returns places matching name', (done) => {
4142
app.get(`${url}?name=Vatnane`)
4243
.expect(200)
43-
.expect(res => {
44+
.expect((res) => {
4445
assert.equal(res.body.length, 1);
4546
assert.equal(res.body[0].name, 'Vatnane');
4647
})
4748
.end(done);
4849
});
4950

50-
it('returns places near point', done => {
51+
it('returns places near point', (done) => {
5152
app.get(`${url}?near=6.13037,61.00607`)
5253
.expect(200)
53-
.expect(res => {
54+
.expect((res) => {
5455
assert.equal(res.body.length, 3);
5556
assert.equal(res.body[0].name, 'Solrenningen');
5657
assert.equal(res.body[1].name, 'Åsedalen');
@@ -59,28 +60,28 @@ describe('Example App', () => {
5960
.end(done);
6061
});
6162

62-
it('returns places near point with max distance', done => {
63+
it('returns places near point with max distance', (done) => {
6364
app.get(`${url}?near=6.13037,61.00607,7000`)
6465
.expect(200)
65-
.expect(res => {
66+
.expect((res) => {
6667
assert.equal(res.body.length, 2);
6768
assert.equal(res.body[0].name, 'Solrenningen');
6869
assert.equal(res.body[1].name, 'Åsedalen');
6970
})
7071
.end(done);
7172
});
7273

73-
it('returns places near point with max and min distance', done => {
74+
it('returns places near point with max and min distance', (done) => {
7475
app.get(`${url}?near=6.13037,61.00607,7000,1000`)
7576
.expect(200)
76-
.expect(res => {
77+
.expect((res) => {
7778
assert.equal(res.body.length, 1);
7879
assert.equal(res.body[0].name, 'Åsedalen');
7980
})
8081
.end(done);
8182
});
8283

83-
it('returns places inside bbox', done => {
84+
it('returns places inside bbox', (done) => {
8485
const bbox = [
8586
'5.5419158935546875',
8687
'60.92859723298985',
@@ -90,18 +91,18 @@ describe('Example App', () => {
9091

9192
app.get(`${url}?bbox=${bbox}`)
9293
.expect(200)
93-
.expect(res => {
94+
.expect((res) => {
9495
assert.equal(res.body.length, 2);
9596
assert.equal(res.body[0].name, 'Norddalshytten');
9697
assert.equal(res.body[1].name, 'Vardadalsbu');
9798
})
9899
.end(done);
99100
});
100101

101-
it('returns places with any of the following tags', done => {
102+
it('returns places with any of the following tags', (done) => {
102103
app.get(`${url}?tags[]=Båt&tags[]=Stekeovn`)
103104
.expect(200)
104-
.expect(res => {
105+
.expect((res) => {
105106
assert.equal(res.body.length, 3);
106107
assert.equal(res.body[0].name, 'Solrenningen');
107108
assert.equal(res.body[1].name, 'Åsedalen');
@@ -110,50 +111,50 @@ describe('Example App', () => {
110111
.end(done);
111112
});
112113

113-
it('returns places with visits less than 40', done => {
114+
it('returns places with visits less than 40', (done) => {
114115
app.get(`${url}?visits=<40`)
115116
.expect(200)
116-
.expect(res => {
117+
.expect((res) => {
117118
assert.equal(res.body.length, 0);
118119
})
119120
.end(done);
120121
});
121122

122-
it('returns places with visits less than or equal to 40', done => {
123+
it('returns places with visits less than or equal to 40', (done) => {
123124
app.get(`${url}?visits=<=40`)
124125
.expect(200)
125-
.expect(res => {
126+
.expect((res) => {
126127
assert.equal(res.body.length, 1);
127128
assert.equal(res.body[0].name, 'Solrenningen');
128129
})
129130
.end(done);
130131
});
131132

132-
it('returns places with visits greater than 10,000', done => {
133+
it('returns places with visits greater than 10,000', (done) => {
133134
app.get(`${url}?visits=>10000`)
134135
.expect(200)
135-
.expect(res => {
136+
.expect((res) => {
136137
assert.equal(res.body.length, 1);
137138
assert.equal(res.body[0].name, 'Vardadalsbu');
138139
})
139140
.end(done);
140141
});
141142

142-
it('returns places with visits > or equal to 10,000', done => {
143+
it('returns places with visits > or equal to 10,000', (done) => {
143144
app.get(`${url}?visits=>=10000`)
144145
.expect(200)
145-
.expect(res => {
146+
.expect((res) => {
146147
assert.equal(res.body.length, 2);
147148
assert.equal(res.body[0].name, 'Åsedalen');
148149
assert.equal(res.body[1].name, 'Vardadalsbu');
149150
})
150151
.end(done);
151152
});
152153

153-
it('returns places with visits > 40 and < 10,000', done => {
154+
it('returns places with visits > 40 and < 10,000', (done) => {
154155
app.get(`${url}?visits=>40&visits=<10000`)
155156
.expect(200)
156-
.expect(res => {
157+
.expect((res) => {
157158
assert.equal(res.body.length, 3);
158159
assert.equal(res.body[0].name, 'Norddalshytten');
159160
assert.equal(res.body[1].name, 'Vatnane');

‎index.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = function MongoQS(options) {
1717

1818
this.keyRegex = opts.keyRegex || /^[a-zæøå0-9-_.]+$/i;
1919
this.valRegex = opts.valRegex || /[^a-zæøå0-9-_.* ]/i;
20-
this.arrRegex = opts.arrRegex || /^[a-zæøå0-9-_.]+(\[\])?$/i;
20+
this.arrRegex = opts.arrRegex || /^[a-zæøå0-9-_.]+(\[])?$/i;
2121

2222
if (this.custom.bbox) {
2323
this.custom.bbox = this.customBBOX(this.custom.bbox);
@@ -34,7 +34,7 @@ module.exports = function MongoQS(options) {
3434
return this;
3535
};
3636

37-
module.exports.prototype.customBBOX = (field) => (query, bbox) => {
37+
module.exports.prototype.customBBOX = field => (query, bbox) => {
3838
const bboxArr = bbox.split(',');
3939

4040
if (bboxArr.length === 4) {
@@ -194,13 +194,13 @@ module.exports.prototype.parseStringVal = function parseStringVal(string) {
194194
module.exports.prototype.parse = function parse(query) {
195195
const res = {};
196196

197-
Object.keys(query).forEach(k => {
197+
Object.keys(query).forEach((k) => {
198198
let key = k;
199199
const val = query[key];
200200

201201
// normalize array keys
202202
if (val instanceof Array) {
203-
key = key.replace(/\[\]$/, '');
203+
key = key.replace(/\[]$/, '');
204204
}
205205

206206
// whitelist
@@ -238,7 +238,7 @@ module.exports.prototype.parse = function parse(query) {
238238
if (this.ops.indexOf('$in') >= 0 && val.length > 0) {
239239
res[key] = {};
240240

241-
for (let i = 0; i < val.length; i++) {
241+
for (let i = 0; i < val.length; i += 1) {
242242
if (this.ops.indexOf(val[i][0]) >= 0) {
243243
const parsed = this.parseString(val[i], true);
244244

‎test.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ beforeEach(() => {
1616

1717
describe('customBBOX()', () => {
1818
it('does not return $geoWithin query for invalid bbox', () => {
19-
['0123', '0,1,2', '0,1,2,a'].forEach(bbox => {
19+
['0123', '0,1,2', '0,1,2,a'].forEach((bbox) => {
2020
mqs.customBBOX('gojson')(query, bbox);
2121
assert.deepEqual(query, {});
2222
});
@@ -45,14 +45,14 @@ describe('customBBOX()', () => {
4545

4646
describe('customNear()', () => {
4747
it('does not return $near query for invalid point', () => {
48-
['0123', '0,'].forEach(bbox => {
48+
['0123', '0,'].forEach((bbox) => {
4949
mqs.customNear('gojson')(query, bbox);
5050
assert.deepEqual(query, {});
5151
});
5252
});
5353

5454
it('returns $near query for valid point', () => {
55-
['0,1', '60.70908,10.37140'].forEach(point => {
55+
['0,1', '60.70908,10.37140'].forEach((point) => {
5656
mqs.customNear('geojson')(query, point);
5757
assert.deepEqual(query, {
5858
geojson: {
@@ -68,7 +68,7 @@ describe('customNear()', () => {
6868
});
6969

7070
it('returns $near query with max distance', () => {
71-
['0,1,2', '60.70908,10.37140,211.123'].forEach(point => {
71+
['0,1,2', '60.70908,10.37140,211.123'].forEach((point) => {
7272
const q = {};
7373

7474
mqs.customNear('geojson')(q, point);
@@ -87,7 +87,7 @@ describe('customNear()', () => {
8787
});
8888

8989
it('returns $near query with max and min distance', () => {
90-
['0,1,2,4', '60.70908,10.37140,211.123,321.456'].forEach(point => {
90+
['0,1,2,4', '60.70908,10.37140,211.123,321.456'].forEach((point) => {
9191
const q = {};
9292

9393
mqs.customNear('geojson')(q, point);
@@ -109,7 +109,7 @@ describe('customNear()', () => {
109109

110110
describe('customAfter()', () => {
111111
it('does not return after query for invalid date', () => {
112-
['foo', '2015-13-40'].forEach(date => {
112+
['foo', '2015-13-40'].forEach((date) => {
113113
mqs.customAfter('endret')(query, date);
114114
assert.deepEqual(query, {});
115115
});
@@ -149,7 +149,7 @@ describe('parseStringVal()', () => {
149149
'true',
150150
'TrUe',
151151
'TRUE',
152-
].forEach(val => {
152+
].forEach((val) => {
153153
it(`returns true for "${val}" string`, () => {
154154
assert.strictEqual(mqs.parseStringVal(val), true);
155155
});
@@ -166,7 +166,7 @@ describe('parseStringVal()', () => {
166166
'false',
167167
'FaLsE',
168168
'FALSE',
169-
].forEach(val => {
169+
].forEach((val) => {
170170
it(`returns false for "${val}" string`, () => {
171171
assert.strictEqual(mqs.parseStringVal(val), false);
172172
});
@@ -199,7 +199,7 @@ describe('parseStringVal()', () => {
199199
' 1 ',
200200
' 100 ',
201201
' 000100 ',
202-
].forEach(val => {
202+
].forEach((val) => {
203203
const ret = parseInt(val, 10);
204204

205205
it(`returns ${ret} for "${val}"`, () => {
@@ -235,7 +235,7 @@ describe('parseStringVal()', () => {
235235
' 1.1 ',
236236
' 100.99 ',
237237
' 000100.0099 ',
238-
].forEach(val => {
238+
].forEach((val) => {
239239
const ret = parseFloat(val, 10);
240240

241241
it(`returns ${ret} for "${val}"`, () => {
@@ -275,7 +275,7 @@ describe('parseStringVal()', () => {
275275
'abc123',
276276
'123abc',
277277
'123abc123',
278-
].forEach(val => {
278+
].forEach((val) => {
279279
it(`returns "${val}" for "${val}"`, () => {
280280
assert.strictEqual(mqs.parseStringVal(val), val);
281281
});

0 commit comments

Comments
 (0)