Merge branch 'main' of https://github.com/pmndrs/koota

Author: krispya

packages/core/src/world/world.ts

@@ -165,8 +165,9 @@ export class World {
 
 		if (typeof args[0] === 'string') {
 			const query = ctx.queriesHashMap.get(args[0]);
-			if (!query) return [];
-			return query.run(this);
+			// TODO: Query results need to be refactored so query.run() returns it and we can create emtpy ones
+			if (!query) return createQueryResult(new Query(this, []), this, []);
+			return createQueryResult(query, this, query.parameters);
 		} else {
 			const params = args as QueryParameter[];
 			const hash = createQueryHash(params);

packages/core/tests/query.test.ts

@@ -203,14 +203,17 @@ describe('Query', () => {
 
 		let entities = world.query(key);
 
-		expect(entities).toEqual([entityA]);
+		expect(entities).toContain(entityA);
+
+		// Check that a query result is returned.
+		expect(entities.updateEach).toBeDefined();
 
 		// Test caching before a world is created.
 		const world2 = createWorld();
 		const entityC = world2.spawn(Position, Name, IsActive);
 		const query2 = world2.query(key);
 
-		expect(query2).toEqual([entityC]);
+		expect(query2).toContain(entityC);
 	});
 
 	it('should exclude entities with IsExcluded', () => {