@galacean/engine-loader 2.0.0-alpha.15 → 2.0.0-alpha.16

package/dist/main.js

@@ -850,11 +850,14 @@ var ReflectionParser = /*#__PURE__*/ function() {
                     return resource;
                 });
             } else if (ReflectionParser._isComponentRef(value)) {
-                var _this__context_components_get;
-                return Promise.resolve((_this__context_components_get = this._context.components.get(value.componentId)) != null ? _this__context_components_get : null);
+                var entity = this._resolveEntityByPath(value.entityPath);
+                if (!entity) return Promise.resolve(null);
+                var type = engineCore.Loader.getClass(value.componentType);
+                if (!type) return Promise.resolve(null);
+                var _entity_getComponents_value_componentIndex;
+                return Promise.resolve((_entity_getComponents_value_componentIndex = entity.getComponents(type, [])[value.componentIndex]) != null ? _entity_getComponents_value_componentIndex : null);
             } else if (ReflectionParser._isEntityRef(value)) {
-                // entity reference
-                return Promise.resolve(this._context.entityMap.get(value.entityId));
+                return Promise.resolve(this._resolveEntityByPath(value.entityPath));
             } else if (ReflectionParser._isSignalRef(value)) {
                 return this.parseSignal(value);
             } else if (originValue) {
@@ -912,6 +915,16 @@ var ReflectionParser = /*#__PURE__*/ function() {
             return Promise.resolve(entity);
         }
     };
+    _proto._resolveEntityByPath = function _resolveEntityByPath(entityPath) {
+        var _this__context = this._context, rootIds = _this__context.rootIds, entityMap = _this__context.entityMap;
+        if (!entityPath.length || entityPath[0] >= rootIds.length) return null;
+        var entity = entityMap.get(rootIds[entityPath[0]]);
+        for(var i = 1; i < entityPath.length; i++){
+            if (!entity || entityPath[i] >= entity.children.length) return null;
+            entity = entity.children[entityPath[i]];
+        }
+        return entity;
+    };
     ReflectionParser._isClass = function _isClass(value) {
         return value["class"] !== undefined;
     };
@@ -922,10 +935,10 @@ var ReflectionParser = /*#__PURE__*/ function() {
         return value["url"] !== undefined;
     };
     ReflectionParser._isEntityRef = function _isEntityRef(value) {
-        return value["entityId"] !== undefined;
+        return Array.isArray(value["entityPath"]) && value["componentType"] === undefined;
     };
     ReflectionParser._isComponentRef = function _isComponentRef(value) {
-        return value["ownerId"] !== undefined && value["componentId"] !== undefined;
+        return Array.isArray(value["entityPath"]) && value["componentType"] !== undefined;
     };
     ReflectionParser._isSignalRef = function _isSignalRef(value) {
         return value["listeners"] !== undefined;
@@ -1162,6 +1175,13 @@ function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
             for(var i = 0, l = entities.length; i < l; i++){
                 entityMap.set(entitiesConfig[i].id, entities[i]);
             }
+            // Build rootIds in serialization order (not async completion order)
+            var rootIds = _this.context.rootIds;
+            for(var i1 = 0, l1 = entitiesConfig.length; i1 < l1; i1++){
+                if (!entitiesConfig[i1].parent && !entitiesConfig[i1].strippedId) {
+                    rootIds.push(entitiesConfig[i1].id);
+                }
+            }
             return entities;
         });
     };
@@ -1287,7 +1307,6 @@ function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
     _proto._parseEntity = function _parseEntity(entityConfig, engine) {
         var transform = entityConfig.transform;
         var entity = new engineCore.Entity(engine, entityConfig.name, transform ? engineCore.Loader.getClass(transform.class) : engineCore.Transform);
-        if (!entityConfig.parent) this.context.rootIds.push(entityConfig.id);
         this._addEntityPlugin(entityConfig.id, entity);
         return Promise.resolve(entity);
     };
@@ -1300,7 +1319,6 @@ function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
         }).then(function(prefabResource) {
             var entity = _instanceof(prefabResource, PrefabResource) ? prefabResource.instantiate() : prefabResource.instantiateSceneRoot();
             var instanceContext = new ParserContext(engine, ParserType.Prefab, null);
-            if (!entityConfig.parent) _this.context.rootIds.push(entityConfig.id);
             _this._generateInstanceContext(entity, instanceContext, "");
             _this._prefabContextMap.set(entity, instanceContext);
             var cbArray = _this._prefabPromiseMap.get(entityConfig.id);