1 files changed, 277 insertions, 75 deletions

diff --git a/node_modules/montage/core/deserializer.js b/node_modules/montage/core/deserializer.js
index 7e812235..b8ed5618 100755
--- a/node_modules/montage/core/deserializer.js
+++ b/node_modules/montage/core/deserializer.js
@@ -98,6 +98,26 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
     }},
 
     /**
+     Initializes the deserializer with a string
+     @param {String|Object} serialization A string or JSON-style object
+     describing the serialized objects.
+     @param {Function} require The module loader for the containing package.
+     @param {String} origin Usually a file name.
+     */
+    init: {
+        value: function (serialization, require, origin) {
+            if (typeof serialization !== "string") {
+                serialization = JSON.stringify(serialization);
+            }
+            this._reset();
+            this._serializationString = serialization;
+            this._require = require;
+            this._origin = origin;
+            return this;
+        }
+    },
+
+    /**
      Initializes the deserializer with a string of serialized objects.
      @function
      @param {String} string A string of serialized objects.
@@ -122,6 +142,14 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
         return this;
     }},
 
+    initWithObjectAndRequire: {value: function(string, require, origin) {
+        this._reset();
+        this._serializationString = JSON.stringify(object);
+        this._require = require;
+        this._origin = origin;
+        return this;
+    }},
+
     /**
      Initializes the deserializer object with a serialization string and the require object used to load the modules containing the object's prototypes.
      @function
@@ -168,8 +196,37 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
 
         return objectsArray;
     }},
+
+    chainDeserializer: {
+        value: function(deserializer) {
+            var chainedSerializations = this._chainedSerializations,
+                optimizedIds, chainedOptimizedIds;
+
+            if (!chainedSerializations) {
+                this._chainedSerializations = chainedSerializations = [];
+            }
+
+            chainedSerializations.push({
+                string: deserializer._serializationString,
+                compiledFunction: deserializer._compiledDeserializationFunction,
+                compiledFunctionString: deserializer._compiledDeserializationFunctionString
+            });
+
+            // need to copy the optimized ids too, ideally all chained templates are optimized for the same document
+            chainedOptimizedIds = deserializer._optimizedIds;
+            if (chainedOptimizedIds) {
+                if (!optimizedIds) {
+                    this._optimizedIds = optimizedIds = {};
+                }
+                for (var id in chainedOptimizedIds) {
+                    optimizedIds[id] = chainedOptimizedIds[id];
+                }
+            }
+        }
+    },
+
     /**
-     This function is to be used in the context of deserializeSelf delegate used for custom object deserializations.
+     This function is to be used in the context of deserializeProperties delegate used for custom object deserializations.
      It reads an entry from the "properties" serialization unit of the object being deserialized.
      @function
      @param {string} name The name of the entry to be read.
@@ -182,8 +239,93 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
         return stack[ix][name];
     }},
 
+    deserializeProperties: {
+        value: function() {
+            var stack = this._objectStack,
+                ix = stack.length - 1,
+                object = stack[ix-1],
+                desc = stack[ix];
+
+            this._deserializeProperties(object, desc.properties);
+        }
+    },
+
+    getProperty: {
+        value: function(name) {
+            var stack = this._objectStack,
+                ix = stack.length - 1,
+                desc = stack[ix];
+
+            return desc.properties[name];
+        }
+    },
+
+    deserializeUnits: {
+        value: function() {
+            var stack = this._objectStack,
+                ix = stack.length - 1,
+                desc = stack[ix];
+
+            desc._units = this._indexedDeserializationUnits;
+        }
+    },
+
+    deserializeUnit: {
+        value: function(name) {
+            var stack = this._objectStack,
+                ix = stack.length - 1,
+                desc = stack[ix],
+                units;
+
+            if (desc._units) {
+                units = desc._units;
+            } else {
+                desc._units = units = {};
+            }
+
+            units[name] = this._indexedDeserializationUnits[name];
+        }
+    },
+
+    getType: {
+        value: function() {
+            var stack = this._objectStack,
+                ix = stack.length - 1,
+                desc = stack[ix];
+
+            return "object" in desc ? "object" : ("prototype" in desc ? "prototype" : null);
+        }
+    },
+
+    getTypeValue: {
+        value: function() {
+            var stack = this._objectStack,
+                ix = stack.length - 1,
+                desc = stack[ix];
+
+            return desc.object || desc.prototype;
+        }
+    },
+
+    getObjectByLabel: {
+        value: function(label) {
+            return this._objects[label] || this._objectLabels[label];
+        }
+    },
+
+    _customDeserialization: {
+        enumerable: false,
+        value: function(object, desc) {
+            this._pushContextObject(object);
+            this._pushContextObject(desc);
+            object.deserializeSelf(this);
+            this._popContextObject();
+            this._popContextObject();
+        }
+    },
+
     /**
-    This function is to be used in the context of deserializeSelf delegate used for custom object deserializations.
+    This function is to be used in the context of deserializeProperties delegate used for custom object deserializations.
      It deserializes all the named properties of a serialized object into the object given.
     @function
     @param {Object} object The target of the properties.
@@ -383,7 +525,7 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
         var serialization = this._serialization,
             moduleIds = this._requiredModuleIds = [],
             modules = this._modules,
-            desc, moduleId;
+            desc, moduleId, name, objectLocation;
 
         for (var label in serialization) {
             desc = serialization[label];
@@ -391,7 +533,8 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
 
             if ("module" in desc) {
                 moduleId = desc.module;
-            } else if (name = /*assignment*/(desc.prototype || desc.object)) {
+            } else if ("prototype" in desc || "object" in desc) {
+                name = desc.prototype || desc.object
                 objectLocation = name.split("[");
                 moduleId = objectLocation[0];
                 desc.module = moduleId;
@@ -437,24 +580,30 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
         }
     },
 
+    _labelRegexp: {
+        enumerable: false,
+        value: /^[a-zA-Z_$][0-9a-zA-Z_$]*$/
+    },
+
 /**
   @private
 */
-    _compileAndDeserialize: {value: function(element, deserialize) {
+    _compileAndDeserialize: {value: function(element, serialization, exports, deserialize) {
         var self = this,
-            serialization,