- update Runtime Logger

- improve model inheritance computation

Author: ecarriou

.gitignore

@@ -1,5 +1,5 @@
 /node_modules/
 /coverage/
-/build/runtime.json
+/build/
 /doc/
 /.vscode/

.npmignore

@@ -1,6 +1,7 @@
 /addons/
 /doc/
 /test/
+/dist/
 /coverage/
 /build/runtime.json
 /src/addons/

bower.json

@@ -1,6 +1,6 @@
 {
     "name": "system-runtime",
-    "version": "1.3.4",
+    "version": "1.3.5",
     "description": "Runtime, the System Runtime Environment",
     "license": "MIT",
     "homepage": "https://system-runtime.github.io",

build/system/system.js

@@ -1,6 +1,6 @@
 {
     "name": "system-runtime",
-    "version": "1.3.4",
+    "version": "1.3.5",
     "description": "Runtime, the System Runtime Environment",
     "homepage": "https://system-runtime.github.io",
     "keywords": [

dist/system-runtime.js

@@ -102,6 +102,7 @@ function generateModels() {
         length = 0,
         i = 0;
 
+    // default values
     for (schemaName in store.compiledSchemas) {
         schema = store.compiledSchemas[schemaName];
 
@@ -212,16 +213,15 @@ function generateModels() {
         }
     }
 
-    // parents
+    // inheritance
     for (modelName in store.generatedModels) {
         model = store.generatedModels[modelName];
-        parents = model[INHERITS];
+        parents = getParents(modelName);
+        parents.reverse();
 
-        if (Array.isArray(parents)) {
-            length = parents.length;
-        } else {
-            length = 0;
-        }
+        var modelToMerge = JSON.parse(JSON.stringify(model));
+
+        length = parents.length;
         for (i = 0; i < length; i++) {
             name = parents[i];
             modelParent = store.generatedModels[name];
@@ -231,6 +231,15 @@ function generateModels() {
                 store.generatedModels[modelName] = mergedModel;
             }
         }
+
+        // last inherit 
+        // is the overriden model
+        modelExt = store.models[modelName];
+        if (modelExt) {
+            mergedModel = merge(modelExt, store.generatedModels[modelName]);
+            delete mergedModel._id;
+            store.generatedModels[modelName] = mergedModel;
+        }
     }
 
     // save 
@@ -1927,9 +1936,10 @@ function getMetaDef() {
 function getParents(id) {
     var result = [];
 
-    result = store.inheritanceTree[id];
-    if (!result) {
+    if (!store.inheritanceTree[id]) {
         result = [];
+    } else {
+        result = store.inheritanceTree[id].slice();
     }
 
     return result;

dist/system-runtime.min.js

@@ -1,6 +1,5 @@
 {
     "_name": "RuntimeLogger",
-    "_inherit": [],
     "_core": true,
     "level": "property",
     "info": "method",