Return default value when input is not an object (#40)

sindresorhus · Feb 18, 2017 · 7f2bfe4 · 7f2bfe4
1 parent f91d08a
commit 7f2bfe4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/bench.js b/bench.js
@@ -43,6 +43,11 @@ bench('get', () => {
 
 	m.get({'foo.baz': {bar: true}}, 'foo\\.baz.bar');
 	m.get({'fo.ob.az': {bar: true}}, 'fo\\.ob\\.az.bar');
+
+	m.get(null, 'foo.bar', false);
+	m.get('foo', 'foo.bar', false);
+	m.get([], 'foo.bar', false);
+	m.get(undefined, 'foo.bar', false);
 });
 
 bench('set', () => {

diff --git a/index.js b/index.js
@@ -22,7 +22,7 @@ function getPathSegments(path) {
 module.exports = {
 	get(obj, path, value) {
 		if (!isObj(obj) || typeof path !== 'string') {
-			return obj;
+			return value === undefined ? obj : value;
 		}
 
 		const pathArr = getPathSegments(path);

diff --git a/test.js b/test.js
@@ -45,6 +45,11 @@ test('get', t => {
 
 	t.is(m.get({'foo.baz': {bar: true}}, 'foo\\.baz.bar'), true);
 	t.is(m.get({'fo.ob.az': {bar: true}}, 'fo\\.ob\\.az.bar'), true);
+
+	t.is(m.get(null, 'foo.bar', false), false);
+	t.is(m.get('foo', 'foo.bar', false), false);
+	t.is(m.get([], 'foo.bar', false), false);
+	t.is(m.get(undefined, 'foo.bar', false), false);
 });
 
 test('set', t => {