@jael-ecs/core 1.1.1 → 1.2.0

package/README.md

@@ -25,6 +25,7 @@ _A modern, performant, and user-friendly Entity Component System library written
   - [EventRegistry](#event-registry)
 - [Best Practices](#best-practices)
 - [Advanced Usage](#advanced-usage)
+- [Planned Features](#planned-features)
 - [Contributing](#contributing)
 - [Acknowledgments](#acknowledgments)
 
@@ -89,15 +90,6 @@ const movementSystem: System = {
       position.x += velocity.dx * (Time.delta || 0.016);
       position.y += velocity.dy * (Time.delta || 0.016);
     });
-
-    // Get entity ids from query
-    for (const entityId of query.ids) {
-      const position = this.world.getComponent<Position>(entityId, "position");
-      const velocity = this.world.getComponent<Velocity>(entityId, "velocity");
-
-      position.x += velocity.dx * (Time.delta || 0.016);
-      position.y += velocity.dy * (Time.delta || 0.016);
-    }
   },
 };
 
@@ -163,21 +155,21 @@ world.removeSystem(yourSystem);
 #### Events
 
 ```typescript
-// Listen to world events ( returns entity proxy for easy reading )
-world.on("entityCreated", ({ entity }) => {
-  console.log("Entity created:", entity);
+// Listen to world events
+world.on("entityCreated", ({ entityId }) => {
+  console.log("Entity created:", entityId);
 });
 
-world.on("entityDestroyed", ({ entity }) => {
-  console.log("Entity destroyed:", entity);
+world.on("entityDestroyed", ({ entityId }) => {
+  console.log("Entity destroyed:", entityId);
 });
 
-world.on("componentAdded", ({ entity, component }) => {
-  console.log(`Component ${component} added to entity`);
+world.on("componentAdded", ({ entityId, component }) => {
+  console.log(`Component ${component} added to entity ${entityId}`);
 });
 
-world.on("componentRemoved", ({ entity, component }) => {
-  console.log(`Component ${component} removed from entity`);
+world.on("componentRemoved", ({ entityId, component }) => {
+  console.log(`Component ${component} removed from entity ${entityId}`);
 });
 
 world.on("updated", () => {
@@ -206,8 +198,7 @@ const posExist = entity.has("position");
 // Get curren value of the component
 const compSchema = entity.get("position");
 
-entity.id // Returns unique entity id from proxy
-
+entity.id; // Returns unique entity id from proxy
 ```
 
 ### System
@@ -287,18 +278,16 @@ const complexQuery2 = world.include("position", "health").exclude("static");
 // Iterate through entities as proxy
 query.entities.forEach((entity) => {
   // Process Entity proxy
-})
+});
 
 // Iterate through entities ids
-for(const entityId of query.ids){
+for (const entityId of query.ids) {
   // Process Entity id
 }
 
-
-
 // Get the first value of the query
 const first = query.entities[0];
-const firstId = query.ids.first()
+const firstId = query.ids.first();
 
 // Check query size
 const count = query.size();
@@ -388,7 +377,7 @@ world.on("entityCreated", (data) => {
 });
 
 // Emit events (handled internally by World)
-world.emit("entityCreated", { entity: someEntity });
+world.emit("entityCreated", { entityId });
 
 // Remove listeners
 world.off("entityCreated", handler);
@@ -450,9 +439,9 @@ class MovementSystem implements System {
   }
 
   update() {
-    for(const entityId of this.movementQuery.ids){
-      // Process movement using entityId
-    }
+    this.movementQuery.entities.forEach((entity) => {
+      // Handle entity movement
+    })
   }
 }
 
@@ -469,9 +458,9 @@ const movementSystem: MovementSystem = {
   }
 
   update(){
-    for (const entityId of this.movementQuery.ids) {
-      // Process movement
-    }
+    this.movementQuery?.entities.forEach((entity) => {
+      // Handle entity movement
+    })
   }
 }
 
@@ -514,6 +503,13 @@ world.on("playerScored", ({ points }) => {
 });
 ```
 
+## Planned Features
+
+- Implement basic one level tag manager.
+- Instancing / Prefab system with searilzation.
+- Entity with childrens and parents.
+- React wrapper (?)
+
 ## Contributing
 
 Contributions are welcome! Please feel free to submit a Pull Request. For major changes, please open an issue first to discuss what you would like to change.
@@ -542,6 +538,7 @@ npm run build
 ## Acknowledgments
 
 - Inspiration from ECS frameworks like [ECSY](https://github.com/ecsyjs/ecsy) and [Bevy](https://github.com/bevyengine/bevy)
+- Deep digging documentation at [Austin Morlan Post](https://austinmorlan.com/posts/entity_component_system/)
 - TypeScript for providing excellent type safety and developer experience
 
 ---

package/dist/ComponentManager.d.ts

@@ -12,14 +12,14 @@ export interface ComponentManagerEvents {
     };
 }
 export declare class ComponentManager extends EventRegistry<ComponentManagerEvents> {
-    componentSet: {
-        [k: number]: ComponentSchema;
-    };
-    world: World;
+    private componentSet;
+    private world;
+    dirtyEntities: Set<number>;
     constructor(world: World);
     clearComponentSchema(entityId: number): void;
     addComponent<K extends keyof ComponentSchema>(entityId: number, key: K, value: ComponentSchema[K]): void;
     getComponent<K extends keyof ComponentSchema>(entityId: number, key: K): ComponentSchema[K] | undefined;
+    cleanDirtyEntities(): void;
     hasComponent<K extends keyof ComponentSchema>(entityId: number, key: K): boolean;
     removeComponent<K extends keyof ComponentSchema>(entityId: number, key: K): void;
 }

package/dist/EventRegistry.d.ts

@@ -1,14 +1,12 @@
-export type Event<V> = {
-    [key: string]: V;
-};
-export type EventCallback<V> = (event: V[keyof V]) => void;
-export default class EventRegistry<E extends Event<any> = {}> {
+export default class EventRegistry<E extends {
+    [key: string]: any;
+} = {}> {
     private _listeners;
-    on(type: keyof E, callback: EventCallback<E>): void;
-    off(type: keyof E, callback: EventCallback<E>): void;
-    once(type: keyof E, callback: EventCallback<E>): void;
-    clearEvent(type: keyof E): void;
+    on<K extends string>(type: K, callback: (e: E[K]) => void): void;
+    off<K extends string>(type: K, callback: (e: E[K]) => void): void;
+    once<K extends string>(type: K, callback: (e: E[K]) => void): void;
+    clearEvent<K extends string>(type: K): void;
     clearAllEvents(): void;
-    contains(type: keyof E, callback: EventCallback<E>): boolean;
-    emit(type: keyof E, data: E[keyof E]): void;
+    contains<K extends string>(type: K, callback: (e: E[K]) => void): boolean;
+    emit<K extends string>(type: K, data?: E[K]): void;
 }

package/dist/Query.d.ts

@@ -13,18 +13,18 @@ export interface QueryEvents {
 export declare class Query extends EventRegistry<QueryEvents> {
     private config;
     private entityMap;
-    private entityInstancesCache;
     private world;
+    private lastVersion;
+    dirty: boolean;
     constructor(config: QueryConfig, world: World);
     hasComponents(entityId: number): boolean;
     size(): number;
     get hash(): number;
     get ids(): SparseSet<number>;
-    private getCachedEntity;
     get entities(): Entity[];
     include(...comps: string[]): Query;
     exclude(...comps: string[]): Query;
-    private _checkExistingEntities;
-    checkEntities(): void;
+    markDirty(): void;
+    checkEntities(entities?: Set<number>): void;
     static getHash(config: QueryConfig): number;
 }

package/dist/World.d.ts

@@ -6,17 +6,17 @@ import { SparseSet } from './SparseSet';
 import { SystemManager, System } from './SystemManager';
 export interface WorldEvents {
     entityCreated: {
-        entity: Entity;
+        entityId: number;
     };
     entityDestroyed: {
-        entity: Entity;
+        entityId: number;
     };
     componentAdded: {
-        entity: Entity;
+        entityId: number;
         component: keyof ComponentSchema;
     };
     componentRemoved: {
-        entity: Entity;
+        entityId: number;
         component: keyof ComponentSchema;
     };
     updated: void;
@@ -26,6 +26,7 @@ export default class World extends EventRegistry<WorldEvents> {
     componentManager: ComponentManager;
     systemManager: SystemManager;
     queries: Map<number, Query>;
+    version: number;
     constructor();
     getEntity(id: number): Entity | undefined;
     get entityIds(): SparseSet<number>;

package/dist/jael-build.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});class o{_listeners=new Map;on(e,t){if(this.contains(e,t))return;const s=this._listeners.get(e);s?s.add(t):this._listeners.set(e,new Set([t]))}off(e,t){if(!this.contains(e,t))return;const s=this._listeners.get(e);s&&s.delete(t)}once(e,t){const s=(n=>{t(n),this.off(e,s)});this.on(e,s)}clearEvent(e){this._listeners.get(e)&&this._listeners.get(e)?.clear()}clearAllEvents(){this._listeners.forEach(e=>e.clear()),this._listeners.clear()}contains(e,t){return this._listeners.get(e)?this._listeners.get(e).has(t):!1}emit(e,t){this._listeners.get(e)&&this._listeners.get(e)?.forEach(s=>{s(t)})}}class u{systemList=[];addSystem(e){this.systemList.push(e),e.init?.(),this.reorder()}reorder(){this.systemList.sort((e,t)=>e.priority-t.priority)}has(e){return this.systemList.indexOf(e)>0}removeSystem(e){if(!this.has(e))return;const t=this.systemList.indexOf(e);t>=0&&(this.systemList.splice(t,1),e.exit?.(),this.reorder())}}class d{denseValues=[];sparse=new Map;[Symbol.iterator](){let e=this.values.length;const t={value:void 0,done:!1};return{next:()=>(t.value=this.values[--e],t.done=e<0,t)}}get values(){return this.denseValues}first(){return this.denseValues[0]}add(e){this.has(e)||(this.denseValues.push(e),this.sparse.set(e,this.denseValues.length-1))}indexOf(e){const t=this.sparse.get(e);return t!==void 0?t:-1}remove(e){if(!this.has(e))return;const t=this.sparse.get(e);this.sparse.delete(e);const s=this.denseValues[this.denseValues.length-1];s!==e&&(this.denseValues[t]=s,this.sparse.set(s,t)),this.denseValues.pop()}forEach(e){for(let t of this)e(t)}size(){return this.denseValues.length}clear(){for(let e of this)this.remove(e)}has(e){return this.sparse.has(e)}}class a{id;_world;constructor(e,t){this.id=t,this._world=e}add(e,t){this._world.addComponent(this.id,e,t)}remove(e){this._world.removeComponent(this.id,e)}has(e){return this._world.componentManager.hasComponent(this.id,e)}get(e){return this._world.componentManager.getComponent(this.id,e)}}class l extends o{entityMap=new d;nextId=0;_world;constructor(e){super(),this._world=e}get entities(){return this.entityMap}create(){const e=this.nextId++;return this.entities.add(e),this.emit("create",e),e}exist(e){return this.entities.has(e)}size(){return this.entities.size()}destroy(e){return this.entities.remove(e),this.emit("destroy",e),e}}class m extends o{componentSet={};world;constructor(e){super(),this.world=e}clearComponentSchema(e){this.componentSet[e]&&delete this.componentSet[e]}addComponent(e,t,s){if(!this.world.exist(e))return;const n=this.componentSet[e];n?n[t]=s:this.componentSet[e]={[t]:s},this.emit("add",{entityId:e,component:t})}getComponent(e,t){if(this.hasComponent(e,t))return this.componentSet[e][t]}hasComponent(e,t){const s=this.componentSet[e];return s?t in s:!1}removeComponent(e,t){if(!this.componentSet[e])return;const s=this.componentSet[e];s&&s[t]!==void 0&&(delete s[t],Object.keys(s).length===0&&delete this.componentSet[e],this.emit("remove",{entityId:e,component:t}))}}class c extends o{config;entityMap;entityInstancesCache;world;constructor(e,t){super(),this.config=e,this.world=t,this.entityInstancesCache=new Map,this.entityMap=new d,this.on("removed",s=>{this.entityInstancesCache.delete(s)})}hasComponents(e){const t=this.world.componentManager;return this.config.include?.every(s=>t.getComponent(e,s))&&this.config.exclude?.every(s=>!t.getComponent(e,s))}size(){return this.ids.size()}get hash(){return c.getHash(this.config)}get ids(){return this.entityMap}getCachedEntity(e){const t=this.entityInstancesCache.get(e);if(t)return t;{const s=this.world.getEntity(e);return s?(this.entityInstancesCache.set(e,s),s):void 0}}get entities(){const e=[],t=this.entityMap.size()>100;return this.entityMap.forEach(s=>{if(t){const n=this.getCachedEntity(s);n&&e.push(n)}else{const n=this.world.getEntity(s);n&&e.push(n)}}),e}include(...e){return this.world.include(...e)}exclude(...e){return this.world.exclude(...e)}_checkExistingEntities(){for(let e of this.ids)this.world.exist(e)||(this.emit("removed",e),this.entityMap.remove(e))}checkEntities(){this.entityInstancesCache.clear();for(let e of this.world.entityIds)this.hasComponents(e)&&(this.entityMap.add(e),this.emit("added",e));this._checkExistingEntities()}static getHash(e){const t=e.include?.map(i=>i.trim()).filter(i=>i).join("_"),s=e.exclude?.map(i=>i.trim()).filter(i=>i).join("_"),n="in_"+t+"_out_"+s;let h=0;for(const i of n)h=(h<<5)-h+i.charCodeAt(0),h|=0;return h}}class p extends o{_startTime=0;_oldTime=0;_requestId=0;running=!1;delta=0;elapsed=0;constructor(){super()}_loop(){let e=0;if(this.running){const t=performance.now();e=(t-this._oldTime)/1e3,this._oldTime=t,this.elapsed+=e}this.delta=e,this.emit("update"),this._requestId=requestAnimationFrame(this._loop.bind(this))}start(){this._startTime=performance.now(),this._oldTime=this._startTime,this.elapsed=0,this.delta=0,this.running=!0,this._loop()}stop(){this.running=!1,cancelAnimationFrame(this._requestId),this._requestId=0}}let g=new p;class f extends o{entityManager;componentManager;systemManager;queries;constructor(){super(),this.entityManager=new l(this),this.componentManager=new m(this),this.systemManager=new u,this.entityManager.on("create",e=>{this.emit("entityCreated",{entity:new a(this,e)}),this._updateQueries()}),this.entityManager.on("destroy",e=>{this.emit("entityDestroyed",{entity:new a(this,e)}),this._updateQueries(),this.componentManager.clearComponentSchema(e)}),this.componentManager.on("add",({entityId:e,component:t})=>{this.emit("componentAdded",{entity:new a(this,e),component:t}),this._updateQueries()}),this.componentManager.on("remove",({entityId:e,component:t})=>{this.getEntity(e)&&this.emit("componentRemoved",{entity:new a(this,e),component:t}),this._updateQueries()}),this.queries=new Map}getEntity(e){return this.exist(e)?new a(this,e):void 0}get entityIds(){return this.entityManager.entities}query(e){const t=c.getHash(e);let n=this.queries.get(t);return n||(n=new c(e,this),this.queries.set(t,n),this._updateQueries()),n}_updateQueries(){this.queries.forEach(e=>e.checkEntities())}exist(e){return this.entityManager.exist(e)}include(...e){return this.query({include:e,exclude:[]})}exclude(...e){return this.query({include:[],exclude:e})}create(){return this.entityManager.create()}destroy(e){this.entityManager.destroy(e)}addSystem(e){this.systemManager.addSystem(e)}removeSystem(e){this.systemManager.removeSystem(e)}addComponent(e,t,s){this.componentManager.addComponent(e,t,s)}getComponent(e,t){return this.componentManager.getComponent(e,t)}removeComponent(e,t){this.componentManager.removeComponent(e,t)}update(){this.systemManager.systemList.forEach(e=>{e.update()}),this.emit("updated")}}exports.ComponentManager=m;exports.EntityManager=l;exports.EventRegistry=o;exports.Query=c;exports.SparseSet=d;exports.SystemManager=u;exports.Time=g;exports.World=f;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});class o{_listeners=new Map;on(e,t){if(this.contains(e,t))return;const s=this._listeners.get(e);s?s.add(t):this._listeners.set(e,new Set([t]))}off(e,t){if(!this.contains(e,t))return;const s=this._listeners.get(e);s&&s.delete(t)}once(e,t){const s=i=>{t(i),this.off(e,s)};this.on(e,s)}clearEvent(e){this._listeners.get(e)&&this._listeners.get(e)?.clear()}clearAllEvents(){this._listeners.forEach(e=>e.clear()),this._listeners.clear()}contains(e,t){return this._listeners.get(e)?this._listeners.get(e).has(t):!1}emit(e,t){this._listeners.get(e)&&this._listeners.get(e)?.forEach(s=>{s(t)})}}class c{systemList=[];addSystem(e){this.systemList.push(e),e.init?.(),this.reorder()}reorder(){this.systemList.sort((e,t)=>e.priority-t.priority)}has(e){return this.systemList.indexOf(e)>0}removeSystem(e){if(!this.has(e))return;const t=this.systemList.indexOf(e);t>=0&&(this.systemList.splice(t,1),e.exit?.(),this.reorder())}}class d{denseValues=[];sparse=new Map;[Symbol.iterator](){let e=this.values.length;const t={value:void 0,done:!1};return{next:()=>(t.value=this.values[--e],t.done=e<0,t)}}get values(){return this.denseValues}first(){return this.denseValues[0]}add(e){this.has(e)||(this.denseValues.push(e),this.sparse.set(e,this.denseValues.length-1))}indexOf(e){const t=this.sparse.get(e);return t!==void 0?t:-1}remove(e){if(!this.has(e))return;const t=this.sparse.get(e);this.sparse.delete(e);const s=this.denseValues[this.denseValues.length-1];s!==e&&(this.denseValues[t]=s,this.sparse.set(s,t)),this.denseValues.pop()}forEach(e){for(let t of this)e(t)}size(){return this.denseValues.length}clear(){for(let e of this)this.remove(e)}has(e){return this.sparse.has(e)}}class m{id;_world;constructor(e,t){this.id=t,this._world=e}add(e,t){this._world.addComponent(this.id,e,t)}remove(e){this._world.removeComponent(this.id,e)}has(e){return this._world.componentManager.hasComponent(this.id,e)}get(e){return this._world.componentManager.getComponent(this.id,e)}}class l extends o{entityMap=new d;nextId=0;_world;constructor(e){super(),this._world=e}get entities(){return this.entityMap}create(){const e=this.nextId++;return this.entities.add(e),this.emit("create",e),e}exist(e){return this.entities.has(e)}size(){return this.entities.size()}destroy(e){return this.entities.remove(e),this.emit("destroy",e),e}}class u extends o{componentSet={};world;dirtyEntities=new Set;constructor(e){super(),this.world=e}clearComponentSchema(e){this.componentSet[e]&&delete this.componentSet[e]}addComponent(e,t,s){if(!this.world.exist(e))return;const i=this.componentSet[e];i?i[t]=s:this.componentSet[e]={[t]:s},this.dirtyEntities.add(e),this.emit("add",{entityId:e,component:t})}getComponent(e,t){if(this.hasComponent(e,t))return this.componentSet[e][t]}cleanDirtyEntities(){this.dirtyEntities.clear()}hasComponent(e,t){const s=this.componentSet[e];return s?t in s:!1}removeComponent(e,t){if(!this.componentSet[e])return;const s=this.componentSet[e];s&&s[t]!==void 0&&(delete s[t],Object.keys(s).length===0&&delete this.componentSet[e],this.dirtyEntities.add(e),this.emit("remove",{entityId:e,component:t}))}}class h extends o{config;entityMap;world;lastVersion=0;dirty;constructor(e,t){super(),this.config=e,this.world=t,this.entityMap=new d,this.dirty=!1,this.world.on("entityDestroyed",({entityId:s})=>{this.entityMap.has(s)&&(this.emit("removed",s),this.entityMap.remove(s))})}hasComponents(e){const t=this.world.componentManager;return this.config.include?.every(s=>t.getComponent(e,s))&&this.config.exclude?.every(s=>!t.getComponent(e,s))}size(){return this.ids.size()}get hash(){return h.getHash(this.config)}get ids(){return this.entityMap}get entities(){const e=[];return this.entityMap.forEach(t=>{const s=this.world.getEntity(t);s&&e.push(s)}),e}include(...e){return this.world.include(...e)}exclude(...e){return this.world.exclude(...e)}markDirty(){this.dirty=!0}checkEntities(e){if(!this.dirty||this.world.version===this.lastVersion)return;const t=e||this.world.entityIds;for(let s of t)this.hasComponents(s)&&(this.entityMap.add(s),this.emit("added",s));this.dirty=!1,this.lastVersion=this.world.version}static getHash(e){const t=e.include?.map(n=>n.trim()).filter(n=>n).join("_"),s=e.exclude?.map(n=>n.trim()).filter(n=>n).join("_"),i="in_"+t+"_out_"+s;let a=0;for(const n of i)a=(a<<5)-a+n.charCodeAt(0),a|=0;return a}}class p extends o{_startTime=0;_oldTime=0;_requestId=0;running=!1;delta=0;elapsed=0;constructor(){super()}_loop(){let e=0;if(this.running){const t=performance.now();e=(t-this._oldTime)/1e3,this._oldTime=t,this.elapsed+=e}this.delta=e,this.emit("update"),this._requestId=requestAnimationFrame(this._loop.bind(this))}start(){this._startTime=performance.now(),this._oldTime=this._startTime,this.elapsed=0,this.delta=0,this.running=!0,this._loop()}stop(){this.running=!1,cancelAnimationFrame(this._requestId),this._requestId=0}}let g=new p;class f extends o{entityManager;componentManager;systemManager;queries;version;constructor(){super(),this.entityManager=new l(this),this.componentManager=new u(this),this.systemManager=new c,this.version=0,this.entityManager.on("create",e=>{this.emit("entityCreated",{entityId:e}),this._updateQueries()}),this.entityManager.on("destroy",e=>{this.emit("entityDestroyed",{entityId:e}),this._updateQueries(),this.componentManager.clearComponentSchema(e)}),this.componentManager.on("add",({entityId:e,component:t})=>{this.emit("componentAdded",{entityId:e,component:t}),this._updateQueries()}),this.componentManager.on("remove",({entityId:e,component:t})=>{this.getEntity(e)&&this.emit("componentRemoved",{entityId:e,component:t}),this._updateQueries()}),this.queries=new Map}getEntity(e){return this.exist(e)?new m(this,e):void 0}get entityIds(){return this.entityManager.entities}query(e){const t=h.getHash(e);let i=this.queries.get(t);return i||(i=new h(e,this),this.queries.set(t,i),this._updateQueries()),i}_updateQueries(){const e=this.componentManager.dirtyEntities;this.queries.forEach(t=>{t.markDirty(),e.size>0&&t.checkEntities()}),this.componentManager.cleanDirtyEntities(),this.version++}exist(e){return this.entityManager.exist(e)}include(...e){return this.query({include:e,exclude:[]})}exclude(...e){return this.query({include:[],exclude:e})}create(){return this.entityManager.create()}destroy(e){this.entityManager.destroy(e)}addSystem(e){this.systemManager.addSystem(e)}removeSystem(e){this.systemManager.removeSystem(e)}addComponent(e,t,s){this.componentManager.addComponent(e,t,s)}getComponent(e,t){return this.componentManager.getComponent(e,t)}removeComponent(e,t){this.componentManager.removeComponent(e,t)}update(){this.systemManager.systemList.forEach(e=>{e.update()}),this.emit("updated")}}exports.ComponentManager=u;exports.EntityManager=l;exports.EventRegistry=o;exports.Query=h;exports.SparseSet=d;exports.SystemManager=c;exports.Time=g;exports.World=f;

package/dist/jael-build.js

@@ -1,4 +1,4 @@
-class a {
+class h {
   _listeners = /* @__PURE__ */ new Map();
   on(e, t) {
     if (this.contains(e, t))
@@ -13,9 +13,9 @@ class a {
     s && s.delete(t);
   }
   once(e, t) {
-    const s = ((n) => {
-      t(n), this.off(e, s);
-    });
+    const s = (i) => {
+      t(i), this.off(e, s);
+    };
     this.on(e, s);
   }
   clearEvent(e) {
@@ -33,7 +33,7 @@ class a {
     });
   }
 }
-class u {
+class c {
   systemList = [];
   addSystem(e) {
     this.systemList.push(e), e.init?.(), this.reorder();
@@ -98,7 +98,7 @@ class d {
     return this.sparse.has(e);
   }
 }
-class h {
+class l {
   id;
   _world;
   constructor(e, t) {
@@ -136,7 +136,7 @@ class h {
     return this._world.componentManager.getComponent(this.id, e);
   }
 }
-class l extends a {
+class u extends h {
   entityMap = new d();
   nextId = 0;
   _world;
@@ -160,9 +160,10 @@ class l extends a {
     return this.entities.remove(e), this.emit("destroy", e), e;
   }
 }
-class m extends a {
+class m extends h {
   componentSet = {};
   world;
+  dirtyEntities = /* @__PURE__ */ new Set();
   constructor(e) {
     super(), this.world = e;
   }
@@ -171,13 +172,16 @@ class m extends a {
   }
   addComponent(e, t, s) {
     if (!this.world.exist(e)) return;
-    const n = this.componentSet[e];
-    n ? n[t] = s : this.componentSet[e] = { [t]: s }, this.emit("add", { entityId: e, component: t });
+    const i = this.componentSet[e];
+    i ? i[t] = s : this.componentSet[e] = { [t]: s }, this.dirtyEntities.add(e), this.emit("add", { entityId: e, component: t });
   }
   getComponent(e, t) {
     if (this.hasComponent(e, t))
       return this.componentSet[e][t];
   }
+  cleanDirtyEntities() {
+    this.dirtyEntities.clear();
+  }
   hasComponent(e, t) {
     const s = this.componentSet[e];
     return s ? t in s : !1;
@@ -185,17 +189,18 @@ class m extends a {
   removeComponent(e, t) {
     if (!this.componentSet[e]) return;
     const s = this.componentSet[e];
-    s && s[t] !== void 0 && (delete s[t], Object.keys(s).length === 0 && delete this.componentSet[e], this.emit("remove", { entityId: e, component: t }));
+    s && s[t] !== void 0 && (delete s[t], Object.keys(s).length === 0 && delete this.componentSet[e], this.dirtyEntities.add(e), this.emit("remove", { entityId: e, component: t }));
   }
 }
-class c extends a {
+class a extends h {
   config;
   entityMap;
-  entityInstancesCache;
   world;
+  lastVersion = 0;
+  dirty;
   constructor(e, t) {
-    super(), this.config = e, this.world = t, this.entityInstancesCache = /* @__PURE__ */ new Map(), this.entityMap = new d(), this.on("removed", (s) => {
-      this.entityInstancesCache.delete(s);
+    super(), this.config = e, this.world = t, this.entityMap = new d(), this.dirty = !1, this.world.on("entityDestroyed", ({ entityId: s }) => {
+      this.entityMap.has(s) && (this.emit("removed", s), this.entityMap.remove(s));
     });
   }
   hasComponents(e) {
@@ -210,30 +215,16 @@ class c extends a {
     return this.ids.size();
   }
   get hash() {
-    return c.getHash(this.config);
+    return a.getHash(this.config);
   }
   get ids() {
     return this.entityMap;
   }
-  getCachedEntity(e) {
-    const t = this.entityInstancesCache.get(e);
-    if (t)
-      return t;
-    {
-      const s = this.world.getEntity(e);
-      return s ? (this.entityInstancesCache.set(e, s), s) : void 0;
-    }
-  }
   get entities() {
-    const e = [], t = this.entityMap.size() > 100;
-    return this.entityMap.forEach((s) => {
-      if (t) {
-        const n = this.getCachedEntity(s);
-        n && e.push(n);
-      } else {
-        const n = this.world.getEntity(s);
-        n && e.push(n);
-      }
+    const e = [];
+    return this.entityMap.forEach((t) => {
+      const s = this.world.getEntity(t);
+      s && e.push(s);
     }), e;
   }
   include(...e) {
@@ -242,25 +233,25 @@ class c extends a {
   exclude(...e) {
     return this.world.exclude(...e);
   }
-  _checkExistingEntities() {
-    for (let e of this.ids)
-      this.world.exist(e) || (this.emit("removed", e), this.entityMap.remove(e));
+  markDirty() {
+    this.dirty = !0;
   }
-  checkEntities() {
-    this.entityInstancesCache.clear();
-    for (let e of this.world.entityIds)
-      this.hasComponents(e) && (this.entityMap.add(e), this.emit("added", e));
-    this._checkExistingEntities();
+  checkEntities(e) {
+    if (!this.dirty || this.world.version === this.lastVersion) return;
+    const t = e || this.world.entityIds;
+    for (let s of t)
+      this.hasComponents(s) && (this.entityMap.add(s), this.emit("added", s));
+    this.dirty = !1, this.lastVersion = this.world.version;
   }
   static getHash(e) {
-    const t = e.include?.map((i) => i.trim()).filter((i) => i).join("_"), s = e.exclude?.map((i) => i.trim()).filter((i) => i).join("_"), n = "in_" + t + "_out_" + s;
+    const t = e.include?.map((n) => n.trim()).filter((n) => n).join("_"), s = e.exclude?.map((n) => n.trim()).filter((n) => n).join("_"), i = "in_" + t + "_out_" + s;
     let o = 0;
-    for (const i of n)
-      o = (o << 5) - o + i.charCodeAt(0), o |= 0;
+    for (const n of i)
+      o = (o << 5) - o + n.charCodeAt(0), o |= 0;
     return o;
   }
 }
-class p extends a {
+class p extends h {
   _startTime = 0;
   _oldTime = 0;
   _requestId = 0;
@@ -286,45 +277,49 @@ class p extends a {
   }
 }
 let g = new p();
-class f extends a {
+class f extends h {
   entityManager;
   componentManager;
   systemManager;
   queries;
+  version;
   constructor() {
-    super(), this.entityManager = new l(this), this.componentManager = new m(this), this.systemManager = new u(), this.entityManager.on("create", (e) => {
+    super(), this.entityManager = new u(this), this.componentManager = new m(this), this.systemManager = new c(), this.version = 0, this.entityManager.on("create", (e) => {
       this.emit("entityCreated", {
-        entity: new h(this, e)
+        entityId: e
       }), this._updateQueries();
     }), this.entityManager.on("destroy", (e) => {
       this.emit("entityDestroyed", {
-        entity: new h(this, e)
+        entityId: e
       }), this._updateQueries(), this.componentManager.clearComponentSchema(e);
     }), this.componentManager.on("add", ({ entityId: e, component: t }) => {
       this.emit("componentAdded", {
-        entity: new h(this, e),
+        entityId: e,
         component: t
       }), this._updateQueries();
     }), this.componentManager.on("remove", ({ entityId: e, component: t }) => {
       this.getEntity(e) && this.emit("componentRemoved", {
-        entity: new h(this, e),
+        entityId: e,
         component: t
       }), this._updateQueries();
     }), this.queries = /* @__PURE__ */ new Map();
   }
   getEntity(e) {
-    return this.exist(e) ? new h(this, e) : void 0;
+    return this.exist(e) ? new l(this, e) : void 0;
   }
   get entityIds() {
     return this.entityManager.entities;
   }
   query(e) {
-    const t = c.getHash(e);
-    let n = this.queries.get(t);
-    return n || (n = new c(e, this), this.queries.set(t, n), this._updateQueries()), n;
+    const t = a.getHash(e);
+    let i = this.queries.get(t);
+    return i || (i = new a(e, this), this.queries.set(t, i), this._updateQueries()), i;
   }
   _updateQueries() {
-    this.queries.forEach((e) => e.checkEntities());
+    const e = this.componentManager.dirtyEntities;
+    this.queries.forEach((t) => {
+      t.markDirty(), e.size > 0 && t.checkEntities();
+    }), this.componentManager.cleanDirtyEntities(), this.version++;
   }
   exist(e) {
     return this.entityManager.exist(e);
@@ -364,11 +359,11 @@ class f extends a {
 }
 export {
   m as ComponentManager,
-  l as EntityManager,
-  a as EventRegistry,
-  c as Query,
+  u as EntityManager,
+  h as EventRegistry,
+  a as Query,
   d as SparseSet,
-  u as SystemManager,
+  c as SystemManager,
   g as Time,
   f as World
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jael-ecs/core",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Entity Component System library with typescript",
   "keywords": [
     "ecs",