improve structute management

Author: ecarriou

src/component.js

@@ -572,24 +572,22 @@ function getMethods(id) {
 
 /**
  * @method getStructureProperties
- * @param {String} name of the property
- * @param {String} name of the model
+ * @param {String} path path of the property
+ * @param {String} name name of the model
  * @returns {Array} list of property schema of the structure type
  * @private
  * @description Get the schema of a structure
  */
-function getStructureProperties(propertyName, model) {
-  var modelDef = null;
+function getStructureProperties(path, model) {
   var type = null;
   var structure = null;
   var result = [];
   var propNames = [];
 
-  modelDef = $metamodel.getModel(model);
-  type = modelDef[propertyName].type;
+  type = $metamodel.getModelPathType(model, path);
   structure = $metamodel.getType(type);
 
-  if (structure.schema) {
+  if (structure && structure.schema) {
     propNames = Object.keys(structure.schema);
     propNames.forEach(function(name) {
       structure.schema[name].name = name;
@@ -1159,7 +1157,10 @@ function addProperties(model, Class, classId) {
  * Some checks can be done in order to see if the set of properties is compliant with the model.
  */
 function addStructure(path, name, model, id) {
-  var properties = getStructureProperties(name, model);
+  var properties = getStructureProperties(
+    path ? path + '.' + name : name,
+    model
+  );
   var sructure = {};
 
   properties.forEach(function property(prop) {
@@ -1172,7 +1173,7 @@ function addStructure(path, name, model, id) {
     propertyType = prop.type;
     propertyReadOnly = prop.readOnly;
 
-    if (propertyType === 'array') {
+    if (Array.isArray(propertyType) || propertyType === 'array') {
       // in case of array, return a sub array
       proxy = function proxy(position, value) {
         var search = [];
@@ -1194,11 +1195,11 @@ function addStructure(path, name, model, id) {
             }
           });
 
-          return true;
+          return result;
         }
 
         if (path) {
-          parentPath = parentPath + '.' + name;
+          parentPath = path + '.' + name;
         } else {
           parentPath = name;
         }
@@ -1219,7 +1220,12 @@ function addStructure(path, name, model, id) {
           } else {
             if (Array.isArray(position)) {
               // we replace the collection
-              if (_isValidCollection(position, 'any')) {
+              if (
+                _isValidCollection(
+                  position,
+                  Array.isArray(propertyType) ? propertyType[0] : 'any'
+                )
+              ) {
                 search = $db[model].find({
                   _id: id
                 });
@@ -1272,7 +1278,12 @@ function addStructure(path, name, model, id) {
           if (propertyReadOnly) {
             $log.readOnlyProperty(id, this.constructor.name, propertyName);
           } else {
-            if ($metamodel.isValidType(value, 'any')) {
+            if (
+              $metamodel.isValidType(
+                value,
+                Array.isArray(propertyType) ? propertyType[0] : 'any'
+              )
+            ) {
               search = $db[model].find({
                 _id: id
               });
@@ -1308,7 +1319,7 @@ function addStructure(path, name, model, id) {
                 this.constructor.name,
                 propertyName,
                 value,
-                propertyType
+                Array.isArray(propertyType) ? propertyType[0] : 'any'
               );
             }
           }
@@ -1330,7 +1341,7 @@ function addStructure(path, name, model, id) {
         var fullPath = '';
 
         if (path) {
-          parentPath = parentPath + '.' + name;
+          parentPath = path + '.' + name;
         } else {
           parentPath = name;
         }
@@ -1355,7 +1366,7 @@ function addStructure(path, name, model, id) {
                   JSON.stringify(getStructureValue(model, id, fullPath))
                 );
                 break;
-              case $metamodel.isStructure(propertyName, model):
+              case $metamodel.isStructure(fullPath, model):
                 propertyValue = addStructure(
                   parentPath,
                   propertyName,

src/metamodel.js

@@ -1869,22 +1869,20 @@ exports.isMethod = function isMethod(name, id) {
 
 /**
  * @method isStructure
- * @param {String} name name of the propertys
- * @param {String} id component id
+ * @param {String} path path of the property
+ * @param {String} modelName model name
  * @returns {Boolean} true if the property is a structure
  * @description Check if an attribute of the schema is a structure
  */
-exports.isStructure = function isStructure(name, id) {
+exports.isStructure = function isStructure(path, modelName) {
   var result = false;
-  var model = store.generatedModels[id];
-  var attributeType = '';
+  var structure = null;
   var type = '';
 
-  if (model[name]) {
-    type = store.type[model[name].type];
-  }
+  type = exports.getModelPathType(modelName, path);
+  structure = exports.getType(type);
 
-  if (type && type.schema) {
+  if (structure && structure.schema) {
     result = true;
   }
 

test/runtime/metamodel-spec.js

@@ -187,6 +187,75 @@ describe('System Runtime metamodel component', () => {
     expect(person.address().city()).equal('Paris');
   });
 
+  it('can add a complex structure', () => {
+    const metamodel = runtime.require('metamodel');
+
+    metamodel.type({
+      'name': 'foods',
+      'type': 'object',
+      'schema': {
+        'vegetables': { 'type': 'vegetable', 'mandatory': true }
+      }
+    });
+
+    metamodel.type({
+      'name': 'vegetable',
+      'type': 'object',
+      'schema': {
+        'kind': { 'type': ['string'], 'mandatory': true }
+      }
+    });
+
+    metamodel.schema({
+      '_name': 'Person',
+      '_inherit': ['_Component'],
+      'firstName': 'property',
+      'lastName': 'property',
+      'likes': 'property'
+    });
+
+    metamodel.model({
+      '_name': 'Person',
+      '_inherit': ['_Component'],
+      'firstName': {
+        'type': 'string',
+        'readOnly': false,
+        'mandatory': true,
+        'default': ''
+      },
+      'lastName': {
+        'type': 'string',
+        'readOnly': true,
+        'mandatory': true,
+        'default': ''
+      },
+      'likes': {
+        'type': 'foods',
+        'readOnly': true,
+        'mandatory': false,
+        'default': {
+        }
+      }
+    });
+
+    metamodel.create();
+
+    const Person = runtime.require('Person');
+
+    const yoda = new Person({
+      'sex': 'male',
+      'firstName': 'Yoda',
+      'lastName': 'Master',
+      'likes': {
+        'vegetables': {
+          'kind': ['all']
+        }
+      }
+    });
+
+    expect(yoda.likes().vegetables().kind(0)).equal('all');
+  });
+
   it('can create a one to one relationship', () => {
     const metamodel = runtime.require('metamodel');