@codehz/ecs 0.1.6 → 0.1.8

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

@@ -617,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() {
@@ -639,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);
@@ -654,6 +656,24 @@ class SystemScheduler {
     this.cachedExecutionOrder = result;
     return result;
   }
+  update(...params) {
+    const executionOrder = this.getExecutionOrder();
+    const systemPromises = new Map;
+    for (const system of executionOrder) {
+      const deps = Array.from(this.systemDependencies.get(system) || []);
+      const depPromises = deps.map((dep) => systemPromises.get(dep)).filter(Boolean);
+      if (depPromises.length > 0) {
+        const promise = Promise.all(depPromises).then(() => system.update(...params));
+        systemPromises.set(system, promise);
+      } else {
+        const result = system.update(...params);
+        if (result instanceof Promise) {
+          systemPromises.set(system, result);
+        }
+      }
+    }
+    return Promise.all(systemPromises.values());
+  }
   clear() {
     this.systems.clear();
     this.cachedExecutionOrder = null;
@@ -801,8 +821,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)) {
@@ -823,11 +843,12 @@ class World {
     this.exclusiveComponents.add(componentId);
   }
   update(...params) {
-    const systems = this.systemScheduler.getExecutionOrder();
-    for (const system of systems) {
-      system.update(...params);
+    const result = this.systemScheduler.update(...params);
+    if (result instanceof Promise) {
+      return result.then(() => this.commandBuffer.execute());
+    } else {
+      this.commandBuffer.execute();
     }
-    this.commandBuffer.execute();
   }
   sync() {
     this.commandBuffer.execute();

package/package.json

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

package/system-scheduler.d.ts

@@ -2,19 +2,22 @@ import type { System } from "./system";
 /**
  * System Scheduler for managing system dependencies and execution order
  */
-export declare class SystemScheduler<UpdateParams extends any[] = [deltaTime: number]> {
+export declare class SystemScheduler<UpdateParams extends any[] = []> {
     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
      */
     getExecutionOrder(): System<UpdateParams>[];
+    update(...params: UpdateParams): Promise<void[]> | void;
     /**
      * Clear all systems and dependencies
      */

package/system.d.ts

@@ -5,7 +5,7 @@ export interface System<UpdateParams extends any[] = []> {
     /**
      * Update the system
      */
-    update(...params: UpdateParams): void;
+    update(...params: UpdateParams): void | Promise<void>;
     /**
      * Dependencies of this system (systems that must run before this one)
      */

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
      */
@@ -110,8 +110,10 @@ export declare class World<UpdateParams extends any[] = []> {
     setExclusive(componentId: EntityId): void;
     /**
      * Update the world (run all systems in dependency order)
+     * This function is synchronous when all systems are synchronous,
+     * and asynchronous (returns a Promise) when any system is asynchronous.
      */
-    update(...params: UpdateParams): void;
+    update(...params: UpdateParams): Promise<void> | void;
     /**
      * Execute all deferred commands immediately without running systems
      */