We need to make sure that the observer still exists when emitting because maybe has been removed after calling previous observers

Author: Josema

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dop",
-  "version": "0.24.2",
+  "version": "0.24.3",
   "main": "./dist/dop.nodejs.js",
   "browser": "./dist/dop.js",
   "unpkg": "./dist/dop.min.js",

src/core/objects/emitToObservers.js

@@ -4,7 +4,7 @@ dop.core.emitToObservers = function(mutations) {
     var mutation,
         path_id,
         observer_id,
-        observers = {},
+        mutationsToEmitByIdObserver = {},
         mutationsWithSubscribers = false,
         data_path = dop.data.path,
         index = 0,
@@ -17,34 +17,37 @@ dop.core.emitToObservers = function(mutations) {
         if (!mutationsWithSubscribers && isObject(dop.data.object[dop.getObjectId(mutation.object)]))
             mutationsWithSubscribers = true;
 
-
+        // .observers
         if (data_path[path_id] !== undefined && data_path[path_id].observers !== undefined) {
             for (observer_id in data_path[path_id].observers) {
-                if (observers[observer_id] === undefined)
-                    observers[observer_id] = [];
-                observers[observer_id].push(mutation);
+                if (mutationsToEmitByIdObserver[observer_id] === undefined)
+                    mutationsToEmitByIdObserver[observer_id] = [];
+                mutationsToEmitByIdObserver[observer_id].push(mutation);
             }
         }
 
-        // If mutation is swap type we should skip
-        if (mutation.swaps === undefined) {
+        // .observers_prop
+        if (mutation.swaps === undefined) { // If mutation is swaps type we should skip because does not have observers_prop and also the length never changes
             path_id += dop.core.pathSeparator(mutation.splice===undefined ? mutation.prop : 'length');
             if (data_path[path_id] !== undefined && data_path[path_id].observers_prop !== undefined) {
                 for (observer_id in data_path[path_id].observers_prop) {
-                    if (observers[observer_id] === undefined)
-                        observers[observer_id] = [];
+                    if (mutationsToEmitByIdObserver[observer_id] === undefined)
+                        mutationsToEmitByIdObserver[observer_id] = [];
                     // We have to check this because we dont want to duplicate
-                    if (observers[observer_id].indexOf(mutation) == -1)
-                        observers[observer_id].push(mutation);
+                    if (mutationsToEmitByIdObserver[observer_id].indexOf(mutation) == -1)
+                        mutationsToEmitByIdObserver[observer_id].push(mutation);
                 }
             }
         }
 
     }
 
     // Emiting
-    for (observer_id in observers)
-        dop.data.observers[observer_id].callback(observers[observer_id]);
+    for (observer_id in mutationsToEmitByIdObserver) {
+        var observer = dop.data.observers[observer_id];
+        if (observer !== undefined) // We need to make sure that the observer still exists, because maybe has been removed after calling previous observers
+            observer.callback(mutationsToEmitByIdObserver[observer_id]);
+    }
 
     return mutationsWithSubscribers;
 };

src/core/objects/storeMutation.js

@@ -41,7 +41,7 @@ dop.core.storeMutation = function(mutation) {
 dop.core.runInterceptors = function(interceptors, type, mutation) {
     if (interceptors && (interceptors=interceptors[type]) && interceptors.length>0)
         for (var index=0,total=interceptors.length; index<total; ++index)
-            if (interceptors[index](mutation) !== true)
+            if (interceptors[index](mutation, dop.getObjectTarget(mutation.object)) !== true)
                 return false;
 
     return true;

src/util/get.js

@@ -4,13 +4,15 @@ dop.util.get = function(object, path) {
     if (path.length === 0)
         return object;
 
-    for (var index=0, total=path.length; index<total; index++) {
+    for (var index=0, total=path.length, tmpobject; index<total; index++) {
 
-        if (index+1<total && isObject(object[ path[index] ]))
-            object = object[ path[index] ];
+        tmpobject = object[ path[index] ];
+
+        if (index+1<total && isObject(tmpobject))
+            object = tmpobject;
 
         else if (object.hasOwnProperty(path[index]))
-            return object[ path[index] ];
+            return tmpobject;
 
         else
             return undefined;

test/observers.js

@@ -57,3 +57,15 @@ test('mutations with createObserver', function(t) {
 })
 
 
+
+
+test('check swap mutation with createObserver', function(t) {
+    
+    var object = dop.register({array:[1,2,3]});
+    var observer = dop.createObserver(function first(mutations) {
+        t.equal(Array.isArray(mutations[0].swaps), true)
+        t.end()
+    });
+    observer.observe(object.array);
+    object.array.reverse()
+})