fix entity mutation command

src/events/internal-events.ts

@@ -32,6 +32,7 @@ export class SimECSCloneEntityEvent extends SimECSEntityEvent {
         super(clone);
     }
 }
+export class SimECSMutateEntityEvent extends SimECSEntityEvent {}
 export class SimECSEntityAddComponentEvent extends SimECSEntityEvent {
     constructor(
         public readonly entity: Readonly<IEntity>,

src/world/runtime/commands/commands.ts

@@ -12,6 +12,7 @@ import type {IPreptimeWorld} from "../../preptime/preptime-world.spec.ts";
 import type {IQuery} from "../../../query/query.spec.ts";
 import {addEntitySym} from "../../../query/_.ts";
 import {Entity} from "../../../entity/entity.ts";
+import {SimECSMutateEntityEvent} from "../../../events/internal-events.ts";
 
 export * from "./commands.spec.ts";
 
@@ -103,10 +104,10 @@ export class Commands implements ICommands {
             throw new Error(`The entity "${entity.id}" cannot be mutated!`);
         }
 
-        mutator(entity);
-        this.commands.push(() => {
-            this.world.removeEntity(entity);
-            this.world.addEntity(entity);
+        this.commands.push(async () => {
+            mutator(entity);
+            this.world.refreshEntityQueryRegistration(entity);
+            await this.world.eventBus.publish(new SimECSMutateEntityEvent(entity));
         });
     }
 

src/world/runtime/runtime-world.spec.ts

@@ -9,6 +9,7 @@ import {type InstanceMap} from "../../util/instance-map.ts";
 import type {TObjectProto, TTypeProto} from "../../_.spec.ts";
 import type {TGroupHandle} from "../world.spec.ts";
 import type {ISystem} from "../../system/system.spec.ts";
+import type {RuntimeWorld} from "./runtime-world.ts";
 
 export * from './commands/commands.spec.ts';
 
@@ -86,6 +87,13 @@ export interface IRuntimeWorld extends IImmutableWorld {
      */
     hmrReplaceSystem(newSystem: ISystem): void
 
+    /**
+     * Refresh an entity's registration with queries.
+     * This is useful e.g. after an entity was mutated
+     * @param entity
+     */
+    refreshEntityQueryRegistration(entity: Readonly<IEntity>): void
+
     /**
      * Replace a resource from this world with a new value
      * @param obj

src/world/runtime/runtime-world.ts

@@ -27,7 +27,7 @@ import {
     getResources,
     hasResource,
 } from "../common/world_resources.ts";
-import {addEntity, hasEntity, removeEntity} from "./runtime-world_entities.ts";
+import {addEntity, hasEntity, refreshEntityQueryRegistration, removeEntity} from "./runtime-world_entities.ts";
 import {addResource, removeResource, replaceResource} from "./runtime-world_resources.ts";
 import {SimECSPushDownAutomaton} from "../../pda/sim-ecs-pda.ts";
 import type {IState} from "../../state/state.spec.ts";
@@ -333,12 +333,10 @@ export class RuntimeWorld implements IRuntimeWorld, IMutableWorld {
 
     // @ts-ignore
     [Symbol.dispose]() {
-        { // unset the context for all systems
-            let system;
-
-            for (system of this.systems) {
-                system.unsetRuntimeContext(this);
-            }
+        // unset the context for all systems
+        let system;
+        for (system of this.systems) {
+            system.unsetRuntimeContext(this);
         }
     }
 
@@ -353,6 +351,7 @@ export class RuntimeWorld implements IRuntimeWorld, IMutableWorld {
     public createEntity = createEntity;
     public getEntities = getEntities;
     public hasEntity = hasEntity;
+    public refreshEntityQueryRegistration = refreshEntityQueryRegistration;
     public removeEntity = removeEntity;
 
 

src/world/runtime/runtime-world_entities.ts

@@ -43,7 +43,7 @@ export function addEntity(this: RuntimeWorld, entity: Readonly<IEntity>): void {
         this.entityEventHandlers.set(entity, eventMap);
     }
 
-    {
+    { // add entity to queries
         let query;
         for (query of this.queries) {
             query[addEntitySym](entity);
@@ -58,14 +58,22 @@ export function hasEntity(this: RuntimeWorld, entity: Readonly<IEntity>): boolea
     return this.data.entities.has(entity);
 }
 
+export function refreshEntityQueryRegistration(this: RuntimeWorld, entity: Readonly<IEntity>): void {
+    let query;
+    for (query of this.queries) {
+        query[removeEntitySym](entity);
+        query[addEntitySym](entity);
+    }
+}
+
 export function removeEntity(this: RuntimeWorld, entity: Readonly<IEntity>): void {
     if (!this.data.entities.has(entity)) {
         return;
     }
 
     this.data.entities.delete(entity);
 
-    {
+    { // Remove entity from all queries
         let query;
         for (query of this.queries) {
             query[removeEntitySym](entity);