CocosPlugin/esengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(build): 修复 Web 构建组件注册和用户脚本打包问题 (#302)

Browse Source 
* refactor(build): 重构 Web 构建管线，支持配置驱动的 Import Maps

- 重构 WebBuildPipeline 支持 split-bundles 和 single-bundle 两种构建模式
- 使用 module.json 的 isCore 字段识别核心模块，消除硬编码列表
- 动态生成 Import Map，从模块清单的 name 字段获取包名映射
- 动态扫描 module.json 文件，不再依赖固定模块列表
- 添加 HTTP 服务器启动脚本 (start-server.bat/sh) 支持 ESM 模块
- 更新 BuildSettingsPanel UI 支持新的构建模式选项
- 添加多语言支持 (zh/en/es)

* fix(build): 修复 Web 构建组件注册和用户脚本打包问题

主要修复:
- 修复组件反序列化时找不到类型的问题
- @ECSComponent 装饰器现在自动注册到 ComponentRegistry
- 添加未使用装饰器的组件警告
- 构建管线自动扫描用户脚本（无需入口文件）

架构改进:
- 解决 Decorators ↔ ComponentRegistry 循环依赖
- 新建 ComponentTypeUtils.ts 作为底层无依赖模块
- 移除冗余的防御性 register 调用
- 统一 ComponentType 定义位置

* refactor(build): 统一 WASM 配置架构，移除硬编码

- 新增 wasmConfig 统一配置替代 wasmPaths/wasmBindings
- wasmConfig.files 支持多候选源路径和明确目标路径
- wasmConfig.runtimePath 指定运行时加载路径
- 重构 _copyWasmFiles 使用统一配置
- HTML 生成使用配置中的 runtimePath
- 移除 physics-rapier2d 的冗余 WASM 配置（由 rapier2d 负责）
- IBuildFileSystem 新增 deleteFile 方法

* feat(build): 单文件构建模式完善和场景配置驱动

## 主要改动

### 单文件构建（single-file mode）
- 修复 WASM 初始化问题，支持 initSync 同步初始化
- 配置驱动的 WASM 识别，通过 wasmConfig.isEngineCore 标识核心引擎模块
- 从 wasmConfig.files 动态获取 JS 绑定路径，消除硬编码

### 场景配置
- 构建验证：必须选择至少一个场景才能构建
- 自动扫描：项目加载时扫描 scenes 目录
- 抽取 _filterScenesByWhitelist 公共方法统一过滤逻辑

### 构建面板优化
- availableScenes prop 传递场景列表
- 场景复选框可点击切换启用状态
- 移除动态 import，使用 prop 传入数据

* chore(build): 补充构建相关的辅助改动

- 添加 BuildFileSystemService 的 listFilesByExtension 优化
- 更新 module.json 添加 externalDependencies 配置
- BrowserRuntime 支持 wasmModule 参数传递
- GameRuntime 添加 loadSceneFromData 方法
- Rust 构建命令更新
- 国际化文案更新

* feat(build): 持久化构建设置到项目配置

## 设计架构

### ProjectService 扩展
- 新增 BuildSettingsConfig 接口定义构建配置字段
- ProjectConfig 添加 buildSettings 字段
- 新增 getBuildSettings / updateBuildSettings 方法

### BuildSettingsPanel
- 组件挂载时从 projectService 加载已保存配置
- 设置变化时自动保存（500ms 防抖）
- 场景选择状态与项目配置同步

### 配置保存位置
保存在项目的 ecs-editor.config.json 中：
- scenes: 选中的场景列表
- buildMode: 构建模式
- companyName/productName/version: 产品信息
- developmentBuild/sourceMap: 构建选项

* fix(editor): Ctrl+S 仅在主编辑区域触发保存场景

- 模态窗口打开时跳过（构建设置、设置、关于等）
- 焦点在 input/textarea/contenteditable 时跳过

* fix(tests): 修复 ECS 测试中 Component 注册问题

- 为所有测试 Component 类添加 @ECSComponent 装饰器
- 移除 beforeEach 中的 ComponentRegistry.reset() 调用
- 将内联 Component 类移到文件顶层以支持装饰器
- 更新测试预期值匹配新的组件类型名称
- 添加缺失的 HierarchyComponent 导入

所有 1388 个测试现已通过。
This commit is contained in:
YHH
2025-12-10 18:23:29 +08:00
committed by GitHub
parent 1b0d38edce
commit a716d8006c
67 changed files with 3671 additions and 1455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/tests/ECS/Component.test.ts
View File

@@ -1,8 +1,10 @@
import { Component } from '../../src/ECS/Component';
import { Entity } from '../../src/ECS/Entity';
import { Scene } from '../../src/ECS/Scene';
import { ECSComponent } from '../../src/ECS/Decorators';
// 测试组件
@ECSComponent('ComponentTest_TestComponent')
class TestComponent extends Component {
public value: number = 100;
public onAddedCalled = false;
@@ -17,6 +19,7 @@ class TestComponent extends Component {
}
}
@ECSComponent('ComponentTest_AnotherTestComponent')
class AnotherTestComponent extends Component {
public name: string = 'test';
}

4
packages/core/tests/ECS/Core/CommandBuffer.test.ts
View File

@@ -4,8 +4,10 @@ import { Component } from '../../../src/ECS/Component';
import { Scene } from '../../../src/ECS/Scene';
import { EntitySystem } from '../../../src/ECS/Systems/EntitySystem';
import { Matcher } from '../../../src/ECS/Utils/Matcher';
import { ECSComponent } from '../../../src/ECS/Decorators';
// 测试组件
@ECSComponent('CmdBuf_HealthComponent')
class HealthComponent extends Component {
public value: number = 100;
@@ -16,10 +18,12 @@ class HealthComponent extends Component {
}
}
@ECSComponent('CmdBuf_MarkerComponent')
class MarkerComponent extends Component {
public marked: boolean = true;
}
@ECSComponent('CmdBuf_VelocityComponent')
class VelocityComponent extends Component {
public vx: number = 0;
public vy: number = 0;

5
packages/core/tests/ECS/Core/MinimalSystemInit.test.ts
View File

@@ -3,9 +3,10 @@ import { Entity } from '../../../src/ECS/Entity';
import { Component } from '../../../src/ECS/Component';
import { EntitySystem } from '../../../src/ECS/Systems/EntitySystem';
import { Matcher } from '../../../src/ECS/Utils/Matcher';
import { ComponentRegistry } from '../../../src/ECS/Core/ComponentStorage';
import { ECSComponent } from '../../../src/ECS/Decorators';
// 简单的测试组件
@ECSComponent('MinSysInit_HealthComponent')
class HealthComponent extends Component {
public health: number;
@@ -34,7 +35,6 @@ describe('MinimalSystemInit - 最小化系统初始化测试', () => {
let scene: Scene;
beforeEach(() => {
ComponentRegistry.reset();
scene = new Scene();
});
@@ -52,7 +52,6 @@ describe('MinimalSystemInit - 最小化系统初始化测试', () => {
entity.addComponent(new HealthComponent(100));
console.log('[Test] Entity created with HealthComponent');
console.log('[Test] ComponentRegistry registered types:', ComponentRegistry.getRegisteredCount());
// 2. 验证QuerySystem能查询到实体
const queryResult = scene.querySystem.queryAll(HealthComponent);

7
packages/core/tests/ECS/Core/MultiSystemInit.test.ts
View File

@@ -3,9 +3,10 @@ import { Entity } from '../../../src/ECS/Entity';
import { Component } from '../../../src/ECS/Component';
import { EntitySystem } from '../../../src/ECS/Systems/EntitySystem';
import { Matcher } from '../../../src/ECS/Utils/Matcher';
import { ComponentRegistry } from '../../../src/ECS/Core/ComponentStorage';
import { ECSComponent } from '../../../src/ECS/Decorators';
// 测试组件
@ECSComponent('MultiSysInit_PositionComponent')
class PositionComponent extends Component {
public x: number;
public y: number;
@@ -18,6 +19,7 @@ class PositionComponent extends Component {
}
}
@ECSComponent('MultiSysInit_VelocityComponent')
class VelocityComponent extends Component {
public vx: number;
public vy: number;
@@ -30,6 +32,7 @@ class VelocityComponent extends Component {
}
}
@ECSComponent('MultiSysInit_HealthComponent')
class HealthComponent extends Component {
public health: number;
@@ -71,7 +74,6 @@ describe('MultiSystemInit - 多系统初始化测试', () => {
let scene: Scene;
beforeEach(() => {
ComponentRegistry.reset();
scene = new Scene();
});
@@ -91,7 +93,6 @@ describe('MultiSystemInit - 多系统初始化测试', () => {
entity.addComponent(new HealthComponent(100));
console.log('[Test] Entity created with Position, Velocity, Health');
console.log('[Test] ComponentRegistry registered types:', ComponentRegistry.getRegisteredCount());
// 2. 验证QuerySystem能查询到实体
const movementQuery = scene.querySystem.queryAll(PositionComponent, VelocityComponent);

19
packages/core/tests/ECS/Core/QuerySystem.test.ts
View File

@@ -3,12 +3,14 @@ import { Entity } from '../../../src/ECS/Entity';
import { Component } from '../../../src/ECS/Component';
import { ComponentRegistry, ComponentType } from '../../../src/ECS/Core/ComponentStorage';
import { Scene } from '../../../src/ECS/Scene';
import { ECSComponent } from '../../../src/ECS/Decorators';
// 测试组件
@ECSComponent('QuerySys_PositionComponent')
class PositionComponent extends Component {
public x: number;
public y: number;
constructor(...args: unknown[]) {
super();
const [x = 0, y = 0] = args as [number?, number?];
@@ -17,10 +19,11 @@ class PositionComponent extends Component {
}
}
@ECSComponent('QuerySys_VelocityComponent')
class VelocityComponent extends Component {
public vx: number;
public vy: number;
constructor(...args: unknown[]) {
super();
const [vx = 0, vy = 0] = args as [number?, number?];
@@ -29,10 +32,11 @@ class VelocityComponent extends Component {
}
}
@ECSComponent('QuerySys_HealthComponent')
class HealthComponent extends Component {
public health: number;
public maxHealth: number;
constructor(...args: unknown[]) {
super();
const [health = 100, maxHealth = 100] = args as [number?, number?];
@@ -41,10 +45,11 @@ class HealthComponent extends Component {
}
}
@ECSComponent('QuerySys_RenderComponent')
class RenderComponent extends Component {
public visible: boolean;
public layer: number;
constructor(...args: unknown[]) {
super();
const [visible = true, layer = 0] = args as [boolean?, number?];
@@ -53,9 +58,10 @@ class RenderComponent extends Component {
}
}
@ECSComponent('QuerySys_AIComponent')
class AIComponent extends Component {
public behavior: string;
constructor(...args: unknown[]) {
super();
const [behavior = 'idle'] = args as [string?];
@@ -63,9 +69,10 @@ class AIComponent extends Component {
}
}
@ECSComponent('QuerySys_PhysicsComponent')
class PhysicsComponent extends Component {
public mass: number;
constructor(...args: unknown[]) {
super();
const [mass = 1.0] = args as [number?];

2
packages/core/tests/ECS/Core/ReferenceTracker.test.ts
View File

@@ -3,7 +3,9 @@ import { ReferenceTracker } from '../../../src/ECS/Core/ReferenceTracker';
import { Component } from '../../../src/ECS/Component';
import { Entity } from '../../../src/ECS/Entity';
import { Scene } from '../../../src/ECS/Scene';
import { ECSComponent } from '../../../src/ECS/Decorators';
@ECSComponent('RefTrackerTestComponent')
class TestComponent extends Component {
public target: Entity | null = null;
}

6
packages/core/tests/ECS/Core/SystemInitialization.test.ts
View File

@@ -3,6 +3,7 @@ import { Entity } from '../../../src/ECS/Entity';
import { Component } from '../../../src/ECS/Component';
import { EntitySystem } from '../../../src/ECS/Systems/EntitySystem';
import { Matcher } from '../../../src/ECS/Utils/Matcher';
import { ECSComponent } from '../../../src/ECS/Decorators';
/**
* System初始化测试套件
@@ -15,6 +16,7 @@ import { Matcher } from '../../../src/ECS/Utils/Matcher';
*/
// 测试组件
@ECSComponent('SysInit_PositionComponent')
class PositionComponent extends Component {
public x: number;
public y: number;
@@ -27,6 +29,7 @@ class PositionComponent extends Component {
}
}
@ECSComponent('SysInit_VelocityComponent')
class VelocityComponent extends Component {
public vx: number;
public vy: number;
@@ -39,6 +42,7 @@ class VelocityComponent extends Component {
}
}
@ECSComponent('SysInit_HealthComponent')
class HealthComponent extends Component {
public health: number;
@@ -49,6 +53,7 @@ class HealthComponent extends Component {
}
}
@ECSComponent('SysInit_TagComponent')
class TagComponent extends Component {
public tag: string;
@@ -59,6 +64,7 @@ class TagComponent extends Component {
}
}
@ECSComponent('SysInit_TestComponent')
class TestComponent extends Component {
public value: number;

2
packages/core/tests/ECS/Core/WorldCoreIntegration.test.ts
View File

@@ -7,8 +7,10 @@ import { EntitySystem } from '../../../src/ECS/Systems/EntitySystem';
import { Component } from '../../../src/ECS/Component';
import { Matcher } from '../../../src/ECS/Utils/Matcher';
import { Entity } from '../../../src/ECS/Entity';
import { ECSComponent } from '../../../src/ECS/Decorators';
// 测试用组件
@ECSComponent('WorldCore_TestComponent')
class TestComponent extends Component {
public value: number = 0;

17
packages/core/tests/ECS/Entity.test.ts
View File

@@ -1,12 +1,14 @@
import { Entity } from '../../src/ECS/Entity';
import { Component } from '../../src/ECS/Component';
import { Scene } from '../../src/ECS/Scene';
import { ECSComponent } from '../../src/ECS/Decorators';
// 测试组件类
@ECSComponent('EntityTest_PositionComponent')
class TestPositionComponent extends Component {
public x: number = 0;
public y: number = 0;
constructor(...args: unknown[]) {
super();
const [x = 0, y = 0] = args as [number?, number?];
@@ -15,9 +17,10 @@ class TestPositionComponent extends Component {
}
}
@ECSComponent('EntityTest_HealthComponent')
class TestHealthComponent extends Component {
public health: number = 100;
constructor(...args: unknown[]) {
super();
const [health = 100] = args as [number?];
@@ -25,10 +28,11 @@ class TestHealthComponent extends Component {
}
}
@ECSComponent('EntityTest_VelocityComponent')
class TestVelocityComponent extends Component {
public vx: number = 0;
public vy: number = 0;
constructor(...args: unknown[]) {
super();
const [vx = 0, vy = 0] = args as [number?, number?];
@@ -37,9 +41,10 @@ class TestVelocityComponent extends Component {
}
}
@ECSComponent('EntityTest_RenderComponent')
class TestRenderComponent extends Component {
public visible: boolean = true;
constructor(...args: unknown[]) {
super();
const [visible = true] = args as [boolean?];
@@ -267,8 +272,8 @@ describe('Entity - 组件缓存优化测试', () => {
expect(debugInfo.name).toBe('TestEntity');
expect(debugInfo.id).toBeGreaterThanOrEqual(0);
expect(debugInfo.componentCount).toBe(2);
expect(debugInfo.componentTypes).toContain('TestPositionComponent');
expect(debugInfo.componentTypes).toContain('TestHealthComponent');
expect(debugInfo.componentTypes).toContain('EntityTest_PositionComponent');
expect(debugInfo.componentTypes).toContain('EntityTest_HealthComponent');
expect(debugInfo.cacheBuilt).toBe(true);
});
});

5
packages/core/tests/ECS/EntitySystemDI.test.ts
View File

@@ -6,20 +6,23 @@ import { Matcher } from '../../src/ECS/Utils/Matcher';
import { Injectable, InjectProperty } from '../../src/Core/DI';
import { Core } from '../../src/Core';
import type { IService } from '../../src/Core/ServiceContainer';
import { ECSSystem } from '../../src/ECS/Decorators';
import { ECSSystem, ECSComponent } from '../../src/ECS/Decorators';
@ECSComponent('DI_Transform')
class Transform extends Component {
constructor(public x: number = 0, public y: number = 0) {
super();
}
}
@ECSComponent('DI_Velocity')
class Velocity extends Component {
constructor(public vx: number = 0, public vy: number = 0) {
super();
}
}
@ECSComponent('DI_Health')
class Health extends Component {
constructor(public value: number = 100) {
super();

4
packages/core/tests/ECS/PersistentEntity.test.ts
View File

@@ -3,8 +3,10 @@ import { Component } from '../../src/ECS/Component';
import { Scene } from '../../src/ECS/Scene';
import { SceneManager } from '../../src/ECS/SceneManager';
import { EEntityLifecyclePolicy } from '../../src/ECS/Core/EntityLifecyclePolicy';
import { ECSComponent } from '../../src/ECS/Decorators';
// 测试组件
@ECSComponent('Persistent_PositionComponent')
class PositionComponent extends Component {
public x: number;
public y: number;
@@ -16,6 +18,7 @@ class PositionComponent extends Component {
}
}
@ECSComponent('Persistent_PlayerComponent')
class PlayerComponent extends Component {
public name: string;
public score: number;
@@ -27,6 +30,7 @@ class PlayerComponent extends Component {
}
}
@ECSComponent('Persistent_EnemyComponent')
class EnemyComponent extends Component {
public type: string;

15
packages/core/tests/ECS/Scene.test.ts
View File

@@ -3,12 +3,14 @@ import { Entity } from '../../src/ECS/Entity';
import { Component } from '../../src/ECS/Component';
import { EntitySystem } from '../../src/ECS/Systems/EntitySystem';
import { Matcher } from '../../src/ECS/Utils/Matcher';
import { ECSComponent } from '../../src/ECS/Decorators';
// 测试组件
@ECSComponent('SceneTest_PositionComponent')
class PositionComponent extends Component {
public x: number;
public y: number;
constructor(...args: unknown[]) {
super();
const [x = 0, y = 0] = args as [number?, number?];
@@ -17,10 +19,11 @@ class PositionComponent extends Component {
}
}
@ECSComponent('SceneTest_VelocityComponent')
class VelocityComponent extends Component {
public vx: number;
public vy: number;
constructor(...args: unknown[]) {
super();
const [vx = 0, vy = 0] = args as [number?, number?];
@@ -29,9 +32,10 @@ class VelocityComponent extends Component {
}
}
@ECSComponent('SceneTest_HealthComponent')
class HealthComponent extends Component {
public health: number;
constructor(...args: unknown[]) {
super();
const [health = 100] = args as [number?];
@@ -39,9 +43,10 @@ class HealthComponent extends Component {
}
}
@ECSComponent('SceneTest_RenderComponent')
class RenderComponent extends Component {
public visible: boolean;
constructor(...args: unknown[]) {
super();
const [visible = true] = args as [boolean?];
@@ -387,7 +392,7 @@ describe('Scene - 场景管理系统测试', () => {
entity.addComponent(new PositionComponent(10, 20));
expect(componentAddedEvent).toBeDefined();
expect(componentAddedEvent.componentType).toBe('PositionComponent');
expect(componentAddedEvent.componentType).toBe('SceneTest_PositionComponent');
});
});

5
packages/core/tests/ECS/Serialization/SceneSerializer.test.ts
View File

@@ -2,6 +2,7 @@ import { SceneSerializer } from '../../../src/ECS/Serialization/SceneSerializer'
import { Scene } from '../../../src/ECS/Scene';
import { Component } from '../../../src/ECS/Component';
import { HierarchySystem } from '../../../src/ECS/Systems/HierarchySystem';
import { HierarchyComponent } from '../../../src/ECS/Components/HierarchyComponent';
import { ECSComponent } from '../../../src/ECS/Decorators';
import { ComponentRegistry, ComponentType } from '../../../src/ECS/Core/ComponentStorage';
import { Serializable, Serialize } from '../../../src/ECS/Serialization';
@@ -37,10 +38,6 @@ describe('SceneSerializer', () => {
let componentRegistry: Map<string, ComponentType>;
beforeEach(() => {
ComponentRegistry.reset();
ComponentRegistry.register(PositionComponent);
ComponentRegistry.register(VelocityComponent);
scene = new Scene({ name: 'SceneSerializerTestScene' });
componentRegistry = ComponentRegistry.getAllComponentNames() as Map<string, ComponentType>;

131
packages/core/tests/ECS/Systems/EntitySystem.test.ts
View File

@@ -5,8 +5,10 @@ import { Scene } from '../../../src/ECS/Scene';
import { Matcher } from '../../../src/ECS/Utils/Matcher';
import { GlobalEventBus } from '../../../src/ECS/Core/EventBus';
import { TypeSafeEventSystem } from '../../../src/ECS/Core/EventSystem';
import { ECSComponent } from '../../../src/ECS/Decorators';
// 测试组件
@ECSComponent('EntitySysTest_TestComponent')
class TestComponent extends Component {
public value: number = 0;
@@ -17,6 +19,45 @@ class TestComponent extends Component {
}
}
// 额外测试组件 - 用于内联测试
@ECSComponent('EntitySysTest_TagComponent2')
class TagComponent2 extends Component {}
@ECSComponent('EntitySysTest_NonExistent')
class NonExistentComponent extends Component {}
@ECSComponent('EntitySysTest_ClickComponent')
class ClickComponent extends Component {
public element: string;
constructor(element: string = '') {
super();
this.element = element;
}
}
@ECSComponent('EntitySysTest_A')
class AComponent extends Component {}
@ECSComponent('EntitySysTest_B')
class BComponent extends Component {}
@ECSComponent('EntitySysTest_C')
class CComponent extends Component {
public aId: number;
public bId: number;
constructor(aId: number = 0, bId: number = 0) {
super();
this.aId = aId;
this.bId = bId;
}
}
@ECSComponent('EntitySysTest_D')
class DComponent extends Component {}
@ECSComponent('EntitySysTest_TagComponent')
class TagComponent extends TestComponent {}
// 测试事件
interface TestEvent {
id: number;
@@ -441,13 +482,8 @@ describe('EntitySystem', () => {
});
it('在系统 process 中添加组件时应立即触发其他系统的 onAdded', () => {
// 使用独立的场景，避免 beforeEach 创建的实体干扰
// Use independent scene to avoid interference from beforeEach entities
const testScene = new Scene();
// 组件定义
class TagComponent extends TestComponent {}
// SystemA: 匹配 TestComponent + TagComponent
class SystemA extends EntitySystem {
public onAddedEntities: Entity[] = [];
@@ -499,12 +535,8 @@ describe('EntitySystem', () => {
});
it('同一帧内添加后移除组件，onAdded 和 onRemoved 都应触发', () => {
// 使用独立的场景，避免 beforeEach 创建的实体干扰
// Use independent scene to avoid interference from beforeEach entities
const testScene = new Scene();
class TagComponent extends TestComponent {}
class TrackingSystemWithTag extends EntitySystem {
public onAddedEntities: Entity[] = [];
public onRemovedEntities: Entity[] = [];
@@ -585,9 +617,8 @@ describe('EntitySystem', () => {
// Use independent scene to avoid interference from beforeEach entities
const testScene = new Scene();
// 使用独立的组件类，避免继承带来的问题
// Use independent component class to avoid inheritance issues
class TagComponent2 extends Component {}
// 使用文件顶部定义的 TagComponent2
// Use TagComponent2 defined at file top
class SystemA extends EntitySystem {
public onAddedEntities: Entity[] = [];
@@ -747,8 +778,7 @@ describe('EntitySystem', () => {
});
it('requireComponent 应该在组件不存在时抛出错误', () => {
class NonExistentComponent extends Component {}
// 使用文件顶部定义的 NonExistentComponent
expect(() => {
helperSystem.testRequireComponent(entity, NonExistentComponent);
}).toThrow();
@@ -834,13 +864,7 @@ describe('EntitySystem', () => {
// 使用独立场景 | Use independent scene
const testScene = new Scene();
class ClickComponent extends Component {
public element: string;
constructor(element: string) {
super();
this.element = element;
}
}
// 使用文件顶部定义的 ClickComponent
const testEntity = testScene.createEntity('panel');
@@ -858,13 +882,7 @@ describe('EntitySystem', () => {
// 使用独立场景 | Use independent scene
const testScene = new Scene();
class ClickComponent extends Component {
public element: string;
constructor(element: string) {
super();
this.element = element;
}
}
// 使用文件顶部定义的 ClickComponent
// 添加一个监听该组件的系统 | Add a system that listens to this component
class ClickSystem extends EntitySystem {
@@ -903,13 +921,7 @@ describe('EntitySystem', () => {
// 使用独立场景 | Use independent scene
const testScene = new Scene();
class ClickComponent extends Component {
public element: string;
constructor(element: string) {
super();
this.element = element;
}
}
// 使用文件顶部定义的 ClickComponent
// 这个系统在 onAdded 中移除组件（模拟可能的用户代码）
// This system removes component in onAdded (simulating possible user code)
@@ -950,25 +962,14 @@ describe('EntitySystem', () => {
// 模拟 lawn-mower-demo 的场景 | Simulate lawn-mower-demo scenario
const testScene = new Scene();
// 组件定义 | Component definitions
class A extends Component {}
class B extends Component {}
class C extends Component {
public aId: number;
public bId: number;
constructor(aId: number, bId: number) {
super();
this.aId = aId;
this.bId = bId;
}
}
class D extends Component {}
// 使用顶层已装饰的组件类 | Use top-level decorated component classes
// AComponent, BComponent, CComponent, DComponent
// ASystem: 匹配 A + D | Matches A + D
class ASystem extends EntitySystem {
public onAddedEntities: Entity[] = [];
constructor() {
super(Matcher.all(A, D));
super(Matcher.all(AComponent, DComponent));
}
protected override onAdded(entity: Entity): void {
console.log('ASystem onAdded:', entity.name);
@@ -980,7 +981,7 @@ describe('EntitySystem', () => {
class BSystem extends EntitySystem {
public onAddedEntities: Entity[] = [];
constructor() {
super(Matcher.all(B, D));
super(Matcher.all(BComponent, DComponent));
}
protected override onAdded(entity: Entity): void {
console.log('BSystem onAdded:', entity.name);
@@ -992,21 +993,21 @@ describe('EntitySystem', () => {
// CSystem: Adds D component to A and B entities in process
class CSystem extends EntitySystem {
constructor() {
super(Matcher.all(C));
super(Matcher.all(CComponent));
}
protected override process(entities: readonly Entity[]): void {
for (const entity of entities) {
const c = entity.getComponent(C);
const c = entity.getComponent(CComponent);
if (c) {
const a = this.scene!.findEntityById(c.aId);
if (a && !a.hasComponent(D)) {
if (a && !a.hasComponent(DComponent)) {
console.log('CSystem: Adding D to Entity A');
a.addComponent(new D());
a.addComponent(new DComponent());
}
const b = this.scene!.findEntityById(c.bId);
if (b && !b.hasComponent(D)) {
if (b && !b.hasComponent(DComponent)) {
console.log('CSystem: Adding D to Entity B');
b.addComponent(new D());
b.addComponent(new DComponent());
}
}
}
@@ -1015,17 +1016,17 @@ describe('EntitySystem', () => {
// DSystem: 在 lateProcess 中移除 D 组件
// DSystem: Removes D component in lateProcess
class DSystem extends EntitySystem {
class DSystemImpl extends EntitySystem {
public lateProcessEntities: Entity[] = [];
constructor() {
super(Matcher.all(D));
super(Matcher.all(DComponent));
}
protected override lateProcess(entities: readonly Entity[]): void {
console.log('DSystem lateProcess, entities count:', entities.length);
for (const entity of entities) {
console.log('DSystem removing D from:', entity.name);
this.lateProcessEntities.push(entity);
const d = entity.getComponent(D);
const d = entity.getComponent(DComponent);
if (d) {
entity.removeComponent(d);
}
@@ -1038,7 +1039,7 @@ describe('EntitySystem', () => {
const aSystem = new ASystem();
const bSystem = new BSystem();
const cSystem = new CSystem();
const dSystem = new DSystem();
const dSystem = new DSystemImpl();
testScene.addSystem(aSystem);
testScene.addSystem(bSystem);
@@ -1047,13 +1048,13 @@ describe('EntitySystem', () => {
// 创建实体 | Create entities
const entity1 = testScene.createEntity('Entity1');
entity1.addComponent(new A());
entity1.addComponent(new AComponent());
const entity2 = testScene.createEntity('Entity2');
entity2.addComponent(new B());
entity2.addComponent(new BComponent());
const entity3 = testScene.createEntity('Entity3');
entity3.addComponent(new C(entity1.id, entity2.id));
entity3.addComponent(new CComponent(entity1.id, entity2.id));
// 执行一帧 | Execute one frame
testScene.update();
@@ -1071,8 +1072,8 @@ describe('EntitySystem', () => {
// D 组件应该在 lateProcess 中被移除
// D component should be removed in lateProcess
expect(entity1.hasComponent(D)).toBe(false);
expect(entity2.hasComponent(D)).toBe(false);
expect(entity1.hasComponent(DComponent)).toBe(false);
expect(entity2.hasComponent(DComponent)).toBe(false);
testScene.removeSystem(aSystem);
testScene.removeSystem(bSystem);

5
packages/core/tests/ECS/Utils/ComponentSparseSet.test.ts
View File

@@ -2,26 +2,31 @@ import { ComponentSparseSet } from '../../../src/ECS/Utils/ComponentSparseSet';
import { Entity } from '../../../src/ECS/Entity';
import { Component } from '../../../src/ECS/Component';
import { Scene } from '../../../src/ECS/Scene';
import { ECSComponent } from '../../../src/ECS/Decorators';
// 测试组件类
@ECSComponent('SparseSet_PositionComponent')
class PositionComponent extends Component {
constructor(public x: number = 0, public y: number = 0) {
super();
}
}
@ECSComponent('SparseSet_VelocityComponent')
class VelocityComponent extends Component {
constructor(public dx: number = 0, public dy: number = 0) {
super();
}
}
@ECSComponent('SparseSet_HealthComponent')
class HealthComponent extends Component {
constructor(public health: number = 100, public maxHealth: number = 100) {
super();
}
}
@ECSComponent('SparseSet_RenderComponent')
class RenderComponent extends Component {
constructor(public visible: boolean = true) {
super();

7
packages/core/tests/ECS/World.test.ts
View File

@@ -5,20 +5,23 @@ import { Entity } from '../../src/ECS/Entity';
import { Component } from '../../src/ECS/Component';
import { Matcher } from '../../src/ECS/Utils/Matcher';
import { IService } from '../../src/Core/ServiceContainer';
import { ECSComponent } from '../../src/ECS/Decorators';
// 测试用组件
@ECSComponent('WorldTest_TestComponent')
class TestComponent extends Component {
public value: number = 0;
constructor(value: number = 0) {
super();
this.value = value;
}
}
@ECSComponent('WorldTest_PlayerComponent')
class PlayerComponent extends Component {
public playerId: string;
constructor(playerId: string) {
super();
this.playerId = playerId;

2
packages/core/tests/ECS/WorldManager.test.ts
View File

@@ -1,8 +1,10 @@
import { WorldManager, IWorldManagerConfig } from '../../src/ECS/WorldManager';
import { IWorldConfig, World } from '../../src/ECS/World';
import { Component } from '../../src/ECS/Component';
import { ECSComponent } from '../../src/ECS/Decorators';
// 测试用组件
@ECSComponent('WorldMgr_TestComponent')
class TestComponent extends Component {
public value: number = 0;