From 238f2eadc535137a10ac1e9d1b17ed36f082798b Mon Sep 17 00:00:00 2001
From: forgejo-actions <+forgejo-actions@users.noreply.github.com>
Date: Fri, 9 May 2025 00:11:37 +0000
Subject: [PATCH] Sync to upstream Jecs 0.6.0-rc.1-nightly.20250509T001119Z

---
 jecs/addons/observers.luau | 14 +++++++-------
 jecs/build.txt             |  2 +-
 jecs/jecs.luau             | 10 +++++++---
 jecs/pesde-rbx.toml        |  2 +-
 jecs/pesde.toml            |  2 +-
 jecs/test.txt              |  2 +-
 jecs/test_fulllog.txt      |  8 ++++----
 jecs/wally.toml            |  2 +-
 8 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/jecs/addons/observers.luau b/jecs/addons/observers.luau
index ef85d85..0175060 100644
--- a/jecs/addons/observers.luau
+++ b/jecs/addons/observers.luau
@@ -1,16 +1,16 @@
 local jecs = require("@jecs")
 
-type Observer<T...> = {
+type Observer = {
 	callback: (jecs.Entity) -> (),
-	query: jecs.Query<T...>,
+	query: jecs.Query<...jecs.Id>,
 }
 
 export type PatchedWorld = jecs.World & {
-	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>) -> (),
+	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) -> (),
 }
 
 local function observers_new(world, description)
diff --git a/jecs/build.txt b/jecs/build.txt
index 7f1df49..2eb25d5 100644
--- a/jecs/build.txt
+++ b/jecs/build.txt
@@ -1,2 +1,2 @@
 modified = ["addons/observers.luau", "jecs.luau"]
-version = "0.6.0-rc.1-nightly.20250508T001059Z"
+version = "0.6.0-rc.1-nightly.20250509T001119Z"
diff --git a/jecs/jecs.luau b/jecs/jecs.luau
index 35cf16a..f705f0e 100644
--- a/jecs/jecs.luau
+++ b/jecs/jecs.luau
@@ -780,7 +780,11 @@ local function world_entity(world: ecs_world_t, entity: i53?): i53
 
 			local any = dense_array[dense]
 			if dense <= alive_count then
-				return any
+				if any ~= entity then
+					error("Entity ID is already in use with a different generation")
+				else
+					return entity
+				end
 			end
 
 			local e_swap = dense_array[dense]
@@ -790,9 +794,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] = any
+			dense_array[alive_count] = entity
 
-			return any
+			return entity
 		else
 			for i = max_id + 1, index do
 				sparse_array[i]	= { dense = i } :: ecs_record_t
diff --git a/jecs/pesde-rbx.toml b/jecs/pesde-rbx.toml
index 31e700d..bef1286 100644
--- a/jecs/pesde-rbx.toml
+++ b/jecs/pesde-rbx.toml
@@ -3,7 +3,7 @@ includes = ["init.luau", "pesde.toml", "README.md", "CHANGELOG.md", "LICENSE", "
 license = "MIT"
 name = "marked/jecs_nightly"
 repository = "https://git.devmarked.win/marked/jecs-nightly"
-version = "0.6.0-rc.1-nightly.20250508T001059Z"
+version = "0.6.0-rc.1-nightly.20250509T001119Z"
 
 [indices]
 default = "https://github.com/pesde-pkg/index"
diff --git a/jecs/pesde.toml b/jecs/pesde.toml
index 6efefea..287766b 100644
--- a/jecs/pesde.toml
+++ b/jecs/pesde.toml
@@ -3,7 +3,7 @@ includes = ["init.luau", "pesde.toml", "README.md", "CHANGELOG.md", "LICENSE", "
 license = "MIT"
 name = "marked/jecs_nightly"
 repository = "https://git.devmarked.win/marked/jecs-nightly"
-version = "0.6.0-rc.1-nightly.20250508T001059Z"
+version = "0.6.0-rc.1-nightly.20250509T001119Z"
 
 [indices]
 default = "https://github.com/pesde-pkg/index"
diff --git a/jecs/test.txt b/jecs/test.txt
index 5d7566c..db110e7 100644
--- a/jecs/test.txt
+++ b/jecs/test.txt
@@ -1,2 +1,2 @@
 passed = true
-timestamp = "20250508T001102Z"
+timestamp = "20250509T001121Z"
diff --git a/jecs/test_fulllog.txt b/jecs/test_fulllog.txt
index 5bcdf18..4ece543 100644
--- a/jecs/test_fulllog.txt
+++ b/jecs/test_fulllog.txt
@@ -1,6 +1,6 @@
-7.2 us   3 kB│ delete children of entity
-9.0 us   1 kB│ remove friends of entity
-393 ns   0  B│ simple deletion of entity
+7.0 us   3 kB│ delete children of entity
+8.9 us   1 kB│ remove friends of entity
+345 ns  10  B│ simple deletion of entity
 repro
 NONE│ 
 
@@ -121,5 +121,5 @@
 PASS│ #2
 PASS│ #3
 
-74/74 test cases passed in 32.600 ms.
+74/74 test cases passed in 30.871 ms.
 0 fails
diff --git a/jecs/wally.toml b/jecs/wally.toml
index e09d156..d0ec6b0 100644
--- a/jecs/wally.toml
+++ b/jecs/wally.toml
@@ -5,4 +5,4 @@ license = "MIT"
 name = "mark-marks/jecs-nightly"
 realm = "shared"
 registry = "https://github.com/UpliftGames/wally-index"
-version = "0.6.0-rc.1-nightly.20250508T001059Z"
+version = "0.6.0-rc.1-nightly.20250509T001119Z"
-- 
2.47.2