1 files changed, 262 insertions, 66 deletions

diff --git a/node_modules/montage/core/serializer.js b/node_modules/montage/core/serializer.js
index 28f1b1d8..74080770 100755
--- a/node_modules/montage/core/serializer.js
+++ b/node_modules/montage/core/serializer.js
@@ -28,7 +28,7 @@ if (typeof window !== "undefined") {
  */
 var Serializer = Montage.create(Montage, /** @lends module:montage/serializer.Serializer# */ {
     _MONTAGE_ID_ATTRIBUTE: {value: "data-montage-id"},
-    _serializedObjects: {value: {}}, // uuid -> string
+    _serializedObjects: {value: {}}, // label -> string
     _serializedReferences: {value: {}}, // uuid -> string
     _externalObjects: {value: null}, // label -> object
     _externalElements: {value: null},
@@ -38,6 +38,7 @@ var Serializer = Montage.create(Montage, /** @lends module:montage/serializer.Se
     _objectNamesIndex: {value: null},
     _objectLabels: {value: null}, // uuid -> label
     _serializationUnits: {value: []},
+    _serializationUnitsIndex: {value: {}},
 
     serializeNullValues: {value: false},
 
@@ -48,7 +49,7 @@ var Serializer = Montage.create(Montage, /** @lends module:montage/serializer.Se
      @param {function} funktion The delegate function that creates the serialization unit. This function accepts the object being serialized as an argument and should return an object to be be JSON'd.
      */
     defineSerializationUnit: {value: function(name, funktion) {
-        this._serializationUnits.push({
+        this._serializationUnits.push(this._serializationUnitsIndex[name] = {
             name: name,
             funktion: funktion
         });
@@ -120,61 +121,117 @@ var Serializer = Montage.create(Montage, /** @lends module:montage/serializer.Se
     },
 
     /**
-     This function is to be used in the context of serializeSelf delegate used for custom object serializations.
+     This function is to be used in the context of serializeProperties delegate used for custom object serializations.
      It adds an entry to the "properties" serialization unit of the object being serialized.
      @function
      @param {string} name The name of the entry to be added.
      @param {string} value The value to be serialized.
      */
-    set: {value: function(name, value) {
-        var stack = this._objectStack;
-
-        return (stack[stack.length - 1][name] = value);
-    }},
-
-    /**
-     This function is to be used in the context of serializeSelf delegate used for custom object serializations.
-     It adds an entry to the "properties" serialization unit of the object being serialized. The value for this entry will be stored as a reference only and not the value itself.
-     @function
-     @param {string} name The name of the entry to be added.
-     @param {string} value The value to be referenced.
-     */
-    setReference: {value: function(name, value) {
+    set: {value: function(name, value, type) {
         var stack = this._objectStack,
             stackElement = stack[stack.length - 1],
-            objectReferences = this._objectReferences,
-            uuid = stackElement.uuid;
+            objectReferences, uuid;
 
-        if (!(uuid in objectReferences)) {
-            objectReferences[uuid] = {};
+        stackElement[name] = value;
+        if (type === "reference") {
+            uuid = stackElement.uuid;
+            objectReferences = this._objectReferences;
+            if (!(uuid in objectReferences)) {
+                objectReferences[uuid] = {};
+            }
             objectReferences[uuid][name] = true;
         }
-
-        return (stackElement[name] = value);
     }},
 
     /**
-     This function is to be used in the context of serializeSelf delegate used for custom object serializations.
+     This function is to be used in the context of serializeProperties delegate used for custom object serializations.
      It serializes all properties specified as part of the "properties" serialization unit.
      @function
      @param {array} propertyNames The array with the property names to be serialized.
      */
-    setProperties: {value: function(propertyNames) {
+    setAll: {value: function(propertyNames) {
         var ix = this._objectStack.length - 2,
             object = this._objectStack[ix];
 
+        if (!propertyNames) {
+            propertyNames = Montage.getSerializablePropertyNames(object);
+        }
+
         for (var i = 0, l = propertyNames.length; i < l; i++) {
             var propertyName = propertyNames[i];
-            if (Montage.getPropertyAttribute(object, propertyName, "serializable") === "reference") {
-                this.setReference(propertyName, object[propertyName]);
-            } else {
-                this.set(propertyName, object[propertyName]);
+            this.set(propertyName, object[propertyName], Montage.getPropertyAttribute(object, propertyName, "serializable"));
+        }
+    }},
+
+    setProperty: {
+        value: function(name, value, type) {
+            var stack = this._objectStack,
+                stackElement = stack[stack.length - 1],
+                objectReferences, uuid;
+
+            stackElement.properties[name] = value;
+            if (type === "reference") {
+                objectReferences = this._objectReferences,
+                uuid = stackElement.properties.uuid;
+                if (!(uuid in objectReferences)) {
+                    objectReferences[uuid] = {};
+                }
+                objectReferences[uuid][name] = true;
             }
         }
+    },
+
+    setProperties: {value: function(propertyNames) {
+        var ix = this._objectStack.length - 2,
+            object = this._objectStack[ix];
+
+        if (!propertyNames) {
+            propertyNames = Montage.getSerializablePropertyNames(object);
+        }
+
+        for (var i = 0, l = propertyNames.length; i < l; i++) {
+            var propertyName = propertyNames[i];
+            this.setProperty(propertyName, object[propertyName], Montage.getPropertyAttribute(object, propertyName, "serializable"));
+        }
     }},
 
+    setType: {
+        value: function(type, value) {
+            if (type === "object" || type === "prototype" || type === "value") {
+                var stack = this._objectStack,
+                stackElement = stack[stack.length - 1];
+
+                delete stackElement.prototype;
+                delete stackElement.object;
+                delete stackElement.value;
+                stackElement[type] = value;
+            }
+        }
+    },
+
+    setUnit: {
+        value: function(name) {
+            var stack = this._objectStack,
+                stackElement = stack[stack.length - 1];
+
+            if (stackElement._units.indexOf(name) === -1) {
+                stackElement._units.push(this._serializationUnitsIndex[name]);
+            }
+        }
+    },
+
+    setAllUnits: {
+        value: function() {
+            var stack = this._objectStack,
+                stackElement = stack[stack.length - 1];
+
+            stackElement._units.length = 0;
+            stackElement._units.push.apply(stackElement._units, this._serializationUnits);
+        }
+    },
+
     /**
-     This function is to be used in the context of serializeSelf delegate used for custom object serializations.
+     This function is to be used in the context of serializeProperties delegate used for custom object serializations.
      It adds an object to be serialized into the current serialization.
      @function
      @param {object} object The object to be serialized.
@@ -188,6 +245,23 @@ var Serializer = Montage.create(Montage, /** @lends module:montage/serializer.Se
         }
     }},
 
+    addObjectReference: {
+        value: function(object) {
+            var label = this._getObjectLabel(object);
+
+            if (!this._serializedObjects[label]) {
+                this._externalObjects[label] = object;
+            }
+            return {"@": label};
+        }
+    },
+
+    getObjectLabel: {
+        value: function(object) {
+            return this._getObjectLabel(object);
+        }
+    },
+
     /**
      @private
      */
@@ -216,7 +290,7 @@ var Serializer = Montage.create(Montage, /** @lends module:montage/serializer.Se
 
         for (var label in externalObjects) {
             var object = externalObjects[label];