Merge 96bed9bd7e into 7c8358656a

* Optimize removal path

* Replace eindex_get implementation

jecs.d.ts

@@ -105,7 +105,7 @@ export class World {
 	/**
 	 * Creates a new World.
 	 */
-	constructor();
+	private constructor();
 
 	/**
 	 * Enforces a check for entities to be created within a desired range.
@@ -249,6 +249,8 @@ export class World {
 	query<T extends Id[]>(...components: T): Query<InferComponents<T>>;
 }
 
+export function world(): World;
+
 export function component<T>(): Entity<T>;
 
 export function tag(): Tag;

jecs.luau

@@ -52,6 +52,8 @@ export type Query<T...> = typeof(setmetatable(
 	}
 ))
 
+type QueryArm<T...> = () -> ()
+
 export type Observer = {
 	callback: (archetype: Archetype) -> (),
 	query: QueryInner,
@@ -658,6 +660,9 @@ local function id_record_ensure(world: World, id: Entity): ComponentRecord
 	local relation = id
 	local target = 0
 	local is_pair = ECS_IS_PAIR(id :: number)
+
+	local has_delete = false
+
 	if is_pair then
 		relation = entity_index_get_alive(entity_index, ECS_PAIR_FIRST(id :: number)) :: i53
 		ecs_assert(relation and entity_index_is_alive(
@@ -665,15 +670,18 @@ local function id_record_ensure(world: World, id: Entity): ComponentRecord
 		target = entity_index_get_alive(entity_index, ECS_PAIR_SECOND(id :: number)) :: i53
 		ecs_assert(target and entity_index_is_alive(
 			entity_index, target), ECS_INTERNAL_ERROR)
-	end
 
-	local cleanup_policy = world_target(world, relation, EcsOnDelete, 0)
+		local cleanup_policy_target = world_target(world, relation, EcsOnDeleteTarget, 0)
-	local cleanup_policy_target = world_target(world, relation, EcsOnDeleteTarget, 0)
 
-	local has_delete = false
+		if cleanup_policy_target == EcsDelete then
+			has_delete = true
+		end
+	else
+		local cleanup_policy = world_target(world, relation, EcsOnDelete, 0)
 
-	if cleanup_policy == EcsDelete or cleanup_policy_target == EcsDelete then
+		if cleanup_policy == EcsDelete then
-		has_delete = true
+			has_delete = true
+		end
 	end
 
 	local on_add, on_change, on_remove = world_get(world,
@@ -2026,18 +2034,16 @@ local function ecs_bulk_insert(world: World, entity: Entity, ids: { Entity }, va
 		local value = values[i] :: any
 
 		local on_add = idr.hooks.on_add
-		local on_change = idr.hooks.on_change
 
-		if value then
+		if value ~= nil then
 			columns_map[id][row] = value
+			local on_change = idr.hooks.on_change
 			local hook = if set then on_change else on_add
 			if hook then
 				hook(entity, id, value :: any)
 			end
-		else
+		elseif on_add then
-			if on_add then
+			on_add(entity, id)
-				on_add(entity, id, value)
-			end
 		end
 	end
 end
@@ -2140,38 +2146,41 @@ local function world_new()
 		return r
 	end
 
-	-- local function entity_index_try_get_safe(entity: number): Record?
+	-- local function inner_entity_index_try_get(entity: number): Record?
-	-- 	local r = entity_index_try_get_any_fast(entity_index, entity)
+	-- 	local r = inner_entity_index_try_get_any(entity)
 	-- 	if r then
 	-- 		local r_dense = r.dense
 	-- 		if r_dense > entity_index.alive_count then
 	-- 			return nil
 	-- 		end
-	-- 		if entity_index.dense_array[r_dense] ~= entity then
+	-- 		if eindex_dense_array[r_dense] ~= entity then
 	-- 			return nil
 	-- 		end
 	-- 	end
 	-- 	return r
 	-- end
 
-	local function inner_entity_index_try_get(entity: number): Record?
+	local function inner_entity_index_try_get_unsafe(entity: number): Record?
-		local r = eindex_sparse_array[ECS_ENTITY_T_LO(entity)]
+		local r = inner_entity_index_try_get_any(entity)
 		if r then
-			if eindex_dense_array[r.dense] ~= entity then
+			local r_dense = r.dense
+			-- if r_dense > entity_index.alive_count then
+			-- 	return nil
+			-- end
+			if eindex_dense_array[r_dense] ~= entity then
 				return nil
 			end
 		end
 		return r
 	end
 
-
 	local function inner_world_add<T, a>(
 		world: World,
 		entity: Entity<T>,
 		id: Id<a>
 	): ()
 		local entity_index = world.entity_index
-		local record = inner_entity_index_try_get(entity :: number)
+		local record = inner_entity_index_try_get_unsafe(entity :: number)
 		if not record then
 			return
 		end
@@ -2199,7 +2208,7 @@ local function world_new()
 
 	local function inner_world_get(world: World, entity: Entity,
 		a: Id, b: Id?, c: Id?, d: Id?, e: Id?): ...any
-		local record = inner_entity_index_try_get(entity::number)
+		local record = inner_entity_index_try_get_unsafe(entity::number)
 		if not record then
 			return nil
 		end
@@ -2230,7 +2239,7 @@ local function world_new()
 	local function inner_world_has(world: World, entity: i53,
 		a: i53, b: i53?, c: i53?, d: i53?, e: i53?): boolean
 
-		local record = inner_entity_index_try_get(entity)
+		local record = inner_entity_index_try_get_unsafe(entity)
 		if not record then
 			return false
 		end
@@ -2250,7 +2259,7 @@ local function world_new()
 	end
 
 	local function inner_world_target<T, a>(world: World, entity: Entity<T>, relation: Id<a>, index: number?): Entity?
-		local record = inner_entity_index_try_get(entity :: number)
+		local record = inner_entity_index_try_get_unsafe(entity :: number)
 		if not record then
 			return nil
 		end
@@ -2312,7 +2321,7 @@ local function world_new()
 	end
 
 	local function inner_world_set<T, a>(world: World, entity: Entity<T>, id: Id<a>, data: a): ()
-		local record = inner_entity_index_try_get(entity :: number)
+		local record = inner_entity_index_try_get_unsafe(entity :: number)
 		if not record then
 			return
 		end
@@ -2413,7 +2422,7 @@ local function world_new()
 	end
 
 	local function inner_world_remove<T, a>(world: World, entity: Entity<T>, id: Id<a>)
-		local record = inner_entity_index_try_get(entity :: number)
+		local record = inner_entity_index_try_get_unsafe(entity :: number)
 		if not record then
 			return
 		end
@@ -2533,11 +2542,12 @@ local function world_new()
 				end
 			end
 		end
+
 	end
 
 	local function inner_world_delete<T>(world: World, entity: Entity<T>)
 		local entity_index = world.entity_index
-		local record = inner_entity_index_try_get(entity::number)
+		local record = inner_entity_index_try_get_unsafe(entity::number)
 		if not record then
 			return
 		end
@@ -2575,15 +2585,41 @@ local function world_new()
 					archetype_destroy(world, idr_archetype)
 				end
 			else
-				for archetype_id in idr.records do
+				local on_remove = idr.hooks.on_remove
-					local idr_archetype = archetypes[archetype_id]
+				if on_remove then
-					local entities = idr_archetype.entities
+					for archetype_id in idr.records do
-					local n = #entities
+						local idr_archetype = archetypes[archetype_id]
-					for i = n, 1, -1 do
+						local to = archetype_traverse_remove(world, entity, idr_archetype)
-						inner_world_remove(world, entities[i], entity)
+						local entities = idr_archetype.entities
-					end
+						local n = #entities
+						for i = n, 1, -1 do
+							local e = entities[i]
+							on_remove(e, entity)
+							local r = eindex_sparse_array[ECS_ID(e :: number)]
+							local from = r.archetype
+							if from ~= idr_archetype then
+								-- unfortunately the on_remove hook allows a window where `e` can have changed archetype
+								-- this is hypothetically not that expensive of an operation anyways
+								to = archetype_traverse_remove(world, entity, from)
+							end
+							entity_move(entity_index, e, r, to)
+						end
 
-					archetype_destroy(world, idr_archetype)
+						archetype_destroy(world, idr_archetype)
+					end
+				else
+					for archetype_id in idr.records do
+						local idr_archetype = archetypes[archetype_id]
+						local to = archetype_traverse_remove(world, entity, idr_archetype)
+						local entities = idr_archetype.entities
+						local n = #entities
+						for i = n, 1, -1 do
+							local e = entities[i]
+							entity_move(entity_index, e, eindex_sparse_array[ECS_ID(e :: number)], to)
+						end
+
+						archetype_destroy(world, idr_archetype)
+					end
 				end
 			end
 		end
@@ -2803,7 +2839,7 @@ local function world_new()
 			if value == NULL then
 				inner_world_add(world, i, ty)
 			else
-				inner_world_add(world, i, ty, value)
+				inner_world_set(world, i, ty, value)
 			end
 		end
 	end

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rbxts/jecs",
-	"version": "0.7.2",
+	"version": "0.7.3",
 	"description": "Stupidly fast Entity Component System",
 	"main": "jecs.luau",
 	"repository": {

test/tests.luau

@@ -25,6 +25,57 @@ local entity_visualiser = require("@tools/entity_visualiser")
 local lifetime_tracker_add = require("@tools/lifetime_tracker")
 local dwi = entity_visualiser.stringify
 
+TEST("repro#", function()
+	do CASE "pair(OnDelete, Delete)"
+	    local world = jecs.world()
+	    local ct = world:component()
+	    world:add(ct, jecs.pair(jecs.OnDelete, jecs.Delete))
+
+	    local e1 = world:entity()
+	    local e2 = world:entity()
+
+	    local dummy = world:entity()
+
+	    world:add(e1, ct)
+	    world:add(e2, jecs.pair(ct, dummy))
+
+	    world:delete(dummy)
+
+	    CHECK(world:contains(e2))
+
+	    world:delete(ct)
+
+	    CHECK(not world:contains(e1))
+	end
+
+	do CASE "pair(OnDeleteTarget, Delete)"
+		print("start")
+	    local world = jecs.world()
+	    local ct = world:component()
+	    world:add(ct, jecs.pair(jecs.OnDeleteTarget, jecs.Delete))
+
+	    local e1 = world:entity()
+	    local e2 = world:entity()
+
+	    -- local dummy = world:entity()
+
+		print("flags")
+	    world:add(e1, ct)
+
+		print(world.component_index[ct].flags)
+	    -- world:add(e2, jecs.pair(ct, dummy))
+
+	    -- world:delete(dummy)
+
+	    -- CHECK(not world:contains(e2))
+
+	    world:delete(ct)
+
+	    CHECK(world:contains(e1))
+	end
+
+end)
+
 TEST("bulk", function()
 	local world = jecs.world()
 	local A = world:component()
@@ -42,7 +93,10 @@ TEST("bulk", function()
 	CHECK(world:get(e, B) == 2)
 	CHECK(world:get(e, C) == 3)
 
-	jecs.bulk_insert(world, e, { D, E, F }, { 4, nil, 5 })
+	jecs.bulk_insert(world, e,
+		{ D, E, F },
+		{ 4, nil, 5 }
+	)
 	CHECK(world:get(e, A) == 1)
 	CHECK(world:get(e, B) == 2)
 	CHECK(world:get(e, C) == 3)
@@ -51,7 +105,10 @@ TEST("bulk", function()
 	CHECK(world:get(e, E) == nil and world:has(e, E))
 	CHECK(world:get(e, F) == 5)
 
-	jecs.bulk_insert(world, e, { A, D, E, F, C }, { 10, 40, nil, 50, 30 })
+	jecs.bulk_insert(world, e,
+		{ A, D, E, F, C },
+		{ 10, 40, nil, 50, 30 }
+	)
 
 	CHECK(world:get(e, A) == 10)
 	CHECK(world:get(e, B) == 2)
@@ -441,7 +498,7 @@ TEST("world:delete()", function()
 		local A = world:entity()
 		local B = world:entity()
 
-		world:add(Relation, pair(jecs.OnDelete, jecs.Delete))
+		world:add(Relation, pair(jecs.OnDeleteTarget, jecs.Delete))
 
 		local entity = world:entity()
 

wally.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ukendio/jecs"
-version = "0.7.2"
+version = "0.7.3"
 registry = "https://github.com/UpliftGames/wally-index"
 realm = "shared"
 license = "MIT"