postext 1.49.1 → 1.51.0

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

@@ -0,0 +1,177 @@
+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 { composedOrder } from '../../composed/groups';
+import { MODULE_RESOURCES, mm } from './fixtures/modules';
+import { CARD_MODULE, NOTICE_MODULE, ROWS_TEMPLATE, cardModule, noticeModule } from './fixtures/moduleRows';
+import { NARROW_MODULE, NESTED_CONFIG, NESTED_TEMPLATE, WIDE_MODULE, boxOf, nestedPage } from './fixtures/moduleNesting';
+// #1095 (DESIGN §13): modules nested more than one level, `grow` and
+// `shrink` among the modules of a row, the ordering dependency of a page
+// frame anchored to a nested group, `rowAlign: 'stretch'` on a module's
+// 'auto' boxes, and the frame of an unknown look marked in the VDT.
+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 }, { ...NESTED_CONFIG, ...config }, createMeasurementCache());
+const pageOf = (doc) => doc.pages.find((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 bottom = (r) => r.y + r.height;
+const kinds = (doc) => (doc.contentWarnings ?? []).map((w) => w.kind);
+const withTemplates = (...templates) => ({ pageTemplates: templates });
+describe('a column of cards inside a row inside the page\'s stack (#1095)', () => {
+    const page = pageOf(build(nestedPage('en'), { locale: 'en' }));
+    it('routes each module to its innermost group', () => {
+        const t = resolvePageTemplate(NESTED_CONFIG, 'anidada', { modules: [{ name: 'aviso[1]', template: 'aviso' }, { name: 'tarjeta[1]', template: 'tarjeta' }, { name: 'ancho[1]', template: 'ancho' }] });
+        expect(t.modules.map((m) => [m.name, m.nested])).toEqual([['aviso[1]', 'banda'], ['tarjeta[1]', 'columna'], ['ancho[1]', 'reparto']]);
+        expect(validatePageTemplates(NESTED_CONFIG)).toEqual([]);
+    });
+    it('lays the box in the row\'s first cell and the cards one under another in its second', () => {
+        const area = page.contentArea;
+        const half = (area.width - 6 * MM) / 2;
+        const box = moduleBox(page, 'aviso[1]');
+        const [c1, c2] = [moduleBox(page, 'tarjeta[1]'), moduleBox(page, 'tarjeta[2]')];
+        expect(box.x).toBeCloseTo(area.x, 3);
+        expect(box.width).toBeCloseTo(half, 3);
+        for (const c of [c1, c2]) {
+            expect(c.x).toBeCloseTo(area.x + half + 6 * MM, 3);
+            expect(c.width).toBeCloseTo(half, 3);
+        }
+        expect(c1.y).toBeCloseTo(box.y, 3);
+        // The column's own gap between its cards.
+        expect(c2.y).toBeCloseTo(bottom(c1) + 4 * MM, 3);
+        // The row is as tall as the column: the next row starts under it.
+        expect(moduleBox(page, 'ancho[1]').y).toBeCloseTo(bottom(c2) + 14 * MM, 3);
+        expect(frame(page, 'tarjeta[2].foto').rect.x).toBeCloseTo(c2.x, 3);
+        expect(kinds(build(nestedPage('en')))).toEqual([]);
+    });
+    it('gives each group inside the stack the box of its modules, at every depth', () => {
+        // The note hangs under the row it names: the row's box takes the
+        // column inside it.
+        const note = frame(page, 'nota');
+        expect(note.rect.y).toBeCloseTo(bottom(moduleBox(page, 'tarjeta[2]')) + 3 * MM, 3);
+    });
+    it('places a page frame anchored to a nested group after the modules group', () => {
+        const t = resolvePageTemplate(NESTED_CONFIG, 'anidada', { modules: [{ name: 'aviso[1]', template: 'aviso' }] });
+        const order = composedOrder(t).map((s) => (s.kind === 'frame' ? s.frame.name : `#${s.group.name}`));
+        expect(order.indexOf('nota')).toBeGreaterThan(order.indexOf('#cuerpo'));
+    });
+    it('keeps the frame ids in the other language, and moves what follows by the row\'s growth', () => {
+        const es = pageOf(build(nestedPage('es'), { locale: 'es' }));
+        expect(es.composed.frames.map((f) => f.id)).toEqual(page.composed.frames.map((f) => f.id));
+        const rowFoot = (p) => Math.max(bottom(moduleBox(p, 'aviso[1]')), bottom(moduleBox(p, 'tarjeta[2]')));
+        expect(moduleBox(es, 'ancho[1]').y - moduleBox(page, 'ancho[1]').y).toBeCloseTo(rowFoot(es) - rowFoot(page), 3);
+    });
+    it('lays a group inside a grid of modules as one cell', () => {
+        const shell = {
+            ...ROWS_TEMPLATE,
+            id: 'rejilla',
+            groups: [
+                { name: 'cuerpo', modules: true, kind: 'grid', columns: 2, columnGap: mm(5), rowGap: mm(5), placement: ROWS_TEMPLATE.groups[0].placement },
+                { name: 'pila', modules: true, within: 'cuerpo', templates: ['tarjeta'], gap: mm(3) },
+            ],
+        };
+        const md = `::::page{template="rejilla"}\n# T\n\n${[noticeModule('en', 0), cardModule('en', 0), cardModule('en', 1), noticeModule('en', 1)].join('\n')}::::\n`;
+        const p = pageOf(build(md, withTemplates(shell, NOTICE_MODULE, CARD_MODULE)));
+        const colW = (p.contentArea.width - 5 * MM) / 2;
+        // Cells: the box, the two cards (one cell), the second box.
+        expect(moduleBox(p, 'tarjeta[1]').x).toBeCloseTo(p.contentArea.x + colW + 5 * MM, 3);
+        expect(moduleBox(p, 'tarjeta[2]').x).toBeCloseTo(moduleBox(p, 'tarjeta[1]').x, 3);
+        expect(moduleBox(p, 'tarjeta[2]').y).toBeCloseTo(bottom(moduleBox(p, 'tarjeta[1]')) + 3 * MM, 3);
+        expect(moduleBox(p, 'aviso[2]').x).toBeCloseTo(p.contentArea.x, 3);
+        expect(moduleBox(p, 'aviso[2]').y).toBeCloseTo(bottom(moduleBox(p, 'tarjeta[2]')) + 5 * MM, 3);
+    });
+});
+describe('modules of a row share its room by grow and shrink (#1095)', () => {
+    it('gives the room past the widths by grow', () => {
+        const page = pageOf(build(nestedPage('en')));
+        const area = page.contentArea;
+        const spare = area.width - 60 * MM - 30 * MM - 5 * MM;
+        const [wide, narrow] = [moduleBox(page, 'ancho[1]'), moduleBox(page, 'estrecho[1]')];
+        expect(wide.width).toBeCloseTo(60 * MM + (spare * 2) / 3, 3);
+        expect(narrow.width).toBeCloseTo(30 * MM + spare / 3, 3);
+        expect(narrow.x).toBeCloseTo(wide.x + wide.width + 5 * MM, 3);
+        expect(narrow.x + narrow.width).toBeCloseTo(area.x + area.width, 3);
+    });
+    it('shares with a \'fill\' module, which takes one share at least', () => {
+        const shell = { ...NESTED_TEMPLATE, groups: [NESTED_TEMPLATE.groups[0], { name: 'reparto', modules: true, kind: 'row', within: 'cuerpo', gap: mm(5) }] };
+        const md = `::::page{template="anidada"}\n# T\n\n${[boxOf('ancho', 'en', 0), noticeModule('en', 1)].join('\n')}::::\n`;
+        const page = pageOf(build(md, withTemplates(shell, NOTICE_MODULE, WIDE_MODULE)));
+        const spare = page.contentArea.width - 60 * MM - 5 * MM;
+        expect(moduleBox(page, 'ancho[1]').width).toBeCloseTo(60 * MM + (spare * 2) / 3, 3);
+        expect(moduleBox(page, 'aviso[1]').width).toBeCloseTo(spare / 3, 3);
+    });
+    it('gives width back by shrink, in proportion to each width, when the widths run past the end', () => {
+        const big = { ...WIDE_MODULE, width: mm(120), grow: undefined, shrink: 1 };
+        const small = { ...NARROW_MODULE, width: mm(80), grow: undefined, shrink: 1 };
+        const md = `::::page{template="anidada"}\n# T\n\n${[boxOf('ancho', 'en', 0), boxOf('estrecho', 'en', 1)].join('\n')}::::\n`;
+        const page = pageOf(build(md, withTemplates(NESTED_TEMPLATE, NOTICE_MODULE, CARD_MODULE, big, small)));
+        const area = page.contentArea;
+        const short = 120 * MM + 80 * MM + 5 * MM - area.width;
+        expect(short).toBeGreaterThan(0);
+        const [a, b] = [moduleBox(page, 'ancho[1]'), moduleBox(page, 'estrecho[1]')];
+        expect(a.width).toBeCloseTo(120 * MM - (short * 120) / 200, 3);
+        expect(b.width).toBeCloseTo(80 * MM - (short * 80) / 200, 3);
+        expect(b.x + b.width).toBeCloseTo(area.x + area.width, 3);
+        // Without shrink the row runs past the group's end, as before.
+        const stiff = pageOf(build(md, withTemplates(NESTED_TEMPLATE, NOTICE_MODULE, CARD_MODULE, { ...big, shrink: undefined }, { ...small, shrink: undefined })));
+        expect(moduleBox(stiff, 'estrecho[1]').width).toBeCloseTo(80 * MM, 3);
+    });
+    it('resolves and checks grow and shrink', () => {
+        expect(resolvePageTemplate(NESTED_CONFIG, 'ancho')).toMatchObject({ grow: 2 });
+        expect(resolvePageTemplate({ pageTemplates: [{ ...WIDE_MODULE, grow: -1, shrink: 'mucho' }] }, 'ancho').grow).toBeUndefined();
+        const ws = validatePageTemplates({ ...NESTED_CONFIG, pageTemplates: [{ ...NESTED_TEMPLATE, grow: 1 }, { ...WIDE_MODULE, grow: -1, shrink: 'mucho' }] }).map((w) => [w.kind, w.path]);
+        expect(ws).toContainEqual(['unknownConfigValue', '/pageTemplates/0/grow']);
+        expect(ws).toContainEqual(['unknownConfigValue', '/pageTemplates/1/grow']);
+        expect(ws).toContainEqual(['unknownConfigValue', '/pageTemplates/1/shrink']);
+    });
+});
+describe('rowAlign: \'stretch\' reaches a module\'s \'auto\' boxes (#1095)', () => {
+    const shellOf = (rowAlign) => ({
+        ...ROWS_TEMPLATE,
+        id: 'fila',
+        groups: [{ name: 'cuerpo', modules: true, kind: 'row', gap: mm(6), ...(rowAlign ? { rowAlign } : {}), placement: ROWS_TEMPLATE.groups[0].placement }],
+    });
+    const md = `::::page{template="fila"}\n# T\n\n${[noticeModule('es', 0), noticeModule('es', 1)].join('\n')}::::\n`;
+    it('makes the shorter box as tall as the row', () => {
+        const page = pageOf(build(md, withTemplates(shellOf(), NOTICE_MODULE)));
+        const [tall, short] = [frame(page, 'aviso[1].texto').rect, frame(page, 'aviso[2].texto').rect];
+        expect(bottom(short)).toBeCloseTo(bottom(tall), 3);
+        expect(short.y).toBeCloseTo(tall.y, 3);
+        // The template asked for it: no motion in the log.
+        expect(page.composed.log.filter((e) => e.frame === 'aviso[2].texto')).toEqual([]);
+    });
+    it('leaves it at its content\'s height with rowAlign: \'start\'', () => {
+        const page = pageOf(build(md, withTemplates(shellOf('start'), NOTICE_MODULE)));
+        expect(bottom(frame(page, 'aviso[1].texto').rect) - bottom(frame(page, 'aviso[2].texto').rect)).toBeGreaterThan(2 * MM);
+    });
+    it('keeps a frame as wide as its content (a pill) at its height', () => {
+        const cards = `::::page{template="fila"}\n# T\n\n${[noticeModule('es', 0), cardModule('es', 0)].join('\n')}::::\n`;
+        const page = pageOf(build(cards, withTemplates(shellOf(), NOTICE_MODULE, CARD_MODULE)));
+        const pill = frame(page, 'tarjeta[1].pie').rect;
+        const plain = pageOf(build(cards, withTemplates(shellOf('start'), NOTICE_MODULE, CARD_MODULE)));
+        expect(pill.height).toBeCloseTo(frame(plain, 'tarjeta[1].pie').rect.height, 3);
+    });
+});
+describe('a frame whose look is unknown (#1095)', () => {
+    it('carries the look\'s name on the frame', () => {
+        const md = `::::page{template="fila"}\n# T\n\n:::module{template="aviso"}\n:::frame{slot="texto" look="azul"}\nPalabras.\n:::\n:::\n::::\n`;
+        const shell = { ...ROWS_TEMPLATE, id: 'fila', groups: [ROWS_TEMPLATE.groups[0]] };
+        const doc = build(md, { ...withTemplates(shell, NOTICE_MODULE), frameLooks: [{ id: 'verde', background: { hex: '#00aa00', model: 'hex' } }] });
+        expect(frame(pageOf(doc), 'aviso[1].texto').lookUnknown).toBe('azul');
+        const known = build(md.replace('azul', 'verde'), { ...withTemplates(shell, NOTICE_MODULE), frameLooks: [{ id: 'verde', background: { hex: '#00aa00', model: 'hex' } }] });
+        expect(frame(pageOf(known), 'aviso[1].texto').lookUnknown).toBeUndefined();
+    });
+});
+//# sourceMappingURL=moduleNesting.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"moduleNesting.test.js","sourceRoot":"","sources":["../../../src/__tests__/composed/moduleNesting.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,239 @@
+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' } },
+                // #1095: a loop of groups inside each other leads to no group.
+                { name: 'l', modules: true, within: 'm' },
+                { name: 'm', modules: true, within: 'l' },
+            ],
+        };
+        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 (#1095): as inside a stack.
+        expect(ws).not.toContainEqual(['unknownConfigValue', '/pageTemplates/0/groups/1/within']);
+        expect(ws).toContainEqual(['unknownConfigValue', '/pageTemplates/0/groups/5/within']);
+        expect(ws).toContainEqual(['unknownConfigValue', '/pageTemplates/0/groups/6/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).toBe('g');
+        expect(resolved.groups.find((g) => g.name === 'l').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' }] };