mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-07-10 16:14:36 +00:00
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>
43 lines
1.1 KiB
TypeScript
43 lines
1.1 KiB
TypeScript
import {
|
|
ColoredTeams,
|
|
Game,
|
|
GameMode,
|
|
PlayerType,
|
|
} from "engine/game/Game";
|
|
import { playerInfo, setup } from "./util/Setup";
|
|
|
|
let game: Game;
|
|
|
|
describe("Teams", () => {
|
|
test("bots are on the same team, but can attack each other", async () => {
|
|
game = await setup("plains", { gameMode: GameMode.Team, playerTeams: 2 });
|
|
|
|
const bot1 = game.addPlayer(playerInfo("bot1", PlayerType.Bot));
|
|
const bot2 = game.addPlayer(playerInfo("bot2", PlayerType.Bot));
|
|
|
|
// Both bots should be on the same team
|
|
expect(bot1.team()).toBe(ColoredTeams.Bot);
|
|
expect(bot2.team()).toBe(ColoredTeams.Bot);
|
|
|
|
// But they should be allowed to attack each other.
|
|
expect(bot1.isOnSameTeam(bot2)).toBe(false);
|
|
});
|
|
|
|
test("humans spawn on different teams", async () => {
|
|
game = await setup(
|
|
"plains",
|
|
{
|
|
gameMode: GameMode.Team,
|
|
playerTeams: 2,
|
|
},
|
|
[
|
|
playerInfo("human1", PlayerType.Human),
|
|
playerInfo("human2", PlayerType.Human),
|
|
],
|
|
);
|
|
expect(game.player("human1").isOnSameTeam(game.player("human2"))).toBe(
|
|
false,
|
|
);
|
|
});
|
|
});
|