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.
TypeScript 2d-game-engine3d3d-game-engineandroidcppecsgame-editorgame-enginegamedeviostypescriptwebassemblywebglwebgpuwechat-minigame
fix: break circular dependency between ScriptLoader and ScriptCompiler
esengineea829be27dfc
diff --git a/editor/src/scripting/ScriptCompiler.ts b/editor/src/scripting/ScriptCompiler.tsindex 43b885ed5..8bf274a65 100644--- a/editor/src/scripting/ScriptCompiler.ts+++ b/editor/src/scripting/ScriptCompiler.ts@@ -6,7 +6,7 @@import * as esbuild from 'esbuild-wasm/esm/browser';import type { NativeFS, CompileTarget } from './types';import { sdkResolvePlugin, virtualFsPlugin } from './esbuildPlugins';-import { findTsFiles, EDITOR_ONLY_DIRS } from './ScriptLoader';+import { findTsFiles, EDITOR_ONLY_DIRS } from './scriptDiscovery';import { discoverPluginPackages, type DiscoveredPlugin } from '../extension/pluginDiscovery';import { joinPath } from '../utils/path';import { initializeEsbuild } from '../builder/ArtifactBuilder';diff --git a/editor/src/scripting/ScriptLoader.ts b/editor/src/scripting/ScriptLoader.tsindex e6700749e..21bad657d 100644--- a/editor/src/scripting/ScriptLoader.ts+++ b/editor/src/scripting/ScriptLoader.ts@@ -239,38 +239,8 @@ export class ScriptLoader {private onCompileSuccess_?: () => void;}-// =============================================================================-// Script Discovery-// =============================================================================--const IGNORED_SCRIPT_DIRS = new Set(['node_modules', 'dist', 'build']);-const EDITOR_ONLY_DIRS = new Set(['editor']);--interface DirListable {- listDirectoryDetailed(path: string): Promise<{ name: string; isDirectory: boolean }[]>;-}--async function findTsFiles(- fs: DirListable,- dir: string,- excludeDirs?: Set<string>,-): Promise<string[]> {- const results: string[] = [];- const entries = await fs.listDirectoryDetailed(dir);- for (const e of entries) {- if (e.isDirectory) {- if (!IGNORED_SCRIPT_DIRS.has(e.name) && !e.name.startsWith('.')- && !(excludeDirs?.has(e.name))) {- results.push(...await findTsFiles(fs, joinPath(dir, e.name), excludeDirs));- }- } else if (e.name.endsWith('.ts')) {- results.push(joinPath(dir, e.name));- }- }- return results;-}--export { findTsFiles, IGNORED_SCRIPT_DIRS, EDITOR_ONLY_DIRS };+// Re-export script discovery utilities+export { findTsFiles, IGNORED_SCRIPT_DIRS, EDITOR_ONLY_DIRS } from './scriptDiscovery';function extractAndRegisterComponents(source: string): string[] {const entries = extractComponentDefs(source);diff --git a/editor/src/scripting/scriptDiscovery.ts b/editor/src/scripting/scriptDiscovery.tsnew file mode 100644index 000000000..a9bc4956b--- /dev/null+++ b/editor/src/scripting/scriptDiscovery.ts@@ -0,0 +1,35 @@+/**+ * @file scriptDiscovery.ts+ * @brief Discover TypeScript files in a project's src directory+ */++import { joinPath } from '../utils/path';++const IGNORED_SCRIPT_DIRS = new Set(['node_modules', 'dist', 'build']);+const EDITOR_ONLY_DIRS = new Set(['editor']);++interface DirListable {+ listDirectoryDetailed(path: string): Promise<{ name: string; isDirectory: boolean }[]>;+}++async function findTsFiles(+ fs: DirListable,+ dir: string,+ excludeDirs?: Set<string>,+): Promise<string[]> {+ const results: string[] = [];+ const entries = await fs.listDirectoryDetailed(dir);+ for (const e of entries) {+ if (e.isDirectory) {+ if (!IGNORED_SCRIPT_DIRS.has(e.name) && !e.name.startsWith('.')+ && !(excludeDirs?.has(e.name))) {+ results.push(...await findTsFiles(fs, joinPath(dir, e.name), excludeDirs));+ }+ } else if (e.name.endsWith('.ts')) {+ results.push(joinPath(dir, e.name));+ }+ }+ return results;+}++export { findTsFiles, IGNORED_SCRIPT_DIRS, EDITOR_ONLY_DIRS };