🐞 tmp fix for issue with soft-delete-2

Author: toovy

lib/services/soft-delete-2.js

@@ -1,4 +1,3 @@
-
 /*
  How the softDelete2 hook is to be positioned relative to other possible hooks:
 
@@ -59,7 +58,9 @@
 
 const errors = require('@feathersjs/errors');
 const SKIP = require('@feathersjs/feathers').SKIP;
-const { callingParams } = require('./calling-params');
+const {
+  callingParams
+} = require('./calling-params');
 
 const defaultDeletedAt = 'deletedAt';
 const deletedMessage = 'Record not found, is logically deleted.';
@@ -91,7 +92,9 @@ module.exports = function (options = {}) {
 
       const result = context.result ? context.result.data || context.result : null;
       if (skipProbeOnGet && result && result[deletedAt] >= 0) {
-        throw new errors.NotFound(deletedMessage, { id: context.id });
+        throw new errors.NotFound(deletedMessage, {
+          id: context.id
+        });
       }
 
       return context;
@@ -115,9 +118,9 @@ module.exports = function (options = {}) {
       case 'create':
         const data = context.data;
 
-        context.data = Array.isArray(data)
-          ? data.map(rec => addField(rec, deletedAt, -1, keepOnCreate))
-          : addField(data, deletedAt, -1, keepOnCreate);
+        context.data = Array.isArray(data) ?
+          data.map(rec => addField(rec, deletedAt, -1, keepOnCreate)) :
+          addField(data, deletedAt, -1, keepOnCreate);
 
         return context;
       case 'get':
@@ -149,36 +152,48 @@ module.exports = function (options = {}) {
   };
 };
 
-async function getActiveRecord (options, context) {
+async function getActiveRecord(options, context) {
   const record = await (options.probeCall || defaultProbeCall)(context, options);
 
   if (record[options.deletedAt || defaultDeletedAt] > -1) {
-    throw new errors.NotFound(deletedMessage, { id: context.id });
+    throw new errors.NotFound(deletedMessage, {
+      id: context.id
+    });
   }
 
   return record;
 }
 
-async function defaultProbeCall (context, options) {
+async function defaultProbeCall(context, options) {
   const params = callingParams({
-    newProps: { provider: undefined }, hooksToDisable: ['softDelete2']
+    newProps: {
+      provider: undefined
+    },
+    hooksToDisable: ['softDelete2']
   })(context);
 
   return context.service.get(context.id, params);
 }
 
-async function defaultPatchCall (context, options) {
+async function defaultPatchCall(context, options) {
   const deletedAt = options.deletedAt || defaultDeletedAt;
 
   const params = callingParams({
-    query: Object.assign({}, context.params.query, { [deletedAt]: -1 }),
-    newProps: { provider: undefined },
+    query: Object.assign({}, context.params.query, {
+      /*[deletedAt]: -1 */ }),
+    newProps: {
+      provider: undefined
+    },
     hooksToDisable: ['softDelete2']
   })(context);
 
-  return context.service.patch(context.id, { [deletedAt]: Date.now() }, params);
+  return context.service.patch(context.id, {
+    [deletedAt]: Date.now()
+  }, params);
 }
 
-function addField (obj = {}, name, value, keep) {
-  return (name in obj) && keep ? obj : Object.assign({}, obj, { [name]: value });
-}
+function addField(obj = {}, name, value, keep) {
+  return (name in obj) && keep ? obj : Object.assign({}, obj, {
+    [name]: value
+  });
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "feathers-hooks-common",
-  "version": "4.20.7",
+  "version": "4.20.8",
   "description": "Useful hooks for use with Feathersjs services.",
   "main": "lib/",
   "types": "types/",
@@ -90,4 +90,4 @@
   "engines": {
     "node": ">= 6"
   }
-}
+}