Merge pull request #515 from anthonygood/fix/by-dot

Ensure `existsByDot` and `getByDot` honour properties with dots in keys

Author: marshallswain

lib/common/exists-by-dot.js

@@ -1,5 +1,7 @@
 
 module.exports = function (obj, path) {
+  if (path in obj) return true;
+
   const parts = path.split('.');
   const nonLeafLen = parts.length - 1;
 

lib/common/get-by-dot.js

@@ -2,7 +2,7 @@
 module.exports = function (obj, path) {
   if (typeof obj !== 'object' || obj === null) return undefined;
 
-  if (path.indexOf('.') === -1) {
+  if (path.indexOf('.') === -1 || path in obj) {
     return obj[path];
   }
 

tests/services/exists-by-dot.test.js

@@ -42,6 +42,15 @@ describe('test existsByDot', () => {
     assert.equal(existsByDot({}, 'name'), false);
   });
 
+  it('finds property with dot in key', () => {
+    const obj = { 'name.first': 'John' };
+    assert.equal(existsByDot(obj, 'name.first'), true);
+    assert.equal(existsByDot(obj, 'name'), false);
+    assert.equal(existsByDot(obj, 'first'), false);
+    assert.equal(existsByDot(obj, 'namefirst'), false);
+    assert.equal(existsByDot(obj, 'name.first.foo'), false);
+  });
+
   it('does not throw if path ends prematurely', () => {
     assert.deepEqual(existsByDot(obj, 'x'), false);
     assert.deepEqual(existsByDot(obj, 'name.a.c.x'), false);

tests/services/get-set-by-dot.test.js

@@ -22,7 +22,8 @@ describe('services byDot', () => {
             name: 'John',
             address: { line1: '100 5-th Avenue', city: 'New York' }
           }
-        }
+        },
+        'foo.bar': {}
       };
     });
 
@@ -47,6 +48,10 @@ describe('services byDot', () => {
         obj.manager.employee.address.city);
     });
 
+    it('gets top level property with dot in key', () => {
+      assert.equal(getByDot(obj, 'foo.bar'), obj['foo.bar']);
+    });
+
     it('does not throw on missing path, at top', () => {
       assert.equal(getByDot(obj, 'xxx'), undefined);
     });