Change TS types for Archetype

jecs.d.ts

@@ -31,31 +31,27 @@ export type Id<TData = unknown> = Entity<TData> | Pair<TData, unknown> | Pair<un
 export type InferComponent<E> = E extends Entity<infer D>
 	? D
 	: E extends Pair<infer P, infer O>
-		? P extends undefined
+	? P extends undefined
-			? O
+		? O
-			: P
+		: P
-		: never;
+	: never;
 
 type FlattenTuple<T extends unknown[]> = T extends [infer U] ? U : LuaTuple<T>;
 type Nullable<T extends unknown[]> = { [K in keyof T]: T[K] | undefined };
 type InferComponents<A extends Id[]> = { [K in keyof A]: InferComponent<A[K]> };
 
-type ArchetypeId = number
+type ArchetypeId = number;
 type Column = unknown[];
 
-type ArchetypeRecord = {
-    count: number;
-    column: number;
-}
-
 export type Archetype = {
-    id: number;
+	id: number;
-    types: number[];
+	types: number[];
-    type: string;
+	type: string;
-    entities: number[];
+	entities: number[];
-    columns: Column[];
+	columns: Column[];
-    records: ArchetypeRecord[];
+	records: number[];
-}
+	counts: number[];
+};
 
 type Iter<T extends unknown[]> = IterableFunction<LuaTuple<[Entity, ...T]>>;
 

jecs.luau

@@ -950,6 +950,7 @@ local function archetype_delete(world: World, archetype: Archetype, row: number,
 			record_to_move.row = row
 		end
 
+		delete = entities[row]
 		entities[row] = move
 	end
 

package.json

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

test/tests.luau

@@ -1045,6 +1045,22 @@ TEST("world:component()", function()
 end)
 
 TEST("world:delete", function()
+	do CASE "invoke OnRemove hooks"
+		local world = world_new()
+
+		local e1 = world:entity()
+		local e2 = world:entity()
+
+		local Stable = world:component()
+		world:set(Stable, jecs.OnRemove, function(e)
+			CHECK(e == e1)
+		end)
+
+		world:set(e1, Stable, true)
+		world:set(e2, Stable, true)
+
+		world:delete(e1)
+	end
 	do CASE "delete recycled entity id used as component"
 		local world = world_new()
 		local id = world:entity()

wally.toml

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