bugfix (get-updates): update solution for separating the two update operations.

Author: netanelgilad

lib/get-updates.js

@@ -116,13 +116,12 @@
         if (_.isDate(srcValue) && _.isDate(dstValue)) {
           if (srcValue.getTime() != dstValue.getTime()) diff[k] = dstValue;
         }
-        else if (_.isArray(srcValue) && _.isArray(dstValue) && !angular.equals(srcValue, dstValue)) {
-          diff[k] = dstValue;
-        }
-        else if (_.isObject(srcValue) && _.isObject(dstValue)) {
+
+        if (_.isObject(srcValue) && _.isObject(dstValue)) {
           var valueDiff = getDifference(srcValue, dstValue);
           utils.setFilled(diff, k, valueDiff);
         }
+
         else if (srcValue !== dstValue) {
           diff[k] = dstValue;
         }
@@ -144,10 +143,12 @@
 
       var set = createSet(paths);
       var unset = createUnset(paths);
+      var pull = createPull(unset);
 
       var updates = {};
       utils.setFilled(updates, '$set', set);
       utils.setFilled(updates, '$unset', unset);
+      utils.setFilled(updates, '$pull', pull);
 
       return updates;
     };
@@ -167,6 +168,18 @@
       }, {});
     };
 
+    var createPull = function(unset) {
+      var arrKeyPaths = _.keys(unset).map(function(k) {
+        var split = k.match(/(.*)\.\d+$/);
+        return split && split[1];
+      });
+
+      return _.compact(arrKeyPaths).reduce(function(pull, k) {
+        pull[k] = null;
+        return pull;
+      }, {});
+    };
+
     var getUndefinedKeys = function(obj) {
       return _.keys(obj).filter(function (k) {
         var v = obj[k];

modules/angular-meteor-object.js

@@ -56,8 +56,19 @@ angularMeteorObject.factory('AngularMeteorObject', [
           }
         }
 
-        // NOTE: do not use #upsert() method, since it does not exist in some collections
-        collection.update(this.$$id, mods, createFulfill({ action: 'updated' }));
+        var pullUpdate;
+        if (mods.$pull) {
+          pullUpdate = { $pull : mods.$pull };
+        }
+
+        if (!pullUpdate) {
+          // NOTE: do not use #upsert() method, since it does not exist in some collections
+          collection.update(this.$$id, mods, createFulfill({action: 'updated'}));
+        }
+        else {
+          collection.update(this.$$id, mods);
+          collection.update(this.$$id, pullUpdate, createFulfill({action: 'updated'}))
+        }
       }
       // insert
       else {
@@ -70,7 +81,7 @@ angularMeteorObject.factory('AngularMeteorObject', [
         collection.insert(mods, createFulfill({ action: 'inserted' }));
       }
 
-      return deferred.promise; 
+      return deferred.promise;
     };
 
     AngularMeteorObject.reset = function(keepClientProps) {
@@ -102,7 +113,7 @@ angularMeteorObject.factory('AngularMeteorObject', [
           delete self[prop];
           delete self._serverBackup[prop];
         });
-      } 
+      }
 
       else {
         _.keys(this.getRawObject()).forEach(function(prop) {
@@ -159,16 +170,28 @@ angularMeteorObject.factory('$meteorObject', [
       this.unregisterAutoBind = this._auto && $rootScope.$watch(function(){
         return self.getRawObject();
       }, function (item, oldItem) {
-        if (item === oldItem) return;
+        if (item === oldItem) {
+          self.$$collection.update({_id: item._id}, self.getRawObject());
+          return;
+        }
 
         var id = item._id;
         delete item._id;
         delete oldItem._id;
 
         var updates = getUpdates(oldItem, item);
         if (_.isEmpty(updates)) return;
+        var pullUpdate;
 
+        if (updates.$pull) {
+          pullUpdate = { $pull : updates.$pull };
+          delete updates.$pull;
+        }
         self.$$collection.update({_id: id}, updates);
+
+        if (pullUpdate) {
+          self.$$collection.update({ _id : id}, pullUpdate);
+        }
       }, true);
 
       this.unregisterAutoDestroy = $rootScope.$on('$destroy', function() {

tests/integration/angular-meteor-get-updates-spec.js

@@ -45,7 +45,8 @@ describe('getUpdates module', function() {
       var expectedUpdates = {
         $set: {
           'b.e': 'e',
-          'd' : [1,2,4,3]
+          'd.2': 4,
+          'd.3': 3
         }
       };
 
@@ -79,6 +80,30 @@ describe('getUpdates module', function() {
       expect(actualUpdates).toDeepEqual(expectedUpdates);
     });
 
+    it('should define a "$pull" property when the destination object has an array value with missing elements', function() {
+      var src = {
+        arr: [1, 2, 3, 4, 5]
+      };
+
+      var dst = {
+        arr: [1, 2, 3]
+      };
+
+      var expectedUpdates = {
+        $unset: {
+          'arr.3': true,
+          'arr.4': true
+        },
+
+        $pull: {
+          'arr': null
+        }
+      };
+
+      var actualUpdates = getUpdates(src, dst);
+      expect(actualUpdates).toDeepEqual(expectedUpdates);
+    });
+
     it('should get updates when object-field is assigned a deep-object', function() {
       var src = {a: {}};
       var dst = {a: {L1: {L2: {L3: 'v'}}}};
@@ -158,7 +183,9 @@ describe('getUpdates module', function() {
 
       expect(updates).toDeepEqual({
         $set: {
-          'a': [1,2,3],
+          'a.0': 1,
+          'a.1': 2,
+          'a.2': 3
         }
       });
     });
@@ -206,7 +233,9 @@ describe('getUpdates module', function() {
 
       expect(updates).toDeepEqual({
         $set: {
-          'a.subfield': [1,2,3],
+          'a.subfield.0': 1,
+          'a.subfield.1': 2,
+          'a.subfield.2': 3
         }
       });
     });