Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/cli/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ module.exports = function () {
description: 'Set database id property (e.g. _id)',
default: 'id'
},
foreignKeySuffix: {
alias: 'f',
description: 'Set foreign key suffix, (e.g. _id as in post_id)',
default: 'Id'
},
quiet: {
alias: 'q',
description: 'Suppress log messages from output'
Expand Down
5 changes: 2 additions & 3 deletions src/cli/run.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ function createApp (source, object, routes, middlewares, argv) {

try {
router = jsonServer.router(
is.JSON(source)
? source
: object
is.JSON(source) ? source : object,
argv
)
} catch (e) {
console.log()
Expand Down
4 changes: 2 additions & 2 deletions src/server/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const nested = require('./nested')
const singular = require('./singular')
const mixins = require('../mixins')

module.exports = (source) => {
module.exports = (source, argv) => {
// Create router
const router = express.Router()

Expand Down Expand Up @@ -60,7 +60,7 @@ module.exports = (source) => {
}

if (_.isArray(value)) {
router.use(`/${key}`, plural(db, key))
router.use(`/${key}`, plural(db, key, argv))
return
}

Expand Down
6 changes: 3 additions & 3 deletions src/server/router/plural.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const write = require('./write')
const getFullURL = require('./get-full-url')
const utils = require('../utils')

module.exports = (db, name) => {
module.exports = (db, name, argv) => {
// Create router
const router = express.Router()

Expand All @@ -16,7 +16,7 @@ module.exports = (db, name) => {
if (db.get(externalResource).value) {
const query = {}
const singularResource = pluralize.singular(name)
query[`${singularResource}Id`] = resource.id
query[`${singularResource}${argv.foreignKeySuffix}`] = resource.id
resource[externalResource] = db.get(externalResource).filter(query).value()
}
})
Expand All @@ -28,7 +28,7 @@ module.exports = (db, name) => {
.forEach((innerResource) => {
const plural = pluralize(innerResource)
if (db.get(plural).value()) {
const prop = `${innerResource}Id`
const prop = `${innerResource}${argv.foreignKeySuffix}`
resource[innerResource] = db.get(plural).getById(resource[prop]).value()
}
})
Expand Down
6 changes: 5 additions & 1 deletion test/server/plural.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ describe('Server', () => {
'/articles?_id=:id': '/posts/:id'
}

const defaultArgv = {
foreignKeySuffix: 'Id'
}

beforeEach(() => {
db = {}

Expand Down Expand Up @@ -92,7 +96,7 @@ describe('Server', () => {
]

server = jsonServer.create()
router = jsonServer.router(db)
router = jsonServer.router(db, defaultArgv)
server.use(jsonServer.defaults())
server.use(jsonServer.rewriter(rewriterRules))
server.use(router)
Expand Down