Upgrade dependencies to Feathers v4 and remove deprecated hooks (#536)

Author: daffl

dtslint-build/package-lock.json

@@ -52,10 +52,7 @@ const setNow = require('./set-now');
 const setSlug = require('./set-slug');
 const setUpdatedAt = require('./set-updated-at');
 const sifter = require('./sifter');
-const skipRemainingHooks = require('./skip-remaining-hooks');
-const skipRemainingHooksOnFlag = require('./skip-remaining-hooks-on-flag');
 const softDelete = require('./soft-delete');
-const softDelete2 = require('./soft-delete-2');
 const stashBefore = require('./stash-before');
 const traverse = require('./traverse');
 const validate = require('./validate');
@@ -121,10 +118,7 @@ module.exports = Object.assign({ callbackToPromise,
   setSlug,
   setUpdatedAt,
   sifter,
-  skipRemainingHooks,
-  skipRemainingHooksOnFlag,
   softDelete,
-  softDelete2,
   stashBefore,
   traverse,
   validate,

lib/services/index.js

@@ -1,77 +1,34 @@
-
-const errors = require('@feathersjs/errors');
 const checkContext = require('./check-context');
 
 module.exports = function (field) {
   const deleteField = field || 'deleted';
 
   return function (context) {
-    const service = context.service;
-    context.data = context.data || {};
-    context.params.query = context.params.query || {};
+    const { service, method, params: { query = {} } } = context;
+
+    context.params.query = query;
+
     checkContext(context, 'before', null, 'softDelete');
 
     if (context.params.query.$disableSoftDelete) {
       delete context.params.query.$disableSoftDelete;
       return context;
     }
 
-    switch (context.method) {
-      case 'find':
-        context.params.query[deleteField] = { $ne: true };
-        return context;
-      case 'get':
-        return throwIfItemDeleted(context.id, true)
-          .then(data => {
-            context.result = data;
-            return context;
-          });
-      case 'create':
-        return context;
-      case 'update': // fall through
-      case 'patch':
-        if (context.id !== null) {
-          return throwIfItemDeleted(context.id)
-            .then(() => context);
-        }
-        context.params.query[deleteField] = { $ne: true };
-        return context;
-      case 'remove':
-        return Promise.resolve()
-          .then(() => context.id ? throwIfItemDeleted(context.id) : null)
-          .then(() => {
-            context.data[deleteField] = true;
-            context.params.query[deleteField] = { $ne: true };
-            context.params.query.$disableSoftDelete = true;
-
-            return service.patch(context.id, context.data, context.params)
-              .then(result => {
-                context.result = result;
-                return context;
-              });
-          });
-    }
-
-    function throwIfItemDeleted (id, isGet) {
-      const params = isGet ? context.params : {
-        query: {},
-        provider: context.params.provider,
-        _populate: 'skip',
-        authenticated: context.params.authenticated,
-        user: context.params.user
-      };
+    context.params.query = Object.assign({}, {
+      [deleteField]: { $ne: true }
+    }, context.params.query);
 
-      params.query.$disableSoftDelete = true;
+    if (method === 'remove') {
+      context.data[deleteField] = true;
 
-      return service.get(id, params)
-        .then(data => {
-          delete params.query.$disableSoftDelete;
-
-          if (data[deleteField]) {
-            throw new errors.NotFound('Item not found.');
-          }
-          return data;
+      return service.patch(context.id, { [deleteField]: true }, context.params)
+        .then(result => {
+          context.result = result;
+          return context;
         });
     }
+
+    return context;
   };
 };