postext 1.49.0 → 1.50.0

package/dist/__tests__/composed/frameLooks.test.js

@@ -0,0 +1,151 @@
+import { describe, it, expect } from 'vitest';
+import { buildDocument } from '../../pipeline/build';
+import { createMeasurementCache } from '../../measure';
+import { formatWarning } from '../../pipeline/contentWarnings';
+import { validatePageTemplates } from '../../composed/validate';
+import { lookOver, normalizeFrameLooks } from '../../composed/templates';
+import { resolveAllConfig } from '../../pipeline/config';
+import { CAPTIONS, GRID_CONFIG, GRID_RESOURCES, PHOTO_TEMPLATE } from './fixtures/grid';
+// #1089: named frame looks. `frameLooks` defines them, a `:::frame{slot}`
+// piece names one with `look="<id>"`, and each item of a repeating grid can
+// so wear a colour of its own without leaving the grid.
+class StubCtx {
+    font = '';
+    measureText(s) {
+        return { width: s.length * 7 };
+    }
+}
+globalThis.OffscreenCanvas = class {
+    getContext() {
+        return new StubCtx();
+    }
+};
+const hex = (h, extra = {}) => ({ hex: h, model: 'hex', ...extra });
+/** Nine pill colours, one per photo. */
+const PILLS = ['#e63946', '#f4a261', '#e9c46a', '#2a9d8f', '#264653', '#8338ec', '#3a86ff', '#ff006e', '#6a994e'];
+const LOOKS = PILLS.map((c, k) => ({ id: `pill-${k + 1}`, background: hex(c), body: { color: hex('#ffffff') } }));
+const PICTURES = GRID_RESOURCES.filter((r) => r.id.startsWith('foto-')).map((r) => r.id);
+/** A photo card whose pill (and, when given, photo frame) names a look. */
+const item = (k, caption, pillLook, photoLook) => `:::frame{slot="foto"${photoLook ? ` look="${photoLook}"` : ''}}\n::resource{id="${PICTURES[k % PICTURES.length]}"}\n\n`
+    + `:::frame{slot="pie"${pillLook ? ` look="${pillLook}"` : ''}}\n${caption}\n:::\n:::\n`;
+const page = (items) => `::::page{template="fotos"}\n# Animals of the river\n\n${items.join('\n')}::::\n`;
+const ninePills = () => page(CAPTIONS.en.map((c, k) => item(k, c, `pill-${k + 1}`)));
+const build = (markdown, config = {}) => buildDocument({ markdown, resources: GRID_RESOURCES }, { ...GRID_CONFIG, frameLooks: LOOKS, ...config }, createMeasurementCache());
+const composed = (doc) => doc.pages.find((p) => p.composed);
+const frame = (p, name) => p.composed.frames.find((f) => f.name === name);
+/** The fill and border of a frame's box. */
+const box = (doc, name) => {
+    const p = composed(doc);
+    const f = frame(p, name);
+    const b = (p.floats ?? []).find((x) => x.id === f.blockIds[0]);
+    return b.designOverlay.blocks.find((x) => x.kind === 'box').box;
+};
+/** The colour of a frame's first line of text. */
+const textColor = (doc, name) => {
+    const p = composed(doc);
+    const ids = new Set(frame(p, name).blockIds);
+    return (p.floats ?? []).find((b) => ids.has(b.id) && b.type === 'paragraph')?.color;
+};
+const warningsOf = (doc, kind) => (doc.contentWarnings ?? []).filter((w) => w.kind === kind);
+describe('named frame looks (#1089)', () => {
+    it('gives each pill of a 3 × 3 photo grid its own colour', () => {
+        const doc = build(ninePills());
+        for (let k = 0; k < 9; k++) {
+            expect(box(doc, `pie[${k + 1}]`).backgroundColor).toBe(PILLS[k]);
+            expect(textColor(doc, `pie[${k + 1}]`)).toBe('#ffffff');
+            // The photo frames keep their style.
+            expect(box(doc, `foto[${k + 1}]`).borderColor).toBe('#2a6f97');
+        }
+        expect(warningsOf(doc, 'lookUnknown')).toEqual([]);
+        expect(warningsOf(doc, 'frameOverflow')).toEqual([]);
+    });
+    it('moves nothing: the grid is laid where it is without looks', () => {
+        const plain = build(page(CAPTIONS.en.map((c, k) => item(k, c))), { frameLooks: undefined });
+        const looked = build(ninePills());
+        const rects = (doc) => composed(doc).composed.frames.map((f) => [f.name, f.rect]);
+        expect(rects(looked)).toEqual(rects(plain));
+        expect(box(plain, 'pie[1]').backgroundColor).toBe('#f4a259');
+    });
+    it('dresses an item\'s main frame too', () => {
+        const doc = build(page([item(0, 'The heron', undefined, 'teal'), item(1, 'The otter')]), {
+            frameLooks: [{ id: 'teal', border: { color: hex('#008080') } }],
+        });
+        expect(box(doc, 'foto[1]').borderColor).toBe('#008080');
+        expect(box(doc, 'foto[2]').borderColor).toBe('#2a6f97');
+        expect(box(doc, 'pie[1]').backgroundColor).toBe('#f4a259');
+    });
+    it('lays the named look over the template frame\'s look, key by key', () => {
+        const template = {
+            ...PHOTO_TEMPLATE,
+            frames: PHOTO_TEMPLATE.frames.map((f) => (f.name === 'pie' ? { ...f, look: { background: hex('#000000'), body: { color: hex('#ffff00') } } } : f)),
+        };
+        const doc = build(page([item(0, 'The heron', 'fill'), item(1, 'The otter')]), {
+            pageTemplates: [template],
+            frameLooks: [{ id: 'fill', background: hex('#123456') }],
+        });
+        // The named look's fill, the template look's text colour.
+        expect(box(doc, 'pie[1]').backgroundColor).toBe('#123456');
+        expect(textColor(doc, 'pie[1]')).toBe('#ffff00');
+        // An item that names none wears the template look.
+        expect(box(doc, 'pie[2]').backgroundColor).toBe('#000000');
+        expect(lookOver({ background: hex('#000000'), body: { color: hex('#ffff00') } }, { id: 'x', name: 'X', body: { boldColor: hex('#ff0000') } }))
+            .toEqual({ background: hex('#000000'), body: { color: hex('#ffff00'), boldColor: hex('#ff0000') } });
+    });
+    it('dresses a frame of a page with no grid', () => {
+        const config = {
+            pageTemplates: [{ id: 'ficha', header: false, frames: [{ name: 'caja', style: 'pastilla', flow: true, placement: { anchor: { to: 'container', edge: 'top-left' } } }] }],
+            frameLooks: [{ id: 'rosa', background: hex('#f6c3d0') }],
+        };
+        const doc = build('::::page{template="ficha"}\n\n:::frame{slot="caja" look="rosa"}\nThe text of the box.\n:::\n\n::::\n', config);
+        expect(box(doc, 'caja').backgroundColor).toBe('#f6c3d0');
+    });
+    it('warns of a look frameLooks lacks, at its value, and wears the style', () => {
+        const md = page([item(0, 'The heron', 'pill-01'), item(1, 'The otter', 'pill-2')]);
+        const doc = build(md);
+        const ws = warningsOf(doc, 'lookUnknown');
+        expect(ws).toHaveLength(1);
+        const w = ws[0];
+        expect(w).toMatchObject({ template: 'fotos', frame: 'pie', look: 'pill-01', suggestion: 'pill-1', fenceIndex: 0 });
+        expect(md.slice(w.sourceStart, w.sourceEnd)).toBe('pill-01');
+        expect(formatWarning(w)).toContain('names the look "pill-01", which frameLooks does not have (did you mean "pill-1"?)');
+        expect(box(doc, 'pie[1]').backgroundColor).toBe('#f4a259');
+        expect(box(doc, 'pie[2]').backgroundColor).toBe(PILLS[1]);
+        // With no frameLooks at all, every look is unknown.
+        expect(warningsOf(build(md, { frameLooks: undefined }), 'lookUnknown')).toHaveLength(2);
+    });
+    it('a part palette recolours a palette-linked look colour', () => {
+        const config = {
+            colorPalette: [{ id: 'tint', name: 'Tint', value: hex('#ffeb99') }],
+            pageTemplates: [{ ...PHOTO_TEMPLATE, palette: 'tint=#c3e0f6' }],
+            frameLooks: [{ id: 'linked', background: hex('#ffeb99', { paletteId: 'tint' }) }, { id: 'loose', background: hex('#abcdef') }],
+        };
+        const doc = build(page([item(0, 'The heron', 'linked'), item(1, 'The otter', 'loose')]), config);
+        expect(box(doc, 'pie[1]').backgroundColor).toBe('#c3e0f6');
+        expect(box(doc, 'pie[2]').backgroundColor).toBe('#abcdef');
+    });
+});
+describe('frameLooks in the config (#1089)', () => {
+    it('keeps what the engine can use, the first of each id', () => {
+        const looks = normalizeFrameLooks([
+            { id: 'a', name: 'A', background: hex('#111111'), border: { color: { model: 'hex' } }, frobnicate: 1 },
+            { id: 'a', background: hex('#222222') },
+            { background: hex('#333333') },
+            { id: 'b' },
+        ]);
+        expect(looks).toEqual([{ id: 'a', name: 'A', background: hex('#111111') }, { id: 'b' }]);
+        expect(normalizeFrameLooks([])).toBeUndefined();
+        expect(resolveAllConfig({}).frameLooks).toBeUndefined();
+        expect(resolveAllConfig({ frameLooks: [{ id: 'a', background: hex('#111111') }] }).frameLooks).toEqual([{ id: 'a', background: hex('#111111') }]);
+    });
+    it('is validated as a frame\'s look', () => {
+        const w = validatePageTemplates({
+            frameLooks: [{ id: 'a', backgrnd: hex('#000000'), label: { colour: hex('#000000') } }, { background: hex('#000000') }],
+        });
+        expect(w.map((x) => `${x.kind} ${x.path}${x.suggestion ? ` → ${x.suggestion}` : ''}`).sort()).toEqual([
+            'unknownConfigKey /frameLooks/0/backgrnd → background',
+            'unknownConfigKey /frameLooks/0/label/colour → color',
+            'unknownConfigValue /frameLooks/1/id',
+        ]);
+    });
+});
+//# sourceMappingURL=frameLooks.test.js.map

package/dist/__tests__/composed/frameLooks.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"frameLooks.test.js","sourceRoot":"","sources":["../../../src/__tests__/composed/frameLooks.test.ts"],"names":[],"mappings":"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"}

package/dist/__tests__/composed/moduleRows.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=moduleRows.test.d.ts.map

package/dist/__tests__/composed/moduleRows.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"moduleRows.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/composed/moduleRows.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/composed/moduleRows.test.js

@@ -0,0 +1,233 @@
+import { describe, it, expect } from 'vitest';
+import { buildDocument } from '../../pipeline/build';
+import { createMeasurementCache } from '../../measure';
+import { validatePageTemplates } from '../../composed/validate';
+import { resolvePageTemplate } from '../../composed/templates';
+import { elementsForSource, findElement } from '../../composed/sourceMap';
+import { flowRectToPage } from '../../vdt';
+import { MODULE_RESOURCES, mm } from './fixtures/modules';
+import { CARD_MODULE, cardModule, NOTICE_MODULE, noticeModule, ROWS_CONFIG, ROWS_TEMPLATE, ROWS_WORDS, rowsPage } from './fixtures/moduleRows';
+// #1088 (DESIGN §12.6, §12.7): modules side by side, in a row or a grid of
+// their own or inside the page's modules stack.
+class StubCtx {
+    font = '';
+    measureText(s) {
+        return { width: s.length * 7 };
+    }
+}
+globalThis.OffscreenCanvas = class {
+    getContext() {
+        return new StubCtx();
+    }
+};
+const MM = 300 / 25.4;
+const build = (markdown, config = {}) => buildDocument({ markdown, resources: MODULE_RESOURCES }, { ...ROWS_CONFIG, ...config }, createMeasurementCache());
+const composedPagesOf = (doc) => doc.pages.filter((p) => p.composed);
+const frame = (page, name) => page.composed.frames.find((f) => f.name === name);
+const moduleBox = (page, name) => page.composed.modules.find((m) => m.name === name).rect;
+const warningsOf = (doc, kind) => (doc.contentWarnings ?? []).filter((w) => w.kind === kind);
+const textOf = (page, f) => f.blockIds.map((id) => (page.floats ?? []).find((b) => b.id === id)).flatMap((b) => b?.lines.map((l) => l.text) ?? []).join(' ').trim();
+const bottom = (r) => r.y + r.height;
+const withTemplates = (...templates) => ({ pageTemplates: templates });
+/** A page template whose one modules group is `group`. */
+const shellWith = (group) => ({
+    ...ROWS_TEMPLATE,
+    id: 'solo',
+    groups: [{ ...ROWS_TEMPLATE.groups[0], ...group, name: 'cuerpo', modules: true }],
+});
+const soloPage = (modules) => `::::page{template="solo"}\n# T\n\n${modules.join('\n')}::::\n`;
+describe('two boxes side by side over a 2 × 2 of cards, written with modules alone (#1088)', () => {
+    const pages = { en: composedPagesOf(build(rowsPage('en'), { locale: 'en' }))[0], es: composedPagesOf(build(rowsPage('es'), { locale: 'es' }))[0] };
+    it('lays the boxes in a row and the cards in a grid, inside the stack', () => {
+        const page = pages.en;
+        expect(page.composed.modules.map((m) => m.name)).toEqual(['aviso[1]', 'aviso[2]', 'tarjeta[1]', 'tarjeta[2]', 'tarjeta[3]', 'tarjeta[4]']);
+        const area = page.contentArea;
+        const [a1, a2] = [moduleBox(page, 'aviso[1]'), moduleBox(page, 'aviso[2]')];
+        // Two equal shares of the group's width, 6 mm between them, one top.
+        const half = (area.width - 6 * MM) / 2;
+        expect(a1.x).toBeCloseTo(area.x, 3);
+        expect(a1.width).toBeCloseTo(half, 3);
+        expect(a2.x).toBeCloseTo(area.x + half + 6 * MM, 3);
+        expect(a2.width).toBeCloseTo(half, 3);
+        expect(a2.y).toBeCloseTo(a1.y, 3);
+        expect(a1.y).toBeCloseTo(bottom(frame(page, 'titulo').rect) + 6 * MM, 3);
+        // Each box's frame in its module's box.
+        expect(frame(page, 'aviso[2].texto').rect.x).toBeCloseTo(a2.x, 3);
+        expect(frame(page, 'aviso[2].texto').rect.width).toBeCloseTo(half, 3);
+        expect(textOf(page, frame(page, 'aviso[2].texto'))).toBe(ROWS_WORDS.en.boxes[1]);
+        // Stretched to the row: both module boxes as tall as the taller.
+        expect(a1.height).toBeCloseTo(a2.height, 3);
+        // The cards: 2 × 2 under the row, the stack's 8 mm after it, 6 mm
+        // between rows and columns.
+        const cards = [1, 2, 3, 4].map((k) => moduleBox(page, `tarjeta[${k}]`));
+        const rowBottom = Math.max(bottom(a1), bottom(a2));
+        expect(cards[0].y).toBeCloseTo(rowBottom + 8 * MM, 3);
+        expect(cards[1].y).toBeCloseTo(cards[0].y, 3);
+        expect(cards[1].x).toBeCloseTo(area.x + half + 6 * MM, 3);
+        expect(cards[2].x).toBeCloseTo(area.x, 3);
+        expect(cards[2].y).toBeCloseTo(Math.max(bottom(cards[0]), bottom(cards[1])) + 6 * MM, 3);
+        for (const c of cards)
+            expect(c.width).toBeCloseTo(half, 3);
+        expect(textOf(page, frame(page, 'tarjeta[4].pie'))).toBe(ROWS_WORDS.en.captions[3]);
+        // The groups inside the stack are the boxes of their modules.
+        expect(doc0Warnings()).toEqual([]);
+    });
+    it('grows the row with its longer box in the other language, and moves the cards down by as much', () => {
+        const tallest = (p) => Math.max(bottom(moduleBox(p, 'aviso[1]')), bottom(moduleBox(p, 'aviso[2]')));
+        const grew = tallest(pages.es) - tallest(pages.en);
+        expect(grew).toBeGreaterThan(2 * MM);
+        // The Spanish first box is the tall one; the second keeps its text's
+        // height and its top.
+        expect(frame(pages.es, 'aviso[2].texto').rect.y).toBeCloseTo(frame(pages.en, 'aviso[2].texto').rect.y, 3);
+        for (const k of [1, 2, 3, 4])
+            expect(moduleBox(pages.es, `tarjeta[${k}]`).y - moduleBox(pages.en, `tarjeta[${k}]`).y).toBeCloseTo(grew, 3);
+        expect(pages.es.composed.frames.map((f) => f.id)).toEqual(pages.en.composed.frames.map((f) => f.id));
+    });
+    it('maps a frame of a module in a row to its Markdown and its config', () => {
+        const md = rowsPage('en');
+        const doc = build(md);
+        const el = findElement(doc, 'cp0:aviso[2].texto')?.element;
+        expect(el?.source).toEqual({ kind: 'config', path: '/pageTemplates/1/frames/0' });
+        const word = ROWS_WORDS.en.boxes[1];
+        const at = md.indexOf(word);
+        const hits = elementsForSource(doc, at, at + word.length).map((h) => h.element.id);
+        expect(hits.some((id) => id.startsWith('cp0:aviso[2].texto'))).toBe(true);
+        expect(hits.some((id) => id.startsWith('cp0:aviso[1].texto'))).toBe(false);
+    });
+    it('mirrors the row and the grid on a right-to-left page', () => {
+        const rtl = composedPagesOf(build(rowsPage('en'), { direction: 'rtl', locale: 'ar' }))[0];
+        const x = (n) => flowRectToPage(rtl, moduleBox(rtl, n)).x;
+        // The first box on the right (the start side), the second to its left.
+        expect(x('aviso[1]')).toBeGreaterThan(x('aviso[2]'));
+        expect(x('tarjeta[1]')).toBeGreaterThan(x('tarjeta[2]'));
+        expect(x('tarjeta[3]')).toBeCloseTo(x('tarjeta[1]'), 3);
+        expect(flowRectToPage(rtl, frame(rtl, 'aviso[1].texto').rect).x).toBeCloseTo(x('aviso[1]'), 3);
+    });
+    function doc0Warnings() {
+        return (build(rowsPage('en')).contentWarnings ?? []).map((w) => w.kind);
+    }
+});
+describe('modules groups of their own kind (#1088)', () => {
+    it('lays a row of modules at their templates\' widths, the rest sharing what is left', () => {
+        const narrow = { ...NOTICE_MODULE, width: { percent: 30 } };
+        const fixed = { ...CARD_MODULE, width: mm(50) };
+        const doc = build(soloPage([noticeModule('en', 0), cardModule('en', 0), noticeModule('en', 1)]), withTemplates(shellWith({ kind: 'row', gap: mm(5) }), narrow, fixed));
+        const page = composedPagesOf(doc)[0];
+        const area = page.contentArea;
+        const [a, t, b] = ['aviso[1]', 'tarjeta[1]', 'aviso[2]'].map((n) => moduleBox(page, n));
+        expect(a.width).toBeCloseTo(area.width * 0.3, 3);
+        expect(t.width).toBeCloseTo(50 * MM, 3);
+        expect(b.width).toBeCloseTo(area.width * 0.3, 3);
+        expect(t.x).toBeCloseTo(a.x + a.width + 5 * MM, 3);
+        // 'fill' (and no width) share what is left.
+        const filling = composedPagesOf(build(soloPage([noticeModule('en', 0), cardModule('en', 0), noticeModule('en', 1)]), withTemplates(shellWith({ kind: 'row', gap: mm(5) }), NOTICE_MODULE, fixed)))[0];
+        const share = (area.width - 50 * MM - 10 * MM) / 2;
+        expect(moduleBox(filling, 'aviso[1]').width).toBeCloseTo(share, 3);
+        expect(moduleBox(filling, 'aviso[2]').x).toBeCloseTo(area.x + share + 50 * MM + 10 * MM, 3);
+    });
+    it('places a shorter module of a row by rowAlign', () => {
+        const md = soloPage([noticeModule('es', 0), noticeModule('es', 1)]);
+        const at = (rowAlign) => composedPagesOf(build(md, withTemplates(shellWith({ kind: 'row', rowAlign }), NOTICE_MODULE)))[0];
+        const [start, center, end] = [at('start'), at('center'), at('end')];
+        const spare = moduleBox(start, 'aviso[1]').height - moduleBox(start, 'aviso[2]').height;
+        expect(spare).toBeGreaterThan(2 * MM);
+        expect(moduleBox(center, 'aviso[2]').y - moduleBox(start, 'aviso[2]').y).toBeCloseTo(spare / 2, 3);
+        expect(moduleBox(end, 'aviso[2]').y - moduleBox(start, 'aviso[2]').y).toBeCloseTo(spare, 3);
+    });
+    it('lays four modules in a grid of two columns', () => {
+        const doc = build(soloPage([0, 1, 2, 3].map((k) => cardModule('es', k))), withTemplates(shellWith({ kind: 'grid', columns: 2, columnGap: mm(4), rowGap: mm(5) }), CARD_MODULE));
+        const page = composedPagesOf(doc)[0];
+        const area = page.contentArea;
+        const colW = (area.width - 4 * MM) / 2;
+        const cards = [1, 2, 3, 4].map((k) => moduleBox(page, `tarjeta[${k}]`));
+        expect(cards.map((c) => c.x)).toEqual([area.x, area.x + colW + 4 * MM, area.x, area.x + colW + 4 * MM].map((v) => expect.closeTo(v, 3)));
+        expect(cards[2].y).toBeCloseTo(Math.max(bottom(cards[0]), bottom(cards[1])) + 5 * MM, 3);
+        expect(frame(page, 'tarjeta[3].foto').rect.width).toBeCloseTo(colW, 3);
+        expect(doc.contentWarnings ?? []).toEqual([]);
+    });
+    it('sends whole rows of a modules grid on to a next page', () => {
+        const md = soloPage(Array.from({ length: 9 }, (_, k) => cardModule('en', k % 4)));
+        const shell = shellWith({ kind: 'grid', columns: 2, gap: mm(6), overflow: { continueIn: 'next-page' } });
+        const doc = build(md, withTemplates(shell, CARD_MODULE));
+        const [first, second] = composedPagesOf(doc);
+        expect(second).toBeDefined();
+        const laidOn = (p) => p.composed.modules.filter((m) => m.rect).map((m) => m.name);
+        const here = laidOn(first);
+        const there = laidOn(second);
+        // Whole rows here: an even count, and every module once.
+        expect(here.length % 2).toBe(0);
+        expect(here.length).toBeGreaterThan(1);
+        expect([...here, ...there]).toEqual(Array.from({ length: 9 }, (_, k) => `tarjeta[${k + 1}]`));
+        const area = first.contentArea;
+        for (const f of first.composed.frames)
+            expect(bottom(f.rect)).toBeLessThanOrEqual(area.y + area.height + 0.5);
+        expect(warningsOf(doc, 'frameOverflow')).toEqual([]);
+        // On the next page the row starts at the group's start side again.
+        const k = here.length + 1;
+        expect(moduleBox(second, `tarjeta[${k}]`).x).toBeCloseTo(second.contentArea.x, 3);
+        expect(frame(second, `tarjeta[${k}].foto`).id).toBe(`cp0:tarjeta[${k}].foto~1`);
+    });
+    it('sends a whole row inside the stack on, and what follows it', () => {
+        const md = rowsPage('en', [...Array.from({ length: 8 }, (_, k) => cardModule('en', k % 4)), noticeModule('en', 0), noticeModule('en', 1)]);
+        const shell = { ...ROWS_TEMPLATE, groups: [{ ...ROWS_TEMPLATE.groups[0], overflow: { continueIn: 'next-page' } }, ...ROWS_TEMPLATE.groups.slice(1)] };
+        const doc = build(md, withTemplates(shell, NOTICE_MODULE, CARD_MODULE));
+        const [first, second] = composedPagesOf(doc);
+        expect(second).toBeDefined();
+        const laidOn = (p) => p.composed.modules.filter((m) => m.rect).map((m) => m.name);
+        expect([...laidOn(first), ...laidOn(second)]).toEqual([...Array.from({ length: 8 }, (_, k) => `tarjeta[${k + 1}]`), 'aviso[1]', 'aviso[2]']);
+        expect(laidOn(first).filter((n) => n.startsWith('tarjeta')).length % 2).toBe(0);
+        // The two boxes stay together in their row.
+        expect(laidOn(second)).toContain('aviso[1]');
+        expect(moduleBox(second, 'aviso[2]').y).toBeCloseTo(moduleBox(second, 'aviso[1]').y, 3);
+    });
+    it('lays a stack of modules at their widths, from the start side', () => {
+        const narrow = { ...NOTICE_MODULE, width: { percent: 50 } };
+        const page = composedPagesOf(build(soloPage([noticeModule('en', 0)]), withTemplates(shellWith({}), narrow)))[0];
+        expect(moduleBox(page, 'aviso[1]').width).toBeCloseTo(page.contentArea.width / 2, 3);
+        expect(moduleBox(page, 'aviso[1]').x).toBeCloseTo(page.contentArea.x, 3);
+    });
+});
+describe('modules groups configuration (#1088)', () => {
+    it('resolves a row, a grid and groups inside a stack, and routes each module', () => {
+        const t = resolvePageTemplate({ pageTemplates: [ROWS_TEMPLATE, NOTICE_MODULE, CARD_MODULE] }, 'doble', { modules: [{ name: 'aviso[1]', template: 'aviso' }, { name: 'tarjeta[1]', template: 'tarjeta' }] });
+        expect(t.groups.find((g) => g.name === 'par')).toMatchObject({ kind: 'row', modules: true, within: 'cuerpo', templates: ['aviso'], rowAlign: 'stretch' });
+        expect(t.groups.find((g) => g.name === 'tarjetas')).toMatchObject({ kind: 'grid', columns: 2, within: 'cuerpo', rowAlign: 'start' });
+        expect(t.modules.map((m) => [m.name, m.group, m.nested])).toEqual([['aviso[1]', 'cuerpo', 'par'], ['tarjeta[1]', 'cuerpo', 'tarjetas']]);
+        expect(resolvePageTemplate({ pageTemplates: [{ ...NOTICE_MODULE, width: { percent: 40 } }] }, 'aviso').width).toEqual({ percent: 40 });
+        expect(validatePageTemplates({ ...ROWS_CONFIG })).toEqual([]);
+    });
+    it('checks within, templates and a module width', () => {
+        const shell = {
+            id: 'shell',
+            frames: [{ name: 'a' }],
+            width: mm(20),
+            groups: [
+                { name: 'g', modules: true, kind: 'row' },
+                { name: 'h', modules: true, within: 'g' },
+                { name: 'i', modules: true, templates: ['aviso'] },
+                { name: 'j', frames: ['a'], within: 'g' },
+                { name: 'k', modules: true, within: 'g', overflow: { continueIn: 'next-page' } },
+            ],
+        };
+        const bad = { ...NOTICE_MODULE, width: 'half' };
+        const ws = validatePageTemplates({ ...ROWS_CONFIG, pageTemplates: [shell, bad] }).map((w) => [w.kind, w.path]);
+        expect(ws).toContainEqual(['unknownConfigValue', '/pageTemplates/0/width']);
+        // Inside a row: only a stack holds groups.
+        expect(ws).toContainEqual(['unknownConfigValue', '/pageTemplates/0/groups/1/within']);
+        expect(ws).toContainEqual(['unknownConfigValue', '/pageTemplates/0/groups/2/templates']);
+        expect(ws).toContainEqual(['unknownConfigValue', '/pageTemplates/0/groups/3/within']);
+        expect(ws).toContainEqual(['unknownConfigValue', '/pageTemplates/0/groups/4/overflow/continueIn']);
+        expect(ws).toContainEqual(['unknownConfigValue', '/pageTemplates/1/width']);
+        const resolved = resolvePageTemplate({ pageTemplates: [shell, bad] }, 'shell');
+        expect(resolved.groups.find((g) => g.name === 'h').within).toBeUndefined();
+        expect(resolvePageTemplate({ pageTemplates: [shell, bad] }, 'aviso').width).toBeUndefined();
+    });
+    it('lays a stack without groups inside it as before', () => {
+        const doc = build(rowsPage('en', [noticeModule('en', 0), noticeModule('en', 1)]), withTemplates({ ...ROWS_TEMPLATE, groups: [ROWS_TEMPLATE.groups[0]] }, NOTICE_MODULE));
+        const page = composedPagesOf(doc)[0];
+        const [a1, a2] = [moduleBox(page, 'aviso[1]'), moduleBox(page, 'aviso[2]')];
+        expect(a1.width).toBeCloseTo(page.contentArea.width, 3);
+        expect(a2.y).toBeCloseTo(bottom(a1) + 8 * MM, 3);
+    });
+});
+//# sourceMappingURL=moduleRows.test.js.map

package/dist/__tests__/composed/moduleRows.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"moduleRows.test.js","sourceRoot":"","sources":["../../../src/__tests__/composed/moduleRows.test.ts"],"names":[],"mappings":"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"}

package/dist/__tests__/composed/modules.test.js

@@ -325,13 +325,14 @@ describe('module configuration and checks (#1062)', () => {
         expect(ws).toContainEqual(['unknownConfigValue', '/pageTemplates/0/header']);
         expect(ws).toContainEqual(['unknownConfigValue', '/pageTemplates/0/spread']);
         expect(ws).toContainEqual(['unknownConfigValue', '/pageTemplates/0/groups/0/modules']);
-        expect(ws).toContainEqual(['unknownConfigValue', '/pageTemplates/1/groups/0/kind']);
+        // A modules row is a kind of its own since #1088.
+        expect(ws).not.toContainEqual(['unknownConfigValue', '/pageTemplates/1/groups/0/kind']);
         expect(ws).toContainEqual(['unknownConfigValue', '/pageTemplates/1/groups/0/frames']);
         expect(ws).toContainEqual(['unknownConfigValue', '/pageTemplates/1/groups/0/overflow/continueIn']);
         expect(ws).toContainEqual(['unknownConfigValue', '/pageTemplates/1/groups/1/overflow/continueIn']);
         // A module holds no modules group; a modules group no frames.
         expect(resolvePageTemplate({ pageTemplates: [bad] }, 'mala').groups[0].modules).toBeUndefined();
-        expect(resolvePageTemplate({ pageTemplates: [shell] }, 'shell').groups[0]).toMatchObject({ kind: 'stack', frames: [], modules: true });
+        expect(resolvePageTemplate({ pageTemplates: [shell] }, 'shell').groups[0]).toMatchObject({ kind: 'row', frames: [], modules: true });
     });
     it('reports a cycle of modules extending each other', () => {
         const a = { id: 'ma', role: 'module', extends: 'mb', frames: [{ name: 'x' }] };