Fix serializing objects into strings

Closes #63
canjs · Oct 13, 2017 · 65a22c9 · 65a22c9
1 parent 38cc6fa
commit 65a22c9
Showing 1 changed file with 30 additions and 3 deletions.
diff --git a/reflections/shape/shape.js b/reflections/shape/shape.js
@@ -63,7 +63,15 @@ function makeSerializer(methodName, symbolsToCheck){
 		if(MapType && !serializeMap) {
 			serializeMap = {
 				unwrap: new MapType(),
-				serialize: new MapType()
+				serialize: new MapType(),
+				isSerializing: {
+					unwrap: new MapType(),
+					serialize: new MapType()
+				},
+				circularReferenceIsSerializing: {
+					unwrap: new MapType(),
+					serialize: new MapType()
+				}
 			};
 			firstSerialize = true;
 		}
@@ -83,6 +91,9 @@ function makeSerializer(methodName, symbolsToCheck){
 			if(serializeMap) {
 
 				if( serializeMap[methodName].has(value) ) {
+					if(serializeMap.isSerializing[methodName].has(value)) {
+						serializeMap.circularReferenceIsSerializing[methodName].set(value, true);
+					}
 					return serializeMap[methodName].get(value);
 				} else {
 					serializeMap[methodName].set(value, serialized);
@@ -92,15 +103,31 @@ function makeSerializer(methodName, symbolsToCheck){
 			for(var i = 0, len = symbolsToCheck.length ; i< len;i++) {
 				var serializer = value[symbolsToCheck[i]];
 				if(serializer) {
-					var result =  serializer.call(value, serialized);
+					serializeMap.isSerializing[methodName].set(value, true);
+					var result = serializer.call(value, serialized);
+					serializeMap.isSerializing[methodName].delete(value);
+
+					if(result !== serialized) {
+						// jshint -W073
+						if(serializeMap.circularReferenceIsSerializing[methodName].has(value)) {
+							// Circular references should use a custom serializer
+							// that sets the serialized value on the object
+							// passed to it as the first argument e.g.
+							// function(proto){
+							//   return proto.a = canReflect.serialize(this.a);
+							// }
+							throw new Error("Cannot serialize cirular reference!");
+						}
+						serializeMap[methodName].set(value, result);
+					}
 					if(firstSerialize) {
 						serializeMap = null;
 					}
 					return result;
 				}
 			}
 
-			if (typeof obj ==='function') {
+			if (typeof obj === "function") {
 				if(serializeMap) {
 					serializeMap[methodName].set(value, value);
 				}