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>
78 lines
2.0 KiB
TypeScript
78 lines
2.0 KiB
TypeScript
import { PlayerStatsLeafSchema } from "core-public/ApiSchemas";
|
|
import { PlayerStatsSchema } from "core-public/StatsSchemas";
|
|
|
|
function testPlayerSchema(
|
|
json: string,
|
|
expectSuccess = true,
|
|
expectThrow = false,
|
|
): void {
|
|
const parse = () => {
|
|
const raw = JSON.parse(json);
|
|
const result = PlayerStatsSchema.safeParse(raw);
|
|
return result.success;
|
|
};
|
|
|
|
if (expectSuccess) {
|
|
// Expect success
|
|
expect(parse()).toBeTruthy();
|
|
} else if (!expectThrow) {
|
|
// Expect failure
|
|
expect(parse()).toBeFalsy();
|
|
} else {
|
|
// Expect throw
|
|
expect(parse).toThrow();
|
|
}
|
|
}
|
|
|
|
describe("StatsSchema", () => {
|
|
test("Parse empty", () => {
|
|
testPlayerSchema("{}");
|
|
});
|
|
|
|
test("Parse partial", () => {
|
|
testPlayerSchema('{"units":{"port":["0","0","0","1"]}}');
|
|
});
|
|
|
|
test("Parse invalid", () => {
|
|
testPlayerSchema("[]", false);
|
|
testPlayerSchema("null", false);
|
|
testPlayerSchema('"null"', false);
|
|
testPlayerSchema('"undefined"', false);
|
|
});
|
|
|
|
test("Parse failure", () => {
|
|
testPlayerSchema("", false, true);
|
|
testPlayerSchema("undefined", false, true);
|
|
testPlayerSchema("{", false, true);
|
|
testPlayerSchema("{}}", false, true);
|
|
});
|
|
|
|
test("null array elements coerce to 0n (LEFT JOIN rows with no stats)", () => {
|
|
// Postgres SUM() over all-NULL rows returns NULL. These should parse as 0n.
|
|
testPlayerSchema(
|
|
'{"attacks":[null,null,null],"betrayals":null,"gold":[null,null,null,null,null,null]}',
|
|
);
|
|
});
|
|
});
|
|
|
|
describe("PlayerStatsLeafSchema", () => {
|
|
test("null stat values coerce to 0n", () => {
|
|
const result = PlayerStatsLeafSchema.safeParse({
|
|
wins: "0",
|
|
losses: "1",
|
|
total: "1",
|
|
stats: { attacks: [null, null, null], betrayals: null },
|
|
});
|
|
expect(result.success).toBe(true);
|
|
});
|
|
|
|
test("missing required field (wins) still fails — undefined is not coerced", () => {
|
|
const result = PlayerStatsLeafSchema.safeParse({
|
|
losses: "1",
|
|
total: "1",
|
|
stats: {},
|
|
});
|
|
expect(result.success).toBe(false);
|
|
});
|
|
});
|