@galacean/engine-loader 1.1.0-beta.17 → 1.1.0-beta.19

package/dist/main.js

@@ -542,11 +542,17 @@ var ReflectionParser = /*#__PURE__*/ function() {
         });
     };
     _proto.parseClassObject = function parseClassObject(item) {
+        var _this = this;
         var Class = engineCore.Loader.getClass(item.class);
         var _item_constructParams;
         var params = (_item_constructParams = item.constructParams) != null ? _item_constructParams : [];
-        var instance = _construct(Class, [].concat(params));
-        return this.parsePropsAndMethods(instance, item);
+        return Promise.all(params.map(function(param) {
+            return _this.parseBasicType(param);
+        })).then(function(resultParams) {
+            return _construct(Class, [].concat(resultParams));
+        }).then(function(instance) {
+            return _this.parsePropsAndMethods(instance, item);
+        });
     };
     _proto.parsePropsAndMethods = function parsePropsAndMethods(instance, item) {
         var promises = [];
@@ -554,16 +560,14 @@ var ReflectionParser = /*#__PURE__*/ function() {
             for(var methodName in item.methods){
                 var methodParams = item.methods[methodName];
                 for(var i = 0, count = methodParams.length; i < count; i++){
-                    var params = methodParams[i];
-                    var promise = this.parseMethod(instance, methodName, params);
-                    promises.push(promise);
+                    promises.push(this.parseMethod(instance, methodName, methodParams[i]));
                 }
             }
         }
         if (item.props) {
             var _this = this, _loop = function(key) {
                 var value = item.props[key];
-                var promise = _this.parseBasicType(value).then(function(v) {
+                var promise = _this.parseBasicType(value, instance[key]).then(function(v) {
                     return instance[key] = v;
                 });
                 promises.push(promise);
@@ -585,7 +589,7 @@ var ReflectionParser = /*#__PURE__*/ function() {
             return (_instance = instance)[methodName].apply(_instance, [].concat(result));
         });
     };
-    _proto.parseBasicType = function parseBasicType(value) {
+    _proto.parseBasicType = function parseBasicType(value, originValue) {
         var _this = this;
         if (Array.isArray(value)) {
             return Promise.all(value.map(function(item) {
@@ -602,13 +606,33 @@ var ReflectionParser = /*#__PURE__*/ function() {
             } else if (ReflectionParser._isEntityRef(value)) {
                 // entity reference
                 return Promise.resolve(this._context.entityMap.get(value.entityId));
-            } else {
-                // basic type
-                return Promise.resolve(value);
+            } else if (originValue) {
+                var _this1 = this, _loop = function(key) {
+                    if (key === "methods") {
+                        var methods = value[key];
+                        for(var methodName in methods){
+                            var methodParams = methods[methodName];
+                            for(var i = 0, count = methodParams.length; i < count; i++){
+                                var params = methodParams[i];
+                                var promise = _this1.parseMethod(originValue, methodName, params);
+                                promises.push(promise);
+                            }
+                        }
+                    } else {
+                        promises.push(_this1.parseBasicType(value[key], originValue[key]).then(function(v) {
+                            return originValue[key] = v;
+                        }));
+                    }
+                };
+                var promises = [];
+                for(var key in value)_loop(key);
+                return Promise.all(promises).then(function() {
+                    return originValue;
+                });
             }
-        } else {
-            return Promise.resolve(value);
         }
+        // primitive type
+        return Promise.resolve(value);
     };
     _proto._getEntityByConfig = function _getEntityByConfig(entityConfig) {
         // @ts-ignore