Skip to content

Commit 06e1aa2

Browse files
flovilmartflovilmart
committed
initial linting of src
1 parent 1eff210 commit 06e1aa2

Some content is hidden

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

78 files changed

+311
-344
lines changed

‎.eslintrc.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"root": true,
3+
"extends": "eslint:recommended",
4+
"env": {
5+
"node": true,
6+
"es6": true
7+
},
8+
"parser": "babel-eslint",
9+
"plugins": [
10+
"flowtype"
11+
],
12+
"parserOptions": {
13+
"ecmaVersion": 6,
14+
"sourceType": "module"
15+
},
16+
"rules": {
17+
"indent": "off",
18+
"no-extra-boolean-cast": [0],
19+
"no-console": [0],
20+
"linebreak-style": ["error", "unix"],
21+
"no-empty":0,
22+
"no-restricted-imports": [0]
23+
}
24+
}

‎.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ cache:
3535
directories:
3636
- node_modules
3737
- "$HOME/.mongodb/versions"
38+
before_script:
39+
- npm run lint
3840
after_script:
3941
- bash <(curl -s https://codecov.io/bash)
4042
after_failure:

‎package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"devDependencies": {
4747
"babel-cli": "6.18.0",
4848
"babel-core": "6.18.2",
49+
"babel-eslint": "^7.1.1",
4950
"babel-plugin-syntax-flow": "6.13.0",
5051
"babel-plugin-transform-flow-strip-types": "6.18.0",
5152
"babel-preset-es2015": "6.14.0",
@@ -54,6 +55,8 @@
5455
"bcrypt-nodejs": "0.0.3",
5556
"cross-env": "3.1.3",
5657
"deep-diff": "0.3.4",
58+
"eslint": "^3.10.2",
59+
"eslint-plugin-flowtype": "^2.25.0",
5760
"gaze": "1.1.1",
5861
"istanbul": "1.0.0-alpha.1",
5962
"jasmine": "2.5.2",
@@ -64,6 +67,7 @@
6467
},
6568
"scripts": {
6669
"dev": "npm run build && node bin/dev",
70+
"lint": "eslint src/",
6771
"build": "babel src/ -d lib/",
6872
"test": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=3.2.6} MONGODB_STORAGE_ENGINE=mmapv1 NODE_ENV=test TESTING=1 node $COVERAGE_OPTION ./spec/support/runner.js",
6973
"test:win": "npm run pretest && cross-env NODE_ENV=test TESTING=1 node ./node_modules/jasmine/bin/jasmine.js && npm run posttest",

‎src/AccountLockout.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// This class handles the Account Lockout Policy settings.
2-
3-
import Config from './Config';
2+
import Parse from 'parse/node';
43

54
export class AccountLockout {
65
constructor(user, config) {
@@ -13,7 +12,7 @@ export class AccountLockout {
1312
*/
1413
_setFailedLoginCount(value) {
1514
let query = {
16-
username: this._user.username,
15+
username: this._user.username
1716
};
1817

1918
const updateFields = {
@@ -76,7 +75,7 @@ export class AccountLockout {
7675
*/
7776
_incrementFailedLoginCount() {
7877
const query = {
79-
username: this._user.username,
78+
username: this._user.username
8079
};
8180

8281
const updateFields = {_failed_login_count: {__op: 'Increment', amount: 1}};
@@ -93,7 +92,7 @@ export class AccountLockout {
9392
return new Promise((resolve, reject) => {
9493
const query = {
9594
username: this._user.username,
96-
_failed_login_count: { $gte: this._config.accountLockout.threshold },
95+
_failed_login_count: { $gte: this._config.accountLockout.threshold }
9796
};
9897

9998
const now = new Date();

‎src/Adapters/Analytics/AnalyticsAdapter.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*eslint no-unused-vars: "off"*/
12
export class AnalyticsAdapter {
23

34
/*

‎src/Adapters/Cache/CacheAdapter.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*eslint no-unused-vars: "off"*/
12
export class CacheAdapter {
23
/**
34
* Get a value in the cache

‎src/Adapters/Cache/InMemoryCacheAdapter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export class InMemoryCacheAdapter {
77
}
88

99
get(key) {
10-
return new Promise((resolve, reject) => {
10+
return new Promise((resolve) => {
1111
let record = this.cache.get(key);
1212
if (record == null) {
1313
return resolve(null);

‎src/Adapters/Cache/NullCacheAdapter.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
export class NullCacheAdapter {
22

3-
constructor(ctx) {
4-
}
3+
constructor() {}
54

6-
get(key) {
7-
return new Promise((resolve, _) => {
5+
get() {
6+
return new Promise((resolve) => {
87
return resolve(null);
98
})
109
}
1110

12-
put(key, value, ttl) {
11+
put() {
1312
return Promise.resolve();
1413
}
1514

16-
del(key) {
15+
del() {
1716
return Promise.resolve();
1817
}
1918

‎src/Adapters/Cache/RedisCacheAdapter.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import logger from '../../logger';
33

44
const DEFAULT_REDIS_TTL = 30 * 1000; // 30 seconds in milliseconds
55

6-
function debug() {
6+
function debug() {
77
logger.debug.apply(logger, ['RedisCacheAdapter', ...arguments]);
88
}
99

@@ -16,8 +16,8 @@ export class RedisCacheAdapter {
1616

1717
get(key) {
1818
debug('get', key);
19-
this.p = this.p.then(() => {
20-
return new Promise((resolve, _) => {
19+
this.p = this.p.then(() => {
20+
return new Promise((resolve) => {
2121
this.client.get(key, function(err, res) {
2222
debug('-> get', key, res);
2323
if(!res) {
@@ -39,14 +39,14 @@ export class RedisCacheAdapter {
3939
if (ttl < 0 || isNaN(ttl)) {
4040
ttl = DEFAULT_REDIS_TTL;
4141
}
42-
this.p = this.p.then(() => {
43-
return new Promise((resolve, _) => {
42+
this.p = this.p.then(() => {
43+
return new Promise((resolve) => {
4444
if (ttl === Infinity) {
45-
this.client.set(key, value, function(err, res) {
45+
this.client.set(key, value, function() {
4646
resolve();
4747
});
4848
} else {
49-
this.client.psetex(key, ttl, value, function(err, res) {
49+
this.client.psetex(key, ttl, value, function() {
5050
resolve();
5151
});
5252
}
@@ -57,9 +57,9 @@ export class RedisCacheAdapter {
5757

5858
del(key) {
5959
debug('del', key);
60-
this.p = this.p.then(() => {
61-
return new Promise((resolve, _) => {
62-
this.client.del(key, function(err, res) {
60+
this.p = this.p.then(() => {
61+
return new Promise((resolve) => {
62+
this.client.del(key, function() {
6363
resolve();
6464
});
6565
});
@@ -69,9 +69,9 @@ export class RedisCacheAdapter {
6969

7070
clear() {
7171
debug('clear');
72-
this.p = this.p.then(() => {
73-
return new Promise((resolve, _) => {
74-
this.client.flushall(function(err, res) {
72+
this.p = this.p.then(() => {
73+
return new Promise((resolve) => {
74+
this.client.flushall(function() {
7575
resolve();
7676
});
7777
});

‎src/Adapters/Email/MailAdapter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1+
/*eslint no-unused-vars: "off"*/
22
/*
33
Mail Adapter prototype
44
A MailAdapter should implement at least sendMail()

‎src/Adapters/Files/FilesAdapter.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*eslint no-unused-vars: "off"*/
12
// Files Adapter
23
//
34
// Allows you to change the file storage mechanism.

‎src/Adapters/Files/GridStoreAdapter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export class GridStoreAdapter extends FilesAdapter {
2828

2929
// For a given config object, filename, and data, store a file
3030
// Returns a promise
31-
createFile(filename: string, data, contentType) {
31+
createFile(filename: string, data) {
3232
return this._connect().then(database => {
3333
let gridStore = new GridStore(database, filename, 'w');
3434
return gridStore.open();

‎src/Adapters/Logger/LoggerAdapter.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*eslint no-unused-vars: "off"*/
12
// Logger Adapter
23
//
34
// Allows you to change the logger mechanism

‎src/Adapters/Logger/WinstonLogger.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function updateTransports(options) {
3737
}, options));
3838
}
3939
// Mount the additional transports
40-
additionalTransports.forEach((transport) => {
40+
additionalTransports.forEach((transport) => {
4141
transports[transport.name] = transport;
4242
});
4343
logger.configure({
@@ -90,7 +90,7 @@ export function removeTransport(transport) {
9090
logger.configure({
9191
transports: _.values(transports)
9292
});
93-
_.remove(additionalTransports, (transport) => {
93+
_.remove(additionalTransports, (transport) => {
9494
return transport.name === transportName;
9595
});
9696
}

‎src/Adapters/Logger/WinstonLoggerAdapter.js

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ import { logger, addTransport, configureLogger } from './WinstonLogger';
33

44
const MILLISECONDS_IN_A_DAY = 24 * 60 * 60 * 1000;
55

6-
// returns Date object rounded to nearest day
7-
let _getNearestDay = (date) => {
8-
return new Date(date.getFullYear(), date.getMonth(), date.getDate());
9-
}
10-
116
export class WinstonLoggerAdapter extends LoggerAdapter {
127
constructor(options) {
138
super();
@@ -38,18 +33,16 @@ export class WinstonLoggerAdapter extends LoggerAdapter {
3833
let limit = options.size || 10;
3934
let order = options.order || 'desc';
4035
let level = options.level || 'info';
41-
let roundedUntil = _getNearestDay(until);
42-
let roundedFrom = _getNearestDay(from);
4336

44-
var options = {
37+
const queryOptions = {
4538
from,
4639
until,
4740
limit,
4841
order
4942
};
5043

51-
return new Promise((resolve, reject) => {
52-
logger.query(options, (err, res) => {
44+
return new Promise((resolve, reject) => {
45+
logger.query(queryOptions, (err, res) => {
5346
if (err) {
5447
callback(err);
5548
return reject(err);

‎src/Adapters/Push/PushAdapter.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*eslint no-unused-vars: "off"*/
12
// Push Adapter
23
//
34
// Allows you to change the push notification mechanism.

‎src/Adapters/Storage/Mongo/MongoCollection.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export default class MongoCollection {
8484

8585
_ensureSparseUniqueIndexInBackground(indexRequest) {
8686
return new Promise((resolve, reject) => {
87-
this._mongoCollection.ensureIndex(indexRequest, { unique: true, background: true, sparse: true }, (error, indexName) => {
87+
this._mongoCollection.ensureIndex(indexRequest, { unique: true, background: true, sparse: true }, (error) => {
8888
if (error) {
8989
reject(error);
9090
} else {

‎src/Adapters/Storage/Mongo/MongoSchemaCollection.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import MongoCollection from './MongoCollection';
2+
import Parse from 'parse/node';
23

34
function mongoFieldToParseSchemaField(type) {
45
if (type[0] === '*') {

‎src/Adapters/Storage/Mongo/MongoStorageAdapter.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ import {
1111
transformWhere,
1212
transformUpdate,
1313
} from './MongoTransform';
14+
import Parse from 'parse/node';
1415
import _ from 'lodash';
16+
import defaults from '../../../defaults';
1517

1618
let mongodb = require('mongodb');
1719
let MongoClient = mongodb.MongoClient;
@@ -63,7 +65,7 @@ const mongoSchemaFromFieldsAndClassNameAndCLP = (fields, className, classLevelPe
6365
}
6466

6567
if (typeof classLevelPermissions !== 'undefined') {
66-
mongoObject._metadata = mongoObject._metadata || {};
68+
mongoObject._metadata = mongoObject._metadata || {};
6769
if (!classLevelPermissions) {
6870
delete mongoObject._metadata.class_permissions;
6971
} else {
@@ -111,14 +113,14 @@ export class MongoStorageAdapter {
111113
delete this.connectionPromise;
112114
return;
113115
}
114-
database.on('error', (error) => {
116+
database.on('error', () => {
115117
delete this.connectionPromise;
116118
});
117-
database.on('close', (error) => {
119+
database.on('close', () => {
118120
delete this.connectionPromise;
119121
});
120122
this.database = database;
121-
}).catch((err) => {
123+
}).catch((err) => {
122124
delete this.connectionPromise;
123125
return Promise.reject(err);
124126
});
@@ -288,7 +290,7 @@ export class MongoStorageAdapter {
288290
throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Object not found.');
289291
}
290292
return Promise.resolve();
291-
}, error => {
293+
}, () => {
292294
throw new Parse.Error(Parse.Error.INTERNAL_SERVER_ERROR, 'Database adapter error');
293295
});
294296
}
@@ -327,7 +329,7 @@ export class MongoStorageAdapter {
327329
schema = convertParseSchemaToMongoSchema(schema);
328330
let mongoWhere = transformWhere(className, query, schema);
329331
let mongoSort = _.mapKeys(sort, (value, fieldName) => transformKey(className, fieldName, schema));
330-
let mongoKeys = _.reduce(keys, (memo, key) => {
332+
let mongoKeys = _.reduce(keys, (memo, key) => {
331333
memo[transformKey(className, key, schema)] = 1;
332334
return memo;
333335
}, {});

0 commit comments

Comments
 (0)