Fix type enforcement for mergeWith/deep + tests

typed-immutable · Sep 12, 2016 · 0db3ae0 · 0db3ae0
1 parent 6f2765d
commit 0db3ae0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/list.js b/src/list.js
@@ -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) {

diff --git a/src/test/list.js b/src/test/list.js
@@ -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 => {
@@ -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 => {
@@ -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/)
 })