Merge 5578a40 into 99dc4bb

guigrpa · Mar 3, 2017 · 1d74d5d · 1d74d5d
2 parents 99dc4bb + 5578a40
commit 1d74d5d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/timm.js b/src/timm.js
@@ -347,7 +347,7 @@ function doSetIn<T: ArrayOrObject>(
   if (idx === path.length - 1) {
     newValue = val;
   } else {
-    const nestedObj = isObject(obj) ? obj[key] : {};
+    const nestedObj = isObject(obj) ? obj[key] : typeof path[idx + 1] === 'number' ? [] : {};
     newValue = doSetIn(nestedObj, path, val, idx + 1);
   }
   return set(obj, key, newValue);

diff --git a/test/objects.js b/test/objects.js
@@ -143,6 +143,25 @@ test('setIn: should create nested arrays for unknown paths with positive integer
   t.is(obj2.unknown[0].long[1].path, 'value');
 });
 
+test('setIn: should create nested arrays for undefined objects', (t) => {
+  const obj2 = timm.setIn(undefined, ['unknown', 0, 'path'], 'value');
+  t.truthy(Array.isArray(obj2.unknown));
+  t.is(obj2.unknown[0].path, 'value');
+});
+
+test('setIn: should create nested arrays for unknown paths', (t) => {
+  const obj2 = timm.setIn(OBJ, ['unknown', 0, 1, 'path'], 'value');
+  t.truthy(Array.isArray(obj2.unknown));
+  t.truthy(Array.isArray(obj2.unknown[0]));
+  t.is(obj2.unknown[0][1].path, 'value');
+});
+
+test('setIn: should create nested object in arrays for unknown paths', (t) => {
+  const obj2 = timm.setIn(undefined, ['x', 0, 'y', 'z'], 'value');
+  t.truthy(Array.isArray(obj2.x));
+  t.is(obj2.x[0].y.z, 'value');
+});
+
 test('setIn: should create nested arrays for unknown paths with negative segments', (t) => {
   const obj2 = timm.setIn(OBJ, ['unknown', -17, 'path'], 3);
   t.truthy(Array.isArray(obj2.unknown));