Merge pull request #147 from pmndrs/refactor/remove-query-class

refactor: remove Query class, streamline internal usage

Author: krispya

package.json

@@ -9,6 +9,7 @@
 		"ship": "pnpm -F koota build && pnpm -F koota test run && pnpm -F koota publish",
 		"prepublish": "pnpm -F koota build && pnpm -F koota generate-tests",
 		"test": "pnpm -F core test run && pnpm -F react test run",
+		"test:build": "pnpm prepublish && pnpm -F koota test run",
 		"lint": "pnpm -r lint"
 	},
 	"devDependencies": {

packages/core/src/query/query-result.ts

@@ -7,39 +7,22 @@ import { shallowEqual } from '../utils/shallow-equal';
 import type { World } from '../world/world';
 import { isModifier } from './modifier';
 import { setChanged } from './modifiers/changed';
-import type { Query } from './query';
 import type {
 	InstancesFromParameters,
+	Query,
 	QueryParameter,
 	QueryResult,
 	QueryResultOptions,
 	StoresFromParameters,
 } from './types';
 
 export function createQueryResult<T extends QueryParameter[]>(
-	query: Query,
 	world: World,
-	params: T
+	entities: Entity[],
+	query: Query
 ): QueryResult<T> {
-	query.commitRemovals(world);
-	const entities = query.entities.dense.slice() as Entity[];
-
-	// Clear so it can accumulate again.
-	if (query.isTracking) {
-		query.entities.clear();
-
-		// @todo: Need to improve the performance of this loop.
-		for (const eid of entities) {
-			query.resetTrackingBitmasks(eid);
-		}
-	}
-
-	const stores: Store<any>[] = [];
-	const traits: Trait[] = [];
-
-	// Get the traits for the query parameters in the order they are defined
-	// and not the order they are sorted for the query hash.
-	getQueryStores<T>(params, traits, stores, world);
+	const traits = [...query.resultTraits];
+	const stores = [...query.resultStores];
 
 	const results = Object.assign(entities, {
 		updateEach(
@@ -236,7 +219,7 @@ export function createQueryResult<T extends QueryParameter[]>(
 	}
 }
 
-/* @inline */ function getQueryStores<T extends QueryParameter[]>(
+/* @inline */ export function getQueryStores<T extends QueryParameter[]>(
 	params: T,
 	traits: Trait[],
 	stores: Store<any>[],
@@ -262,3 +245,14 @@ export function createQueryResult<T extends QueryParameter[]>(
 		}
 	}
 }
+
+export function createEmptyQueryResult(): QueryResult<QueryParameter[]> {
+	const results = Object.assign([], {
+		updateEach: () => results,
+		useStores: () => results,
+		select: () => results,
+		sort: () => results,
+	}) as QueryResult<QueryParameter[]>;
+
+	return results;
+}