@codehz/ecs 0.1.5 → 0.1.7

package/README.md

@@ -176,7 +176,7 @@ bun run examples/simple/demo.ts
 - `delete(entity, componentId)`: 从实体移除组件
 - `setExclusive(componentId)`: 将组件标记为独占关系
 - `createQuery(componentIds)`: 创建查询
-- `registerSystem(system)`: 注册系统
+- `registerSystem(system, dependencies?)`: 注册系统
 - `registerLifecycleHook(componentId, hook)`: 注册组件或通配符关系生命周期钩子
 - `unregisterLifecycleHook(componentId, hook)`: 注销组件或通配符关系生命周期钩子
 - `update(...params)`: 更新世界（参数取决于泛型配置）
@@ -289,7 +289,7 @@ class MovementSystem implements System<[deltaTime: number]> {
 }
 ```
 
-系统支持依赖关系排序，确保正确的执行顺序。依赖关系通过系统的 `dependencies` 属性指定：
+系统支持依赖关系排序，确保正确的执行顺序。依赖关系可以通过系统的 `dependencies` 属性指定：
 
 ```typescript
 class InputSystem implements System<[deltaTime: number]> {
@@ -314,7 +314,7 @@ class MovementSystem implements System<[deltaTime: number]> {
 // 注册系统
 const inputSystem = new InputSystem();
 world.registerSystem(inputSystem);
-world.registerSystem(new MovementSystem(inputSystem));
+world.registerSystem(new MovementSystem(inputSystem), [inputSystem]); // 也可以在注册时指定额外依赖
 ```
 
 系统将按照拓扑排序执行，依赖系统始终在被依赖系统之前运行。

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;
   }
 }
 
@@ -615,12 +617,14 @@ class Query {
 // src/system-scheduler.ts
 class SystemScheduler {
   systems = new Set;
+  systemDependencies = new Map;
   cachedExecutionOrder = null;
-  addSystem(system) {
+  addSystem(system, additionalDeps = []) {
     this.systems.add(system);
     for (const dep of system.dependencies || []) {
       this.systems.add(dep);
     }
+    this.systemDependencies.set(system, new Set([...additionalDeps, ...system.dependencies || []]));
     this.cachedExecutionOrder = null;
   }
   getExecutionOrder() {
@@ -637,7 +641,7 @@ class SystemScheduler {
         throw new Error("Circular dependency detected in system scheduling");
       }
       visiting.add(system);
-      for (const dep of system.dependencies || []) {
+      for (const dep of this.systemDependencies.get(system) || []) {
         visit(dep);
       }
       visiting.delete(system);
@@ -734,8 +738,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);
@@ -800,8 +803,8 @@ class World {
     }
     return archetype.get(entityId, componentType);
   }
-  registerSystem(system) {
-    this.systemScheduler.addSystem(system);
+  registerSystem(system, additionalDeps = []) {
+    this.systemScheduler.addSystem(system, additionalDeps);
   }
   registerLifecycleHook(componentType, hook) {
     if (!this.lifecycleHooks.has(componentType)) {
@@ -1000,7 +1003,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 +1034,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.7",
   "type": "module",
   "main": "./index.js",
   "types": "./index.d.ts",

package/system-scheduler.d.ts

@@ -4,12 +4,14 @@ import type { System } from "./system";
  */
 export declare class SystemScheduler<UpdateParams extends any[] = [deltaTime: number]> {
     private systems;
+    private systemDependencies;
     private cachedExecutionOrder;
     /**
      * Add a system with optional dependencies
      * @param system The system to add
+     * @param additionalDeps Additional dependencies for the system
      */
-    addSystem(system: System<UpdateParams>): void;
+    addSystem(system: System<UpdateParams>, additionalDeps?: System<UpdateParams>[]): void;
     /**
      * Get the execution order of systems based on dependencies
      * Uses topological sort

package/world.d.ts

@@ -94,7 +94,7 @@ export declare class World<UpdateParams extends any[] = []> {
     /**
      * Register a system with optional dependencies
      */
-    registerSystem(system: System<UpdateParams>): void;
+    registerSystem(system: System<UpdateParams>, additionalDeps?: System<UpdateParams>[]): void;
     /**
      * Register a lifecycle hook for component or wildcard relation events
      */