Merge branch 'alpha' into updatePostgres

Author: cbaker6

changelogs/CHANGELOG_alpha.md

@@ -1,3 +1,10 @@
+# [6.1.0-alpha.2](https://github.com/parse-community/parse-server/compare/6.1.0-alpha.1...6.1.0-alpha.2) (2023-03-05)
+
+
+### Bug Fixes
+
+* Nested date is incorrectly decoded as empty object `{}` when fetching a Parse Object ([#8446](https://github.com/parse-community/parse-server/issues/8446)) ([22d2446](https://github.com/parse-community/parse-server/commit/22d2446dfea2bc339affc20535d181097e152acf))
+
 # [6.1.0-alpha.1](https://github.com/parse-community/parse-server/compare/6.0.0...6.1.0-alpha.1) (2023-03-03)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "parse-server",
-  "version": "6.1.0-alpha.1",
+  "version": "6.1.0-alpha.2",
   "description": "An express module providing a Parse-compatible API server",
   "main": "lib/index.js",
   "repository": {

package.json

@@ -248,6 +248,10 @@ describe_only_db('mongo')('MongoStorageAdapter', () => {
     expect(object.date[0] instanceof Date).toBeTrue();
     expect(object.bar.date[0] instanceof Date).toBeTrue();
     expect(object.foo.test.date[0] instanceof Date).toBeTrue();
+    const obj = await new Parse.Query('MyClass').first({useMasterKey: true});
+    expect(obj.get('date')[0] instanceof Date).toBeTrue();
+    expect(obj.get('bar').date[0] instanceof Date).toBeTrue();
+    expect(obj.get('foo').test.date[0] instanceof Date).toBeTrue();
   });
 
   it('handles updating a single object with array, object date', done => {

spec/MongoStorageAdapter.spec.js

@@ -188,6 +188,16 @@ const transformInteriorValue = restValue => {
   // Handle atomic values
   var value = transformInteriorAtom(restValue);
   if (value !== CannotTransform) {
+    if (value && typeof value === 'object') {
+      if (value instanceof Date) {
+        return value;
+      }
+      if (value instanceof Array) {
+        value = value.map(transformInteriorValue);
+      } else {
+        value = mapValues(value, transformInteriorValue);
+      }
+    }
     return value;
   }
 
@@ -1014,9 +1024,6 @@ function mapValues(object, iterator) {
   const result = {};
   Object.keys(object).forEach(key => {
     result[key] = iterator(object[key]);
-    if (result[key] && JSON.stringify(result[key]).includes(`"__type"`)) {
-      result[key] = mapValues(object[key], iterator);
-    }
   });
   return result;
 }