Refine the code

Author: jwu

lib/app.js

@@ -164,7 +164,10 @@ export default class App {
    */
   createObject(classname, data) {
     const ctor = this.getClass(classname);
-    return Schema.instantiate(this, ctor, data || {});
+    let obj = new ctor();
+    Schema.parse(this, obj, data || {});
+
+    return obj;
   }
 
   /**
@@ -437,8 +440,32 @@ export default class App {
     });
   }
 
+  _finalizeComp(comp, data, entities) {
+    let ent = comp._entity;
+    let proto = comp.constructor;
+
+    // add event listeners
+    while (proto.__classname__ !== undefined) {
+      if (proto.hasOwnProperty('events')) {
+        for (let name in proto.events) {
+          let method = proto.events[name];
+          let fn = comp[method];
+          if (fn) {
+            fn = fn.bind(comp);
+            ent.on(name, fn);
+            comp.__events__.push({ name, fn });
+          }
+        }
+      }
+      proto = Object.getPrototypeOf(proto);
+    }
+
+    // parse schema data
+    Schema.parse(this, comp, data, entities);
+  }
+
   _createComp(ctor, ent, data = {}) {
-    let comp = Schema.instantiate(this, ctor, data);
+    let comp = new ctor();
     comp._app = this;
     comp._system = this._getSystem(comp);
     comp._entity = ent;
@@ -461,6 +488,9 @@ export default class App {
       proto = Object.getPrototypeOf(proto);
     }
 
+    // parse schema data
+    Schema.parse(this, comp, data);
+
     // invoke onInit & onEnable when entity is ready
     if (ent._ready) {
       // invoke onInit

lib/schema.js

@@ -1,5 +1,5 @@
 function _getClassParser(typename) {
-  return function (app, data) {
+  return function (app, data, propInfo, entities) {
     let ctor = app.getClass(typename);
     if (ctor === undefined) {
       console.warn(`Can not find class ${typename}.`);
@@ -17,17 +17,20 @@ function _getClassParser(typename) {
       return null;
     }
 
-    return instantiate(app, ctor, data);
+    let obj = new ctor();
+    parse(app, obj, data, entities);
+
+    return obj;
   };
 }
 
 function _getArrayParser(elementParser) {
   if (elementParser) {
-    return function (app, data) {
+    return function (app, data, propInfo, entities) {
       let result = new Array(data.length);
 
       for (let i = 0; i < data.length; ++i) {
-        result[i] = elementParser(app, data[i]);
+        result[i] = elementParser(app, data[i], propInfo, entities);
       }
 
       return result;
@@ -160,10 +163,9 @@ function createPrototypeAccessors(app, schema) {
   return prototypeAccessors;
 }
 
-function instantiate(app, ctor, data) {
-  let obj = new ctor();
+function parse(app, obj, data, entities) {
+  let proto = obj.constructor;
 
-  let proto = ctor;
   while (proto.__classname__ !== undefined) {
     if (proto.hasOwnProperty('schema') === false) {
       proto = Object.getPrototypeOf(proto);
@@ -187,7 +189,7 @@ function instantiate(app, ctor, data) {
 
       //
       if (parser) {
-        let result = parser(app, value, propInfo);
+        let result = parser(app, value, propInfo, entities);
         obj[interName] = result;
       } else {
         obj[interName] = value;
@@ -196,11 +198,9 @@ function instantiate(app, ctor, data) {
 
     proto = Object.getPrototypeOf(proto);
   }
-
-  return obj;
 }
 
 export default {
   createPrototypeAccessors,
-  instantiate,
+  parse,
 };