diff --git a/client/scripts/eslint-baseline.json b/client/scripts/eslint-baseline.json index d87c055dc..5c1b4105f 100644 --- a/client/scripts/eslint-baseline.json +++ b/client/scripts/eslint-baseline.json @@ -8,7 +8,7 @@ "trek/no-swallowed-catch": 130, "max-params": 32, "trek/store-without-selector": 67, - "react-hooks/refs": 556, + "react-hooks/refs": 555, "react-hooks/set-state-in-effect": 194, "@typescript-eslint/no-floating-promises": 165, "react-hooks/exhaustive-deps": 116, diff --git a/server/tests/e2e/journey-book-design.e2e.test.ts b/server/tests/e2e/journey-book-design.e2e.test.ts index 1731fe1fe..9ecc0a19a 100644 --- a/server/tests/e2e/journey-book-design.e2e.test.ts +++ b/server/tests/e2e/journey-book-design.e2e.test.ts @@ -212,6 +212,7 @@ describe('the whole-book design over MCP and REST', () => { const after = await book(journey.id, editor.id); expect(after.body.book.version).toBe(applied.version); expect(bookDocumentSchema.safeParse(after.body.book.document).success).toBe(true); - expect(after.body.book.document.theme.id).toBe('field-notes'); + // Applied over a stored book, the design brings its pages; the book keeps its own theme. + expect(after.body.book.document.spreads.length).toBeGreaterThan(1); }); }); diff --git a/server/tests/unit/nest/journey/journey-book-design.mcp.test.ts b/server/tests/unit/nest/journey/journey-book-design.mcp.test.ts index 7b5080644..06f30f852 100644 --- a/server/tests/unit/nest/journey/journey-book-design.mcp.test.ts +++ b/server/tests/unit/nest/journey/journey-book-design.mcp.test.ts @@ -35,6 +35,7 @@ import { bookDesignRevisionAnswerSchema, bookPageDescriptionSchema, bookWriteResultSchema, + designBookRequestSchema, } from '@trek/shared'; import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'; @@ -239,8 +240,11 @@ describe('the design tools', () => { it('JBDMCP-006: design_book takes layouts templates and answers the template of each page', async () => { const { journey, editor } = await crew(); - const directives = { style: 'postcard' as const, layouts: 'templates' as const, seed: 1 }; - const designed = await designs.designBook({ journeyId: journey.id, directives }, ctx(editor.id)); + const request = designBookRequestSchema.parse({ + journeyId: journey.id, + directives: { style: 'postcard', layouts: 'templates', seed: 1 }, + }); + const designed = await designs.designBook(request, ctx(editor.id)); const draft = bookDesignAnswerSchema.parse(answered(designed)); expect(draft.plan.some((row) => row.template !== undefined)).toBe(true); expect(draft.style.style).toBe('postcard'); diff --git a/shared/src/book/design/design-template-pick.spec.ts b/shared/src/book/design/design-template-pick.spec.ts index 35610db23..fddbcd2c8 100644 --- a/shared/src/book/design/design-template-pick.spec.ts +++ b/shared/src/book/design/design-template-pick.spec.ts @@ -93,14 +93,29 @@ describe('the template picker', () => { expect(mapped.every((t) => t !== undefined)).toBe(true); }); - it('AUTOTPL-004: never the same template twice running, never loud after loud or lively', () => { + it('AUTOTPL-004: never the same template twice running, never loud after busy, unless only that keeps every photo framed in the style', () => { + const busy = (t: BookDecoratedTemplate) => ['loud', 'lively'].includes(templateEnergy(t)); for (const archetype of BOOK_COVER_ARCHETYPES) { const picks = book(varied, { archetype, theme: null }); + expect(picks.length, archetype).toBe(varied.length); picks.forEach((t, i) => { const before = picks[i - 1]; - if (!before) return; - expect(t.id, `${archetype} at ${i}`).not.toBe(before.id); - if (templateEnergy(t) === 'loud') expect(['loud', 'lively']).not.toContain(templateEnergy(before)); + const page = varied[i]; + if (!before || !page) return; + const keeps = (x: BookDecoratedTemplate) => + x.id !== before.id && !(templateEnergy(x) === 'loud' && busy(before)); + if (keeps(t)) return; + // The rhythm gives way only where no template of the book's styles frames every photo and keeps it. + const fits = (x: BookDecoratedTemplate) => + templatePhotoSlots(x) === page.photos.length && + (!page.story || roles(x).includes('body')) && + (!roles(x).includes('map') || page.mappable); + expect( + innerPool(archetype) + .filter((x) => fits(x) && keeps(x)) + .map((x) => x.id), + `${archetype} at ${i}`, + ).toEqual([]); }); } }); diff --git a/shared/src/book/design/design-templated-framing.ts b/shared/src/book/design/design-templated-framing.ts index 310b43d22..24b379567 100644 --- a/shared/src/book/design/design-templated-framing.ts +++ b/shared/src/book/design/design-templated-framing.ts @@ -336,7 +336,8 @@ export function composeWordsPage(c: ComposeCtx, entry: AutoEntry, story: BookEle let x = right.x; for (const mark of marks) { if (!mark) continue; - const frame = fitIn(mark.frame, frameOf(x, right.y + right.h * 0.7, right.w / 2 - scaled(c, 4), right.h * 0.3)); + const { w = 0, h = 0 } = mark.frame; + const frame = fitIn({ w, h }, frameOf(x, right.y + right.h * 0.7, right.w / 2 - scaled(c, 4), right.h * 0.3)); els.push({ ...mark, frame: frameOf(x, frame.y, frame.w, frame.h) }); x += frame.w + scaled(c, 8); }