Permalink
Browse files

Fix

  • Loading branch information...
typicode committed Jul 2, 2017
1 parent 14de49f commit bd3fb1f8cd7253b88f31470d95a47bcf29df03e7
Showing with 23 additions and 27 deletions.
  1. +1 −0 .eslintignore
  2. +2 −1 .eslintrc.js
  3. +0 −6 package.json
  4. +4 −4 src/cli/run.js
  5. +1 −1 src/cli/utils/load.js
  6. +2 −2 src/server/rewriter.js
  7. +4 −4 src/server/router/index.js
  8. +9 −9 src/server/router/plural.js
View
@@ -1 +1,2 @@
src/server/public
lib
View
@@ -9,6 +9,7 @@ module.exports = {
semi: false,
},
],
'prefer-template': "error"
},
env: { mocha: true },
env: { mocha: true }
}
View
@@ -92,12 +92,6 @@
"url": "https://github.com/typicode/json-server/issues"
},
"homepage": "https://github.com/typicode/json-server",
"standard": {
"fix": true,
"env": {
"mocha": true
}
},
"engines": {
"node": ">= 4"
}
View
@@ -18,20 +18,20 @@ function prettyPrint(argv, object, rules) {
console.log()
console.log(chalk.bold(' Resources'))
for (let prop in object) {
console.log(' ' + root + '/' + prop)
console.log(` ${root}/${prop}`)
}
if (rules) {
console.log()
console.log(chalk.bold(' Other routes'))
for (var rule in rules) {
console.log(' ' + rule + ' -> ' + rules[rule])
console.log(` ${rule} -> ${rules[rule]}`)
}
}
console.log()
console.log(chalk.bold(' Home'))
console.log(' ' + root)
console.log(` ${root}`)
console.log()
}
@@ -172,7 +172,7 @@ module.exports = function(argv) {
process.stdin.setEncoding('utf8')
process.stdin.on('data', chunk => {
if (chunk.trim().toLowerCase() === 's') {
const filename = 'db-' + Date.now() + '.json'
const filename = `db-${Date.now()}.json`
const file = path.join(argv.snapshots, filename)
const state = app.db.getState()
fs.writeFileSync(file, JSON.stringify(state, null, 2), 'utf-8')
View
@@ -36,6 +36,6 @@ module.exports = function(source, cb) {
const data = low(source, { storage: fileAsync }).getState()
cb(null, data)
} else {
throw new Error('Unsupported source ' + source)
throw new Error(`Unsupported source ${source}`)
}
}
View
@@ -19,14 +19,14 @@ module.exports = routes => {
// Rewrite target url using params
let target = routes[route]
for (let param in req.params) {
target = target.replace(':' + param, req.params[param])
target = target.replace(`:${param}`, req.params[param])
}
req.url = target
req.query = updateQueryString(req.query, req.url)
next()
})
} else {
router.all(route + '*', (req, res, next) => {
router.all(`${route}*`, (req, res, next) => {
// Rewrite url by replacing prefix
req.url = req.url.replace(route, routes[route])
req.query = updateQueryString(req.query, req.url)
@@ -66,10 +66,10 @@ module.exports = (source, opts = { foreignKeySuffix: 'Id' }) => {
}
const msg =
`Type of "${key}" (${typeof value}) ` +
(_.isObject(source) ? '' : `in ${source}`) +
' is not supported. ' +
'Use objects or arrays of objects.'
`Type of "${key}" (${typeof value}) ${_.isObject(source)
? ''
: `in ${source}`} is not supported. ` +
`Use objects or arrays of objects.`
throw new Error(msg)
})
@@ -161,7 +161,7 @@ module.exports = (db, name, opts) => {
res.setHeader('X-Total-Count', chain.size())
res.setHeader(
'Access-Control-Expose-Headers',
'X-Total-Count' + (_page ? ', Link' : '')
`X-Total-Count${_page ? ', Link' : ''}`
)
}
@@ -175,29 +175,29 @@ module.exports = (db, name, opts) => {
if (page.first) {
links.first = fullURL.replace(
'page=' + page.current,
'page=' + page.first
`page=${page.current}`,
`page=${page.first}`
)
}
if (page.prev) {
links.prev = fullURL.replace(
'page=' + page.current,
'page=' + page.prev
`page=${page.current}`,
`page=${page.prev}`
)
}
if (page.next) {
links.next = fullURL.replace(
'page=' + page.current,
'page=' + page.next
`page=${page.current}`,
`page=${page.next}`
)
}
if (page.last) {
links.last = fullURL.replace(
'page=' + page.current,
'page=' + page.last
`page=${page.current}`,
`page=${page.last}`
)
}

0 comments on commit bd3fb1f

Please sign in to comment.