Merge pull request #144 from r04423/fix/world-destroy-cleanup

refactor: remove entity cleanup from World.destroy()

Author: krispya

packages/core/src/world/world.ts

@@ -131,8 +131,6 @@ export class World {
 		destroyEntity(this, this[$internal].worldEntity);
 		this[$internal].worldEntity = null!;
 
-		// Destroy itself and all entities.
-		this.entities.forEach((entity) => destroyEntity(this, entity));
 		this.reset();
 		this.#isInitialized = false;
 

packages/core/tests/world.test.ts

@@ -49,6 +49,22 @@ describe('World', () => {
 		expect(world.entities.length).toBe(1);
 	});
 
+	it('destroy should lead to entities with auto-remove relations being removed as well', () => {
+		const Node = trait();
+		const ChildOf = relation({ autoRemoveTarget: true, exclusive: true });
+
+		const world = createWorld();
+
+		// Create a parent node and two child nodes
+		const parentNode = world.spawn(Node);
+		world.spawn(Node, ChildOf(parentNode));
+		world.spawn(Node, ChildOf(parentNode));
+
+		// Expect this to not throw, since the ChildOf relation will automatically
+		// remove the child node when the parent node is destroyed first
+		expect(() => world.destroy()).not.toThrow();
+	});
+
 	it('errors if more than 16 worlds are created', () => {
 		for (let i = 0; i < 16; i++) {
 			createWorld();

packages/publish/tests/core/world.test.ts

@@ -42,6 +42,22 @@ describe('World', () => {
 		expect(world.entities.length).toBe(1);
 	});
 
+	it('destroy should lead to entities with auto-remove relations being removed as well', () => {
+		const Node = trait();
+		const ChildOf = relation({ autoRemoveTarget: true, exclusive: true });
+
+		const world = createWorld();
+
+		// Create a parent node and two child nodes
+		const parentNode = world.spawn(Node);
+		world.spawn(Node, ChildOf(parentNode));
+		world.spawn(Node, ChildOf(parentNode));
+
+		// Expect this to not throw, since the ChildOf relation will automatically
+		// remove the child node when the parent node is destroyed first
+		expect(() => world.destroy()).not.toThrow();
+	});
+
 	it('errors if more than 16 worlds are created', () => {
 		for (let i = 0; i < 16; i++) {
 			createWorld();