mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-07-10 19:14:36 +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>
71 lines
2.0 KiB
TypeScript
71 lines
2.0 KiB
TypeScript
import { vi, type Mocked } from "vitest";
|
|
import { UnitType } from "engine/game/Game";
|
|
import { Cluster, TrainStation } from "engine/game/TrainStation";
|
|
|
|
const createMockStation = (id: string): Mocked<TrainStation> => {
|
|
return {
|
|
id,
|
|
unit: {
|
|
type: vi.fn(() => UnitType.City),
|
|
} as any,
|
|
setCluster: vi.fn(),
|
|
getCluster: vi.fn(() => null),
|
|
} as any;
|
|
};
|
|
|
|
describe("Cluster tests", () => {
|
|
let cluster: Cluster;
|
|
let stationA: Mocked<TrainStation>;
|
|
let stationB: Mocked<TrainStation>;
|
|
let stationC: Mocked<TrainStation>;
|
|
|
|
beforeEach(() => {
|
|
cluster = new Cluster();
|
|
stationA = createMockStation("A");
|
|
stationB = createMockStation("B");
|
|
stationC = createMockStation("C");
|
|
});
|
|
|
|
test("addStation adds a station and sets cluster", () => {
|
|
cluster.addStation(stationA);
|
|
|
|
expect(cluster.has(stationA)).toBe(true);
|
|
expect(stationA.setCluster).toHaveBeenCalledWith(cluster);
|
|
});
|
|
|
|
test("removeStation removes station from cluster", () => {
|
|
cluster.addStation(stationA);
|
|
cluster.removeStation(stationA);
|
|
|
|
expect(cluster.has(stationA)).toBe(false);
|
|
});
|
|
|
|
test("addStations adds multiple stations and sets cluster", () => {
|
|
const set = new Set([stationA, stationB]);
|
|
|
|
cluster.addStations(set);
|
|
|
|
expect(cluster.has(stationA)).toBe(true);
|
|
expect(cluster.has(stationB)).toBe(true);
|
|
expect(stationA.setCluster).toHaveBeenCalledWith(cluster);
|
|
expect(stationB.setCluster).toHaveBeenCalledWith(cluster);
|
|
});
|
|
|
|
test("merge combines stations from another cluster", () => {
|
|
const otherCluster = new Cluster();
|
|
otherCluster.addStation(stationB);
|
|
otherCluster.addStation(stationC);
|
|
|
|
cluster.addStation(stationA);
|
|
cluster.merge(otherCluster);
|
|
|
|
expect(cluster.has(stationA)).toBe(true);
|
|
expect(cluster.has(stationB)).toBe(true);
|
|
expect(cluster.has(stationC)).toBe(true);
|
|
});
|
|
|
|
test("has returns false for non-member stations", () => {
|
|
expect(cluster.has(stationA)).toBe(false);
|
|
});
|
|
});
|