@codehz/ecs 0.1.3 → 0.1.5

package/README.md

@@ -171,6 +171,8 @@ bun run examples/simple/demo.ts
 
 - `new()`: 创建新实体
 - `set(entity, componentId, data)`: 向实体添加组件
+- `get(entity, componentId)`: 获取实体的组件数据（注意：只能获取已设置的组件，使用前请先用 `has()` 检查组件是否存在）
+- `has(entity, componentId)`: 检查实体是否拥有指定组件
 - `delete(entity, componentId)`: 从实体移除组件
 - `setExclusive(componentId)`: 将组件标记为独占关系
 - `createQuery(componentIds)`: 创建查询
@@ -251,6 +253,7 @@ const restored = World.deserialize(readySnapshot);
 
 注意事项
 
+- **重要警告**：`get()` 方法只能获取实体已设置的组件。如果尝试获取不存在的组件，会抛出错误。由于 `undefined` 是组件的有效值，不能使用 `get()` 的返回值是否为 `undefined` 来判断组件是否存在。请在使用 `get()` 之前先用 `has()` 方法检查组件是否存在。
 - 快照只包含实体、组件、以及 `EntityIdManager` 的分配器状态（用于保留下一次分配的 ID）；并不会自动恢复已注册的系统、查询缓存或生命周期钩子。恢复后应由应用负责重新注册系统与钩子。
 - 若需要跨版本兼容，建议在持久化格式中包含 `version` 字段，并在恢复时进行格式兼容性检查与迁移。
 

package/changeset.d.ts

@@ -29,8 +29,4 @@ export declare class ComponentChangeset {
      * Apply the changeset to existing components and return the final state
      */
     applyTo(existingComponents: Map<EntityId<any>, any>): Map<EntityId<any>, any>;
-    /**
-     * Get the final component types after applying changes
-     */
-    getFinalComponentTypes(existingComponents: Map<EntityId<any>, any>): EntityId<any>[];
 }

package/index.js

@@ -277,17 +277,23 @@ class Archetype {
     if (index === undefined) {
       return;
     }
-    this.entities.splice(index, 1);
-    this.entityToIndex.delete(entityId);
     const removedData = new Map;
     for (const componentType of this.componentTypes) {
       const dataArray = this.getComponentData(componentType);
-      removedData.set(componentType, dataArray[index]);
-      dataArray.splice(index, 1);
+      removedData.set(componentType, dataArray[index] === MISSING_COMPONENT ? undefined : dataArray[index]);
     }
-    for (let i = index;i < this.entities.length; i++) {
-      this.entityToIndex.set(this.entities[i], i);
+    const lastIndex = this.entities.length - 1;
+    if (index !== lastIndex) {
+      const lastEntity = this.entities[lastIndex];
+      this.entities[index] = lastEntity;
+      this.entityToIndex.set(lastEntity, index);
+      for (const componentType of this.componentTypes) {
+        const dataArray = this.getComponentData(componentType);
+        [dataArray[index], dataArray[lastIndex]] = [dataArray[lastIndex], dataArray[index]];
+      }
     }
+    this.entities.pop();
+    this.entityToIndex.delete(entityId);
     return removedData;
   }
   exists(entityId) {
@@ -439,10 +445,6 @@ class ComponentChangeset {
     }
     return finalComponents;
   }
-  getFinalComponentTypes(existingComponents) {
-    const finalComponents = this.applyTo(existingComponents);
-    return Array.from(finalComponents.keys()).sort((a, b) => a - b);
-  }
 }
 
 // src/command-buffer.ts
@@ -790,6 +792,12 @@ class World {
     if (!archetype) {
       throw new Error(`Entity ${entityId} does not exist`);
     }
+    const detailedType = getDetailedIdType(componentType);
+    if (detailedType.type !== "wildcard-relation") {
+      if (!archetype.componentTypes.includes(componentType)) {
+        throw new Error(`Entity ${entityId} does not have component ${componentType}. Use has() to check component existence before calling get().`);
+      }
+    }
     return archetype.get(entityId, componentType);
   }
   registerSystem(system) {
@@ -989,11 +997,10 @@ class World {
       }
     }
     const finalComponents = changeset.applyTo(currentComponents);
-    const finalComponentTypes = changeset.getFinalComponentTypes(currentComponents);
-    const currentComponentTypes = currentArchetype.componentTypes.sort((a, b) => a - b);
-    const needsArchetypeChange = finalComponentTypes.length !== currentComponentTypes.length || !finalComponentTypes.every((type, index) => type === currentComponentTypes[index]);
+    const currentComponentTypes = currentArchetype.componentTypes;
+    const needsArchetypeChange = finalComponents.size !== currentComponentTypes.length || !currentComponentTypes.every((type) => finalComponents.has(type));
     if (needsArchetypeChange) {
-      const newArchetype = this.ensureArchetype(finalComponentTypes);
+      const newArchetype = this.ensureArchetype(finalComponents.keys().toArray());
       currentArchetype.removeEntity(entityId);
       newArchetype.addEntity(entityId, finalComponents);
       this.entityToArchetype.set(entityId, newArchetype);
@@ -1024,7 +1031,7 @@ class World {
     return changeset;
   }
   ensureArchetype(componentTypes) {
-    const sortedTypes = [...componentTypes].sort((a, b) => a - b);
+    const sortedTypes = componentTypes.toSorted((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.3",
+  "version": "0.1.5",
   "type": "module",
   "main": "./index.js",
   "types": "./index.d.ts",