Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge arrays onto objects #46

Merged
merged 3 commits into from
Oct 12, 2016
Merged

Merge arrays onto objects #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d6babd
add test for replacing objects with arrays
macdja38 Sep 28, 2016
bcab627
Make arrays overwrite all non-array objects
TehShrike Oct 7, 2016
88f4e28
Few more array-overwrites-everything tests for super-defensiveness
TehShrike Oct 7, 2016
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
3 changes: 1 addition & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ function deepmerge(target, source, optionsArgument) {
var arrayMerge = options.arrayMerge || defaultArrayMerge

if (array) {
target = target || [];
return arrayMerge(target, source, optionsArgument)
return Array.isArray(target) ? arrayMerge(target, source, optionsArgument) : source.slice()
} else {
return mergeObject(target, source, optionsArgument)
}
Expand Down
51 changes: 51 additions & 0 deletions test/merge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,57 @@ test('should replace object with simple key in target', function (t) {
t.end()
})

test('should replace objects with arrays', function(t) {
var target = [
{ key1: { subkey: 'one' }}
]

var src = [
{ key1: [ "subkey" ]}
]

var expected = [
{ key1: [ "subkey" ]}
]

t.deepEqual(merge(target, src), expected)
t.end()
})

test('should replace dates with arrays', function(t) {
var target = [
{ key1: new Date()}
]

var src = [
{ key1: [ "subkey" ]}
]

var expected = [
{ key1: [ "subkey" ]}
]

t.deepEqual(merge(target, src), expected)
t.end()
})

test('should replace null with arrays', function(t) {
var target = {
key1: null
}

var src = {
key1: [ "subkey" ]
}

var expected = {
key1: [ "subkey" ]
}

t.deepEqual(merge(target, src), expected)
t.end()
})

test('should work on simple array', function (t) {
var src = ['one', 'three']
var target = ['one', 'two']
Expand Down