modify stashBefore hook, move $disableStashBefore from query to params (#555)

* feat move $disableStashBefore from query to params

* Rename $disableStashBefore to disableStashBefore

* Add vscode launch script for debugging Mocha tests (#554)

* Add vscode script for debugging tests

* Remove default comment from launch.json

* stash-before: Don’t modify existing params

Author: marshallswain

lib/services/calling-params.js

@@ -59,8 +59,7 @@ function callingParams ({ query, propNames = [], newProps = {}, hooksToDisable =
           newParams.$ignoreDeletedAt = true;
           break;
         case 'stashBefore':
-          newParams.query = newParams.query || {};
-          newParams.query.$disableStashBefore = true;
+          newParams.disableStashBefore = true;
           break;
       }
     });

lib/services/stash-before.js

@@ -8,8 +8,7 @@ module.exports = function (prop) {
   return context => {
     checkContext(context, 'before', ['get', 'update', 'patch', 'remove'], 'stashBefore');
 
-    if (context.params.query && context.params.query.$disableStashBefore) {
-      delete context.params.query.$disableStashBefore;
+    if (context.params.disableStashBefore) {
       return context;
     }
 
@@ -23,13 +22,12 @@ module.exports = function (prop) {
       user: context.params.user
     };
 
-    params.query = params.query || {};
-    params.query.$disableStashBefore = true;
-
-    return context.service.get(context.id, params)
+    return context.service.get(context.id, {
+      ...params,
+      query: params.query || {},
+      disableStashBefore: true
+    })
       .then(data => {
-        delete params.query.$disableStashBefore;
-
         context.params[beforeField] = JSON.parse(JSON.stringify(data));
         return context;
       })

tests/services/calling-params-1.test.js

@@ -117,7 +117,8 @@ describe('service calling-params-1.test.js', () => {
         provider: 'socketio',
         user: { name: 'Matt' },
         _populate: 'skip',
-        query: { $disableSoftDelete: true, $disableStashBefore: true }
+        disableStashBefore: true,
+        query: { $disableSoftDelete: true }
       });
     });
 
@@ -143,7 +144,8 @@ describe('service calling-params-1.test.js', () => {
         hooksToDisable: ['populate', 'fastJoin', 'softDelete', 'stashBefore']
       })(context1);
       assert.deepEqual(res, {
-        query: { id: 1, aa: 'a1', $disableSoftDelete: true, $disableStashBefore: true },
+        disableStashBefore: true,
+        query: { id: 1, aa: 'a1', $disableSoftDelete: true },
         foo: 'bar',
         baz: 'faz',
         _populate: 'skip',

tests/services/stash-before.test.js

@@ -36,7 +36,7 @@ function users () {
     before: {
       all: [
         context => {
-          if ((context.params.query || {}).$disableStashBefore === true) {
+          if (context.params.disableStashBefore === true) {
             innerCallParams = context.params;
           }
         },