From d24ab71e4c6d2a9a09df05186bcc9dc36bd230a9 Mon Sep 17 00:00:00 2001
From: Ukendio <ukendio@gmail.com>
Date: Sat, 5 Apr 2025 00:41:38 +0200
Subject: [PATCH] Style fixes

---
 addons/observers.luau | 12 +++++-
 jecs.luau             |  8 ++--
 test/tests.luau       | 97 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 111 insertions(+), 6 deletions(-)

diff --git a/addons/observers.luau b/addons/observers.luau
index 9afad4e..a11f67c 100644
--- a/addons/observers.luau
+++ b/addons/observers.luau
@@ -16,6 +16,10 @@ local function observers_new(world, description)
 		local r = jecs.entity_index_try_get_fast(
 			entity_index, entity)
 
+		if not r then
+			return
+		end
+
 		local archetype = r.archetype
 
 		if jecs.query_match(query, archetype) then
@@ -42,9 +46,13 @@ local function world_track(world, ...)
 		local r = jecs.entity_index_try_get_fast(
 			entity_index, entity)
 
+		if not r then
+			return
+		end
+
 		local archetype = r.archetype
 
-		if jecs.query_match(q_shim, archetype) then
+		if jecs.query_match(q_shim :: any, archetype) then
 			n += 1
 			dense_array[n] = entity
 			sparse_array[entity] = n
@@ -73,7 +81,7 @@ local function world_track(world, ...)
 				return nil
 			end
 			i -= 1
-			return dense_array[row]
+			return dense_array[row] :: any
 		end
 	end
 
diff --git a/jecs.luau b/jecs.luau
index 8080a5b..9eeb65b 100644
--- a/jecs.luau
+++ b/jecs.luau
@@ -124,9 +124,9 @@ 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_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)
@@ -2600,7 +2600,7 @@ export type World = {
 
 return {
 	World = World :: { new: () -> World },
-	world = World.new :: () -> World,
+	world = world_new :: () -> World,
 
 	OnAdd = EcsOnAdd :: Entity<(entity: Entity) -> ()>,
 	OnRemove = EcsOnRemove :: Entity<(entity: Entity) -> ()>,
diff --git a/test/tests.luau b/test/tests.luau
index 7091be0..561a027 100644
--- a/test/tests.luau
+++ b/test/tests.luau
@@ -117,6 +117,103 @@ local function name(world, e)
 	return world:get(e, jecs.Name)
 end
 
+
+local function worldReset(world)
+	local entity_index = world.entity_index
+	for i = jecs.Rest, entity_index.max_id do
+		local entity = entity_index.dense_array[i]
+		world:delete(entity)
+	end
+	for i = jecs.Rest, entity_index.max_id do
+		local sparse = entity_index.dense_array[i]
+		entity_index.sparse_array[sparse] = nil
+		entity_index.dense_array[i] = nil
+	end
+	entity_index.alive_count = jecs.Rest
+	entity_index.max_id = jecs.Rest
+end
+
+local lifetime_tracker_add = require("@tools/lifetime_tracker")
+TEST("the great reset", function()
+	local world = world_new()
+	lifetime_tracker_add(world, {padding_enabled=false})
+	local A = world:component()
+	local B = world:component()
+
+	for i = 1, 10 do
+		local e = world:entity()
+		world:set(e, A, true)
+		world:set(e, B, true)
+	end
+	world:print_entity_index()
+	worldReset(world)
+	CHECK(world:contains(A))
+	CHECK(world:contains(B))
+	world:print_entity_index()
+end)
+
+TEST("#repro3", function()
+	local world = world_new()
+	local Model = world:component()
+	local ModelBase = world:component()
+
+	local systems = {}
+
+	local function progress()
+		for _, system in systems do
+			system()
+		end
+	end
+
+	local newQuery = nil
+	local oldQuery = nil
+
+	local function modelBase()
+		if not newQuery then
+			newQuery = world:query(Model):without(ModelBase):cached()
+		end
+		if not oldQuery then
+			oldQuery = world:query(ModelBase):without(Model):cached()
+		end
+		for e, model in newQuery do
+			world:set(e, ModelBase, { "part base" })
+		end
+		for e, model in oldQuery do
+			world:remove(e, ModelBase)
+		end
+	end
+
+	table.insert(systems, modelBase)
+
+	do CASE("should add the correct ModelBase for parts")
+		local e = world:entity()
+		world:set(e, Model, { instance = "Model" })
+		progress()
+		CHECK(world:get(e, ModelBase)[1] == "part base" )
+	end
+
+	do CASE("should add the correct ModelBase for parts")
+		local e = world:entity()
+		world:set(e, Model, { instance = "Model "})
+		progress()
+		CHECK(world:get(e, ModelBase)[1] == "part base")
+	end
+
+
+
+	do CASE("")
+		local e = world:entity()
+		world:set(e, Model, { instance = "Model "})
+		progress()
+		CHECK(world:get(e, ModelBase)[1] == "part base")
+		world:remove(e, Model)
+		progress()
+		CHECK(world:get(e, ModelBase) == nil)
+
+
+	end
+end)
+
 TEST("#adding a recycled target", function()
     local world = world_new()
     local R = world:component()