@codehz/ecs 0.3.1 → 0.3.3

package/command-buffer.d.ts

@@ -26,11 +26,11 @@ export declare class CommandBuffer {
     /**
      * Remove a component from an entity (deferred)
      */
-    delete<T>(entityId: EntityId, componentType: EntityId<T>): void;
+    remove<T>(entityId: EntityId, componentType: EntityId<T>): void;
     /**
      * Destroy an entity (deferred)
      */
-    destroy(entityId: EntityId): void;
+    delete(entityId: EntityId): void;
     /**
      * Execute all commands and clear the buffer
      */

package/index.js

@@ -558,10 +558,10 @@ class CommandBuffer {
   set(entityId, componentType, component2) {
     this.commands.push({ type: "set", entityId, componentType, component: component2 });
   }
-  delete(entityId, componentType) {
+  remove(entityId, componentType) {
     this.commands.push({ type: "delete", entityId, componentType });
   }
-  destroy(entityId) {
+  delete(entityId) {
     this.commands.push({ type: "destroy", entityId });
   }
   execute() {
@@ -698,6 +698,14 @@ class Query {
       this.cachedArchetypes.push(archetype);
     }
   }
+  removeArchetype(archetype) {
+    if (this.isDisposed)
+      return;
+    const index = this.cachedArchetypes.indexOf(archetype);
+    if (index !== -1) {
+      this.cachedArchetypes.splice(index, 1);
+    }
+  }
   dispose() {
     this.world.releaseQuery(this);
   }
@@ -801,11 +809,6 @@ class World {
       if (snapshot.entityManager) {
         this.entityIdManager.deserializeState(snapshot.entityManager);
       }
-      if (Array.isArray(snapshot.exclusiveComponents)) {
-        for (const id of snapshot.exclusiveComponents) {
-          this.exclusiveComponents.add(id);
-        }
-      }
       if (Array.isArray(snapshot.entities)) {
         for (const entry of snapshot.entities) {
           const entityId = entry.id;
@@ -929,10 +932,10 @@ class World {
     if (detailedType.type === "invalid") {
       throw new Error(`Invalid component type: ${componentType}`);
     }
-    this.commandBuffer.delete(entityId, componentType);
+    this.commandBuffer.remove(entityId, componentType);
   }
   delete(entityId) {
-    this.commandBuffer.destroy(entityId);
+    this.commandBuffer.delete(entityId);
   }
   has(entityId, componentType) {
     const archetype = this.entityToArchetype.get(entityId);
@@ -1075,8 +1078,12 @@ class World {
       matchingArchetypes = [...this.archetypes];
     }
     for (const wildcard of wildcardRelations) {
-      const componentArchetypes = this.archetypesByComponent.get(wildcard.componentId) || [];
-      matchingArchetypes = matchingArchetypes.filter((archetype) => componentArchetypes.includes(archetype));
+      matchingArchetypes = matchingArchetypes.filter((archetype) => archetype.componentTypes.some((archetypeType) => {
+        if (!isRelationId(archetypeType))
+          return false;
+        const decoded = decodeRelationId(archetypeType);
+        return decoded.componentId === wildcard.componentId;
+      }));
     }
     return matchingArchetypes;
   }
@@ -1242,6 +1249,9 @@ class World {
         }
       }
     }
+    for (const query of this.queries) {
+      query.removeArchetype(archetype);
+    }
   }
   triggerLifecycleHooks(entityId, addedComponents, removedComponents) {
     for (const [componentType, component2] of addedComponents) {
@@ -1320,7 +1330,6 @@ class World {
     return {
       version: 1,
       entityManager: this.entityIdManager.serializeState(),
-      exclusiveComponents: Array.from(this.exclusiveComponents),
       entities
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codehz/ecs",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "type": "module",
   "main": "./index.js",
   "types": "./index.d.ts",

package/query.d.ts

@@ -47,6 +47,10 @@ export declare class Query {
      * Check if a new archetype matches this query and add to cache if it does
      */
     checkNewArchetype(archetype: Archetype): void;
+    /**
+     * Remove an archetype from the cached archetypes
+     */
+    removeArchetype(archetype: Archetype): void;
     /**
      * Dispose the query and disconnect from world
      */

package/world.d.ts

@@ -197,7 +197,6 @@ export declare class World<UpdateParams extends any[] = []> {
 export type SerializedWorld = {
     version: number;
     entityManager: any;
-    exclusiveComponents: EntityId[];
     entities: SerializedEntity[];
 };
 export type SerializedEntity = {