Changed integers for patch instructions (New object, Splice, Swap)

Author: Josema

.gitignore

@@ -16,4 +16,4 @@ npm-debug.log*
 
 # Files
 dist
-test*.*
+testing/

.npmignore

@@ -18,7 +18,7 @@ npm-debug.log*
 src/
 test/
 examples/
-test*.*
+testing/
 .editorconfig
 .travis.yml
 Gruntfile.js

package.json

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

src/protocol/instructions.js

@@ -23,24 +23,24 @@ dop.protocol.instructions = {
     // Sending the same request without parameters means a cancel/abort of the request
     // [1234]
 
-                        // Subscriptor -> Owner
+                        // Subscriber -> Owner
     subscribe: 1,       // [ 1234, <instruction>, <params...>]
                         // [-1234, 0, <object_id>, <data_object>]
                         // [-1234, 0, <object_id>, ['path']]
 
-                        // Subscriptor -> Owner
+                        // Subscriber -> Owner
     unsubscribe: 2,     // [ 1234, <instruction>, <object_id>]
                         // [-1234, 0]
 
-                        // Subscriptor -> Owner
-    call: 3,            // [ 1234, <instruction>, <object_id>, ['path','path'], [<params...>]]
+                        // Subscriber -> Owner
+    call: 3,            // [ 1234, <instruction>, <object_id>, ['path','subpath'], [<params...>]]
                         // [-1234, 0, <return>]
 
-                        // Owner -> Subscriptor
-    broadcast: 4,       // [ 1234, <instruction>, <object_id>, ['path','path'], [<params...>]]
+                        // Owner -> Subscriber
+    broadcast: 4,       // [ 1234, <instruction>, <object_id>, ['path','subpath'], [<params...>]]
                         // [-1234, 0, <return>]
 
-                        // Owner -> Subscriptor
+                        // Owner -> Subscriber
     patch: 5,           // [ 1234, <instruction>, <object_id>, <version>, <patch>]
                         // [-1234, 0]
 

src/protocol/instructionsPatchs.js

@@ -2,9 +2,9 @@
 dop.protocol.instructionsPatchs = {
     undefined: '~U', // Delete
     function: '~F', // Remote function
-    object: 2, // New object or array
-    splice: 3, // Splice array
-    swaps: 4, // Swap array
+    object: 0, // New object or array
+    splice: 1, // Splice array
+    swaps: 2, // Swap array
 
     // Non standards, only for JavaScript
     nan: '~N',

test/getpatchs.js

@@ -125,7 +125,7 @@ test(header+'Setting an array and mutating it', function(t) {
     var collector = dop.collect();
 
 
-    var patchExpected = [{"array":[2,["c","b",{"B1":"string"},false,true]]}];
+    var patchExpected = [{"array":[0,["c","b",{"B1":"string"},false,true]]}];
     var mutationsExpected = 5;
     set(object, 'array', [true,false]);
     object.array.push('a','b','c')
@@ -149,7 +149,7 @@ test(header+'Mutating array then mutating nested objects', function(t) {
     var collector = dop.collect();
 
 
-    var patchExpected = [{"array":[4,[0,1]]},{"array":{"2":[2,{"B1":false}],"length":3}}];
+    var patchExpected = [{"array":[2,[0,1]]},{"array":{"2":[0,{"B1":false}],"length":3}}];
     var mutationsExpected = 3;
     object.array.reverse();
     set(object.array, 2, {B1:false});
@@ -170,7 +170,7 @@ test(header+'Mutating nested objects then mutating parent array', function(t) {
     var collector = dop.collect();
 
 
-    var patchExpected = [{"array":{"2":[2,{"B1":false}],"length":3}},{"array":[4,[0,2]]}];
+    var patchExpected = [{"array":{"2":[0,{"B1":false}],"length":3}},{"array":[2,[0,2]]}];
     var mutationsExpected = 3;
     set(object.array, 2, {B1:false});
     object.array.reverse();
@@ -191,7 +191,7 @@ test(header+'Mutating array twice', function(t) {
     var collector = dop.collect();
 
 
-    var patchExpected = [{"array":[[3,[3,0,5,4,6]],[4,[0,1,1,2,3,4]]]}];
+    var patchExpected = [{"array":[[1,[3,0,5,4,6]],[2,[0,1,1,2,3,4]]]}];
     var mutationsExpected = 2;
     object.array.push(5,4,6);
     object.array.sort();
@@ -211,7 +211,7 @@ test(header+'Mutating array and mutating array deeper', function(t) {
     var collector = dop.collect();
 
 
-    var patchExpected = [{"array":[4,[0,2]]},{"array":{"0":[4,[0,1]]}}];
+    var patchExpected = [{"array":[2,[0,2]]},{"array":{"0":[2,[0,1]]}}];
     var mutationsExpected = 2;
     object.array.reverse();
     object.array[0].reverse();
@@ -230,7 +230,7 @@ test(header+'Mutating array deeper and mutating container', function(t) {
     var collector = dop.collect();
 
 
-    var patchExpected = [{"array":{"2":[4,[0,1]]}},{"array":[4,[0,2]]}];
+    var patchExpected = [{"array":{"2":[2,[0,1]]}},{"array":[2,[0,2]]}];
     var mutationsExpected = 2;
     object.array[2].reverse();
     object.array.reverse();

test/getunpatchs.js

@@ -130,7 +130,7 @@ test(header+'Setting an array and mutating it', function(t) {
     var collector = dop.collect();
 
 
-    var patchExpected = [{"array":[4,[2,0]]},{"array":undefined}];
+    var patchExpected = [{"array":[2,[2,0]]},{"array":undefined}];
     var mutationsExpected = 4;
     set(object, 'array', [true,false]);
     set(object.array, 2, {B1:[true,false]});
@@ -152,7 +152,7 @@ test(header+'Mutating array then mutating nested objects', function(t) {
     var collector = dop.collect();
 
 
-    var patchExpected = [{"array":{"2":undefined,"length":2}},{"array":[4,[1,0]]}];
+    var patchExpected = [{"array":{"2":undefined,"length":2}},{"array":[2,[1,0]]}];
     var mutationsExpected = 3;
     object.array.reverse();
     set(object.array, 2, {B1:false});
@@ -173,7 +173,7 @@ test(header+'Mutating nested objects then mutating parent array', function(t) {
     var collector = dop.collect();
 
 
-    var patchExpected = [{"array":[4,[2,0]]},{"array":{"2":undefined,"length":2}}];
+    var patchExpected = [{"array":[2,[2,0]]},{"array":{"2":undefined,"length":2}}];
     var mutationsExpected = 3;
     set(object.array, 2, {B1:false});
     object.array.reverse();
@@ -194,7 +194,7 @@ test(header+'Mutating array twice', function(t) {
     var collector = dop.collect();
 
 
-    var patchExpected = [{"array":[[4,[4,3,2,1,1,0]],[3,[3,3]]]}];
+    var patchExpected = [{"array":[[2,[4,3,2,1,1,0]],[1,[3,3]]]}];
     var mutationsExpected = 2;
     object.array.push(5,4,6);
     object.array.sort();
@@ -213,7 +213,7 @@ test(header+'Mutating array and mutating array deeper', function(t) {
     var collector = dop.collect();
 
 
-    var patchExpected = [{"array":{"0":[4,[1,0]]}},{"array":[4,[2,0]]}];
+    var patchExpected = [{"array":{"0":[2,[1,0]]}},{"array":[2,[2,0]]}];
     var mutationsExpected = 2;
     object.array.reverse();
     object.array[0].reverse();
@@ -232,7 +232,7 @@ test(header+'Mutating array deeper and mutating container', function(t) {
     var collector = dop.collect();
 
 
-    var patchExpected = [{"array":[4,[2,0]]},{"array":{"2":[4,[1,0]]}}];
+    var patchExpected = [{"array":[2,[2,0]]},{"array":{"2":[2,[1,0]]}}];
     var mutationsExpected = 2;
     object.array[2].reverse();
     object.array.reverse();