Merge 96bed9bd7e into fd6883cfed

addons/observers.luau

@@ -1,16 +1,16 @@
 local jecs = require("@jecs")
 
-type Observer = {
+type Observer<T...> = {
 	callback: (jecs.Entity) -> (),
-	query: jecs.Query<...jecs.Id>,
+	query: jecs.Query<T...>,
 }
 
 export type PatchedWorld = jecs.World & {
-	added: <T>(PatchedWorld, jecs.Id<T>, (jecs.Entity, jecs.Id, T) -> ()) -> () -> (),
-	removed: <T>(PatchedWorld, jecs.Id<T>, (jecs.Entity, jecs.Id) -> ()) -> () -> (),
-	changed: <T>(PatchedWorld, jecs.Id<T>, (jecs.Entity, jecs.Id, T) -> ()) -> () -> (),
-	observer: (PatchedWorld, Observer) -> (),
-	monitor: (PatchedWorld, Observer) -> (),
+	added: <T>(PatchedWorld, jecs.Id<T>, (e: jecs.Entity, id: jecs.Id, value: T) -> ()) -> () -> (),
+	removed: <T>(PatchedWorld, jecs.Id<T>, (e: jecs.Entity, id: jecs.Id) -> ()) -> () -> (),
+	changed: <T>(PatchedWorld, jecs.Id<T>, (e: jecs.Entity, id: jecs.Id, value: T) -> ()) -> () -> (),
+	observer: (PatchedWorld, Observer<any>) -> (),
+	monitor: (PatchedWorld, Observer<any>) -> (),
 }
 
 local function observers_new(world, description)

jecs.luau

@@ -780,11 +780,7 @@ local function world_entity(world: ecs_world_t, entity: i53?): i53
 
 			local any = dense_array[dense]
 			if dense <= alive_count then
-				if any ~= entity then
-					error("Entity ID is already in use with a different generation")
-				else
-					return entity
-				end
+				return any
 			end
 
 			local e_swap = dense_array[dense]
@@ -794,9 +790,9 @@ local function world_entity(world: ecs_world_t, entity: i53?): i53
 			r_swap.dense = dense
 			r.dense = alive_count
 			dense_array[dense] = e_swap
-			dense_array[alive_count] = entity
+			dense_array[alive_count] = any
 
-			return entity
+			return any
 		else
 			for i = max_id + 1, index do
 				sparse_array[i]	= { dense = i } :: ecs_record_t

test/addons/observers.luau

@@ -23,6 +23,7 @@ TEST("addons/observers", function()
 		world:set(world:entity(), A, true)
 
 		CHECK(count == 3)
+		print(count)
 	end
 
 	do CASE "Ensure ordering between signals and observers"

test/tests.luau

@@ -672,7 +672,7 @@ TEST("world:range()", function()
 		local e2v1 = world:entity(399)
 		CHECK(world:contains(e2v1))
 		CHECK(ECS_ID(e2v1) == 399)
-		CHECK(ECS_GENERATION(e2v1) == 0)
+		CHECK(ECS_GENERATION(e2v1) == 1)
 	end
 
 	do CASE "over range start"
@@ -685,12 +685,12 @@ TEST("world:range()", function()
 		local e2v1 = world:entity(405)
 		CHECK(world:contains(e2v1))
 		CHECK(ECS_ID(e2v1) == 405)
-		CHECK(ECS_GENERATION(e2v1) == 0)
+		CHECK(ECS_GENERATION(e2v1) == 1)
 
-		world:delete(e2v1)
-		local e2v2 = world:entity(e2v1)
-		CHECK(ECS_ID(e2v2) == 405)
-		CHECK(ECS_GENERATION(e2v2) == 0)
+		do
+			local _e2v1 = world:entity(405)
+			CHECK(_e2v1 == e2v1)
+		end
 	end
 end)