Merge pull request feathersjs-ecosystem#431 from dekelev/keep-query-fix

Added `keepQuery` support for keeping props with dot in their name

Author: eddyystop

lib/common/_pluck.js

@@ -20,9 +20,9 @@ function _pluckItem (item, fieldNames) {
   const plucked = {};
 
   fieldNames.forEach(fieldName => {
-    const value = getByDot(item, fieldName);
+    const value = fieldName in item ? item[fieldName] : getByDot(item, fieldName);
     if (value !== undefined) { // prevent setByDot creating nested empty objects
-      setByDot(plucked, fieldName, value);
+      if (fieldName in item) { plucked[fieldName] = value; } else { setByDot(plucked, fieldName, value); }
     }
   });
 

tests/services/keep-query.test.js

@@ -43,7 +43,7 @@ describe('services keepQuery', () => {
         type: 'before',
         method: 'create',
         params: {
-          query: { empl: { name: { first: 'John', last: 'Doe' }, status: 'AA' }, dept: 'Acct' }
+          query: { empl: { name: { first: 'John', last: 'Doe' }, status: 'AA' }, dept: 'Acct', 'owner.id': 1, 'owner.admin': false }
         } };
     });
 
@@ -55,9 +55,9 @@ describe('services keepQuery', () => {
     });
 
     it('prop with 1 dot', () => {
-      hooks.keepQuery('empl.name', 'dept')(hookBefore);
+      hooks.keepQuery('empl.name', 'dept', 'owner.id', 'owner.admin')(hookBefore);
       assert.deepEqual(hookBefore.params.query,
-        { empl: { name: { first: 'John', last: 'Doe' } }, dept: 'Acct' }
+        { empl: { name: { first: 'John', last: 'Doe' } }, dept: 'Acct', 'owner.id': 1, 'owner.admin': false }
       );
     });