Sovereignty/jecs
1
0
Fork 0
mirror of https://github.com/Ukendio/jecs.git synced 2025-04-25 09:30:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix type errors

Browse source
This commit is contained in:
Ukendio 2024-12-24 22:17:58 +01:00
parent c37930b7e8
commit d5d275cc17
1 changed files with 37 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
jecs.luau
View file

@ -585,7 +585,9 @@ local function archetype_append_to_records(
end end
end end
local function create_observer_uni(world: World, component: number, event)
local function create_observer_uni(world: World, component: number, event): ecs_partial_t<Observer>
local map = world.observerable[event] local map = world.observerable[event]
if not map then if not map then
map = {} map = {}
@ -602,7 +604,7 @@ local function create_observer_uni(world: World, component: number, event)
table.insert(observer_list, observer) table.insert(observer_list, observer)
return observer return observer :: any
end end
local function archetype_create(world: World, id_types: { i24 }, ty, prev: i53?): Archetype local function archetype_create(world: World, id_types: { i24 }, ty, prev: i53?): Archetype
@ -1494,12 +1496,12 @@ local function query_iter(query): () -> (number, ...any)
return query_next return query_next
end end
local function query_without(query: { compatible_archetypes: { Archetype } }, ...) local function query_without(query: QueryInner, ...: i53)
local filters = query.filters local filters: { without: { i53 } } = query.filters :: any
local without = { ... } local without = { ... }
if not filters then if not filters then
filters = {} filters = {}
query.filters = filters query.filters = filters :: any
end end
filters.without = without filters.without = without
local compatible_archetypes = query.compatible_archetypes local compatible_archetypes = query.compatible_archetypes
@ -1529,13 +1531,13 @@ local function query_without(query: { compatible_archetypes: { Archetype } }, ..
return query :: any return query :: any
end end
local function query_with(query: { compatible_archetypes: { Archetype } }, ...) local function query_with(query: QueryInner, ...)
local compatible_archetypes = query.compatible_archetypes local compatible_archetypes = query.compatible_archetypes
local filters = query.filters local filters: { with: { i53 } } = query.filters :: any
local with = { ... } local with = { ... }
if not filters then if not filters then
filters = {} filters = {}
query.filters = filters query.filters = filters :: any
end end
filters.with = with filters.with = with
for i = #compatible_archetypes, 1, -1 do for i = #compatible_archetypes, 1, -1 do
@ -1571,14 +1573,15 @@ local function query_archetypes(query)
return query.compatible_archetypes return query.compatible_archetypes
end end
local function query_cached(query) local function query_cached(query: QueryInner)
local archetypes = query.compatible_archetypes local archetypes = query.compatible_archetypes
local observer_1 = create_observer_uni(query.world, query.ids[1], EcsArchetypeCreate) local world = query.world :: World
local observer_1 = create_observer_uni(world, query.ids[1], EcsArchetypeCreate)
observer_1.query = query observer_1.query = query
observer_1.callback = function(archetype) observer_1.callback = function(archetype)
table.insert(archetypes, archetype) table.insert(archetypes, archetype)
end end
local observer_2 = create_observer_uni(query.world, query.ids[1], EcsArchetypeDelete) local observer_2 = create_observer_uni(world, query.ids[1], EcsArchetypeDelete)
observer_2.query = query observer_2.query = query
observer_2.callback = function(archetype) observer_2.callback = function(archetype)
local i = table.find(archetypes, archetype) local i = table.find(archetypes, archetype)
@ -1914,6 +1917,29 @@ export type Query<T...> = typeof(setmetatable({}, {
cached: (self: Query<T...>) -> Query<T...>, cached: (self: Query<T...>) -> Query<T...>,
} }
type QueryInner = {
compatible_archetypes: { Archetype },
filters: {
without: { i53 }?,
with: { i53 }?,
}?,
ids: { i53 },
world: {} -- Downcasted to be serializable by the analyzer
}
type Observer = {
callback: (archetype: Archetype) -> (),
query: QueryInner,
}
type function ecs_partial_t(ty)
local output = types.newtable()
for k, v in ty:properties() do
output:setproperty(k, types.unionof(v.write, types.singleton(nil)))
end
return output
end
export type World = { export type World = {
archetypeIndex: { [string]: Archetype }, archetypeIndex: { [string]: Archetype },
archetypes: Archetypes, archetypes: Archetypes,