@codehz/ecs 0.1.5 → 0.1.6

package/index.js

@@ -280,8 +280,9 @@ class Archetype {
     const removedData = new Map;
     for (const componentType of this.componentTypes) {
       const dataArray = this.getComponentData(componentType);
-      removedData.set(componentType, dataArray[index] === MISSING_COMPONENT ? undefined : dataArray[index]);
+      removedData.set(componentType, dataArray[index]);
     }
+    this.entityToIndex.delete(entityId);
     const lastIndex = this.entities.length - 1;
     if (index !== lastIndex) {
       const lastEntity = this.entities[lastIndex];
@@ -289,11 +290,13 @@ class Archetype {
       this.entityToIndex.set(lastEntity, index);
       for (const componentType of this.componentTypes) {
         const dataArray = this.getComponentData(componentType);
-        [dataArray[index], dataArray[lastIndex]] = [dataArray[lastIndex], dataArray[index]];
+        dataArray[index] = dataArray[lastIndex];
       }
     }
     this.entities.pop();
-    this.entityToIndex.delete(entityId);
+    for (const componentType of this.componentTypes) {
+      this.getComponentData(componentType).pop();
+    }
     return removedData;
   }
   exists(entityId) {
@@ -436,14 +439,13 @@ class ComponentChangeset {
     }
   }
   applyTo(existingComponents) {
-    const finalComponents = new Map(existingComponents);
     for (const componentType of this.removes) {
-      finalComponents.delete(componentType);
+      existingComponents.delete(componentType);
     }
     for (const [componentType, component2] of this.adds) {
-      finalComponents.set(componentType, component2);
+      existingComponents.set(componentType, component2);
     }
-    return finalComponents;
+    return existingComponents;
   }
 }
 
@@ -734,8 +736,7 @@ class World {
             currentComponents.set(archetypeComponentType, componentData);
           }
         }
-        const newComponentTypes = Array.from(currentComponents.keys()).sort((a, b) => a - b);
-        const newArchetype = this.ensureArchetype(newComponentTypes);
+        const newArchetype = this.ensureArchetype(currentComponents.keys());
         sourceArchetype.removeEntity(sourceEntityId);
         if (sourceArchetype.getEntities().length === 0) {
           this.cleanupEmptyArchetype(sourceArchetype);
@@ -1000,7 +1001,7 @@ class World {
     const currentComponentTypes = currentArchetype.componentTypes;
     const needsArchetypeChange = finalComponents.size !== currentComponentTypes.length || !currentComponentTypes.every((type) => finalComponents.has(type));
     if (needsArchetypeChange) {
-      const newArchetype = this.ensureArchetype(finalComponents.keys().toArray());
+      const newArchetype = this.ensureArchetype(finalComponents.keys());
       currentArchetype.removeEntity(entityId);
       newArchetype.addEntity(entityId, finalComponents);
       this.entityToArchetype.set(entityId, newArchetype);
@@ -1031,7 +1032,7 @@ class World {
     return changeset;
   }
   ensureArchetype(componentTypes) {
-    const sortedTypes = componentTypes.toSorted((a, b) => a - b);
+    const sortedTypes = Array.from(componentTypes).sort((a, b) => a - b);
     const hashKey = this.createArchetypeSignature(sortedTypes);
     return getOrCreateWithSideEffect(this.archetypeBySignature, hashKey, () => {
       const newArchetype = new Archetype(sortedTypes);

package/package.json

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