@galacean/engine-loader 1.4.0-alpha.3 → 1.4.0-beta.0

package/dist/module.js

@@ -649,11 +649,18 @@ var ReflectionParser = /*#__PURE__*/ function() {
     };
     _proto.parseMethod = function parseMethod(instance, methodName, methodParams) {
         var _this = this;
-        return Promise.all(methodParams.map(function(param) {
+        var isMethodObject = ReflectionParser._isMethodObject(methodParams);
+        var params = isMethodObject ? methodParams.params : methodParams;
+        return Promise.all(params.map(function(param) {
             return _this.parseBasicType(param);
         })).then(function(result) {
             var _instance;
-            return (_instance = instance)[methodName].apply(_instance, [].concat(result));
+            var methodResult = (_instance = instance)[methodName].apply(_instance, [].concat(result));
+            if (isMethodObject && methodParams.result) {
+                return _this.parsePropsAndMethods(methodResult, methodParams.result);
+            } else {
+                return methodResult;
+            }
         });
     };
     _proto.parseBasicType = function parseBasicType(value, originValue) {
@@ -663,7 +670,9 @@ var ReflectionParser = /*#__PURE__*/ function() {
                 return _this.parseBasicType(item);
             }));
         } else if ((typeof value === "undefined" ? "undefined" : _type_of(value)) === "object" && value != null) {
-            if (ReflectionParser._isClass(value)) {
+            if (ReflectionParser._isClassType(value)) {
+                return Promise.resolve(Loader.getClass(value["classType"]));
+            } else if (ReflectionParser._isClass(value)) {
                 // class object
                 return this.parseClassObject(value);
             } else if (ReflectionParser._isAssetRef(value)) {
@@ -742,6 +751,9 @@ var ReflectionParser = /*#__PURE__*/ function() {
     ReflectionParser._isClass = function _isClass(value) {
         return value["class"] !== undefined;
     };
+    ReflectionParser._isClassType = function _isClassType(value) {
+        return value["classType"] !== undefined;
+    };
     ReflectionParser._isAssetRef = function _isAssetRef(value) {
         return value["refId"] !== undefined;
     };
@@ -751,6 +763,9 @@ var ReflectionParser = /*#__PURE__*/ function() {
     ReflectionParser._isComponentRef = function _isComponentRef(value) {
         return value["ownerId"] !== undefined && value["componentId"] !== undefined;
     };
+    ReflectionParser._isMethodObject = function _isMethodObject(value) {
+        return Array.isArray(value == null ? void 0 : value.params);
+    };
     return ReflectionParser;
 }();
 ReflectionParser.customParseComponentHandles = new Map();
@@ -6179,8 +6194,8 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader) {
             }
             config.atlasRotated && (sprite.atlasRotated = true);
         }
-        isNaN(width) || (sprite.width = width);
-        isNaN(height) || (sprite.height = height);
+        width === undefined || (sprite.width = width);
+        height === undefined || (sprite.height = height);
         return sprite;
     };
     return SpriteAtlasLoader;
@@ -6219,16 +6234,16 @@ var SpriteLoader = /*#__PURE__*/ function(Loader) {
             .getResourceByRef(data.texture).then(function(texture) {
                 var sprite = new Sprite(resourceManager.engine, texture, data.region, data.pivot, data.border);
                 var width = data.width, height = data.height;
-                isNaN(width) || (sprite.width = width);
-                isNaN(height) || (sprite.height = height);
+                width === undefined || (sprite.width = width);
+                height === undefined || (sprite.height = height);
                 return sprite;
             });
         } else {
             return new AssetPromise(function(resolve) {
                 var sprite = new Sprite(resourceManager.engine, null, data.region, data.pivot, data.border);
                 var width = data.width, height = data.height;
-                isNaN(width) || (sprite.width = width);
-                isNaN(height) || (sprite.height = height);
+                width === undefined || (sprite.width = width);
+                height === undefined || (sprite.height = height);
                 resolve(sprite);
             });
         }