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: break circular dependency between AssetTypeRegistry and InspectorHelpers

esengine0dcb40b04d96
diff --git a/editor/src/__tests__/asset/AssetTypeConsumers.test.ts b/editor/src/__tests__/asset/AssetTypeConsumers.test.ts
index fff84a26a..b213d7c47 100644
--- a/editor/src/__tests__/asset/AssetTypeConsumers.test.ts
+++ b/editor/src/__tests__/asset/AssetTypeConsumers.test.ts
@@ -7,7 +7,6 @@ import {
getDisplayType,
} from '../../asset/AssetTypeRegistry';
import { getAssetIcon, getAssetType } from '../../panels/content-browser/ContentBrowserTypes';
-import { getAssetIcon as getInspectorIcon, getAssetTypeName } from '../../panels/inspector/InspectorHelpers';
describe('ContentBrowserTypes delegates to Registry', () => {
beforeEach(() => {
@@ -31,22 +30,22 @@ describe('ContentBrowserTypes delegates to Registry', () => {
});
});
-describe('InspectorHelpers delegates to Registry', () => {
+describe('AssetTypeRegistry display helpers', () => {
beforeEach(() => {
resetAssetTypeRegistry();
registerBuiltinAssetTypes();
});
- it('getAssetIcon returns registry icon', () => {
+ it('getAssetTypeIcon returns icon for all known types', () => {
const types = ['image', 'script', 'scene', 'audio', 'json', 'material', 'shader', 'font', 'folder', 'animclip'] as const;
for (const t of types) {
- const icon = getInspectorIcon(t, 16);
- const registryIcon = getAssetTypeIcon(t, 16);
- expect(icon).toBe(registryIcon);
+ const icon = getAssetTypeIcon(t, 16);
+ expect(typeof icon).toBe('string');
+ expect(icon.length).toBeGreaterThan(0);
}
});
- it('getAssetTypeName returns registry display name', () => {
+ it('getAssetTypeDisplayName returns correct display name', () => {
const expected: Record<string, string> = {
image: 'Image',
script: 'Script',
@@ -60,11 +59,11 @@ describe('InspectorHelpers delegates to Registry', () => {
animclip: 'Animation Clip',
};
for (const [type, name] of Object.entries(expected)) {
- expect(getAssetTypeName(type)).toBe(name);
+ expect(getAssetTypeDisplayName(type)).toBe(name);
}
});
- it('getAssetTypeName returns File for unknown type', () => {
- expect(getAssetTypeName('unknown')).toBe('File');
+ it('getAssetTypeDisplayName returns File for unknown type', () => {
+ expect(getAssetTypeDisplayName('unknown')).toBe('File');
});
});
diff --git a/editor/src/panels/InspectorPanel.ts b/editor/src/panels/InspectorPanel.ts
index b911578a7..364af2d23 100644
--- a/editor/src/panels/InspectorPanel.ts
+++ b/editor/src/panels/InspectorPanel.ts
@@ -8,7 +8,7 @@ import type { EditorStore, AssetSelection, DirtyFlag } from '../store/EditorStor
import { getDefaultComponentData } from '../schemas/ComponentSchemas';
import { icons } from '../utils/icons';
import type { EditorInfo } from './inspector/InspectorHelpers';
-import { getAssetTypeName } from './inspector/InspectorHelpers';
+import { getAssetTypeDisplayName } from '../asset/AssetTypeRegistry';
import { renderEntityHeader, renderComponent, renderAddComponentButton, renderEntityExtensionSections, renderAssetExtensionSections } from './inspector/EntityInspector';
import type { InspectorSectionInstance } from './inspector/InspectorRegistry';
import { type MaterialPreviewState, renderMaterialPreview, hideMaterialPreview } from './inspector/MaterialPreviewSection';
@@ -347,7 +347,7 @@ export class InspectorPanel {
}
this.extensionSections_ = renderAssetExtensionSections(this.contentContainer_, asset.path, asset.type, this.store_);
- this.updateFooter(getAssetTypeName(asset.type));
+ this.updateFooter(getAssetTypeDisplayName(asset.type));
}
// =========================================================================
diff --git a/editor/src/panels/inspector/AssetInspector.ts b/editor/src/panels/inspector/AssetInspector.ts
index d9dda1a25..7cb4c90d8 100644
--- a/editor/src/panels/inspector/AssetInspector.ts
+++ b/editor/src/panels/inspector/AssetInspector.ts
@@ -6,13 +6,14 @@
import type { AssetSelection, AssetType } from '../../store/EditorStore';
import { getAssetDatabase } from '../../asset/AssetDatabase';
import { icons } from '../../utils/icons';
-import { escapeHtml, getAssetIcon, getProjectDir } from './InspectorHelpers';
+import { escapeHtml, getProjectDir } from './InspectorHelpers';
+import { getAssetTypeIcon } from '../../asset/AssetTypeRegistry';
export function renderAssetHeader(container: HTMLElement, asset: AssetSelection): void {
const header = document.createElement('div');
header.className = 'es-inspector-asset-header';
header.innerHTML = `
- <span class="es-asset-header-icon">${getAssetIcon(asset.type, 20)}</span>
+ <span class="es-asset-header-icon">${getAssetTypeIcon(asset.type, 20)}</span>
<span class="es-asset-header-name">${escapeHtml(asset.name)}</span>
`;
container.appendChild(header);
diff --git a/editor/src/panels/inspector/FileInspector.ts b/editor/src/panels/inspector/FileInspector.ts
index c759ca21f..11abef855 100644
--- a/editor/src/panels/inspector/FileInspector.ts
+++ b/editor/src/panels/inspector/FileInspector.ts
@@ -6,7 +6,8 @@
import type { AssetType } from '../../store/EditorStore';
import { icons } from '../../utils/icons';
import { getEditorInstance } from '../../context/EditorContext';
-import { getNativeFS, getFileExtension, formatFileSize, formatDate, getAssetTypeName, escapeHtml, renderError } from './InspectorHelpers';
+import { getNativeFS, getFileExtension, formatFileSize, formatDate, escapeHtml, renderError } from './InspectorHelpers';
+import { getAssetTypeDisplayName } from '../../asset/AssetTypeRegistry';
export async function renderScriptInspector(container: HTMLElement, path: string): Promise<void> {
const fs = getNativeFS();
@@ -163,7 +164,7 @@ export async function renderFileInspector(container: HTMLElement, path: string,
<div class="es-component-properties es-collapsible-content">
<div class="es-property-row">
<label class="es-property-label">Type</label>
- <div class="es-property-value">${getAssetTypeName(type)}${ext ? ` (${ext})` : ''}</div>
+ <div class="es-property-value">${getAssetTypeDisplayName(type)}${ext ? ` (${ext})` : ''}</div>
</div>
<div class="es-property-row">
<label class="es-property-label">File Size</label>
diff --git a/editor/src/panels/inspector/InspectorHelpers.ts b/editor/src/panels/inspector/InspectorHelpers.ts
index 455e13be5..fa36d3248 100644
--- a/editor/src/panels/inspector/InspectorHelpers.ts
+++ b/editor/src/panels/inspector/InspectorHelpers.ts
@@ -10,7 +10,6 @@ import type { NativeFS } from '../../types/NativeFS';
import { getAssetMimeType } from 'esengine';
import { getEditorContext, getEditorInstance } from '../../context/EditorContext';
import { icons } from '../../utils/icons';
-import { getAssetTypeIcon, getAssetTypeDisplayName } from '../../asset/AssetTypeRegistry';
// =============================================================================
// Types
@@ -68,14 +67,6 @@ export function formatDate(date: Date | null): string {
return date.toLocaleString();
}
-export function getAssetIcon(type: string, size: number = 16): string {
- return getAssetTypeIcon(type, size);
-}
-
-export function getAssetTypeName(type: string): string {
- return getAssetTypeDisplayName(type);
-}
-
export function escapeHtml(text: string): string {
const div = document.createElement('div');
div.textContent = text;