二七王：布局求解器补齐显式失败与运行时注入契约，配置补 runtime/targetKind 声明
求解器（ui/LayoutSolver.js）： - 按方向校验 anchor：竖排只收 top/bottom/center、横排只收 left/right/center， 未知 direction 一并拒绝。框架 AlignmentUtils 的 switch 对写错方向的 anchor 落到 default（居中），笔误会被静默吞掉——ROOM_CATEGORY_COLUMN 就是这么把前两行摆到画布外的。 - grid 校验合并 ctx 后的 cols/rows 必须是数字：缺 rows 时 capacity=NaN 让超载守卫失效、 循环一次不跑，静默返回空数组（一个矩形都不产出）。 - line/fan/grid 要求 anchorX/anchorY 必须是数字（框架的 anchorY||0 会把缺失变成 0）； point 要求 x/y 必须是数字。 - apply() 精灵数与矩形数不等时抛错，不再静默截断：截断会让多余精灵停在上一手牌的旧坐标上。 - 统一运行时注入：ctx 里的 INJECT_KEYS（target/x/y/w/h/anchorX/anchorY/rows/ itemWidth/itemHeight）覆盖配置同名字段，优先级 ctx > bySeat > base。 - line + items 竖排显式拒绝（只实现了水平）。 配置： - ROOM_CATEGORY_COLUMN anchor 由 'left' 改为 'top'（竖排语义）。 - ROOM_OPTION_OVERFLOW_GRID 补 rows（runtime）、槽尺寸与 anchor 沿用 ROOM_OPTION_ROW， cols 直接引用 ROOM_OPTION_MAX_PER_ROW；ROOM_OPTION_ROW 补上注释里已声明的 itemHeight。 - 所有依赖运行时注入的节点加 runtime 声明，所有 attach 节点加 targetKind （sprite / layout / platform），显式区分「忘了写」与「故意延后到运行时」。 守卫（tests/test_constants.js）： - 求解冒烟改为只对 runtime 声明过的键注入假值，没声明却缺字段的照常抛错变红。 - 补矩形数量断言（line/fan/grid 按项数、point/attach 恒 1）——此前只查数组与坐标类型， 空数组照样通过，「少画了几张牌」对守卫完全不可见。 - attach.target 改为只在 targetKind 指定的那一个命名空间里校验存在。 - 补 runtime 声明自身的合法性检查与布局节点总数（62）钉死。 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Claude Opus 5
@@ -247,6 +247,92 @@ t.eq('bySeat 未知 seat 抛错', throws(() => EQW_LayoutSolver.solve(bySeat, {
|
||||
t.eq('node 为空抛错', throws(() => EQW_LayoutSolver.solve(null, {})), true);
|
||||
t.eq('未知 corner 抛错', throws(() => EQW_LayoutSolver.solve({ kind: 'attach', target: 'TARGET', corner: 'middle', w: 1, h: 1 }, { rects: rects })), true);
|
||||
|
||||
// ============ 方向 × 对齐基准：写错方向的 anchor 必须抛错，不被框架 default 静默吞掉 ============
|
||||
// AlignmentUtils.distributeVertically 只认 top/bottom/center，'left' 会落到 default（居中）——
|
||||
// 3 项 32 高 8 间距时算出 y=[-56,-16,24]，前两行跑到画布外，界面上却看不出是配置写错了
|
||||
const vLine = (anchor) => ({ kind: 'line', direction: 'vertical', anchorX: 0, anchorY: 0, itemWidth: 200, itemHeight: 32, spacing: 8, anchor: anchor });
|
||||
const hLine = (anchor) => ({ kind: 'line', direction: 'horizontal', anchorX: 0, anchorY: 0, itemWidth: 200, itemHeight: 32, spacing: 8, anchor: anchor });
|
||||
t.eq('竖排 anchor=left 抛错', throws(() => EQW_LayoutSolver.solve(vLine('left'), { count: 3 })), true);
|
||||
t.eq('竖排 anchor=right 抛错', throws(() => EQW_LayoutSolver.solve(vLine('right'), { count: 3 })), true);
|
||||
t.eq('竖排 anchor=top 正常', throws(() => EQW_LayoutSolver.solve(vLine('top'), { count: 3 })), false);
|
||||
t.eq('竖排 anchor=bottom 正常', throws(() => EQW_LayoutSolver.solve(vLine('bottom'), { count: 3 })), false);
|
||||
t.eq('竖排 anchor=center 正常', throws(() => EQW_LayoutSolver.solve(vLine('center'), { count: 3 })), false);
|
||||
t.eq('竖排 不写 anchor 正常(框架默认 center)', throws(() => EQW_LayoutSolver.solve(vLine(undefined), { count: 3 })), false);
|
||||
t.eq('横排 anchor=top 抛错', throws(() => EQW_LayoutSolver.solve(hLine('top'), { count: 3 })), true);
|
||||
t.eq('横排 anchor=bottom 抛错', throws(() => EQW_LayoutSolver.solve(hLine('bottom'), { count: 3 })), true);
|
||||
t.eq('横排 anchor=left 正常', throws(() => EQW_LayoutSolver.solve(hLine('left'), { count: 3 })), false);
|
||||
t.eq('横排 anchor=right 正常', throws(() => EQW_LayoutSolver.solve(hLine('right'), { count: 3 })), false);
|
||||
t.eq('未知 direction 抛错', throws(() => EQW_LayoutSolver.solve({ kind: 'line', direction: 'diagonal', anchorX: 0, anchorY: 0, itemWidth: 10, itemHeight: 10, anchor: 'left' }, { count: 3 })), true);
|
||||
// fan 走同一条 distribute，校验一致
|
||||
t.eq('fan 竖排 anchor=left 抛错', throws(() => EQW_LayoutSolver.solve(
|
||||
{ kind: 'fan', direction: 'vertical', anchorX: 0, anchorY: 0, maxWidth: 100, itemWidth: 10, itemHeight: 10, spacingMax: 0, spacingMin: -5, anchor: 'left' }, { count: 3 })), true);
|
||||
// grid 逐行走水平分布，竖排语义的 anchor 同样拒绝
|
||||
t.eq('grid anchor=top 抛错', throws(() => EQW_LayoutSolver.solve(
|
||||
{ kind: 'grid', anchorX: 0, anchorY: 0, cols: 2, rows: 2, itemWidth: 10, itemHeight: 10, anchor: 'top' }, { count: 4 })), true);
|
||||
// line + items 只实现了水平：竖排显式拒绝，不按水平硬算
|
||||
t.eq('line+items 竖排抛错', throws(() => EQW_LayoutSolver.solve(
|
||||
{ kind: 'line', direction: 'vertical', anchorX: 0, anchorY: 0, itemHeight: 10, anchor: 'top', items: [{ key: 'A', width: 10 }] }, {})), true);
|
||||
|
||||
// ============ 对齐基准点必填：框架的 anchorY||0 会把缺失静默变成 0 ============
|
||||
t.eq('line 缺 anchorY 抛错', throws(() => EQW_LayoutSolver.solve(
|
||||
{ kind: 'line', direction: 'horizontal', anchorX: 0, itemWidth: 10, itemHeight: 10, anchor: 'left' }, { count: 2 })), true);
|
||||
t.eq('line 由 ctx.anchorY 补上则正常', EQW_LayoutSolver.solve(
|
||||
{ kind: 'line', direction: 'horizontal', anchorX: 0, itemWidth: 10, itemHeight: 10, anchor: 'left' },
|
||||
{ count: 2, anchorY: 77 })[0].y, 77);
|
||||
t.eq('ctx.anchorX 覆盖配置 anchorX', EQW_LayoutSolver.solve(
|
||||
{ kind: 'line', direction: 'horizontal', anchorX: 0, anchorY: 0, itemWidth: 10, itemHeight: 10, anchor: 'left' },
|
||||
{ count: 2, anchorX: 500 })[0].x, 500);
|
||||
t.eq('fan 缺 anchorX 抛错', throws(() => EQW_LayoutSolver.solve(
|
||||
{ kind: 'fan', direction: 'horizontal', anchorY: 0, maxWidth: 100, itemWidth: 10, itemHeight: 10, spacingMax: 0, spacingMin: -5, anchor: 'left' }, { count: 3 })), true);
|
||||
|
||||
// ============ grid：cols/rows 缺失必须抛错（曾静默返回空数组）============
|
||||
// cols*undefined = NaN → count > NaN 恒 false（超载守卫失效）、for(row<undefined) 一次不跑 → 返回 []
|
||||
const gridNoRows = { kind: 'grid', anchorX: 0, anchorY: 0, cols: 4, itemWidth: 10, itemHeight: 10, anchor: 'left' };
|
||||
t.eq('grid 缺 rows 抛错', throws(() => EQW_LayoutSolver.solve(gridNoRows, { count: 3 })), true);
|
||||
t.eq('grid 缺 cols 抛错', throws(() => EQW_LayoutSolver.solve(
|
||||
{ kind: 'grid', anchorX: 0, anchorY: 0, rows: 2, itemWidth: 10, itemHeight: 10, anchor: 'left' }, { count: 3 })), true);
|
||||
// ctx.rows 运行时注入：行数由实际项数决定的场景
|
||||
t.eq('ctx.rows 注入后正常求解', EQW_LayoutSolver.solve(gridNoRows, { count: 6, rows: 2 }).length, 6);
|
||||
t.eq('ctx.rows 参与容量计算(满格)', EQW_LayoutSolver.solve(gridNoRows, { count: 8, rows: 2 }).length, 8);
|
||||
t.eq('ctx.rows 参与容量计算(超载仍抛错)', throws(() => EQW_LayoutSolver.solve(gridNoRows, { count: 9, rows: 2 })), true);
|
||||
t.eq('ctx.rows 覆盖配置 rows', throws(() => EQW_LayoutSolver.solve(
|
||||
{ kind: 'grid', anchorX: 0, anchorY: 0, cols: 4, rows: 4, itemWidth: 10, itemHeight: 10, anchor: 'left' },
|
||||
{ count: 9, rows: 2 })), true);
|
||||
|
||||
// ============ point：x/y 缺失抛错 + 运行时注入 ============
|
||||
t.eq('point 缺 x/y 抛错', throws(() => EQW_LayoutSolver.solve({ kind: 'point', w: 10, h: 10 }, {})), true);
|
||||
t.eq('point 缺 y 抛错', throws(() => EQW_LayoutSolver.solve({ kind: 'point', x: 1, w: 10, h: 10 }, {})), true);
|
||||
t.eq('point 由 ctx.x/ctx.y 注入', EQW_LayoutSolver.solve({ kind: 'point', w: 10, h: 10 }, { x: 5, y: 6 }),
|
||||
[{ x: 5, y: 6, width: 10, height: 10 }]);
|
||||
t.eq('point 的 ctx.w/ctx.h 也生效', EQW_LayoutSolver.solve({ kind: 'point', x: 1, y: 2 }, { w: 33, h: 44 }),
|
||||
[{ x: 1, y: 2, width: 33, height: 44 }]);
|
||||
|
||||
// ============ 运行时注入通道清单 ============
|
||||
t.eq('INJECT_KEYS 覆盖 target/x/y/w/h/anchorX/anchorY/rows/itemWidth/itemHeight',
|
||||
EQW_LayoutSolver.INJECT_KEYS.slice().sort(),
|
||||
['anchorX', 'anchorY', 'h', 'itemHeight', 'itemWidth', 'rows', 'target', 'w', 'x', 'y']);
|
||||
t.eq('ctx.itemWidth 注入生效', EQW_LayoutSolver.solve(
|
||||
{ kind: 'line', direction: 'vertical', anchorX: 0, anchorY: 0, itemHeight: 32, spacing: 8, anchor: 'top' },
|
||||
{ count: 2, itemWidth: 240 })[0].width, 240);
|
||||
// runtime 声明只是给人和守卫看的契约，不影响求解（求解器对所有 INJECT_KEYS 一视同仁）
|
||||
t.eq('runtime 声明不影响求解', EQW_LayoutSolver.solve(
|
||||
{ kind: 'point', runtime: ['x', 'y'] }, { x: 7, y: 8 }), [{ x: 7, y: 8, width: undefined, height: undefined }]);
|
||||
|
||||
// ============ apply：精灵数与矩形数不一致必须抛错，不静默截断 ============
|
||||
// 少摆的精灵会停在上一手牌的旧坐标上（陈旧精灵 + 陈旧坐标），是最难反查的一类错位
|
||||
const moved = [];
|
||||
global.SpriteManager = { setPosition: function (id, x, y) { moved.push([id, x, y]); } };
|
||||
const applyLine = { kind: 'line', direction: 'horizontal', anchorX: 0, anchorY: 0, itemWidth: 10, itemHeight: 10, spacing: 0, anchor: 'left' };
|
||||
moved.length = 0;
|
||||
EQW_LayoutSolver.apply(applyLine, [11, 12, 13], { count: 3 });
|
||||
t.eq('apply 数量相等时逐个摆位', moved, [[11, 0, 0], [12, 10, 0], [13, 20, 0]]);
|
||||
moved.length = 0;
|
||||
t.eq('apply 精灵多于矩形抛错', throws(() => EQW_LayoutSolver.apply(applyLine, [11, 12, 13], { count: 2 })), true);
|
||||
t.eq('apply 精灵少于矩形抛错', throws(() => EQW_LayoutSolver.apply(applyLine, [11, 12], { count: 3 })), true);
|
||||
t.eq('apply 抛错时一个都没摆', moved, []);
|
||||
t.eq('apply 未传 spriteIds 抛错', throws(() => EQW_LayoutSolver.apply(applyLine, null, { count: 3 })), true);
|
||||
t.eq('apply 空数组 + 零矩形不抛错', throws(() => EQW_LayoutSolver.apply(applyLine, [], { count: 0 })), false);
|
||||
|
||||
// ============ 纯函数：不修改入参 ============
|
||||
const before = JSON.stringify(bySeat);
|
||||
EQW_LayoutSolver.solve(bySeat, { seat: 'SELF', count: 3 });
|
||||
|
||||
Reference in New Issue
Block a user