fix(object): revert 1ee8e6 partially to fix undetected changes when

saving

Author: leeyeh

src/object.js

@@ -9,6 +9,15 @@ const {
   findValue,
 } = require('./utils');
 
+const recursiveToPointer = value => {
+  if (_.isObject(value)) {
+    if (value._toPointer) return value._toPointer();
+    return _.mapObject(value, recursiveToPointer);
+  }
+  if (_.isArray(value)) return value.map(recursiveToPointer);
+  return value;
+};
+
 const RESERVED_KEYS = ['objectId', 'createdAt', 'updatedAt'];
 const checkReservedKey = key => {
   if (RESERVED_KEYS.indexOf(key) !== -1) {
@@ -311,10 +320,6 @@ module.exports = function(AV) {
       dirty: function(attr) {
         this._refreshCache();
 
-        return this._dirty();
-      },
-
-      _dirty: function(attr) {
         var currentChanges = _.last(this._opSetQueue);
 
         if (attr) {
@@ -567,8 +572,7 @@ module.exports = function(AV) {
           !(value instanceof AV.Object) &&
           !(value instanceof AV.File)
         ) {
-          value = value.toJSON ? value.toJSON() : value;
-          var json = JSON.stringify(value);
+          var json = JSON.stringify(recursiveToPointer(value));
           if (this._hashedJSON[key] !== json) {
             var wasSet = !!this._hashedJSON[key];
             this._hashedJSON[key] = json;
@@ -593,16 +597,15 @@ module.exports = function(AV) {
         AV._arrayEach(this._opSetQueue, function(opSet) {
           var op = opSet[key];
           if (op) {
-            const [value, actualTarget, actualKey] = findValue(
+            const [value, actualTarget, actualKey, firstKey] = findValue(
               self.attributes,
               key
             );
             setValue(self.attributes, key, op._estimate(value, self, key));
             if (actualTarget && actualTarget[actualKey] === AV.Op._UNSET) {
               delete actualTarget[actualKey];
-            } else {
-              self._resetCacheForKey(key);
             }
+            self._resetCacheForKey(firstKey);
           }
         });
       },
@@ -1604,7 +1607,7 @@ module.exports = function(AV) {
   AV.Object._findUnsavedChildren = function(objects, children, files) {
     AV._traverse(objects, function(object) {
       if (object instanceof AV.Object) {
-        if (object._dirty()) {
+        if (object.dirty()) {
           children.push(object);
         }
         return;

src/utils/index.js

@@ -208,6 +208,7 @@ const setValue = (target, key, value) => {
 
 const findValue = (target, key) => {
   const segs = key.split('.');
+  const firstSeg = segs[0];
   const lastSeg = segs.pop();
   let currentTarget = target;
   for (let i = 0; i < segs.length; i++) {
@@ -217,7 +218,7 @@ const findValue = (target, key) => {
     }
   }
   const value = currentTarget[lastSeg];
-  return [value, currentTarget, lastSeg];
+  return [value, currentTarget, lastSeg, firstSeg];
 };
 
 module.exports = {

test/object.js

@@ -756,17 +756,31 @@ describe('Objects', function() {
           className: 'C',
           objectId: id,
         },
+        d: {
+          __type: 'Pointer',
+          className: 'C',
+          objectId: id,
+          objects: [{}],
+        },
       });
       const b = a.get('b')[0];
       const c = a.get('c');
+      const d = a.get('d');
       b.set({ a });
-      a._dirty().should.eql(false);
-      b._dirty().should.eql(true);
-      c._dirty().should.eql(false);
+      a.dirty().should.eql(false);
+      b.dirty().should.eql(true);
+      c.dirty().should.eql(false);
+      d.dirty().should.eql(false);
+      d.get('objects')[0].foo = 'bar';
+      a.dirty().should.eql(false);
+      b.dirty().should.eql(true);
+      c.dirty().should.eql(false);
+      d.dirty().should.eql(true);
       c.set({ a });
-      a._dirty().should.eql(false);
-      b._dirty().should.eql(true);
-      c._dirty().should.eql(true);
+      a.dirty().should.eql(false);
+      b.dirty().should.eql(true);
+      c.dirty().should.eql(true);
+      d.dirty().should.eql(true);
     });
   });
 }); //END  RETRIEVING