Remove engine domain index barrel exports phase 2 - PR_26140_068-remove-engine-domain-index-barrels-phase2

DavidQ · DavidQ · commit 70c237c4855e · 2026-05-20T21:44:59.000-04:00
diff --git a/docs/dev/reports/engine_domain_index_barrel_removal_phase2_report.md b/docs/dev/reports/engine_domain_index_barrel_removal_phase2_report.md
@@ -0,0 +1,48 @@
+# PR_26140_068 Engine Domain Index Barrel Removal Phase 2
+
+## Summary
+- Removed the targeted phase 2 engine domain barrel files:
+  - `src/engine/events/index.js`
+  - `src/engine/fx/index.js`
+  - `src/engine/game/index.js`
+  - `src/engine/level/index.js`
+  - `src/engine/localization/index.js`
+  - `src/engine/logging/index.js`
+  - `src/engine/memory/index.js`
+  - `src/engine/state/index.js`
+- Replaced active imports and re-exports from those barrels with direct canonical file imports.
+- Kept edits to import/export wiring only. No runtime logic, sample JSON, game/sample entry removal, replacement barrels, or pass-through shims were added.
+- No edits were made under `src/engine/debug/**`, `src/engine/network/**`, or `src/engine/systems/**`.
+- `src/engine/core/index.js` remains in place; only its `EventBus` re-export was pointed directly at `src/engine/events/EventBus.js`.
+
+## Direct Import Mapping
+- `EventBus` -> `src/engine/events/EventBus.js`
+- `ParticleSystem` -> `src/engine/fx/ParticleSystem.js`
+- `GameModeState` -> `src/engine/game/GameModeState.js`
+- `isGameplayModeActive`, `runIfGameplayMode` -> `src/engine/game/gameplayHooks.js`
+- `LevelLoader` -> `src/engine/level/LevelLoader.js`
+- `LocalizationService` -> `src/engine/localization/LocalizationService.js`
+- `Logger` -> `src/engine/logging/Logger.js`
+- `ErrorBoundary` -> `src/engine/logging/ErrorBoundary.js`
+- `DisposableStore` -> `src/engine/memory/DisposableStore.js`
+- `ObjectPool` -> `src/engine/memory/ObjectPool.js`
+- `StateMachine` -> `src/engine/state/StateMachine.js`
+
+## Validation
+- PASS: target barrel scan reports `0` active imports/exports from the eight phase 2 barrels.
+- PASS: target deletion scan confirms all eight targeted `index.js` files no longer exist.
+- PASS: no JSON files changed.
+- PASS: `node --check` passed for 23 changed existing JS/MJS files.
+- PASS: local import target validation passed for 23 changed existing JS/MJS files.
+- PASS: `npm run test:workspace-v2` passed 59/59 tests.
+- PASS: targeted affected domain tests passed:
+  - `tests/core/Engine2DCapabilityCombinedFoundation.test.mjs`
+  - `tests/final/FinalSystems.test.mjs`
+  - `tests/final/PlatformUxSystems.test.mjs`
+  - `tests/final/ReleaseReadinessSystems.test.mjs`
+  - `tests/fx/ParticleSystem.test.mjs`
+  - `tests/production/ProductionReadiness.test.mjs`
+  - `tests/runtime/Phase19RuntimeLifecycleValidation.test.mjs`
+  - `tests/runtime/RuntimeMonitoringHooks.test.mjs`
+- PASS: `git diff --check` exited 0. Git emitted advisory line-ending warnings for touched `.mjs` test files only.
+- SKIPPED: full samples smoke test, per PR instruction.
diff --git a/games/Asteroids/game/AsteroidsGameScene.js b/games/Asteroids/game/AsteroidsGameScene.js
@@ -5,7 +5,7 @@ David Quesenberry
 AsteroidsGameScene.js
 */
 import { AttractModeController, Scene } from '/src/engine/scene/index.js';
-import { ParticleSystem } from '/src/engine/fx/index.js';
+import ParticleSystem from '/src/engine/fx/ParticleSystem.js';
 import { asPositiveInteger } from '/src/shared/number/numbers.js';
 import AsteroidsSession from './AsteroidsSession.js';
 import AsteroidsWorld from './AsteroidsWorld.js';
diff --git a/samples/phase-02/0206/LevelLoaderScene.js b/samples/phase-02/0206/LevelLoaderScene.js
@@ -10,7 +10,7 @@ import { ThemeTokens } from '/src/engine/theme/ThemeTokens.js';
 import { clamp } from '/src/shared/math/scalars.js';
 import { drawFrame, drawPanel } from '/src/engine/debug/index.js';
 import { isColliding } from '/src/engine/collision/aabb.js';
-import { LevelLoader } from '/src/engine/level/index.js';
+import LevelLoader from '/src/engine/level/LevelLoader.js';
 import { levelData } from './levelData.js';
 
 const theme = new Theme(ThemeTokens);
diff --git a/samples/phase-02/0208/StateMachineScene.js b/samples/phase-02/0208/StateMachineScene.js
@@ -9,7 +9,7 @@ import { Theme } from '/src/engine/theme/Theme.js';
 import { ThemeTokens } from '/src/engine/theme/ThemeTokens.js';
 import { clamp } from '/src/shared/math/scalars.js';
 import { drawFrame, drawPanel } from '/src/engine/debug/index.js';
-import { StateMachine } from '/src/engine/state/index.js';
+import StateMachine from '/src/engine/state/StateMachine.js';
 
 const theme = new Theme(ThemeTokens);
 
diff --git a/samples/phase-02/0217/GameModeStateScene.js b/samples/phase-02/0217/GameModeStateScene.js
@@ -8,7 +8,7 @@ import { Scene } from '/src/engine/scene/index.js';
 import { Theme } from '/src/engine/theme/Theme.js';
 import { ThemeTokens } from '/src/engine/theme/ThemeTokens.js';
 import { drawFrame, drawPanel } from '/src/engine/debug/index.js';
-import { GameModeState } from '/src/engine/game/index.js';
+import GameModeState from '/src/engine/game/GameModeState.js';
 
 const theme = new Theme(ThemeTokens);
 
diff --git a/samples/phase-02/0218/PolishedPlayableSliceScene.js b/samples/phase-02/0218/PolishedPlayableSliceScene.js
@@ -10,7 +10,7 @@ import { ThemeTokens } from '/src/engine/theme/ThemeTokens.js';
 import { clamp } from '/src/shared/math/scalars.js';
 import { drawFrame, drawPanel } from '/src/engine/debug/index.js';
 import { renderByLayers, renderSpriteReadyEntities } from '/src/engine/rendering/index.js';
-import { GameModeState } from '/src/engine/game/index.js';
+import GameModeState from '/src/engine/game/GameModeState.js';
 import { resolveInteraction } from '/src/engine/interaction/index.js';
 import { updatePatrolEntity, isWithinDetectionRange } from '/src/engine/ai/index.js';
 import { spawnProjectile, updateProjectiles } from '/src/engine/systems/index.js';
diff --git a/samples/phase-05/0508/StateMachineFrameworkScene.js b/samples/phase-05/0508/StateMachineFrameworkScene.js
@@ -8,7 +8,7 @@ import { Scene } from '/src/engine/scene/index.js';
 import { Theme } from '/src/engine/theme/Theme.js';
 import { ThemeTokens } from '/src/engine/theme/ThemeTokens.js';
 import { drawFrame, drawPanel } from '/src/engine/debug/index.js';
-import { StateMachine } from '/src/engine/state/index.js';
+import StateMachine from '/src/engine/state/StateMachine.js';
 
 const theme = new Theme(ThemeTokens);
 
diff --git a/samples/phase-07/0706/MemoryManagementScene.js b/samples/phase-07/0706/MemoryManagementScene.js
@@ -8,7 +8,8 @@ import { Scene } from '/src/engine/scene/index.js';
 import { Theme } from '/src/engine/theme/Theme.js';
 import { ThemeTokens } from '/src/engine/theme/ThemeTokens.js';
 import { drawFrame, drawPanel } from '/src/engine/debug/index.js';
-import { DisposableStore, ObjectPool } from '/src/engine/memory/index.js';
+import DisposableStore from '/src/engine/memory/DisposableStore.js';
+import ObjectPool from '/src/engine/memory/ObjectPool.js';
 
 const theme = new Theme(ThemeTokens);
 
diff --git a/samples/phase-07/0711/LocalizationSystemScene.js b/samples/phase-07/0711/LocalizationSystemScene.js
@@ -8,7 +8,7 @@ import { Scene } from '/src/engine/scene/index.js';
 import { Theme } from '/src/engine/theme/Theme.js';
 import { ThemeTokens } from '/src/engine/theme/ThemeTokens.js';
 import { drawFrame, drawPanel } from '/src/engine/debug/index.js';
-import { LocalizationService } from '/src/engine/localization/index.js';
+import LocalizationService from '/src/engine/localization/LocalizationService.js';
 
 const theme = new Theme(ThemeTokens);
 
diff --git a/samples/phase-08/0805/ParticleFxScene.js b/samples/phase-08/0805/ParticleFxScene.js
@@ -8,7 +8,7 @@ import { Scene } from '/src/engine/scene/index.js';
 import { Theme } from '/src/engine/theme/Theme.js';
 import { ThemeTokens } from '/src/engine/theme/ThemeTokens.js';
 import { drawFrame, drawPanel } from '/src/engine/debug/index.js';
-import { ParticleSystem } from '/src/engine/fx/index.js';
+import ParticleSystem from '/src/engine/fx/ParticleSystem.js';
 
 const theme = new Theme(ThemeTokens);
 
diff --git a/samples/phase-08/0810/LoggingErrorSystemScene.js b/samples/phase-08/0810/LoggingErrorSystemScene.js
@@ -8,7 +8,7 @@ import { Scene } from '/src/engine/scene/index.js';
 import { Theme } from '/src/engine/theme/Theme.js';
 import { ThemeTokens } from '/src/engine/theme/ThemeTokens.js';
 import { drawFrame, drawPanel } from '/src/engine/debug/index.js';
-import { ErrorBoundary } from '/src/engine/logging/index.js';
+import ErrorBoundary from '/src/engine/logging/ErrorBoundary.js';
 
 const theme = new Theme(ThemeTokens);
 
diff --git a/samples/phase-11/1105/main.js b/samples/phase-11/1105/main.js
@@ -7,7 +7,7 @@ main.js
 import Engine from '/src/engine/core/Engine.js';
 import { Theme } from '/src/engine/theme/Theme.js';
 import { ThemeTokens } from '/src/engine/theme/ThemeTokens.js';
-import { Logger } from '/src/engine/logging/index.js';
+import Logger from '/src/engine/logging/Logger.js';
 import { CrashRecoveryManager } from '/src/engine/release/index.js';
 import CrashRecoveryScene from './CrashRecoveryScene.js';
 
diff --git a/src/engine/ai/AIStateController.js b/src/engine/ai/AIStateController.js
@@ -4,7 +4,7 @@ David Quesenberry
 03/22/2026
 AIStateController.js
 */
-import { StateMachine } from '../state/index.js';
+import StateMachine from '../state/StateMachine.js';
 
 export default class AIStateController {
   constructor({ initial = 'idle', states = {} } = {}) {
diff --git a/src/engine/core/Engine.js b/src/engine/core/Engine.js
@@ -19,7 +19,7 @@ import {
   createRuntimeMonitoringHooks
 } from '../runtime/index.js';
 import { AudioService } from '../audio/index.js';
-import { Logger } from '../logging/index.js';
+import Logger from '../logging/Logger.js';
 import { SettingsSystem } from '../release/index.js';
 
 export default class Engine {
diff --git a/src/engine/core/index.js b/src/engine/core/index.js
@@ -10,7 +10,7 @@ export { default as FixedTicker } from './FixedTicker.js';
 export { default as RuntimeMetrics } from './RuntimeMetrics.js';
 
 // Baseline core service cluster exports (timing/frame, event routing, camera integration).
-export { EventBus } from '../events/index.js';
+export { default as EventBus } from '../events/EventBus.js';
 export { default as Camera2D } from '../camera/Camera2D.js';
 export { default as Camera3D } from '../camera/Camera3D.js';
 export { followCameraTarget, worldRectToScreen } from '../camera/CameraSystem.js';
diff --git a/src/engine/events/index.js b/src/engine/events/index.js
diff --git a/src/engine/fx/index.js b/src/engine/fx/index.js
diff --git a/src/engine/game/index.js b/src/engine/game/index.js
diff --git a/src/engine/level/index.js b/src/engine/level/index.js
diff --git a/src/engine/localization/index.js b/src/engine/localization/index.js
diff --git a/src/engine/logging/index.js b/src/engine/logging/index.js
diff --git a/src/engine/memory/index.js b/src/engine/memory/index.js
diff --git a/src/engine/state/index.js b/src/engine/state/index.js
diff --git a/tests/core/Engine2DCapabilityCombinedFoundation.test.mjs b/tests/core/Engine2DCapabilityCombinedFoundation.test.mjs
@@ -13,7 +13,8 @@ import { Tilemap, renderTilemap } from '../../src/engine/tilemap/index.js';
 import { isColliding } from '../../src/engine/collision/aabb.js';
 import { runHybridCollision } from '../../src/engine/collision/hybrid.js';
 import { moveRectWithTilemapCollision } from '../../src/engine/systems/index.js';
-import { GameModeState, runIfGameplayMode } from '../../src/engine/game/index.js';
+import GameModeState from '../../src/engine/game/GameModeState.js';
+import { runIfGameplayMode } from '../../src/engine/game/gameplayHooks.js';
 
 function createCanvasHarness() {
   const calls = [];
diff --git a/tests/final/FinalSystems.test.mjs b/tests/final/FinalSystems.test.mjs
@@ -8,7 +8,7 @@ import assert from 'node:assert/strict';
 import { compressJson, decompressJson } from '../../src/engine/persistence/index.js';
 import { ReplaySystem } from '../../src/engine/replay/index.js';
 import { AchievementSystem } from '../../src/engine/world/index.js';
-import { LocalizationService } from '../../src/engine/localization/index.js';
+import LocalizationService from '../../src/engine/localization/LocalizationService.js';
 
 export function run() {
   const compressed = compressJson({ hp: 3, coins: 12 });
diff --git a/tests/final/PlatformUxSystems.test.mjs b/tests/final/PlatformUxSystems.test.mjs
@@ -6,12 +6,13 @@ PlatformUxSystems.test.mjs
 */
 import assert from 'node:assert/strict';
 import { AudioService, MidiPlayer, FrequencyPlayer, Synthesizer, MediaTrackService, PlaylistManager } from '../../src/engine/audio/index.js';
-import { ParticleSystem } from '../../src/engine/fx/index.js';
+import ParticleSystem from '../../src/engine/fx/ParticleSystem.js';
 import { UIFramework } from '../../src/engine/ui/index.js';
 import InputContextService from '../../src/engine/input/InputContextService.js';
 import { SceneTransitionController } from '../../src/engine/scene/index.js';
 import { SaveSlotManager, StorageService, CookieStorageService } from '../../src/engine/persistence/index.js';
-import { Logger, ErrorBoundary } from '../../src/engine/logging/index.js';
+import Logger from '../../src/engine/logging/Logger.js';
+import ErrorBoundary from '../../src/engine/logging/ErrorBoundary.js';
 
 class MemoryStorage {
   constructor() {
diff --git a/tests/final/ReleaseReadinessSystems.test.mjs b/tests/final/ReleaseReadinessSystems.test.mjs
@@ -13,7 +13,7 @@ import {
   ReleaseValidationChecklist,
   SettingsSystem,
 } from '../../src/engine/release/index.js';
-import { Logger } from '../../src/engine/logging/index.js';
+import Logger from '../../src/engine/logging/Logger.js';
 import { StorageService } from '../../src/engine/persistence/index.js';
 
 class MemoryStorage {
diff --git a/tests/fx/ParticleSystem.test.mjs b/tests/fx/ParticleSystem.test.mjs
@@ -5,7 +5,7 @@
  ParticleSystem.test.mjs
 */
 import assert from 'node:assert/strict';
-import { ParticleSystem } from '../../src/engine/fx/index.js';
+import ParticleSystem from '../../src/engine/fx/ParticleSystem.js';
 
 function createSequenceRandom(values) {
   let index = 0;
diff --git a/tests/production/ProductionReadiness.test.mjs b/tests/production/ProductionReadiness.test.mjs
@@ -9,7 +9,7 @@ import ActionInputMap from '../../src/engine/input/ActionInputMap.js';
 import ActionInputService from '../../src/engine/input/ActionInputService.js';
 import ResolutionScaler from '../../src/engine/rendering/ResolutionScaler.js';
 import AssetOptimizer from '../../src/engine/assets/AssetOptimizer.js';
-import { ObjectPool } from '../../src/engine/memory/index.js';
+import ObjectPool from '../../src/engine/memory/ObjectPool.js';
 
 export async function run() {
   const map = new ActionInputMap({ jump: ['Space'] });
diff --git a/tests/runtime/Phase19RuntimeLifecycleValidation.test.mjs b/tests/runtime/Phase19RuntimeLifecycleValidation.test.mjs
@@ -6,7 +6,7 @@ Phase19RuntimeLifecycleValidation.test.mjs
 */
 import assert from 'node:assert/strict';
 import Engine from '../../src/engine/core/Engine.js';
-import { Logger } from '../../src/engine/logging/index.js';
+import Logger from '../../src/engine/logging/Logger.js';
 
 function createCanvas() {
   const canvas = {
diff --git a/tests/runtime/RuntimeMonitoringHooks.test.mjs b/tests/runtime/RuntimeMonitoringHooks.test.mjs
@@ -6,7 +6,7 @@ RuntimeMonitoringHooks.test.mjs
 */
 import assert from 'node:assert/strict';
 import { createRuntimeMonitoringHooks } from '../../src/engine/runtime/index.js';
-import { Logger } from '../../src/engine/logging/index.js';
+import Logger from '../../src/engine/logging/Logger.js';
 
 function createWindowStub() {
   const listeners = new Map();
diff --git a/tools/shared/platformShell.js b/tools/shared/platformShell.js
@@ -12,7 +12,7 @@ import { createWorkspaceSystemController } from "./projectSystem.js";
 import { bindEventHandlers, createCommandDispatcher } from "./eventCommandUtils.js";
 import { asHtmlInput, queryAll, queryFirst, readDataAttribute, setTextContent } from "./uiSafeUtils.js";
 import { escapeHtml } from "../../src/shared/string/strings.js";
-import { Logger } from "../../src/engine/logging/index.js";
+import Logger from "../../src/engine/logging/Logger.js";
 import {
   LocalStorageService,
   SessionStorageService
