mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-07-10 18:14:40 +00:00
Evan Pelle
a7f992e9b0
Restructure the single src/ tree into an npm-workspaces monorepo under
packages/, rename core -> engine, extract a types-only core-public layer,
and break the pre-existing engine -> client dependency cycle.
Structure (packages/):
core-public public API/wire schemas + shared enums (clean leaf)
shared framework-agnostic helpers (clean leaf)
engine deterministic simulation (was src/core)
client rendering/UI (was src/client)
server coordination (was src/server)
Dependency DAG: engine -> {core-public, shared}; client -> {core-public,
shared, engine}; server -> {core-public, engine}.
- npm workspaces: root package.json workspaces + per-package package.json;
tsconfig.base.json holds shared options + path aliases
(core-public/* shared/* engine/* client/* server/*) resolved uniformly by
tsc, Vite (resolve.tsconfigPaths), Vitest, and tsx. Lockfile regenerated.
- core-public: moved Schemas/ApiSchemas/CosmeticSchemas/StatsSchemas/
ClanApiSchemas/WorkerSchemas/Base64/PatternDecoder; extracted the enums
(GameTypes), GameEvent type, emoji table, and GraphicsOverrides schema.
Engine re-exports the moved enums/types so existing imports keep working.
- Broke engine -> client cycle:
- renderNumber/renderTroops -> shared/format
- NameBoxCalculator moved into engine
- username validation returns translation key + params; client translates
- applyStateUpdate moved to client (operates on the render-only PlayerState)
- Config/UnitGrid/execution-Util/GameImpl now use structural read
interfaces (engine/game/ReadViews: PlayerLike/UnitLike/GameLike) instead
of importing client view classes; client imports view classes from a new
client/view barrel; deleted the engine/game/GameView re-export shim.
- Build/deploy updated: vite.config, index.html, eslint, Dockerfile
(copies packages/ + tsconfig.base.json before npm ci), .vscode, tests.
Verified: tsc --noEmit clean; 1364 + 65 tests pass; production vite build
succeeds; engine has zero client/server imports; core-public and shared are
dependency leaves.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
66 lines
2.0 KiB
TypeScript
66 lines
2.0 KiB
TypeScript
import { beforeEach, describe, expect, test } from "vitest";
|
|
import { PlayerExecution } from "engine/execution/PlayerExecution";
|
|
import {
|
|
Game,
|
|
Player,
|
|
PlayerInfo,
|
|
PlayerType,
|
|
} from "engine/game/Game";
|
|
import { setup } from "../../util/Setup";
|
|
import { executeTicks } from "../../util/utils";
|
|
|
|
let game: Game;
|
|
let largePlayer: Player;
|
|
let smallPlayer: Player;
|
|
|
|
describe("PlayerExecution Annexation Bug", () => {
|
|
beforeEach(async () => {
|
|
game = await setup(
|
|
"big_plains",
|
|
{ infiniteGold: true, instantBuild: true },
|
|
[
|
|
new PlayerInfo("large", PlayerType.Human, "client1", "large_id"),
|
|
new PlayerInfo("small", PlayerType.Human, "client2", "small_id"),
|
|
],
|
|
);
|
|
|
|
largePlayer = game.player("large_id");
|
|
smallPlayer = game.player("small_id");
|
|
|
|
game.addExecution(new PlayerExecution(largePlayer));
|
|
game.addExecution(new PlayerExecution(smallPlayer));
|
|
});
|
|
|
|
test("A large player is not reverse-annexed by surrounded smaller player", () => {
|
|
// Cluster A
|
|
smallPlayer.conquer(game.ref(50, 50));
|
|
smallPlayer.conquer(game.ref(50, 51));
|
|
smallPlayer.conquer(game.ref(51, 50));
|
|
smallPlayer.conquer(game.ref(51, 51));
|
|
// Cluster B
|
|
smallPlayer.conquer(game.ref(10, 10));
|
|
smallPlayer.conquer(game.ref(90, 90));
|
|
|
|
// Larger player gets the rest
|
|
game.map().forEachTile((tile) => {
|
|
if (game.ownerID(tile) !== smallPlayer.smallID()) {
|
|
largePlayer.conquer(tile);
|
|
}
|
|
});
|
|
|
|
const initialLargeTiles = largePlayer.numTilesOwned();
|
|
expect(largePlayer.numTilesOwned()).toBe(initialLargeTiles);
|
|
expect(smallPlayer.numTilesOwned()).toBeGreaterThan(0);
|
|
|
|
// Keep ticksPerClusterCalc and lastTileChange in mind
|
|
executeTicks(game, 20);
|
|
largePlayer.conquer(game.ref(49, 49));
|
|
smallPlayer.conquer(game.ref(50, 50));
|
|
|
|
// Annexation happens here
|
|
executeTicks(game, 50);
|
|
expect(largePlayer.numTilesOwned()).toBeGreaterThan(initialLargeTiles);
|
|
expect(smallPlayer.numTilesOwned()).toBe(0);
|
|
});
|
|
});
|