From a62cb370cff5fbed0a38d9fa34470518068b13b1 Mon Sep 17 00:00:00 2001
From: Ukendio <ukendio@gmail.com>
Date: Sun, 9 Jun 2024 23:58:01 +0200
Subject: [PATCH] Everything are entities!

---
 lib/init.lua | 81 ++++++++++++++++++++++++----------------------------
 1 file changed, 38 insertions(+), 43 deletions(-)

diff --git a/lib/init.lua b/lib/init.lua
index b83d988..402473c 100644
--- a/lib/init.lua
+++ b/lib/init.lua
@@ -853,77 +853,72 @@ end
 
 -- __nominal_type_dont_use could not be any or T as it causes a type error
 -- or produces a union
-export type Component<T=any> = T & {__nominal_type_dont_use: never}
-export type Entity<T=any> = Component<T>
-export type Relationship<T=any> = Component<T>
-type ctype<T> = Component<T>
-
-export type QueryShim<T...> = typeof(setmetatable(
-	{} :: {
-		--- Excludes the given selection from the query
-		without: <U...>(QueryShim<T...>, U...) -> QueryShim<T...>
-	},
-	{} :: {
-		__iter: (QueryShim<T...>) -> () -> (Entity, T...)
-	}
-))
+export type Entity<T=any> = number & {__nominal_type_dont_use: T}
+export type Pair = number
 
+export type QueryShim<T...> = typeof(setmetatable({
+	without = function(...): QueryShim<T...>
+		return nil :: any
+	end
+}, {
+	__iter = function(): () -> (number, T...)
+		return nil :: any
+	end
+}))
 export type WorldShim = typeof(setmetatable(
 	{} :: {
 
 		--- Creates a new entity
-		entity: <T>(WorldShim) -> Entity<T>,
+		entity: (WorldShim) -> Entity,
 		--- Creates a new entity located in the first 256 ids.
 		--- These should be used for static components for fast access.
-		component: <T>(WorldShim) -> Component<T>,
+		component: <T>(WorldShim) -> Entity<T>,
 		--- Gets the target of an relationship. For example, when a user calls
 		--- `world:target(id, ChildOf(parent))`, you will obtain the parent entity.
-		target: (WorldShim, id: Entity, relation: Relationship) -> Entity?,
+		target: (WorldShim, id: Entity, relation: Entity) -> Entity?,
 		--- Deletes an entity and all it's related components and relationships.
 		delete: (WorldShim, id: Entity) -> (),
 	
 		--- Adds a component to the entity with no value
-		add: <T>(WorldShim, id: Entity, component: Component<T>) -> (),
+		add: <T>(WorldShim, id: Entity, component: Entity<T>) -> (),
 		--- Assigns a value to a component on the given entity
-		set: <T>(WorldShim, id: Entity, component: Component<T>, data: T) -> (),
+		set: <T>(WorldShim, id: Entity, component: Entity<T>, data: T) -> (),
 		--- Removes a component from the given entity
-		remove: (WorldShim, id: Entity, component: Component) -> (),
+		remove: (WorldShim, id: Entity, component: Entity) -> (),
 		--- Retrieves the value of up to 4 components. These values may be nil.
 		get:
-			(<A>(WorldShim, id: any, ctype<A>) -> A)
-			& (<A, B>(WorldShim, id: Entity, ctype<A>, ctype<B>) -> (A, B))
-			& (<A, B, C>(WorldShim, id: Entity, ctype<A>, ctype<B>, ctype<C>) -> (A, B, C))
-			& <A, B, C, D>(WorldShim, id: Entity, ctype<A>, ctype<B>, ctype<C>, ctype<D>) -> (A, B, C, D),
+			(<A>(WorldShim, id: any, Entity<A>) -> A)
+			& (<A, B>(WorldShim, id: Entity, Entity<A>, Entity<B>) -> (A, B))
+			& (<A, B, C>(WorldShim, id: Entity, Entity<A>, Entity<B>, Entity<C>) -> (A, B, C))
+			& <A, B, C, D>(WorldShim, id: Entity, Entity<A>, Entity<B>, Entity<C>, Entity<D>) -> (A, B, C, D),
 	
 		--- Searches the world for entities that match a given query
-		query:
-			(<A>(WorldShim, ctype<A>) -> QueryShim<A>)
-			& (<A, B>(WorldShim, ctype<A>, ctype<B>) -> QueryShim<A, B>)
-			& (<A, B, C>(WorldShim, ctype<A>, ctype<B>, ctype<C>) -> QueryShim<A, B, C>)
-			& (<A, B, C, D>(WorldShim, ctype<A>, ctype<B>, ctype<C>, ctype<D>) -> QueryShim<A, B, C, D>)
-			& (<A, B, C, D, E>(WorldShim, ctype<A>, ctype<B>, ctype<C>, ctype<D>, ctype<E>) -> QueryShim<A, B, C, D, E>)
-			& (<A, B, C, D, E, F>(WorldShim, ctype<A>, ctype<B>, ctype<C>, ctype<D>, ctype<E>, ctype<F>) -> QueryShim<A, B, C, D, E, F>)
-			& (<A, B, C, D, E, F, G>(WorldShim, ctype<A>, ctype<B>, ctype<C>, ctype<D>, ctype<E>, ctype<F>, ctype<G>) -> QueryShim<A, B, C, D, E, F, G>)
-			& (<A, B, C, D, E, F, G, H>(WorldShim, ctype<A>, ctype<B>, ctype<C>, ctype<D>, ctype<E>, ctype<F>, ctype<G>, ctype<H>) -> QueryShim<A, B, C, D, E, F, G, H>)
-			& (<A, B, C, D, E, F, G, H, I>(WorldShim, ctype<A>, ctype<B>, ctype<C>, ctype<D>, ctype<E>, ctype<F>, ctype<G>, ctype<H>, ctype<I>) -> QueryShim<A, B, C, D, E, F, G, H, I>)
-			& (<A, B, C, D, E, F, G, H, I, J>(WorldShim, ctype<A>, ctype<B>, ctype<C>, ctype<D>, ctype<E>, ctype<F>, ctype<G>, ctype<H>, ctype<I>, ctype<J>) -> QueryShim<A, B, C, D, E, F, G, H, I, J>)
-			& (<A, B, C, D, E, F, G, H, I, J, K>(WorldShim, ctype<A>, ctype<B>, ctype<C>, ctype<D>, ctype<E>, ctype<F>, ctype<G>, ctype<H>, ctype<I>, ctype<J>, ctype<K>, ...ctype<any>) -> QueryShim<A, B, C, D, E, F, G, H, I, J, K>)
+		query: (<A>(WorldShim, Entity<A>) -> QueryShim<A>)
+			& (<A, B>(WorldShim, Entity<A>, Entity<B>) -> QueryShim<A, B>)
+			& (<A, B, C>(WorldShim, Entity<A>, Entity<B>, Entity<C>) -> QueryShim<A, B, C>)
+			& (<A, B, C, D>(WorldShim, Entity<A>, Entity<B>, Entity<C>, Entity<D>) -> QueryShim<A, B, C, D>)
+			& (<A, B, C, D, E>(WorldShim, Entity<A>, Entity<B>, Entity<C>, Entity<D>, Entity<E>) -> QueryShim<A, B, C, D, E>)
+			& (<A, B, C, D, E, F>(WorldShim, Entity<A>, Entity<B>, Entity<C>, Entity<D>, Entity<E>, Entity<F>) -> QueryShim<A, B, C, D, E, F>)
+			& (<A, B, C, D, E, F, G>(WorldShim, Entity<A>, Entity<B>, Entity<C>, Entity<D>, Entity<E>, Entity<F>, Entity<G>) -> QueryShim<A, B, C, D, E, F, G>)
+			& (<A, B, C, D, E, F, G, H>(WorldShim, Entity<A>, Entity<B>, Entity<C>, Entity<D>, Entity<E>, Entity<F>, Entity<G>, Entity<H>) -> QueryShim<A, B, C, D, E, F, G, H>)
+			& (<A, B, C, D, E, F, G, H, I>(WorldShim, Entity<A>, Entity<B>, Entity<C>, Entity<D>, Entity<E>, Entity<F>, Entity<G>, Entity<H>, Entity<I>) -> QueryShim<A, B, C, D, E, F, G, H, I>)
+			& (<A, B, C, D, E, F, G, H, I, J>(WorldShim, Entity<A>, Entity<B>, Entity<C>, Entity<D>, Entity<E>, Entity<F>, Entity<G>, Entity<H>, Entity<I>, Entity<J>) -> QueryShim<A, B, C, D, E, F, G, H, I, J>)
+			& (<A, B, C, D, E, F, G, H, I, J, K>(WorldShim, Entity<A>, Entity<B>, Entity<C>, Entity<D>, Entity<E>, Entity<F>, Entity<G>, Entity<H>, Entity<I>, Entity<J>, Entity<K>, ...Entity<any>) -> QueryShim<A, B, C, D, E, F, G, H, I, J, K>)
 		
 	},
 	{} :: {
 		__iter: (world: WorldShim) -> () -> (number, {[unknown]: unknown?})
 	}
-
 ))
 
 return table.freeze({
 	World = (World :: any) :: {new: () -> WorldShim},
 
-	OnAdd = (ON_ADD :: any) :: Component,
-	OnRemove = (ON_REMOVE :: any) :: Component,
-	OnSet = (ON_SET :: any) :: Component,
-	Wildcard = (WILDCARD :: any) :: Component,
-	w = (WILDCARD :: any) :: Component,
+	OnAdd = (ON_ADD :: any) :: Entity,
+	OnRemove = (ON_REMOVE :: any) :: Entity,
+	OnSet = (ON_SET :: any) :: Entity,
+	Wildcard = (WILDCARD :: any) :: Entity,
+	w = (WILDCARD :: any) :: Entity,
 	Rest = REST,
 
 	IS_PAIR = ECS_IS_PAIR,
@@ -934,6 +929,6 @@ return table.freeze({
 	ECS_PAIR_RELATION = ECS_PAIR_RELATION,
 	ECS_PAIR_OBJECT = ECS_PAIR_OBJECT,
 
-	pair = (ECS_PAIR :: any) :: <R, T>(pred: Entity<R>, obj: Entity<T>) -> Relationship<R>,
+	pair = (ECS_PAIR :: any) :: <R, T>(pred: Entity, obj: Entity) -> number,
 	getAlive = getAlive
 })