Backend-for-Montage support

core/core.js

@@ -422,7 +422,7 @@ valuePropertyDescriptor.value = function Montage_defineProperty(obj, prop, descr
         if (! (typeof obj === "object" || typeof obj === FUNCTION) || obj === null) {
             throw new TypeError("Object must be an object, not '" + obj + "'");
         }
-        
+
         var isValueDescriptor = (VALUE in descriptor);
 
         // reset defaults appropriately for framework.

core/criteria.js

@@ -44,7 +44,10 @@ var Criteria = exports.Criteria = Montage.specialize({
      */
    syntax: {
         get: function() {
-            return this._syntax || (this._syntax = parse(this._expression));
+            if (!this._syntax && this.expression) {
+                this._syntax = parse(this.expression);
+            }
+            return this._syntax;
         }
     },
     _compiledSyntax: {
@@ -121,7 +124,14 @@ var Criteria = exports.Criteria = Montage.specialize({
 
     serializeSelf: {
         value: function (serializer) {
-            serializer.setProperty("expression", this._expression || (this._expression = stringify(this.syntax)));
+            // serializer.setProperty("expression", this._expression || (this._expression = stringify(this.syntax)));
+            if (this._expression) {
+                serializer.setProperty("expression", this._expression);
+            } else if (this.syntax) {
+                serializer.setProperty("expression", (this._expression = stringify(this.syntax)));
+            } else {
+                serializer.setProperty("expression", "");
+            }
             serializer.setProperty("parameters", this.parameters);
         }
     },

core/deprecate.js

@@ -1,5 +1,5 @@
 /* global console */
-var Montage = require("./core").Montage;
+var Montage = require("./core").Montage,
     Map = require("collections/map");
 
 var deprecatedFeaturesOnceMap = new Map();

core/meta/property-descriptor.js

@@ -103,7 +103,7 @@ exports.PropertyDescriptor = Montage.specialize( /** @lends PropertyDescriptor#
             this._setPropertyWithDefaults(serializer, "collectionValueType", this.collectionValueType);
             this._setPropertyWithDefaults(serializer, "valueObjectPrototypeName", this.valueObjectPrototypeName);
             this._setPropertyWithDefaults(serializer, "valueObjectModuleId", this.valueObjectModuleId);
-            this._setPropertyWithDefaults(serializer, "valueDescriptor", this._valueDescriptorReference);
+            this._setPropertyWithDefaults(serializer, "valueDescriptor", this._valueDescriptor || this._valueDescriptorReference);
             if (this.enumValues.length > 0) {
                 this._setPropertyWithDefaults(serializer, "enumValues", this.enumValues);
             }
@@ -125,12 +125,17 @@ exports.PropertyDescriptor = Montage.specialize( /** @lends PropertyDescriptor#
             if (value !== void 0) {
                 this._owner = value;
             }
-            
+
             this._overridePropertyWithDefaults(deserializer, "cardinality");
-            
+
             if (this.cardinality === -1) {
                 this.cardinality = Infinity;
             }
+
+            value = deserializer.getProperty("isDerived");
+            if (value !== void 0) {
+                this._isDerived = value;
+            }
 
             this._overridePropertyWithDefaults(deserializer, "mandatory");
             this._overridePropertyWithDefaults(deserializer, "readOnly");
@@ -139,7 +144,7 @@ exports.PropertyDescriptor = Montage.specialize( /** @lends PropertyDescriptor#
             this._overridePropertyWithDefaults(deserializer, "collectionValueType");
             this._overridePropertyWithDefaults(deserializer, "valueObjectPrototypeName");
             this._overridePropertyWithDefaults(deserializer, "valueObjectModuleId");
-            this._overridePropertyWithDefaults(deserializer, "_valueDescriptorReference", "valueDescriptor", "targetBlueprint");
+            this._overridePropertyWithDefaults(deserializer, "valueDescriptor", "valueDescriptor", "targetBlueprint");
             this._overridePropertyWithDefaults(deserializer, "enumValues");
             this._overridePropertyWithDefaults(deserializer, "defaultValue");
             this._overridePropertyWithDefaults(deserializer, "helpKey");
@@ -303,7 +308,7 @@ exports.PropertyDescriptor = Montage.specialize( /** @lends PropertyDescriptor#
      */
     isDerived: {
         get: function () {
-            return false;
+            return this._isDerived || false;
         }
     },
 
@@ -363,14 +368,30 @@ exports.PropertyDescriptor = Montage.specialize( /** @lends PropertyDescriptor#
      */
     valueDescriptor: {
         serializable: false,
+        get: function () {
+            // TODO: Needed for backwards compatibility with ObjectDescriptorReference.
+            // Remove eventually, this can become completely sync
+            if (this._valueDescriptor && typeof this._valueDescriptor.promise === "function") {
+                deprecate.deprecationWarningOnce("valueDescriptor reference via ObjectDescriptorReference", "direct reference via object syntax");
+                return this._valueDescriptor.promise(this.require);
+            } else {
+                return this._valueDescriptor;
+            }
+        },
+        set: function (descriptor) {
+            this._valueDescriptor = descriptor;
+        }
+    },
+
+    valueDescriptorReference: {
         get: function () {
             // TODO: Needed for backwards compatibility with ObjectDescriptorReference.
             // Remove eventually, this can become completely sync
             if (this._valueDescriptorReference && typeof this._valueDescriptorReference.promise === "function") {
                 deprecate.deprecationWarningOnce("valueDescriptor reference via ObjectDescriptorReference", "direct reference via object syntax");
                 return this._valueDescriptorReference.promise(this.require);
             } else {
-                return this._valueDescriptorReference && Promise.resolve(this._valueDescriptorReference);
+                return this._valueDescriptor && Promise.resolve(this._valueDescriptor);
             }
         },
         set: function (descriptor) {

core/serialization/deserializer/montage-reviver.js

@@ -68,8 +68,10 @@ var ModuleLoader = Montage.specialize({
                 moduleDescriptor = _require.getModuleDescriptor(module.redirect);
             }
 
+
+
             if (moduleDescriptor.mappingRedirect !== void 0) {
-                return this.getExports(
+                return this.getModuleDescriptor(
                     moduleDescriptor.mappingRequire,
                     moduleDescriptor.mappingRedirect
                 );

core/serialization/deserializer/self-deserializer.js

@@ -26,6 +26,12 @@ var SelfDeserializer = Montage.specialize( {
     },
 
     getProperty: {
+        value: deprecate.deprecateMethod(void 0, function (name) {
+            return this.getValue(name);
+        }, "getProperty", "getValue", true)
+    },
+
+    getValue: {
         value: function (name) {
             if (this._objectDescriptor.values) {
                 return this._objectDescriptor.values[name];

core/serialization/serializer/montage-visitor.js

@@ -128,6 +128,7 @@ var MontageVisitor = Montage.specialize({
             var builderObject = this.builder.createCustomObject(),
                 substituteObject;
 
+
             this.setObjectSerialization(object, builderObject);
 
             substituteObject = this.serializeMontageObject(malker, object, builderObject);
@@ -349,15 +350,18 @@ var MontageVisitor = Montage.specialize({
             if (!malker.legacyMode) {
                 var unitSerializer = new UnitSerializer()
                     .initWithMalkerAndVisitorAndObject(malker, this, object),
-                    bindings = Bindings.serializeObjectBindings(unitSerializer, object);
+                    bindings = Bindings.serializeObjectBindings(unitSerializer, object),
+                    propertyNames = new Set(Montage.getSerializablePropertyNames(object));
+
+
 
                 if (bindings) {
                     var valuesObject = this.builder.top.getProperty("values");
                     this.builder.push(valuesObject);
 
 
                     /* jshint forin: true */
-                    for (var key in bindings) {
+                    for (var key in bindings && propertyNames.has(key)) {
                     /* jshint forin: false */
                         this.builder.top.setProperty(key, bindings[key]);
                     }
@@ -416,6 +420,7 @@ var MontageVisitor = Montage.specialize({
                 propertyNames = Montage.getSerializablePropertyNames(object),
                 propertyNamesCount = propertyNames.length;
 
+
             for (var i = 0; i < propertyNamesCount; i++) {
                 propertyName = propertyNames[i];
                 type = Montage.getPropertyAttribute(object, propertyName, "serializable");

data/converter/raw-property-value-to-object-converter.js

@@ -126,7 +126,10 @@ exports.RawPropertyValueToObjectConverter = Converter.specialize( /** @lends Raw
 
     convertSyntax: {
         get: function() {
-            return this._convertSyntax || (this._convertSyntax = parse(this.convertExpression));
+            if (!this._convertSyntax && this.convertExpression) {
+                this._convertSyntax = parse(this.convertExpression);
+            }
+            return this._convertSyntax;
         }
     },
 
@@ -162,7 +165,10 @@ exports.RawPropertyValueToObjectConverter = Converter.specialize( /** @lends Raw
      * */
     revertSyntax: {
         get: function() {
-            return this._revertSyntax || (this._revertSyntax = parse(this.revertExpression));
+            if (!this._revertSyntax && this.revertExpression) {
+                this._revertSyntax = parse(this.revertExpression);
+            }
+            return this._revertSyntax;
         }
     },
 
@@ -172,7 +178,10 @@ exports.RawPropertyValueToObjectConverter = Converter.specialize( /** @lends Raw
 
     compiledRevertSyntax: {
         get: function () {
-            return this._compiledRevertSyntax || (this._compiledRevertSyntax = compile(this.revertSyntax));
+            if (!this._compiledRevertSyntax && this.revertSyntax) {
+                this._compiledRevertSyntax = compile(this.revertSyntax);
+            }
+            return this._compiledRevertSyntax;
         }
     },
 
@@ -314,14 +323,17 @@ exports.RawPropertyValueToObjectConverter = Converter.specialize( /** @lends Raw
 
             return this._descriptorToFetch.then(function (typeToFetch) {
                 var type = [typeToFetch.module.id, typeToFetch.name].join("/");
-                
+
                 if (self.serviceIdentifier) {
                     criteria.parameters.serviceIdentifier = self.serviceIdentifier;
                 }
 
                 query = DataQuery.withTypeAndCriteria(type, criteria);
 
                 return self.service ? self.service.then(function (service) {
+                    // if (type.indexOf("Renderer") !== -1) {
+                    //     debugger;
+                    // }
                     return service.rootService.fetchData(query);
                 }) : null;
             });

data/model/data-identifier.js

@@ -22,6 +22,12 @@ var Montage = require("core/core").Montage;
  *
  * Exact details are not exposed and may vary per specific DataService or RawDataService
  *
+ * Note, a dataService's identifier is by default it's moduleId.
+ *
+ * "montage-data://[this.dataService.identifier]/[this.dataService.connectionDescriptor.name]/[this.objectDescriptor.name]/[this.primaryKey]
+ *
+ * "montage-data://twitter-service/production/user/14DS9ZT459EF44305UI
+
  * @class
  * @extends external:Montage
  */

data/model/data-object-descriptor.js

@@ -1,5 +1,6 @@
 var ObjectDescriptor = require("./object-descriptor").ObjectDescriptor,
-    DataPropertyDescriptor = require("./data-property-descriptor").DataPropertyDescriptor;
+    DataPropertyDescriptor = require("./data-property-descriptor").DataPropertyDescriptor,
+    deprecate = require("core/deprecate");
 
 /**
  * Extends an object descriptor with the additional object information needed by
@@ -10,7 +11,7 @@ var ObjectDescriptor = require("./object-descriptor").ObjectDescriptor,
  * @extends ObjectDescriptor
  */
 exports.DataObjectDescriptor = ObjectDescriptor.specialize(/** @lends DataObjectDescriptor.prototype */ {
-
+    
     /**
      * The names of the properties containing the identifier for this type of
      * data object.

data/model/data-query.js

@@ -87,6 +87,15 @@ exports.DataQuery = Montage.specialize(/** @lends DataQuery.prototype */ {
         value: undefined
     },
 
+    /**
+     * A property used to give a meaningful name to an operation
+     *
+     * @type {string}
+     */
+    name: {
+        value: undefined
+    },
+
     /**
      * An object defining the criteria that must be satisfied by objects for
      * them to be included in the data set defined by this query.

data/service/data-mapping.js

@@ -48,16 +48,36 @@ exports.DataMapping = Montage.specialize(/** @lends DataMapping.prototype */ {
      */
     mapRawDataToObject: {
         value: function (data, object, context) {
-            var i, key,
-                keys = Object.keys(data);
+            var i, key, keys;
+
             if (data) {
+                keys = Object.keys(data);
                 for (i = 0; (key = keys[i]); ++i) {
                     object[key] = data[key];
                 }
             }
         }
     },
 
+    /**
+     * Maps the value of a single raw data property onto the model object
+     *
+     * @method
+     * @argument {Object} data           - An object whose properties' values
+     *                                     hold the raw data.
+     * @argument {Object} object         - The object on which to assign the property
+     * @argument {string} propertyName   - The name of the model property to which
+     *                                     to assign the value(s).
+     * @returns {DataStream|Promise|?}   - Either the value or a "promise" for it
+     *
+     */
+    mapRawDataToObjectProperty: {
+        value: function (data, object, propertyName) {
+            // TO DO: Provide a default mapping based on object descriptor and prpoerty name
+            // For now, subclasses must override this.
+        }
+    },
+
     /**
      * @todo Document.
      */