mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-07-10 17:04:35 +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>
232 lines
7.2 KiB
TypeScript
232 lines
7.2 KiB
TypeScript
import { describe, expect, it } from "vitest";
|
|
import { SpawnExecution } from "engine/execution/SpawnExecution";
|
|
import {
|
|
Game,
|
|
Player,
|
|
PlayerInfo,
|
|
PlayerType,
|
|
} from "engine/game/Game";
|
|
import { TileRef } from "engine/game/GameMap";
|
|
import { SpatialQuery } from "engine/pathfinding/spatial/SpatialQuery";
|
|
import { createGame, L, W } from "./_fixtures";
|
|
|
|
// Spawns player and **expands territory** via getSpawnTiles (euclidean dist 4)
|
|
// Ref: src/core/execution/Util.ts
|
|
function addPlayer(game: Game, tile: TileRef): Player {
|
|
const info = new PlayerInfo("test", PlayerType.Human, null, "test_id");
|
|
game.addPlayer(info);
|
|
game.addExecution(new SpawnExecution("game_id", info, tile));
|
|
game.executeNextTick();
|
|
game.executeNextTick();
|
|
return game.player(info.id);
|
|
}
|
|
|
|
describe("SpatialQuery", () => {
|
|
describe("closestShore", () => {
|
|
it("finds shore tile owned by player", () => {
|
|
// prettier-ignore
|
|
const game = createGame({
|
|
width: 5, height: 5, grid: [
|
|
W, W, W, W, W,
|
|
W, L, L, L, W,
|
|
W, L, L, L, W,
|
|
W, L, L, L, W,
|
|
W, W, W, W, W,
|
|
],
|
|
});
|
|
|
|
const spatial = new SpatialQuery(game);
|
|
const player = addPlayer(game, game.ref(2, 2));
|
|
|
|
// All land tiles owned by player because of spawn expansion
|
|
const result = spatial.closestShore(player, game.ref(2, 2));
|
|
|
|
expect(result).not.toBeNull();
|
|
expect(game.isShore(result!)).toBe(true);
|
|
expect(game.ownerID(result!)).toBe(player.smallID());
|
|
});
|
|
|
|
it("returns null when no shore within maxDist", () => {
|
|
// prettier-ignore
|
|
const game = createGame({
|
|
width: 7, height: 7, grid: [
|
|
W, W, W, W, W, W, W,
|
|
W, L, L, L, L, L, W,
|
|
W, L, L, L, L, L, W,
|
|
W, L, L, L, L, L, W,
|
|
W, L, L, L, L, L, W,
|
|
W, L, L, L, L, L, W,
|
|
W, W, W, W, W, W, W,
|
|
],
|
|
});
|
|
|
|
const spatial = new SpatialQuery(game);
|
|
const player = addPlayer(game, game.ref(3, 3));
|
|
|
|
// maxDist=1 from center (3,3) - shore is 2 tiles away
|
|
const result = spatial.closestShore(player, game.ref(3, 3), 1);
|
|
|
|
expect(result).toBeNull();
|
|
});
|
|
|
|
it("finds shore on player's island (two separate islands)", () => {
|
|
// prettier-ignore
|
|
const game = createGame({
|
|
width: 8, height: 4, grid: [
|
|
L, L, W, W, W, W, L, L,
|
|
L, L, W, W, W, W, L, L,
|
|
L, L, W, W, W, W, L, L,
|
|
L, L, W, W, W, W, L, L,
|
|
],
|
|
});
|
|
|
|
const spatial = new SpatialQuery(game);
|
|
const player = addPlayer(game, game.ref(0, 0));
|
|
|
|
const result = spatial.closestShore(player, game.ref(0, 2));
|
|
|
|
expect(result).not.toBeNull();
|
|
expect(game.isShore(result!)).toBe(true);
|
|
expect(game.ownerID(result!)).toBe(player.smallID());
|
|
expect(game.x(result!)).toBeLessThanOrEqual(2);
|
|
});
|
|
|
|
it("finds shore even if no land path exists (two separate islands)", () => {
|
|
// prettier-ignore
|
|
const game = createGame({
|
|
width: 8, height: 4, grid: [
|
|
L, L, W, W, W, W, L, L,
|
|
L, L, W, W, W, W, L, L,
|
|
L, L, W, W, W, W, L, L,
|
|
L, L, W, W, W, W, L, L,
|
|
],
|
|
});
|
|
|
|
const spatial = new SpatialQuery(game);
|
|
const player = addPlayer(game, game.ref(0, 0));
|
|
|
|
const result = spatial.closestShore(player, game.ref(7, 2));
|
|
|
|
expect(result).not.toBeNull();
|
|
expect(game.isShore(result!)).toBe(true);
|
|
expect(game.ownerID(result!)).toBe(player.smallID());
|
|
expect(game.x(result!)).toBeLessThanOrEqual(2);
|
|
});
|
|
|
|
it("finds shore for terra nullius when land is unclaimed", () => {
|
|
// prettier-ignore
|
|
const game = createGame({
|
|
width: 5, height: 5, grid: [
|
|
W, W, W, W, W,
|
|
W, L, L, L, W,
|
|
W, L, L, L, W,
|
|
W, L, L, L, W,
|
|
W, W, W, W, W,
|
|
],
|
|
});
|
|
|
|
const spatial = new SpatialQuery(game);
|
|
const terraNullius = game.terraNullius();
|
|
|
|
const result = spatial.closestShore(terraNullius, game.ref(2, 2));
|
|
|
|
expect(result).not.toBeNull();
|
|
expect(game.isShore(result!)).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe("closestShoreByWater", () => {
|
|
it("returns null for terra nullius", () => {
|
|
// prettier-ignore
|
|
const game = createGame({
|
|
width: 5, height: 5, grid: [
|
|
W, W, W, W, W,
|
|
W, L, L, L, W,
|
|
W, L, L, L, W,
|
|
W, L, L, L, W,
|
|
W, W, W, W, W,
|
|
],
|
|
});
|
|
|
|
const spatial = new SpatialQuery(game);
|
|
const terraNullius = game.terraNullius();
|
|
|
|
const result = spatial.closestShoreByWater(terraNullius, game.ref(0, 0));
|
|
|
|
expect(result).toBeNull();
|
|
});
|
|
|
|
it("returns null when target is on land", () => {
|
|
// prettier-ignore
|
|
const game = createGame({
|
|
width: 5, height: 5, grid: [
|
|
W, W, W, W, W,
|
|
W, L, L, L, W,
|
|
W, L, L, L, W,
|
|
W, L, L, L, W,
|
|
W, W, W, W, W,
|
|
],
|
|
});
|
|
|
|
const spatial = new SpatialQuery(game);
|
|
const player = addPlayer(game, game.ref(2, 2));
|
|
|
|
const result = spatial.closestShoreByWater(player, game.ref(2, 2));
|
|
|
|
expect(result).toBeNull();
|
|
});
|
|
|
|
it("returns null when target is in disconnected water body", () => {
|
|
// prettier-ignore
|
|
const game = createGame({
|
|
width: 14, height: 6, grid: [
|
|
W, W, L, L, L, L, L, L, L, L, L, L, W, W,
|
|
W, W, L, L, L, L, L, L, L, L, L, L, W, W,
|
|
W, W, L, L, L, L, L, L, L, L, L, L, W, W,
|
|
W, W, L, L, L, L, L, L, L, L, L, L, W, W,
|
|
W, W, L, L, L, L, L, L, L, L, L, L, W, W,
|
|
W, W, L, L, L, L, L, L, L, L, L, L, W, W,
|
|
],
|
|
});
|
|
|
|
const spatial = new SpatialQuery(game);
|
|
const player = addPlayer(game, game.ref(3, 2));
|
|
const result = spatial.closestShoreByWater(player, game.ref(13, 2));
|
|
|
|
expect(result).toBeNull();
|
|
});
|
|
|
|
it("finds shore via long water path around island", () => {
|
|
// prettier-ignore
|
|
const game = createGame({
|
|
width: 18, height: 14, grid: [
|
|
W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W,
|
|
W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W,
|
|
W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W,
|
|
W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W,
|
|
W, W, W, W, L, L, L, L, L, L, L, L, L, L, W, W, W, W,
|
|
W, W, W, W, L, L, L, L, L, L, L, L, L, L, W, W, W, W,
|
|
W, W, W, W, L, L, L, L, L, L, L, L, L, L, W, W, W, W,
|
|
W, W, W, W, L, L, L, L, L, L, L, L, L, L, W, W, W, W,
|
|
W, W, W, W, L, L, L, L, L, L, L, L, L, L, W, W, W, W,
|
|
W, W, W, W, L, L, L, L, L, L, L, L, L, L, W, W, W, W,
|
|
W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W,
|
|
W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W,
|
|
W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W,
|
|
W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, L,
|
|
],
|
|
});
|
|
|
|
const spatial = new SpatialQuery(game);
|
|
const player = addPlayer(game, game.ref(4, 4));
|
|
|
|
const target = game.ref(17, 13);
|
|
const result = spatial.closestShoreByWater(player, target);
|
|
|
|
expect(result).not.toBeNull();
|
|
expect(game.isShore(result!)).toBe(true);
|
|
expect(game.ownerID(result!)).toBe(player.smallID());
|
|
});
|
|
});
|
|
});
|