Changed protocol for array mutations. Now swap and splice are represented with 0 or 1 instead of negative value for swaps

Author: Josema

src/core/objects/injectMutationInAction.js

@@ -41,8 +41,9 @@ dop.core.injectMutationInAction = function(action, mutation, isUnaction) {
             var swaps = mutation.swaps.slice(0);
             if (isUnaction)
                 swaps.reverse();
-            var tochange = (swaps[0]>0) ? 0 : 1;
-            swaps[tochange] = swaps[tochange]*-1;
+            // var tochange = (swaps[0]>0) ? 0 : 1;
+            // swaps[tochange] = swaps[tochange]*-1;
+            swaps.unshift(0); // 0 mean swap
             mutations.push(swaps);
         }
 
@@ -55,14 +56,16 @@ dop.core.injectMutationInAction = function(action, mutation, isUnaction) {
             }
             else
                 splice = mutation.splice.slice(0);
-                
+            
+            splice.unshift(1); // 1 mean splice
             mutations.push(splice);
         }
 
         // set
         else
-            mutations.push([prop, 1, value]);
+            mutations.push([1, prop, 1, value]);
 
+        // We have to update the length of the array in case that is lower than before
         if (isUnaction && mutation.length!==undefined && mutation.length!==mutation.object.length)
             action.length = mutation.length;
     }

src/core/objects/setActionMutator.js

@@ -11,21 +11,24 @@ dop.core.setActionMutator = function(destiny, prop, value, typeofValue, path) {
             var mutations = value[dop.cons.DOP],
                 mutation,
                 index=0,
-                total=mutations.length;
+                total=mutations.length,
+                typeArrayMutation;
 
             // if (typeofDestiny!='array')
             //     dop.set(destiny, prop, []);
 
             for (;index<total; ++index) {
-                mutation = mutations[index];
-                // swaps
-                if (mutation[0]<0 || mutation[1]<0) {
-                    mutation = mutation.slice(0);
-                    (mutation[0]<0) ? mutation[0] = mutation[0]*-1 : mutation[1] = mutation[1]*-1;
+                typeArrayMutation = mutations[index][0]; // 0=swaps 1=splices
+                mutation = mutations[index].slice(1);
+                // swap
+                if (typeArrayMutation===0) {
+                    // mutation = mutation.slice(0);
+                    // (mutation[0]<0) ? mutation[0] = mutation[0]*-1 : mutation[1] = mutation[1]*-1;
                     dop.core.swap(destiny[prop], mutation);
                 }
                 // set
                 else {
+                    // We have to update the length of the array in case that is lower than before
                     if (destiny[prop].length<mutation[0])
                         dop.getObjectTarget(destiny[prop]).length = mutation[0];
                     // set

test/getactions.js

@@ -264,7 +264,7 @@ test('Setting an array and pushing changes', function(t) {
 
 
 test('Pushing an item', function(t) {
-    var actionExpected = {one:{"~DOP":[[4,0,7]]}};
+    var actionExpected = {one:{"~DOP":[[1,4,0,7]]}};
     var mutationsExpected = 1;
 
     var collector = dop.collect();
@@ -278,7 +278,7 @@ test('Pushing an item', function(t) {
 
 
 test('Setting an item of array', function(t) {
-    var actionExpected = {one:{"~DOP":[[1,1,'DOS']]}};
+    var actionExpected = {one:{"~DOP":[[1,1,1,'DOS']]}};
     var mutationsExpected = 1;
 
     var collector = dop.collect();
@@ -290,7 +290,7 @@ test('Setting an item of array', function(t) {
 
 
 test('Setting a subobject into an array', function(t) {
-    var actionExpected = {"one":{"2":{"~DOP":[[2,1,{}]]}}};
+    var actionExpected = {"one":{"2":{"~DOP":[[1,2,1,{}]]}}};
     var mutationsExpected = 1;
 
     var collector = dop.collect();
@@ -325,7 +325,7 @@ test('Setting a property of a subobject that is into an array', function(t) {
 
 
 test('Pushing an item of a subarray that is into an array', function(t) {
-    var actionExpected = {"one":{"2":{"2":{"array":{"~DOP":[[1,0,"xD"]]}}}}};
+    var actionExpected = {"one":{"2":{"2":{"array":{"~DOP":[[1,1,0,"xD"]]}}}}};
     var mutationsExpected = 1;
 
     var collector = dop.collect();
@@ -349,7 +349,7 @@ test('Setting a array internaly', function(t) {
 
 
 test('Pushing items and changing properties internaly', function(t) {
-    var actionExpected = {one:{3:{2:{array:{"~DOP":[[2,1,"juas"],[3,0,"omg"]]}}},"~DOP":[[5,0,"omg"],[0,-5,1,4,2,3]]},two:undefined};
+    var actionExpected = {one:{3:{2:{array:{"~DOP":[[1,2,1,"juas"],[1,3,0,"omg"]]}}},"~DOP":[[1,5,0,"omg"],[0,0,5,1,4,2,3]]},two:undefined};
     var mutationsExpected = 5;
 
     var collector = dop.collect();
@@ -374,7 +374,7 @@ test('Pushing items and changing properties internaly', function(t) {
 
 
 test('Setting a property literaly', function(t) {
-    var actionExpected = {"~DOP":[[0,1,"testing"]]};
+    var actionExpected = {"~DOP":[[1,0,1,"testing"]]};
     var mutationsExpected = 1;
 
     var collector = dop.collect();
@@ -386,7 +386,7 @@ test('Setting a property literaly', function(t) {
 
 
 test('Pushing a property', function(t) {
-    var actionExpected = {"~DOP":[[1,0,"second"]]};
+    var actionExpected = {"~DOP":[[1,1,0,"second"]]};
     var mutationsExpected = 1;
 
     var collector = dop.collect();
@@ -397,7 +397,7 @@ test('Pushing a property', function(t) {
 });
 
 test('Adding a subobject', function(t) {
-    var actionExpected = {"~DOP":[[2,0,{"obj":123}]]};
+    var actionExpected = {"~DOP":[[1,2,0,{"obj":123}]]};
     var mutationsExpected = 1;
 
     var collector = dop.collect();
@@ -409,7 +409,7 @@ test('Adding a subobject', function(t) {
 
 
 test('Shift and editing subobject', function(t) {
-    var actionExpected = {"1":{"prop":456},"~DOP":[[0,1]]};
+    var actionExpected = {"1":{"prop":456},"~DOP":[[1,0,1]]};
     var mutationsExpected = 2;
 
     var collector = dop.collect();
@@ -423,7 +423,7 @@ test('Shift and editing subobject', function(t) {
 
 
 test('Pushing literal arrays', function(t) {
-    var actionExpected = {"1":{"prop":["my","array"]},"~DOP":[[2,0,[7,8,[9,10]],11],[0,1,"first"]]};
+    var actionExpected = {"1":{"prop":["my","array"]},"~DOP":[[1,2,0,[7,8,[9,10]],11],[1,0,1,"first"]]};
     var mutationsExpected = 3;
 
     var collector = dop.collect();