Skip to content

Commit 988ddde

Browse files
committed
style update to standard v7
1 parent bf45e62 commit 988ddde

File tree

15 files changed

+12
-78
lines changed

15 files changed

+12
-78
lines changed

src/cli/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ var run = require('./run')
44
var pkg = require('../../package.json')
55

66
module.exports = function () {
7-
87
updateNotifier({ pkg: pkg }).notify()
98

109
var argv = yargs

src/cli/run.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ function createApp (source, object, routes, argv) {
7474
}
7575

7676
module.exports = function (argv) {
77-
7877
var source = argv._[0]
7978
var app
8079
var server
@@ -98,7 +97,6 @@ module.exports = function (argv) {
9897

9998
// Load JSON, JS or HTTP database
10099
load(source, function (err, data) {
101-
102100
if (err) throw err
103101

104102
// Load additional routes
@@ -125,7 +123,6 @@ module.exports = function (argv) {
125123

126124
// Start server
127125
start(function () {
128-
129126
// Snapshot
130127
console.log(
131128
chalk.gray(' Type s + enter at any time to create a snapshot of the database')
@@ -162,7 +159,6 @@ module.exports = function (argv) {
162159
.on('change', function (file) {
163160
if (file === source) {
164161
if (is.JSON(file)) {
165-
console.log(file, fs.readFileSync(file))
166162
var obj = JSON.parse(fs.readFileSync(file))
167163
// Compare .json file content with in memory database
168164
var isDatabaseDifferent = !_.eq(obj, app.db.getState())

src/cli/utils/load.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@ module.exports = function (source, cb) {
88
var data
99

1010
if (is.URL(source)) {
11-
1211
request({ url: source, json: true }, function (err, response) {
1312
if (err) return cb(err)
1413
cb(null, response.body)
1514
})
16-
1715
} else if (is.JS(source)) {
18-
1916
var filename = path.resolve(source)
2017
delete require.cache[filename]
2118
var dataFn = require(filename)
@@ -26,15 +23,10 @@ module.exports = function (source, cb) {
2623

2724
data = dataFn()
2825
cb(null, data)
29-
3026
} else if (is.JSON(source)) {
31-
3227
data = low(source, { storage: fileAsync }).getState()
3328
cb(null, data)
34-
3529
} else {
36-
3730
throw new Error('Unsupported source ' + source)
38-
3931
}
4032
}

src/server/defaults.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ var objectAssign = require('object-assign')
1010
module.exports = function (opts) {
1111
var userDir = path.join(process.cwd(), 'public')
1212
var defaultDir = path.join(__dirname, 'public')
13-
var staticDir = fs.existsSync(userDir) ?
14-
userDir :
15-
defaultDir
13+
var staticDir = fs.existsSync(userDir)
14+
? userDir
15+
: defaultDir
1616

1717
opts = objectAssign({ logger: true, static: staticDir }, opts)
1818

src/server/rewriter.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ module.exports = function (routes) {
44
var router = express.Router()
55

66
Object.keys(routes).forEach(function (route) {
7-
87
if (route.indexOf(':') !== -1) {
98
router.all(route, function (req, res, next) {
109
// Rewrite target url using params
@@ -22,7 +21,6 @@ module.exports = function (routes) {
2221
next()
2322
})
2423
}
25-
2624
})
2725

2826
return router

src/server/router/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ var singular = require('./singular')
1111
var mixins = require('../mixins')
1212

1313
module.exports = function (source) {
14-
1514
// Create router
1615
var router = express.Router()
1716

src/server/router/nested.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ var pluralize = require('pluralize')
33
var utils = require('../utils')
44

55
module.exports = function () {
6-
76
var router = express.Router()
87

98
// Rewrite URL (/:resource/:id/:nested -> /:nested) and request query

src/server/router/plural.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ var pluralize = require('pluralize')
44
var utils = require('../utils')
55

66
module.exports = function (db, name) {
7-
87
// Create router
98
var router = express.Router()
109

@@ -40,7 +39,6 @@ module.exports = function (db, name) {
4039
// GET /name?_start=&_end=&
4140
// GET /name?_embed=&_expand=
4241
function list (req, res, next) {
43-
4442
// Resource chain
4543
var chain = db.get(name)
4644

@@ -82,7 +80,6 @@ module.exports = function (db, name) {
8280
})
8381

8482
if (q) {
85-
8683
// Full-text search
8784
q = q.toLowerCase()
8885

@@ -94,7 +91,6 @@ module.exports = function (db, name) {
9491
}
9592
}
9693
})
97-
9894
}
9995

10096
Object.keys(req.query).forEach(function (key) {
@@ -228,9 +224,9 @@ module.exports = function (db, name) {
228224
var id = utils.toNative(req.params.id)
229225
var chain = db.get(name)
230226

231-
chain = req.method === 'PATCH' ?
232-
chain.updateById(id, req.body) :
233-
chain.replaceById(id, req.body)
227+
chain = req.method === 'PATCH'
228+
? chain.updateById(id, req.body)
229+
: chain.replaceById(id, req.body)
234230

235231
var resource = chain.value()
236232

src/server/router/singular.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
var express = require('express')
22

33
module.exports = function (db, name) {
4-
54
var router = express.Router()
65

76
function show (req, res, next) {
@@ -37,5 +36,4 @@ module.exports = function (db, name) {
3736
.patch(update)
3837

3938
return router
40-
4139
}

src/server/utils.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ module.exports = {
88
// '1' -> 1
99
function toNative (value) {
1010
if (typeof value === 'string') {
11-
if (value === ''
12-
|| value.trim() !== value
13-
|| (value.length > 1 && value[0] === '0')) {
11+
if (
12+
value === '' ||
13+
value.trim() !== value ||
14+
(value.length > 1 && value[0] === '0')
15+
) {
1416
return value
1517
} else if (value === 'true' || value === 'false') {
1618
return value === 'true'

0 commit comments

Comments
 (0)