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

List.merge* support #36

Merged
merged 2 commits into from
Dec 9, 2016
Merged

List.merge* support #36

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f2765d
List.merge* support
davecoates Sep 11, 2016
0db3ae0
Fix type enforcement for mergeWith/deep + tests
davecoates Sep 12, 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
Prev Previous commit
Fix type enforcement for mergeWith/deep + tests
  • Loading branch information
@davecoates
davecoates committed Sep 12, 2016
commit 0db3ae0613b401a65447e3cd613a82f10ec7c725
15 changes: 9 additions & 6 deletions src/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,26 +276,29 @@ class TypeInferedList extends BaseImmutableList {

mergeWith(merger, ...iterables) {
const maxSize = maxSizeFromIterables(iterables);
const typedIterables = iterables.map(convertValuesToType.bind(null, this[$type]));
if (maxSize > this.size) {
return change(this, store => store.setSize(maxSize).mergeWith(merger, ...iterables));
return change(this, store => store.setSize(maxSize).mergeWith(merger, ...typedIterables));
}
return change(this, store => store.mergeWith(merger, ...iterables));
return change(this, store => store.mergeWith(merger, ...typedIterables));
}

mergeDeep(...iterables) {
const maxSize = maxSizeFromIterables(iterables);
const typedIterables = iterables.map(convertValuesToType.bind(null, this[$type]));
if (maxSize > this.size) {
return change(this, store => store.setSize(maxSize).mergeDeep(...iterables));
return change(this, store => store.setSize(maxSize).mergeDeep(...typedIterables));
}
return change(this, store => store.mergeDeep(...iterables));
return change(this, store => store.mergeDeep(...typedIterables));
}

mergeDeepWith(merger, ...iterables) {
const maxSize = maxSizeFromIterables(iterables);
const typedIterables = iterables.map(convertValuesToType.bind(null, this[$type]));
if (maxSize > this.size) {
return change(this, store => store.setSize(maxSize).mergeDeepWith(merger, ...iterables));
return change(this, store => store.setSize(maxSize).mergeDeepWith(merger, ...typedIterables));
}
return change(this, store => store.mergeDeepWith(merger, ...iterables));
return change(this, store => store.mergeDeepWith(merger, ...typedIterables));
}

__ensureOwner(ownerID) {
Expand Down
6 changes: 3 additions & 3 deletions src/test/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ test('mergeWith', assert => {
const useExisting = (prev, next) => prev != null ? prev : next;
assert.deepEqual(numbers.mergeWith(useExisting, NumberList.of(4, 5, 6, 7)).toArray(), [1, 2, 3, 7])
assert.deepEqual(numbers.mergeWith(useExisting, NumberList.of(4)).toArray(), [1, 2, 3])
assert.throws(() => numbers.merge(useExisting, [4, 5, 6, '7']), /is not a number/)
assert.throws(() => numbers.mergeWith(useExisting, [4, 5, 6, '7']), /is not a number/)
})

test('mergeDeep', assert => {
Expand All @@ -1039,7 +1039,7 @@ test('mergeDeep', assert => {
assert.deepEqual(
numbers.mergeDeep([[10, 11, 12, 13], [20, 21]]).toJS(),
[[10, 11, 12, 13], [20, 21, 6]])
assert.throws(() => numbers.mergeDeep([[10], ['11']], /is not a number/)
assert.throws(() => numbers.mergeDeep([[10], ['11']]), /is not a number/)
})

test('mergeDeepWith', assert => {
Expand All @@ -1051,5 +1051,5 @@ test('mergeDeepWith', assert => {
assert.deepEqual(
numbers.mergeDeepWith(add, [[10, 11, 12, 13], [20, 21]]).toJS(),
[[11, 13, 15, 13], [24, 26, 6]])
assert.throws(() => numbers.mergeDeep(add, [[10], ['11']], /is not a number/)
assert.throws(() => numbers.mergeDeepWith(add, [[10], ['11']]), /is not a number/)
})