Simplify utils, use more lodash packages

Author: Michal Vlasák

package-lock.json

@@ -18,10 +18,12 @@
     "node": "8.6.0"
   },
   "dependencies": {
+    "lodash.difference": "^4.5.0",
     "lodash.foreach": "^4.5.0",
     "lodash.isempty": "^4.4.0",
     "lodash.isobject": "^3.0.2",
     "lodash.isstring": "^4.0.1",
+    "lodash.pick": "^4.4.0",
     "omit-deep": "^0.3.0",
     "on-finished": "^2.3.0",
     "on-headers": "^1.0.1",

package.json

@@ -1,5 +1,6 @@
 const forEach = require('lodash.foreach');
-const { pick, removeEmpty, deleteKeys } = require('./utils');
+const pick = require('lodash.pick');
+const { removeEmpty, shallowOmit } = require('./utils');
 
 const serializers = {
     error(obj) {
@@ -60,8 +61,7 @@ const disablePaths = paths => {
 
         if (affectedFields.length > 0) {
             const newSerializer = obj => {
-                const objCopy = JSON.parse(JSON.stringify(obj)); // we will loose info about functions being passed to logger, but that's a really specific use case, so probably OK
-                return deleteKeys(value(objCopy), affectedFields);
+                return shallowOmit(value(obj), affectedFields);
             };
             serializers[key] = newSerializer;
         }

serializers.js

@@ -1,4 +1,4 @@
-const { pick } = require('../utils');
+const pick = require('lodash.pick');
 const omitDeep = require('omit-deep');
 const stream = require('stream');
 

tests/serializers.test.js

@@ -1,31 +1,18 @@
 const isEmpty = require('lodash.isempty');
+const difference = require('lodash.difference');
+const pick = require('lodash.pick');
 
-const pick = (object, paths) => {
-    const obj = {};
-    for (const path of paths) {
-        if (object[path]) {
-            obj[path] = object[path];
-        }
-    }
-    return obj;
-};
+// left here for future
+/* const shallowOmit = (obj, omitKeys) => {
+    return difference(Object.keys(obj), omitKeys).reduce((omitted, key) => {
+        omitted[key] = obj[key];
+        return omitted;
+    }, {});
+};*/
 
-const removeEmpty = obj => {
-    Object.keys(obj).forEach(key => {
-        if (obj[key] === undefined || isEmpty(obj[key])) {
-            delete obj[key];
-        }
-    });
-    return obj;
-};
+const shallowOmit = (obj, omitKeys) => pick(obj, difference(Object.keys(obj), omitKeys));
 
-const deleteKeys = (obj, keys) => {
-    keys.forEach(key => {
-        if (obj[key]) {
-            delete obj[key];
-        }
-    });
-    return obj;
-};
+const removeEmpty = obj =>
+    shallowOmit(obj, Object.keys(obj).filter(key => obj[key] === undefined || isEmpty(obj[key])));
 
-module.exports = { pick, removeEmpty, deleteKeys };
+module.exports = { shallowOmit, removeEmpty };