mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-07-10 18:44: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>
77 lines
2.4 KiB
TypeScript
77 lines
2.4 KiB
TypeScript
import { describe, expect, test } from "vitest";
|
|
import {
|
|
alignClusterOrder,
|
|
Slot,
|
|
} from "client/controllers/AttackingTroopsController";
|
|
import { Cell } from "engine/game/Game";
|
|
|
|
// Slots only need the `dst` fields populated for `alignClusterOrder` — it
|
|
// compares the new positions against the previous targets to decide whether
|
|
// the worker reordered same-size clusters.
|
|
const slot = (x: number, y: number): Slot => ({
|
|
curX: x,
|
|
curY: y,
|
|
srcX: x,
|
|
srcY: y,
|
|
dstX: x,
|
|
dstY: y,
|
|
startMs: 0,
|
|
});
|
|
|
|
describe("alignClusterOrder", () => {
|
|
const c = (x: number, y: number) => new Cell(x, y);
|
|
|
|
test("preserves order when direct mapping is closer", () => {
|
|
const next = [c(10, 10), c(100, 100)];
|
|
const prev = [slot(12, 11), slot(98, 102)];
|
|
alignClusterOrder(next, prev);
|
|
expect(next[0].x).toBe(10);
|
|
expect(next[1].x).toBe(100);
|
|
});
|
|
|
|
test("swaps when the worker reordered same-size clusters", () => {
|
|
// prev[0] is near (10,10), prev[1] is near (100,100); the worker returned
|
|
// them in the opposite order. Expect swap so each label sticks to its front.
|
|
const next = [c(101, 99), c(11, 12)];
|
|
const prev = [slot(10, 10), slot(100, 100)];
|
|
alignClusterOrder(next, prev);
|
|
expect(next[0].x).toBe(11);
|
|
expect(next[1].x).toBe(101);
|
|
});
|
|
|
|
test("does not swap on a tie (strict less-than)", () => {
|
|
const next = [c(0, 0), c(10, 0)];
|
|
const prev = [slot(5, 0), slot(5, 0)];
|
|
alignClusterOrder(next, prev);
|
|
expect(next[0].x).toBe(0);
|
|
expect(next[1].x).toBe(10);
|
|
});
|
|
|
|
test("no-op when fewer than two new positions", () => {
|
|
const single = [c(99, 99)];
|
|
alignClusterOrder(single, [slot(0, 0), slot(1000, 1000)]);
|
|
expect(single[0].x).toBe(99);
|
|
|
|
const empty: Cell[] = [];
|
|
alignClusterOrder(empty, [slot(0, 0), slot(1000, 1000)]);
|
|
expect(empty.length).toBe(0);
|
|
});
|
|
|
|
test("no-op when fewer than two previous slots (initial render)", () => {
|
|
const next = [c(100, 100), c(0, 0)];
|
|
alignClusterOrder(next, [slot(0, 0)]);
|
|
expect(next[0].x).toBe(100);
|
|
expect(next[1].x).toBe(0);
|
|
|
|
alignClusterOrder(next, []);
|
|
expect(next[0].x).toBe(100);
|
|
expect(next[1].x).toBe(0);
|
|
});
|
|
|
|
test("no-op when more than two new positions (assumed cap)", () => {
|
|
const next = [c(100, 0), c(0, 0), c(50, 0)];
|
|
alignClusterOrder(next, [slot(0, 0), slot(100, 0)]);
|
|
expect(next.map((p) => p.x)).toEqual([100, 0, 50]);
|
|
});
|
|
});
|