Skip to content

Commit 951dd19

Browse files
author
Andreas Reiterer
committed
don't set the related object if key is null
1 parent 9d12161 commit 951dd19

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

lib/shallow-populate.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,12 +257,14 @@ function setItems (data, include, params, response) {
257257
if (keyHere !== undefined) {
258258
if (Array.isArray(keyHere)) {
259259
if (!asArray) {
260-
_set(item, nameAs, getRelatedItems(keyHere[0], relatedItems, include, params))
260+
const items = getRelatedItems(keyHere[0], relatedItems, include, params)
261+
if (items !== undefined) { _set(item, nameAs, items) }
261262
} else {
262263
_set(item, nameAs, getRelatedItems(keyHere, relatedItems, include, params))
263264
}
264265
} else {
265-
_set(item, nameAs, getRelatedItems(keyHere, relatedItems, include, params))
266+
const items = getRelatedItems(keyHere, relatedItems, include, params)
267+
if (items !== undefined) { _set(item, nameAs, items) }
266268
}
267269
}
268270
})

test/shallow-populate.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ describe('populating thing', () => {
338338
const response = await shallowPopulate(context)
339339
const result = response[dataResult]
340340

341-
assert(!result.posts, `${type}: post should have not been populated`)
341+
assert(!Object.prototype.hasOwnProperty.call(result, 'posts'), `${type}: post should have not been populated`)
342342
}
343343
})
344344

0 commit comments

Comments
 (0)