feat: Serialize aggregation results via EJSON when rawValues is true

Author: mtrezza

spec/ParseQuery.Aggregate.spec.js

@@ -541,6 +541,21 @@ describe('Parse.Query Aggregate testing', () => {
     expect(results.length).toBe(0);
   });
 
+  it_id('f01a0001-0005-0005-0005-000000000005')(it_exclude_dbs(['postgres']))('rawValues: true serializes BSON Date in results as `{ $date: iso }`', async () => {
+    const obj = new TestObject();
+    await obj.save();
+    const iso = new Date(obj.createdAt.getTime() + 1).toISOString();
+    const pipeline = [
+      { $match: { objectId: obj.id, createdAt: { $lte: { $date: iso } } } },
+      { $project: { _id: 1, _created_at: 1 } },
+    ];
+    const query = new Parse.Query('TestObject');
+    const results = await query.aggregate(pipeline, { rawValues: true, useMasterKey: true });
+    expect(results.length).toBe(1);
+    // EJSON-serialized date marker, not Parse `{ __type: 'Date', iso }` encoding.
+    expect(results[0]._created_at).toEqual(jasmine.objectContaining({ $date: jasmine.any(String) }));
+  });
+
   it_only_db('postgres')(
     'can group by any date field postgres (it does not work if you have dirty data)', // rows in your collection with non date data in the field that is supposed to be a date
     done => {

src/Adapters/Storage/Mongo/MongoStorageAdapter.js

@@ -980,6 +980,9 @@ export class MongoStorageAdapter implements StorageAdapter {
         })
       )
       .then(results => {
+        if (rawValues) {
+          return results;
+        }
         results.forEach(result => {
           if (Object.prototype.hasOwnProperty.call(result, '_id')) {
             if (isPointerField && result._id) {
@@ -998,7 +1001,12 @@ export class MongoStorageAdapter implements StorageAdapter {
         });
         return results;
       })
-      .then(objects => objects.map(object => mongoObjectToParseObject(className, object, schema)))
+      .then(objects => {
+        if (rawValues) {
+          return objects.map(obj => EJSON.serialize(obj));
+        }
+        return objects.map(object => mongoObjectToParseObject(className, object, schema));
+      })
       .catch(err => this.handleError(err));
   }
 

src/Routers/AggregateRouter.js

@@ -49,9 +49,11 @@ export class AggregateRouter extends ClassesRouter {
         req.info.clientSDK,
         req.info.context
       );
-      for (const result of response.results) {
-        if (typeof result === 'object') {
-          UsersRouter.removeHiddenProperties(result);
+      if (!options.rawValues) {
+        for (const result of response.results) {
+          if (typeof result === 'object') {
+            UsersRouter.removeHiddenProperties(result);
+          }
         }
       }
       return { response };