New softDelete for Feathers 4 (#544)

Author: daffl

lib/services/make-calling-params.js

@@ -1,32 +1,42 @@
+const { GeneralError } = require('@feathersjs/errors');
 const checkContext = require('./check-context');
 
-module.exports = function (field) {
-  const deleteField = field || 'deleted';
+const defaultQuery = { deleted: { $ne: true } };
+const defaultData = { deleted: true };
+const getValue = (value, ...args) => {
+  if (typeof value === 'function') {
+    return Promise.resolve(value(...args));
+  }
+  return Promise.resolve(value);
+};
 
-  return function (context) {
-    const { service, method, params: { query = {} } } = context;
+module.exports = ({
+  deletedQuery = defaultQuery,
+  removeData = defaultData
+} = {}) => {
+  return async context => {
+    const { service, method, params, app } = context;
+    const { disableSoftDelete, query = {} } = params;
 
-    context.params.query = query;
+    if (app.version < '4.0.0') {
+      throw new GeneralError('The softDelete hook requires Feathers 4.0.0 or later');
+    }
 
     checkContext(context, 'before', null, 'softDelete');
 
-    if (context.params.query.$disableSoftDelete) {
-      delete context.params.query.$disableSoftDelete;
+    if (disableSoftDelete) {
       return context;
     }
 
-    context.params.query = Object.assign({}, {
-      [deleteField]: { $ne: true }
-    }, context.params.query);
+    const deleteQuery = await getValue(deletedQuery, context);
+
+    context.params.query = Object.assign({}, query, deleteQuery);
 
     if (method === 'remove') {
-      context.data[deleteField] = true;
+      const data = await getValue(removeData, context);
+      const result = await service.patch(context.id, data, params);
 
-      return service.patch(context.id, { [deleteField]: true }, context.params)
-        .then(result => {
-          context.result = result;
-          return context;
-        });
+      context.result = result;
     }
 
     return context;