@galacean/engine-loader 1.5.8 → 1.5.9

package/dist/module.js

@@ -673,43 +673,16 @@ var ParserType = /*#__PURE__*/ function(ParserType) {
         this.entityMap = new Map();
         this.entityConfigMap = new Map();
         this.components = new Map();
+        this.componentConfigMap = new Map();
         this.rootIds = [];
         this.strippedIds = [];
-        this.componentWaitingMap = new Map();
         this.resourceManager = engine.resourceManager;
     }
     var _proto = ParserContext.prototype;
-    _proto.addComponent = function addComponent(id, component) {
-        this.components.set(id, component);
-        var waitingList = this.componentWaitingMap.get(id);
-        if (waitingList == null ? void 0 : waitingList.length) {
-            waitingList.forEach(function(resolve) {
-                return resolve(component);
-            });
-            this.componentWaitingMap.delete(id);
-        }
-    };
-    _proto.getComponentByRef = function getComponentByRef(ref) {
-        var _this = this;
-        return new Promise(function(resolve, reject) {
-            var component = _this.components.get(ref.componentId);
-            if (component) {
-                resolve(component);
-            } else {
-                var resolves = _this.componentWaitingMap.get(ref.componentId);
-                if (resolves) {
-                    resolves.push(resolve);
-                } else {
-                    _this.componentWaitingMap.set(ref.componentId, [
-                        resolve
-                    ]);
-                }
-            }
-        });
-    };
     _proto.clear = function clear() {
         this.entityMap.clear();
         this.components.clear();
+        this.componentConfigMap.clear();
         this.entityConfigMap.clear();
         this.rootIds.length = 0;
         this.strippedIds.length = 0;
@@ -823,7 +796,8 @@ var ReflectionParser = /*#__PURE__*/ function() {
                     return resource;
                 });
             } else if (ReflectionParser._isComponentRef(value)) {
-                return this._context.getComponentByRef(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);
             } else if (ReflectionParser._isEntityRef(value)) {
                 // entity reference
                 return Promise.resolve(this._context.entityMap.get(value.entityId));
@@ -1130,6 +1104,7 @@ function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
         this._parseComponents = this._parseComponents.bind(this);
         this._parsePrefabModification = this._parsePrefabModification.bind(this);
         this._parseAddedComponents = this._parseAddedComponents.bind(this);
+        this._parseComponentsPropsAndMethods = this._parseComponentsPropsAndMethods.bind(this);
         this._parsePrefabRemovedEntities = this._parsePrefabRemovedEntities.bind(this);
         this._parsePrefabRemovedComponents = this._parsePrefabRemovedComponents.bind(this);
         this._clearAndResolve = this._clearAndResolve.bind(this);
@@ -1141,7 +1116,7 @@ function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
     }
     var _proto = HierarchyParser.prototype;
     /** start parse the scene or prefab or others */ _proto.start = function start() {
-        this._parseEntities().then(this._organizeEntities).then(this._parseComponents).then(this._parsePrefabModification).then(this._parseAddedComponents).then(this._parsePrefabRemovedEntities).then(this._parsePrefabRemovedComponents).then(this._clearAndResolve).then(this._resolve).catch(this._reject);
+        this._parseEntities().then(this._organizeEntities).then(this._parseComponents).then(this._parseAddedComponents).then(this._parseComponentsPropsAndMethods).then(this._parsePrefabModification).then(this._parsePrefabRemovedEntities).then(this._parsePrefabRemovedComponents).then(this._clearAndResolve).then(this._resolve).catch(this._reject);
     };
     _proto._parseEntities = function _parseEntities() {
         var _this = this;
@@ -1166,16 +1141,14 @@ function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
     _proto._parseComponents = function _parseComponents() {
         var entitiesConfig = this.data.entities;
         var entityMap = this.context.entityMap;
-        var promises = [];
         for(var i = 0, l = entitiesConfig.length; i < l; i++){
             var entityConfig = entitiesConfig[i];
             if (entityConfig.strippedId) {
                 continue;
             }
             var entity = entityMap.get(entityConfig.id);
-            this._addComponents(entity, entityConfig.components, promises);
+            this._addComponents(entity, entityConfig.components);
         }
-        return Promise.all(promises);
     };
     _proto._parsePrefabModification = function _parsePrefabModification() {
         var _loop = function(i, l) {
@@ -1212,78 +1185,62 @@ function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
         var entityMap = this.context.entityMap;
         var entityConfigMap = this.context.entityConfigMap;
         var strippedIds = this.context.strippedIds;
-        var promises = [];
         for(var i = 0, n = strippedIds.length; i < n; i++){
             var entityConfig = entityConfigMap.get(strippedIds[i]);
             var prefabContext = this._prefabContextMap.get(entityMap.get(entityConfig.prefabInstanceId));
             var entity = prefabContext.entityMap.get(entityConfig.prefabSource.entityId);
-            this._addComponents(entity, entityConfig.components, promises);
+            this._addComponents(entity, entityConfig.components);
         }
-        for(var _iterator = _create_for_of_iterator_helper_loose(this.context.componentWaitingMap.values()), _step; !(_step = _iterator()).done;){
-            var waitingList = _step.value;
-            waitingList.forEach(function(resolve) {
-                return resolve(null);
-            });
-        }
-        return Promise.all(promises);
     };
     _proto._parsePrefabRemovedEntities = function _parsePrefabRemovedEntities() {
-        var _loop = function(i, l) {
+        var entitiesConfig = this.data.entities;
+        var entityMap = this.context.entityMap;
+        for(var i = 0, l = entitiesConfig.length; i < l; i++){
             var entityConfig = entitiesConfig[i];
             var id = entityConfig.id, removedEntities = entityConfig.removedEntities;
             if (removedEntities == null ? void 0 : removedEntities.length) {
-                var _promises;
                 var rootEntity = entityMap.get(id);
-                (_promises = promises).push.apply(_promises, [].concat(removedEntities.map(function(target) {
+                for(var j = 0, m = removedEntities.length; j < m; j++){
+                    var target = removedEntities[j];
                     var entityId = target.entityId;
-                    var context = _this._prefabContextMap.get(rootEntity);
+                    var context = this._prefabContextMap.get(rootEntity);
                     var targetEntity = context.entityMap.get(entityId);
                     if (targetEntity) {
                         targetEntity.destroy();
                     }
-                })));
+                }
             }
-        };
-        var _this = this;
-        var entitiesConfig = this.data.entities;
-        var entityMap = this.context.entityMap;
-        var promises = [];
-        for(var i = 0, l = entitiesConfig.length; i < l; i++)_loop(i);
-        return Promise.all(promises);
+        }
     };
     _proto._parsePrefabRemovedComponents = function _parsePrefabRemovedComponents() {
-        var _loop = function(i, l) {
+        var entitiesConfig = this.data.entities;
+        var entityMap = this.context.entityMap;
+        var prefabContextMap = this._prefabContextMap;
+        for(var i = 0, l = entitiesConfig.length; i < l; i++){
             var entityConfig = entitiesConfig[i];
             var id = entityConfig.id, removedComponents = entityConfig.removedComponents;
             if (removedComponents == null ? void 0 : removedComponents.length) {
-                var _promises;
                 var rootEntity = entityMap.get(id);
-                (_promises = promises).concat.apply(_promises, [].concat(removedComponents.map(function(target) {
+                for(var j = 0, m = removedComponents.length; j < m; j++){
+                    var target = removedComponents[j];
                     var componentId = target.componentId;
-                    var context = _this._prefabContextMap.get(rootEntity);
+                    var context = prefabContextMap.get(rootEntity);
                     var targetComponent = context.components.get(componentId);
                     if (targetComponent) {
                         targetComponent.destroy();
                     }
-                })));
+                }
             }
-        };
-        var _this = this;
-        var entitiesConfig = this.data.entities;
-        var entityMap = this.context.entityMap;
-        var promises = [];
-        for(var i = 0, l = entitiesConfig.length; i < l; i++)_loop(i);
-        return Promise.all(promises);
+        }
     };
     _proto._organizeEntities = function _organizeEntities() {
         var _this_context = this.context, rootIds = _this_context.rootIds, strippedIds = _this_context.strippedIds;
         var parentIds = rootIds.concat(strippedIds);
-        for(var _iterator = _create_for_of_iterator_helper_loose(parentIds), _step; !(_step = _iterator()).done;){
-            var parentId = _step.value;
-            this._parseChildren(parentId);
+        for(var i = 0, l = parentIds.length; i < l; i++){
+            this._parseChildren(parentIds[i]);
         }
-        for(var i = 0; i < rootIds.length; i++){
-            this._handleRootEntity(rootIds[i]);
+        for(var i1 = 0; i1 < rootIds.length; i1++){
+            this._handleRootEntity(rootIds[i1]);
         }
     };
     _proto._getEntityByConfig = function _getEntityByConfig(entityConfig, engine) {
@@ -1356,16 +1313,18 @@ function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
             }
         }
     };
-    _proto._addComponents = function _addComponents(entity, components, promises) {
+    _proto._addComponents = function _addComponents(entity, components) {
+        var context = this.context;
+        var componentMap = context.components;
+        var componentConfigMap = context.componentConfigMap;
         for(var i = 0, n = components.length; i < n; i++){
             var componentConfig = components[i];
             var key = !componentConfig.refId ? componentConfig.class : componentConfig.refId;
+            var componentId = componentConfig.id;
             var component = entity.addComponent(Loader.getClass(key));
-            this.context.addComponent(componentConfig.id, component);
-            var promise = this._reflectionParser.parsePropsAndMethods(component, componentConfig);
-            promises.push(promise);
+            componentMap.set(componentId, component);
+            componentConfigMap.set(componentId, componentConfig);
         }
-        return promises;
     };
     _proto._applyEntityData = function _applyEntityData(entity, entityConfig) {
         if (entityConfig === void 0) entityConfig = {};
@@ -1407,6 +1366,20 @@ function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
             this._generateInstanceContext(child, context, childPath);
         }
     };
+    _proto._parseComponentsPropsAndMethods = function _parseComponentsPropsAndMethods() {
+        var context = this.context;
+        var componentConfigMap = context.componentConfigMap;
+        var reflectionParser = this._reflectionParser;
+        var promises = [];
+        for(var _iterator = _create_for_of_iterator_helper_loose(context.components), _step; !(_step = _iterator()).done;){
+            var _step_value = _step.value, componentId = _step_value[0], component = _step_value[1];
+            var componentConfig = componentConfigMap.get(componentId);
+            if (componentConfig) {
+                promises.push(reflectionParser.parsePropsAndMethods(component, componentConfig));
+            }
+        }
+        return Promise.all(promises);
+    };
     return HierarchyParser;
 }();
 
@@ -5442,7 +5415,7 @@ var PrefabLoader = /*#__PURE__*/ function(Loader) {
                 type: "json"
             })).then(function(data) {
                 PrefabParser.parse(engine, item.url, data).then(resolve).catch(reject);
-            });
+            }, reject);
         });
     };
     return PrefabLoader;