Merge pull request #11399 from Uzlopak/why-not-ObjectAssign

PoC for Object assign
Automattic · Feb 15, 2022 · 96c067e · 96c067e
2 parents 7c46428 + 09c6f8e
commit 96c067e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/lib/aggregate.js b/lib/aggregate.js
@@ -174,15 +174,10 @@ Aggregate.prototype.append = function() {
  * @api public
  */
 Aggregate.prototype.addFields = function(arg) {
-  const fields = {};
-  if (typeof arg === 'object' && !Array.isArray(arg)) {
-    Object.keys(arg).forEach(function(field) {
-      fields[field] = arg[field];
-    });
-  } else {
+  if (typeof arg !== 'object' || arg === null || Array.isArray(arg)) {
     throw new Error('Invalid addFields() argument. Must be an object');
   }
-  return this.append({ $addFields: fields });
+  return this.append({ $addFields: Object.assign({}, arg) });
 };
 
 /**

diff --git a/test/aggregate.test.js b/test/aggregate.test.js
@@ -458,6 +458,18 @@ describe('aggregate: ', function() {
     });
 
     describe('addFields', function() {
+      it('should throw if passed a non object', function () {
+        const aggregate = new Aggregate();
+        assert.throws(() => {aggregate.addFields("invalid")}, /Invalid addFields\(\) argument\. Must be an object/)
+      });
+      it('should throw if passed null', function () {
+        const aggregate = new Aggregate();
+        assert.throws(() => {aggregate.addFields(null)}, /Invalid addFields\(\) argument\. Must be an object/)
+      });
+      it('should throw if passed an Array', function () {
+        const aggregate = new Aggregate();
+        assert.throws(() => {aggregate.addFields([])}, /Invalid addFields\(\) argument\. Must be an object/)
+      });
       it('(object)', function() {
         const aggregate = new Aggregate();