Restructure Object encoding for any layer of nested objects

Author: andrewimm

src/ParseObject.js

@@ -231,8 +231,8 @@ export default class ParseObject {
     return dirty;
   }
 
-  _toFullJSON(): AttributeMap {
-    var json: { [key: string]: mixed } = this.toJSON();
+  _toFullJSON(seen): AttributeMap {
+    var json: { [key: string]: mixed } = this.toJSON(seen);
     json.__type = 'Object';
     json.className = this.className;
     return json;
@@ -366,15 +366,16 @@ export default class ParseObject {
    * @method toJSON
    * @return {Object}
    */
-  toJSON(): AttributeMap {
+  toJSON(seen): AttributeMap {
     var seenEntry = this.id ? this.className + ':' + this.id : this;
+    var seen = seen || [seenEntry];
     var json = {};
     var attrs = this.attributes;
     for (var attr in attrs) {
       if ((attr === 'createdAt' || attr === 'updatedAt') && attrs[attr].toJSON) {
         json[attr] = attrs[attr].toJSON();
       } else {
-        json[attr] = encode(attrs[attr], false, false, [seenEntry]);
+        json[attr] = encode(attrs[attr], false, false, seen);
       }
     }
     var pending = this._getPendingOps();

src/__tests__/ParseObject-test.js

@@ -627,6 +627,55 @@ describe('ParseObject', () => {
     });
   });
 
+  it('encodes multiple layers of nested objects', () => {
+    var grandparent = ParseObject.fromJSON({
+      __type: 'Object',
+      className: 'Item',
+      objectId: 'nestedGrand',
+      child: {
+        __type: 'Pointer',
+        className: 'Item',
+        objectId: 'nestedParent'
+      }
+    });
+
+    var parent = ParseObject.fromJSON({
+      __type: 'Object',
+      className: 'Item',
+      objectId: 'nestedParent',
+      child: {
+        __type: 'Pointer',
+        className: 'Item',
+        objectId: 'nestedChild'
+      }
+    });
+
+    var child = ParseObject.fromJSON({
+      __type: 'Object',
+      className: 'Item',
+      objectId: 'nestedChild',
+      count: 12
+    });
+
+    expect(grandparent.get('child').id).toBe(parent.id);
+    expect(grandparent.get('child').get('child').id).toBe(child.id);
+
+    expect(grandparent.toJSON()).toEqual({
+      objectId: 'nestedGrand',
+      child: {
+        __type: 'Object',
+        className: 'Item',
+        objectId: 'nestedParent',
+        child: {
+          __type: 'Object',
+          className: 'Item',
+          objectId: 'nestedChild',
+          count: 12
+        }
+      }
+    });
+  });
+
   it('updates the existed flag when saved', () => {
     var o = new ParseObject('Item');
     expect(o.existed()).toBe(false);

src/__tests__/encode-test.js

@@ -27,13 +27,13 @@ mockObject.prototype = {
   toJSON() {
     return this.attributes;
   },
-  _toFullJSON() {
+  _toFullJSON(seen) {
     var json = {
       __type: 'Object',
       className: this.className
     };
     for (var attr in this.attributes) {
-      json[attr] = this.attributes[attr];
+      json[attr] = encode(this.attributes[attr], false, false, seen.concat(this));
     }
     return json;
   }

src/encode.js

@@ -33,19 +33,7 @@ function encode(value: mixed, disallowObjects: boolean, forcePointers: boolean,
       return value.toPointer();
     }
     seen = seen.concat(seenEntry);
-    var json = encode(value.attributes, disallowObjects, forcePointers, seen);
-    if (json.createdAt) {
-      json.createdAt = json.createdAt.iso;
-    }
-    if (json.updatedAt) {
-      json.updatedAt = json.updatedAt.iso;
-    }
-    json.className = value.className;
-    json.__type = 'Object';
-    if (value.id) {
-      json.objectId = value.id;
-    }
-    return json;
+    return value._toFullJSON(seen);
   }
   if (value instanceof Op ||
       value instanceof ParseACL ||