From 0ff2348a6ed528a9f745dfbbb2f36b53cff7c543 Mon Sep 17 00:00:00 2001
From: Ukendio <ukendio@gmail.com>
Date: Wed, 26 Jun 2024 15:50:00 +0200
Subject: [PATCH] Uniform function declarations

---
 lib/init.luau | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/lib/init.luau b/lib/init.luau
index 479cce6..f49a6d6 100644
--- a/lib/init.luau
+++ b/lib/init.luau
@@ -652,22 +652,18 @@ local function PreparedQuery(
 		return EmptyQuery
 	end
 
-	local preparedQuery = {}
-	preparedQuery.__index = preparedQuery
 	
 	local queryOutput = {}
 
 	local i = 1
 
-	local length = #compatibleArchetypes
-
 	local function queryNext(): ...any
 		local entityId = archetype.entities[i]
 
 		while entityId == nil do 
 			lastArchetype += 1
 			archetype = compatibleArchetypes[lastArchetype]
-			if lastArchetype > length then 
+			if not archetype then 
 				return
 			end
 			i = 1
@@ -730,16 +726,8 @@ local function PreparedQuery(
 
 		return entityId, unpack(queryOutput, 1, queryLength)
 	end
-	
-	function preparedQuery:__iter(): () -> ...any
-		return queryNext
-	end
 
-	function preparedQuery:next(): ...any
-		return queryNext()	
-	end
-
-	function preparedQuery:without(...: any): Query
+	local function without(self, ...): Query
 		local withoutComponents = { ... }
 		for i = #compatibleArchetypes, 1, -1 do
 			local archetype = compatibleArchetypes[i]
@@ -765,8 +753,16 @@ local function PreparedQuery(
 
 		return self
 	end
+	
+	local preparedQuery = {
+		__iter = function() 
+			return queryNext
+		end,
+		next = queryNext,
+		without = without
+	}
 
-	return setmetatable({}, preparedQuery) :: any
+	return (setmetatable(preparedQuery, preparedQuery) :: any):: Query
 end
 
 function World.query(world: World, ...: any): Query