Not using multiEncode composer anymore

Author: Josema

src/api/encode.js

@@ -1,12 +1,6 @@
 
-dop.encode = (function(data, encoder) {
-    var encoderCache
-    return function(data, encoder) {
-        if (typeof encoder != 'function') {
-            if (encoderCache === undefined)
-                encoderCache = dop.core.multiEncode(dop.core.encodeSpecial, dop.core.encodeProtocol, dop.core.encodeUtil);
-            encoder = encoderCache;
-        }
-        return JSON.stringify(data, encoder);
-    }
-})();
+dop.encode = function(data, encoder) {
+    if (typeof encoder != 'function')
+        encoder = dop.core.encode;
+    return JSON.stringify(data, encoder);
+};

src/core/protocol/decode.js

@@ -9,9 +9,8 @@ dop.core.decode = function(property, value, node, undefineds) {
             return dop.core.createRemoteFunction(node);
 
         if (value == '~U' && isObject(undefineds)) {
-            this[property] = undefined;
-            // undefineds.push([this, property]); // http://stackoverflow.com/questions/17648150/how-does-json-parse-manage-undefined
-            // return undefined;
+            undefineds.push([this, property]); // http://stackoverflow.com/questions/17648150/how-does-json-parse-manage-undefined
+            return undefined;
         }
 
         if (value === '~I')

src/core/protocol/encodeUtil.js src/core/protocol/encode.jssrc/core/protocol/encodeUtil.js renamed to src/core/protocol/encode.js

@@ -1,20 +1,26 @@
 
-dop.core.encodeUtil = function(property, value) {
+dop.core.encode = function(property, value) {
 
     var tof = typeof value;
 
-    if (value === Infinity)
-        return '~I';
+    if (tof == 'undefined') // http://stackoverflow.com/questions/17648150/how-does-json-parse-manage-undefined
+        return '~U';
 
-    if (value === -Infinity)
-        return '~i';
+    if (tof == 'string' && value[0] == '~')
+        return '~'+value;
 
     if (tof == 'number' && isNaN(value))
         return '~N';
 
     if (tof == 'object' && value instanceof RegExp)
         return '~R' + value.toString();
 
+    if (value === Infinity)
+        return '~I';
+
+    if (value === -Infinity)
+        return '~i';
+
     return value;
 };
 

src/core/protocol/encodeFunction.js

@@ -0,0 +1,4 @@
+
+dop.core.encodeFunction = function(property, value) {
+    return (isFunction(value)) ? '~F' : dop.core.encode(property, value);
+};

src/core/protocol/encodeProtocol.js

@@ -1,15 +1,15 @@
 
-dop.core.multiEncode = function() {
-    var encoders = arguments,
-        length = encoders.length, v;
-    return function recursion(property, value, index) {
-        if (index>=length)
-            return value;
-        else if (index === undefined) {
-            v = value;
-            index = 0;
-        }
-        v = encoders[index](property, value);
-        return (v!==value) ? v : recursion(property, value, index+1);
-    }
-};
+// dop.core.multiEncode = function() {
+//     var encoders = arguments,
+//         length = encoders.length, v;
+//     return function recursion(property, value, index) {
+//         if (index>=length)
+//             return value;
+//         else if (index === undefined) {
+//             v = value;
+//             index = 0;
+//         }
+//         v = encoders[index](property, value);
+//         return (v!==value) ? v : recursion(property, value, index+1);
+//     }
+// };

src/core/protocol/encodeSpecial.js

@@ -27,9 +27,9 @@ test('Multiple data', function(t) {
     var encoded = dop.encode(data);
     var decoded = dop.decode(encoded);
     t.deepEqual(decoded, data, 'deepEqual');
-    data.NaN = NaN;
+    // data.NaN = NaN;
     data.function = function(){};
-    decoded = dop.decode(dop.encode(data));
+    decoded = dop.decode(dop.encode(data, dop.core.encodeFunction));
     t.equal(JSON.stringify(decoded), JSON.stringify(data), 'Stringify');
     t.equal(typeof decoded.function, 'function', 'Has function');
     // console.log( decoded);