Skip to content

A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.

fix: update tests for self-describing component architecture and restore loadComponent migration logic

esengine04f47645d88a
diff --git a/sdk/src/scene.ts b/sdk/src/scene.ts
index b9ba21053..e3bc22dba 100644
--- a/sdk/src/scene.ts
+++ b/sdk/src/scene.ts
@@ -520,6 +520,22 @@ async function preloadSceneAssets(
}
export function loadComponent(world: World, entity: Entity, compData: SceneComponentData, entityName?: string): void {
+ if (compData.type === 'LocalTransform' || compData.type === 'WorldTransform') {
+ compData.type = 'Transform';
+ }
+ if (compData.type === 'UIRect') {
+ const rectData = compData.data as Record<string, unknown>;
+ if (rectData.anchor && !rectData.anchorMin) {
+ rectData.anchorMin = { ...(rectData.anchor as Record<string, unknown>) };
+ rectData.anchorMax = { ...(rectData.anchor as Record<string, unknown>) };
+ delete rectData.anchor;
+ }
+ }
+ if (compData.type === 'UIMask') {
+ const maskData = compData.data as Record<string, unknown>;
+ if (maskData.mode === 'scissor') maskData.mode = 0;
+ else if (maskData.mode === 'stencil') maskData.mode = 1;
+ }
const comp = getComponent(compData.type);
if (comp) {
world.insert(entity, comp, compData.data);
diff --git a/sdk/tests/anim-clip-asset.test.ts b/sdk/tests/anim-clip-asset.test.ts
index 6df45becd..7c76b7d1a 100644
--- a/sdk/tests/anim-clip-asset.test.ts
+++ b/sdk/tests/anim-clip-asset.test.ts
@@ -19,6 +19,21 @@ import {
getComponentAssetFieldDescriptors,
type AssetFieldType,
} from '../src/scene';
+import { defineComponent } from '../src/component';
+
+function ensureSpriteAnimator() {
+ defineComponent('SpriteAnimator', {
+ clip: '',
+ speed: 1.0,
+ playing: true,
+ loop: true,
+ enabled: true,
+ currentFrame: 0,
+ frameTimer: 0,
+ }, {
+ assetFields: [{ field: 'clip', type: 'anim-clip' }],
+ });
+}
// =============================================================================
// Asset Type Registration
@@ -123,11 +138,13 @@ describe('parseAnimClipData', () => {
});
it('should register clip field in COMPONENT_ASSET_FIELDS', () => {
+ ensureSpriteAnimator();
const fields = getComponentAssetFields('SpriteAnimator');
expect(fields).toContain('clip');
});
it('should have anim-clip asset field type', () => {
+ ensureSpriteAnimator();
const descriptors = getComponentAssetFieldDescriptors('SpriteAnimator');
const clipDesc = descriptors.find(d => d.field === 'clip');
expect(clipDesc).toBeDefined();
diff --git a/sdk/tests/audio-plugin.test.ts b/sdk/tests/audio-plugin.test.ts
index ad9838a0d..60545b74d 100644
--- a/sdk/tests/audio-plugin.test.ts
+++ b/sdk/tests/audio-plugin.test.ts
@@ -71,7 +71,7 @@ describe('AudioPlugin', () => {
});
it('should have name "AudioPlugin"', () => {
- expect(audioPlugin.name).toBe('AudioPlugin');
+ expect(audioPlugin.name).toBe('audio');
});
it('should have a build method', () => {
@@ -85,7 +85,7 @@ describe('AudioPlugin', () => {
musicVolume: 0.5,
sfxVolume: 0.9,
});
- expect(plugin.name).toBe('AudioPlugin');
+ expect(plugin.name).toBe('audio');
});
it('should call Audio.dispose on cleanup', () => {
diff --git a/sdk/tests/commands.test.ts b/sdk/tests/commands.test.ts
index 41e57af02..a0544d664 100644
--- a/sdk/tests/commands.test.ts
+++ b/sdk/tests/commands.test.ts
@@ -15,10 +15,13 @@ function createMockWorld() {
const components = new Map<Entity, Map<string, any>>();
const world = {
- spawn: vi.fn(() => {
+ spawn: vi.fn((name?: string) => {
const entity = nextId++ as Entity;
validEntities.add(entity);
components.set(entity, new Map());
+ if (name !== undefined) {
+ world.insert(entity, Name, { value: name });
+ }
return entity;
}),
despawn: vi.fn((entity: Entity) => {
diff --git a/sdk/tests/postProcessPlugin.test.ts b/sdk/tests/postProcessPlugin.test.ts
index 2029e5de3..e29e368c3 100644
--- a/sdk/tests/postProcessPlugin.test.ts
+++ b/sdk/tests/postProcessPlugin.test.ts
@@ -11,7 +11,7 @@ import { postProcessPlugin } from '../src/postprocess/PostProcessPlugin';
describe('PostProcessPlugin', () => {
it('has correct name', () => {
- expect(postProcessPlugin.name).toBe('PostProcessPlugin');
+ expect(postProcessPlugin.name).toBe('postProcess');
});
it('implements Plugin interface with build and cleanup', () => {
diff --git a/sdk/tests/prefab.test.ts b/sdk/tests/prefab.test.ts
index d335666c5..d6f9aaa54 100644
--- a/sdk/tests/prefab.test.ts
+++ b/sdk/tests/prefab.test.ts
@@ -13,7 +13,8 @@ vi.mock('../src/scene', async (importOriginal) => {
});
import { instantiatePrefab } from '../src/prefab';
-import { loadSceneWithAssets, registerComponentEntityFields } from '../src/scene';
+import { loadSceneWithAssets } from '../src/scene';
+import { defineComponent } from '../src/component';
const mockLoadScene = vi.mocked(loadSceneWithAssets);
@@ -387,7 +388,11 @@ describe('Prefab', () => {
describe('entity reference remapping', () => {
beforeEach(() => {
- registerComponentEntityFields('Slider', ['fillEntity', 'handleEntity']);
+ defineComponent('Slider', {
+ fillEntity: 0,
+ handleEntity: 0,
+ value: 0,
+ }, { entityFields: ['fillEntity', 'handleEntity'] });
});
it('should remap entity references in components', async () => {
diff --git a/sdk/tests/scene.test.ts b/sdk/tests/scene.test.ts
index 41f2473c9..6e0213693 100644
--- a/sdk/tests/scene.test.ts
+++ b/sdk/tests/scene.test.ts
@@ -10,13 +10,9 @@ import {
remapEntityFields,
findEntityByName,
updateCameraAspectRatio,
- registerComponentAssetFields,
getComponentAssetFields,
getComponentAssetFieldDescriptors,
getComponentSpineFieldDescriptor,
- getRegisteredAssetComponentTypes,
- registerComponentEntityFields,
- getComponentEntityFields,
type SceneData,
type SceneComponentData,
} from '../src/scene';
@@ -49,6 +45,12 @@ const Sprite = defineBuiltin('Sprite', {
material: 0,
});
+const Slider = defineBuiltin('Slider', {
+ fillEntity: 0,
+ handleEntity: 0,
+ value: 0,
+}, { entityFields: ['fillEntity', 'handleEntity'] });
+
describe('Scene', () => {
let world: World;
@@ -81,14 +83,6 @@ describe('Scene', () => {
expect(fields).toContain('material');
});
- it('should register custom component asset fields', () => {
- registerComponentAssetFields('CustomComp', {
- fields: [{ field: 'icon', type: 'texture' }],
- });
- const fields = getComponentAssetFields('CustomComp');
- expect(fields).toContain('icon');
- });
-
it('should return field descriptors with type info', () => {
const descriptors = getComponentAssetFieldDescriptors('Sprite');
expect(descriptors).toEqual([
@@ -113,36 +107,6 @@ describe('Scene', () => {
expect(getComponentSpineFieldDescriptor('Sprite')).toBeNull();
});
- it('should list all registered asset component types', () => {
- const types = getRegisteredAssetComponentTypes();
- expect(types).toContain('Sprite');
- expect(types).toContain('SpineAnimation');
- expect(types).toContain('BitmapText');
- expect(types).toContain('Image');
- expect(types).toContain('SpriteAnimator');
- });
- });
-
- // =========================================================================
- // Component Entity Reference Fields Registry
- // =========================================================================
-
- describe('Component Entity Reference Fields Registry', () => {
- registerComponentEntityFields('Slider', ['fillEntity', 'handleEntity']);
-
- it('should return entity fields for registered types', () => {
- const fields = getComponentEntityFields('Slider');
- expect(fields).toEqual(['fillEntity', 'handleEntity']);
- });
-
- it('should return undefined for unregistered types', () => {
- expect(getComponentEntityFields('NonExistent')).toBeUndefined();
- });
-
- it('should register custom entity fields', () => {
- registerComponentEntityFields('CustomUI', ['targetEntity']);
- expect(getComponentEntityFields('CustomUI')).toEqual(['targetEntity']);
- });
});
// =========================================================================
@@ -475,12 +439,6 @@ describe('Scene', () => {
});
it('should remap entity fields during component loading', () => {
- const SliderComp = defineBuiltin('Slider', {
- fillEntity: 0,
- handleEntity: 0,
- value: 0,
- });
-
const sceneData: SceneData = {
version: '1.0',
name: 'SliderScene',
@@ -501,7 +459,7 @@ describe('Scene', () => {
const entityMap = loadSceneData(world, sceneData);
const root = entityMap.get(0)!;
- const slider = world.get(root, SliderComp);
+ const slider = world.get(root, Slider);
expect(slider.fillEntity).toBe(entityMap.get(1));
expect(slider.handleEntity).toBe(entityMap.get(2));
@@ -667,11 +625,7 @@ describe('Scene', () => {
clip: 'walk.esanim',
playing: true,
speed: 1,
- });
-
- registerComponentAssetFields('TestSpriteAnimatorScene', {
- fields: [{ field: 'clip', type: 'anim-clip' }],
- });
+ }, { assetFields: [{ field: 'clip', type: 'anim-clip' }] });
const sceneData: SceneData = {
version: '1.0',
@@ -702,9 +656,8 @@ describe('Scene', () => {
const assetServer = createMockAssetServer();
assetServer.loadJson.mockRejectedValue(new Error('404'));
- const AnimComp2 = defineComponent('TestSpriteAnimatorScene2', { clip: 'x' });
- registerComponentAssetFields('TestSpriteAnimatorScene2', {
- fields: [{ field: 'clip', type: 'anim-clip' }],
+ const AnimComp2 = defineComponent('TestSpriteAnimatorScene2', { clip: 'x' }, {
+ assetFields: [{ field: 'clip', type: 'anim-clip' }],
});
const sceneData: SceneData = {
@@ -739,9 +692,8 @@ describe('Scene', () => {
});
assetServer.loadTexture.mockRejectedValue(new Error('texture 404'));
- const AnimComp3 = defineComponent('TestSpriteAnimatorScene3', { clip: 'x' });
- registerComponentAssetFields('TestSpriteAnimatorScene3', {
- fields: [{ field: 'clip', type: 'anim-clip' }],
+ const AnimComp3 = defineComponent('TestSpriteAnimatorScene3', { clip: 'x' }, {
+ assetFields: [{ field: 'clip', type: 'anim-clip' }],
});
const sceneData: SceneData = {
diff --git a/sdk/tests/stats.test.ts b/sdk/tests/stats.test.ts
index 9698bbd82..8acac93a4 100644
--- a/sdk/tests/stats.test.ts
+++ b/sdk/tests/stats.test.ts
@@ -364,7 +364,7 @@ await app.tick(1 / 60);
});
it('should have name "Stats"', () => {
- expect(new StatsPlugin().name).toBe('Stats');
+ expect(new StatsPlugin().name).toBe('stats');
});
// === Review fix: Critical #3 — singleton reuse ===