Sync to upstream Jecs 0.6.0-nightly.20250608T001058Z

2025-06-08 00:11:16 +00:00 · 2025-06-08 00:11:16 +00:00 · f82cb6d163
commit f82cb6d163
parent cfb593eb16
8 changed files with 83 additions and 83 deletions
--- a/jecs/addons/observers.luau
+++ b/jecs/addons/observers.luau
@ -1,26 +1,22 @@
 local jecs = require("@jecs")

-type Observer = {
-	callback: (jecs.Entity) -> (),
-	query: jecs.Query<...any>,
-}
-
-type Monitor = {
-	callback: (jecs.Entity, jecs.Entity) -> (),
-	query: jecs.Query<any>
-}
-
 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) -> (),
-	monitor: (PatchedWorld, Monitor) -> (),
+	observer: (
+		PatchedWorld,
+		any,
+		(jecs.Entity) -> ()
+	) -> (),
+	monitor: (
+		PatchedWorld,
+		any,
+		(jecs.Entity, jecs.Id) -> ()
+	) -> ()
 }

-local function observers_new(world, description)
-	local query = description.query
-	local callback = description.callback
+local function observers_new(world, query, callback)
 	local terms = query.filter_with :: { jecs.Id }
 	if not terms then
 		local ids = query.ids
@ -94,9 +90,7 @@ local function join(world, component)
 	end
 end

-local function monitors_new(world, description)
-	local query = description.query
-	local callback = description.callback
+local function monitors_new(world, query, callback)
 	local terms = query.filter_with :: { jecs.Id }
 	if not terms then
 		local ids = query.ids
@ -131,7 +125,8 @@ local function monitors_new(world, description)
 		local archetype = r.archetype

 		if jecs.query_match(query, archetype) then
-			callback(entity, jecs.OnRemove)
+			local EcsOnRemove = jecs.OnRemove :: jecs.Id
+			callback(entity, EcsOnRemove)
 		end
 	end

@ -162,7 +157,7 @@ local function observers_add(world: jecs.World): PatchedWorld
 			listeners = {}
 			signals.added[component] = listeners

-			local function on_add(entity: number, id: number, value: any)
+			local function on_add(entity, id, value)
 				for _, listener in listeners :: any do
 					listener(entity, id, value)
 				end
@ -170,13 +165,14 @@ local function observers_add(world: jecs.World): PatchedWorld
 			local existing_hook = world:get(component, jecs.OnAdd)
 			if existing_hook then
 				table.insert(listeners, existing_hook)
-				local idr = world.component_index[component]
-				if idr then
-					idr.hooks.on_add = on_add
-				end
 			end

-			world:set(component, jecs.OnAdd, on_add)
+			local idr = world.component_index[component]
+			if idr then
+				idr.hooks.on_add = on_add
+			else
+				world:set(component, jecs.OnAdd, on_add)
+			end
 		end
 		table.insert(listeners, fn)
 		return function()
@ -196,7 +192,7 @@ local function observers_add(world: jecs.World): PatchedWorld
 		if not listeners then
 			listeners = {}
 			signals.emplaced[component] = listeners
-			local function on_change(entity: number, id: number, value: any)
+			local function on_change(entity, id, value: any)
 				for _, listener in listeners :: any do
 					listener(entity, id, value)
 				end
@ -204,12 +200,13 @@ local function observers_add(world: jecs.World): PatchedWorld
 			local existing_hook = world:get(component, jecs.OnChange)
 			if existing_hook then
 				table.insert(listeners, existing_hook)
-				local idr = world.component_index[component]
-				if idr then
-					idr.hooks.on_change = on_change
-				end
 			end
-			world:set(component, jecs.OnChange, on_change)
+			local idr = world.component_index[component]
+			if idr then
+				idr.hooks.on_change = on_change
+			else
+				world:set(component, jecs.OnChange, on_change)
+			end
 		end
 		table.insert(listeners, fn)
 		return function()
@ -229,23 +226,26 @@ local function observers_add(world: jecs.World): PatchedWorld
 		if not listeners then
 			listeners = {}
 			signals.removed[component] = listeners
-			local function on_remove(entity: number, id: number, value: any)
+			local function on_remove(entity, id)
 				for _, listener in listeners :: any do
-					listener(entity, id, value)
+					listener(entity, id)
 				end
 			end
 			local existing_hook = world:get(component, jecs.OnRemove)
 			if existing_hook then
 				table.insert(listeners, existing_hook)
-				local idr = world.component_index[component]
-				if idr then
-					idr.hooks.on_remove = on_remove
-				end
 			end

-			world:set(component, jecs.OnRemove, on_remove)
+			local idr = world.component_index[component]
+			if idr then
+				idr.hooks.on_remove = on_remove
+			else
+				world:set(component, jecs.OnRemove, on_remove)
+			end
 		end
+
 		table.insert(listeners, fn)
+
 		return function()
 			local n = #listeners
 			local i = table.find(listeners, fn)
--- a/jecs/build.txt
+++ b/jecs/build.txt
@ -1,2 +1,2 @@
-modified = [".luaurc", "jecs.luau"]
-version = "0.6.0-nightly.20250606T001110Z"
+modified = ["addons/observers.luau", "jecs.luau"]
+version = "0.6.0-nightly.20250608T001058Z"
--- a/jecs/jecs.luau
+++ b/jecs/jecs.luau
@ -1,4 +1,3 @@
-
 --!optimize 2
 --!native
 --!strict
@ -95,30 +94,31 @@ type ecs_world_t = {
 	observable: Map<i53, Map<i53, { ecs_observer_t }>>,
 }

-local HI_COMPONENT_ID = _G.__JECS_HI_COMPONENT_ID or 256
 -- stylua: ignore start
-local EcsOnAdd =                    HI_COMPONENT_ID +  1
-local EcsOnRemove =                 HI_COMPONENT_ID +  2
-local EcsOnChange =                 HI_COMPONENT_ID +  3
-local EcsWildcard =                 HI_COMPONENT_ID +  4
-local EcsChildOf =                  HI_COMPONENT_ID +  5
-local EcsComponent =                HI_COMPONENT_ID +  6
-local EcsOnDelete =                 HI_COMPONENT_ID +  7
-local EcsOnDeleteTarget =           HI_COMPONENT_ID +  8
-local EcsDelete =                   HI_COMPONENT_ID +  9
-local EcsRemove =                   HI_COMPONENT_ID + 10
-local EcsName =                     HI_COMPONENT_ID + 11
-local EcsOnArchetypeCreate =        HI_COMPONENT_ID + 12
-local EcsOnArchetypeDelete =        HI_COMPONENT_ID + 13
-local EcsRest =                     HI_COMPONENT_ID + 14

-local ECS_ID_DELETE =                        	    0b01
-local ECS_ID_IS_TAG =                        	    0b10
-local ECS_ID_MASK =                          	    0b00
+local ECS_ENTITY_MASK =       bit32.lshift(1, 24)
+local ECS_GENERATION_MASK =   bit32.lshift(1, 16)
+local ECS_PAIR_OFFSET = 	                 2^48

-local ECS_ENTITY_MASK =              bit32.lshift(1, 24)
-local ECS_GENERATION_MASK =          bit32.lshift(1, 16)
-local ECS_PAIR_OFFSET = 						    2^48
+local ECS_ID_DELETE =                 	     0b01
+local ECS_ID_IS_TAG =                 	     0b10
+local ECS_ID_MASK =                   	     0b00
+
+local HI_COMPONENT_ID =                       256
+local EcsOnAdd =             HI_COMPONENT_ID +  1
+local EcsOnRemove =          HI_COMPONENT_ID +  2
+local EcsOnChange =          HI_COMPONENT_ID +  3
+local EcsWildcard =          HI_COMPONENT_ID +  4
+local EcsChildOf =           HI_COMPONENT_ID +  5
+local EcsComponent =         HI_COMPONENT_ID +  6
+local EcsOnDelete =          HI_COMPONENT_ID +  7
+local EcsOnDeleteTarget =    HI_COMPONENT_ID +  8
+local EcsDelete =            HI_COMPONENT_ID +  9
+local EcsRemove =            HI_COMPONENT_ID + 10
+local EcsName =              HI_COMPONENT_ID + 11
+local EcsOnArchetypeCreate = HI_COMPONENT_ID + 12
+local EcsOnArchetypeDelete = HI_COMPONENT_ID + 13
+local EcsRest =              HI_COMPONENT_ID + 14

 local NULL_ARRAY = table.freeze({}) :: Column
 local NULL = newproxy(false)
@ -2655,19 +2655,19 @@ return {
 	meta = (ECS_META :: any) :: <T>(id: Entity, id: Id<T>, value: T) -> Entity<T>,
 	is_tag = (ecs_is_tag :: any) :: <T>(World, Id<T>) -> boolean,

-    OnAdd = EcsOnAdd :: Entity<<T>(entity: Entity, id: Id<T>, data: T) -> ()>,
-	OnRemove = EcsOnRemove :: Entity<(entity: Entity, id: Id) -> ()>,
-	OnChange = EcsOnChange :: Entity<<T>(entity: Entity, id: Id<T>, data: T) -> ()>,
-	ChildOf = EcsChildOf :: Entity,
-	Component = EcsComponent :: Entity,
-	Wildcard = EcsWildcard :: Entity,
-	w = EcsWildcard :: Entity,
-	OnDelete = EcsOnDelete :: Entity,
-	OnDeleteTarget = EcsOnDeleteTarget :: Entity,
-	Delete = EcsDelete :: Entity,
-	Remove = EcsRemove :: Entity,
-	Name = EcsName :: Entity<string>,
-	Rest = EcsRest :: Entity,
+    OnAdd = (EcsOnAdd :: any) :: Entity<<T>(entity: Entity, id: Id<T>, data: T) -> ()>,
+	OnRemove = (EcsOnRemove :: any) :: Entity<(entity: Entity, id: Id) -> ()>,
+	OnChange = (EcsOnChange :: any) :: Entity<<T>(entity: Entity, id: Id<T>, data: T) -> ()>,
+	ChildOf = (EcsChildOf :: any) :: Entity,
+	Component = (EcsComponent :: any) :: Entity,
+	Wildcard = (EcsWildcard :: any) :: Entity,
+	w = (EcsWildcard :: any) :: Entity,
+	OnDelete = (EcsOnDelete :: any) :: Entity,
+	OnDeleteTarget = (EcsOnDeleteTarget :: any) :: Entity,
+	Delete = (EcsDelete :: any) :: Entity,
+	Remove = (EcsRemove :: any) :: Entity,
+	Name = (EcsName :: any) :: Entity<string>,
+	Rest = (EcsRest :: any) :: Entity,

 	pair = (ECS_PAIR :: any) :: <P, O>(first: Id<P>, second: Id<O>) -> Pair<P, O>,

--- 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-nightly.20250606T001110Z"
+version = "0.6.0-nightly.20250608T001058Z"

 [indices]
 default = "https://github.com/pesde-pkg/index"
--- 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-nightly.20250606T001110Z"
+version = "0.6.0-nightly.20250608T001058Z"

 [indices]
 default = "https://github.com/pesde-pkg/index"
--- a/jecs/test.txt
+++ b/jecs/test.txt
@ -1,2 +1,2 @@
 passed = true
-timestamp = "20250607T001059Z"
+timestamp = "20250608T001100Z"
--- a/jecs/test_fulllog.txt
+++ b/jecs/test_fulllog.txt
@ -1,6 +1,6 @@
-[38;1m7.3[0m [33;1mus[0m [38;1m  3[0m [33;1mkB[0m[38;1m│[0m [38;1mdelete children of entity[0m
-[38;1m9.1[0m [33;1mus[0m [38;1m  1[0m [33;1mkB[0m[38;1m│[0m [38;1mremove friends of entity[0m
-[38;1m342[0m [32;1mns[0m [38;1m 10[0m [32;1m B[0m[38;1m│[0m [38;1msimple deletion of entity[0m
+[38;1m7.2[0m [33;1mus[0m [38;1m  2[0m [33;1mkB[0m[38;1m│[0m [38;1mdelete children of entity[0m
+[38;1m8.9[0m [33;1mus[0m [38;1m  1[0m [33;1mkB[0m[38;1m│[0m [38;1mremove friends of entity[0m
+[38;1m342[0m [32;1mns[0m [38;1m  0[0m [32;1m B[0m[38;1m│[0m [38;1msimple deletion of entity[0m
 [37;1mrepro[0m
 [38;5;208mNONE[0m[38;1m│[0m [38;1m[0m

@ -121,5 +121,5 @@
 [32;1mPASS[0m[38;1m│[0m [38;1m#2[0m
 [32;1mPASS[0m[38;1m│[0m [38;1m#3[0m

-[38;1m74/74 test cases passed in 32.356 ms.[0m
+[38;1m74/74 test cases passed in 30.541 ms.[0m
 [32;1m0 fails[0m
--- 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-nightly.20250606T001110Z"
+version = "0.6.0-nightly.20250608T001058Z"