Merge pull request #327 from mixmaxhq/jordi/COMM-78-remove-spread-operator

fix: remove uses of the spread operator

Author: jsalvata

src/aggregate.js

@@ -47,24 +47,23 @@ module.exports = async function aggregate(collection, params) {
   const $sort = generateSort(params);
   const $limit = params.limit + 1;
 
-  let addFields = [];
-  let cleanUp = [];
+  let aggregation;
   if (params.sortCaseInsensitive) {
-    addFields = [{ $addFields: { __lc: { $toLower: '$' + params.paginatedField } } }];
-    cleanUp = [{ $project: { __lc: 0 } }];
+    aggregation = params.aggregation.concat([
+      { $addFields: { __lc: { $toLower: '$' + params.paginatedField } } },
+      { $match },
+      { $sort },
+      { $limit },
+      { $project: { __lc: 0 } },
+    ]);
+  } else {
+    aggregation = params.aggregation.concat([{ $match }, { $sort }, { $limit }]);
   }
-  const aggregation = params.aggregation.concat([
-    ...addFields,
-    { $match },
-    { $sort },
-    { $limit },
-    ...cleanUp,
-  ]);
 
   // Aggregation options:
   // https://mongodb.github.io/node-mongodb-native/3.6/api/Collection.html#aggregate
   // https://mongodb.github.io/node-mongodb-native/4.0/interfaces/aggregateoptions.html
-  const options = { ...params.options };
+  const options = Object.assign({}, params.options);
   /**
    * IMPORTANT
    *

src/find.js

@@ -39,10 +39,12 @@ module.exports = async function(collection, params) {
   let response;
   if (params.sortCaseInsensitive) {
     // For case-insensitive sorting, we need to work with an aggregation:
-    response = aggregate(collection, {
-      ...params,
-      aggregation: params.query ? [{ $match: params.query }] : [],
-    });
+    response = aggregate(
+      collection,
+      Object.assign({}, params, {
+        aggregation: params.query ? [{ $match: params.query }] : [],
+      })
+    );
   } else {
     // Need to repeat `params.paginatedField` default value ('_id') since it's set in 'sanitizeParams()'
     params = _.defaults(await sanitizeParams(collection, params), { query: {} });