improve validation of items in collaction

Author: ecarriou

bower.json

@@ -6,8 +6,7 @@
     "homepage": "https://designfirst.io/systemruntime/",
     "author": {
         "name": "erwan carriou",
-        "email": "[email protected]",
-        "twitter": "@ecarriou"
+        "email": "[email protected]"
     },
     "repository": {
         "type": "git",

package.json

@@ -23,8 +23,7 @@
   "main": "./src/runtime.js",
   "author": {
     "name": "erwan carriou",
-    "email": "[email protected]",
-    "twitter": "@ecarriou"
+    "email": "[email protected]"
   },
   "license": "Apache-2.0",
   "repository": {
@@ -60,10 +59,10 @@
     "karma": "^2.0.2",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
+    "karma-coverage": "^1.1.2",
     "karma-mocha": "^1.3.0",
     "karma-script-launcher": "^1.0.0",
-    "load-grunt-tasks": "^3.5.2",
+    "load-grunt-tasks": "^4.0.0",
     "mocha": "^5.1.1"
   }
 }

src/behavior.js

@@ -129,34 +129,34 @@ function createFunction(name, func, core, useCoreAPI) {
   // kludge for Babel
   funcBody = funcBody.replace(/_this/g, 'this');
 
-  if (params[0] === '') {
-    params = [];
+  if (paramsClean[0] === '') {
+    paramsClean = [];
   }
 
   if (useCoreAPI) {
-    params.push('$component');
-    params.push('$db');
-    params.push('$metamodel');
-    params.push('$workflow');
-    params.push('$behavior');
-    params.push('$state');
-    params.push('$log');
-    params.push('$helper');
+    paramsClean.push('$component');
+    paramsClean.push('$db');
+    paramsClean.push('$metamodel');
+    paramsClean.push('$workflow');
+    paramsClean.push('$behavior');
+    paramsClean.push('$state');
+    paramsClean.push('$log');
+    paramsClean.push('$helper');
   }
 
   if ($helper.isOnNode()) {
-    params.push('require');
+    paramsClean.push('require');
   }
 
-  if (params[0] !== '') {
+  if (paramsClean[0] !== '') {
     action = new Function(
       '__action',
       'return function ' +
         functionName +
         ' (' +
-        params.join(', ') +
+        paramsClean.join(', ') +
         ") { return new Function('" +
-        params.join("', '") +
+        paramsClean.join("', '") +
         "', __action).apply(this, arguments) };"
     )(funcBody);
   } else {

src/component.js

@@ -173,11 +173,7 @@ function _Array(conf) {
             data: [val, 'add']
           });
         } else {
-          if (typeof val.id !== 'undefined') {
-            $log.invalidPropertyName(id, classId, propertyName, val.id(), type);
-          } else {
-            $log.invalidPropertyName(id, classId, propertyName, val, type);
-          }
+          $log.invalidPropertyName(id, classId, propertyName, val, type);
         }
       } else {
         if (val && $metamodel.isValidType(val, type)) {
@@ -1043,7 +1039,7 @@ function addProperties(model, Class, classId) {
                 this.constructor.name,
                 propertyName,
                 value,
-                propertyType
+                propertyType[0]
               );
             }
           }
@@ -1445,15 +1441,15 @@ function addStructure(path, name, model, id) {
                     $workflow.process({
                       component: id,
                       state: fullPath.replace(/\[(\d)*\]/g, ''),
-                      data: [arr, 'add']
+                      data: [value, 'add']
                     });
                   }
 
                   // current element
                   $workflow.process({
                     component: id,
                     state: fullPath,
-                    data: [arr, 'add']
+                    data: [value, 'add']
                   });
                 }
               } else {

src/log.js

@@ -664,21 +664,6 @@ exports.invalidType = function invalidType(name, value, typeName) {
   );
 };
 
-/**
- * @method invalidClassType
- * @param {Object} obj an object
- * @param {String} type expected class type
- * @description Invalid class type
- */
-exports.invalidClassType = function invalidClassType(obj, type) {
-  getLogger().warn(
-    "invalid class name for the object '" +
-      JSON.stringify(obj) +
-      "': expected '" +
-      type
-  );
-};
-
 /**
  * @method invalidConfiguration
  * @param {Object} obj an object

src/metamodel.js

@@ -1838,36 +1838,6 @@ exports.isValidType = function isValidType(value, typeName) {
     return result;
   }
 
-  /**
-   * @method _checkClassName
-   * @param {String} value
-   * @param {String} typeName
-   * @returns {Boolean} the object is compliant with the type
-   * @private
-   * @description Check if an object is compliant with a class
-   */
-  function _checkClassName(value, typeName) {
-    var isValid = false;
-    var typeRef = getRealClassName(typeName);
-    var component = value;
-
-    if (value !== '' && value !== null) {
-      if (hasType(value, 'string')) {
-        component = $component.get(value);
-      }
-      if (getClassName(component) === typeRef && component && component.id) {
-        isValid = true;
-      }
-    } else {
-      isValid = true;
-    }
-
-    if (!isValid) {
-      $log.invalidClassType(value, typeName);
-    }
-    return isValid;
-  }
-
   /**
    * @method _isValidType
    * @param {String} value
@@ -1896,7 +1866,12 @@ exports.isValidType = function isValidType(value, typeName) {
                 isValid = checkCustomSchema(value[i], typeName[0]);
                 break;
               case exports.isClassName(typeName[0]):
-                isValid = _checkClassName(value[i], typeName[0]);
+                if (value[i] !== '' && value[i] !== null) {
+                  isValid = exports.inheritFrom(
+                    getClassName(value[i]),
+                    typeName[0]
+                  );
+                }
                 break;
               default:
                 isValid = hasType(value[i], typeName[0]);
@@ -1930,7 +1905,9 @@ exports.isValidType = function isValidType(value, typeName) {
       }
       break;
     case exports.isClassName(typeName):
-      result = _checkClassName(value, typeName);
+      if (value !== '' && value !== null) {
+        result = exports.inheritFrom(getClassName(value), typeName);
+      }
       break;
     default:
       result = _isValidType(value, typeName);
@@ -2305,7 +2282,6 @@ exports.isValidObject = function isValidObject(
 
     if (!hasType(comp, 'undefined')) {
       if (!exports.inheritFrom(comp.constructor.name, typeRef)) {
-        // if (getClassName(comp) !== typeRef) { uncomment this line for a strict mode
         isValid = false;
         $log.invalidType(fieldName, field, typeRef);
       } else {

test/runtime/component-spec.js

@@ -23,6 +23,7 @@ describe('a System Runtime component', function () {
       'fullName': 'method',
       'testMethod': 'method',
       'children': 'collection',
+      'teacher': 'link',
       'father': 'link',
       'moving': 'event'
     });
@@ -77,6 +78,12 @@ describe('a System Runtime component', function () {
         'mandatory': false,
         'default': {}
       },
+      'teacher': {
+        'type': 'Person',
+        'readOnly': false,
+        'mandatory': false,
+        'default': {}
+      },
       'address': {
         'type': 'string',
         'readOnly': false,
@@ -487,7 +494,7 @@ describe('a System Runtime component', function () {
     expect(yoda.birthDate().toISOString()).equal(now.toISOString());
   });
 
-  it('can add a link to another components', function () {
+  it('can add a link to another component', function () {
     const Person = runtime.require('Person');
 
     const anakin = new Person({
@@ -505,7 +512,26 @@ describe('a System Runtime component', function () {
     expect(leia.father().firstName()).equal('Anakin');
   });
 
-  it('can remove a link to another components', function () {
+  it('can add a link to another component that inherits from the valid class', function () {
+    const Person = runtime.require('Person');
+    const Teacher = runtime.require('Teacher');
+
+    const luke = new Person({
+      'firstName': 'Luke',
+      'lastName': 'Skywalker'
+    });
+
+    const yoda = new Teacher({
+      'firstName': 'Yoda',
+      'lastName': 'Master'
+    });
+
+    luke.teacher(yoda);
+
+    expect(luke.teacher()).to.not.be.undefined;
+  });
+
+  it('can remove a link to another component', function () {
     const Person = runtime.require('Person');
 
     const anakin = new Person({
@@ -656,6 +682,25 @@ describe('a System Runtime component', function () {
     anakin.children([]);
 
     expect(anakin.children().length).equal(0);
+  }); const Teacher = runtime.require('Teacher');
+
+  it('can add an item in a collection that inherits from the valid class', function () {
+    const Person = runtime.require('Person');
+    const Teacher = runtime.require('Teacher');
+
+    const vador = new Person({
+      'firstName': 'Dark',
+      'lastName': 'Vador'
+    });
+
+    const luke = new Teacher({
+      'firstName': 'Yoda',
+      'lastName': 'Master'
+    });
+
+    vador.children(0, luke);
+
+    expect(vador.children(0)).to.not.be.undefined;
   });
 
   it('can destroy itself', function () {