Skip to content

A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.

fix: detect circular prefab dependencies in AssetDependencyAnalyzer

esengine4a95cd36ffed
diff --git a/editor/src/asset/AssetDependencyAnalyzer.ts b/editor/src/asset/AssetDependencyAnalyzer.ts
index cd3ae590a..06d865a89 100644
--- a/editor/src/asset/AssetDependencyAnalyzer.ts
+++ b/editor/src/asset/AssetDependencyAnalyzer.ts
@@ -181,8 +181,9 @@ export class AssetDependencyAnalyzer {
dependents: Map<string, Set<string>>,
visited: Set<string>
): Promise<void> {
- if (visited.has(resolvedPath)) return;
- visited.add(resolvedPath);
+ const key = uuid || resolvedPath;
+ if (visited.has(key)) return;
+ visited.add(key);
const entry = getAssetTypeEntry(resolvedPath);
if (!entry?.hasTransitiveDeps) return;
diff --git a/editor/src/prefab/PrefabDependencyTracker.ts b/editor/src/prefab/PrefabDependencyTracker.ts
index 3e3290f05..19a76b3c8 100644
--- a/editor/src/prefab/PrefabDependencyTracker.ts
+++ b/editor/src/prefab/PrefabDependencyTracker.ts
@@ -31,6 +31,10 @@ export class PrefabDependencyTracker {
registerDependency(dependentPrefab: string, dependsOn: string): void {
const normalized = this.normalizePath(dependsOn);
const normalizedDependent = this.normalizePath(dependentPrefab);
+ if (this.wouldCreateCycle(normalized, normalizedDependent)) {
+ console.warn(`Circular prefab dependency detected: ${normalizedDependent} -> ${normalized}`);
+ return;
+ }
let set = this.dependents_.get(normalized);
if (!set) {
set = new Set();
@@ -39,6 +43,22 @@ export class PrefabDependencyTracker {
set.add(normalizedDependent);
}
+ private wouldCreateCycle(dependsOn: string, dependent: string): boolean {
+ const visited = new Set<string>();
+ const check = (from: string): boolean => {
+ if (from === dependent) return true;
+ if (visited.has(from)) return false;
+ visited.add(from);
+ const upstreams = this.dependents_.get(from);
+ if (!upstreams) return false;
+ for (const u of upstreams) {
+ if (check(u)) return true;
+ }
+ return false;
+ };
+ return check(dependsOn);
+ }
+
onPrefabFileChanged(changedPaths: string[]): void {
if (!this.scene_) return;