Вариант ${esc(no)}
${inline(name)}
@@ -175,9 +211,7 @@ function tableCell(c) {
}
function renderTable(tbl) {
const head = tbl.headers.map((h) => `${inline(h)} `).join('');
- const body = tbl.rows.map((r) =>
- `${r.map((c) => `${tableCell(c)} `).join('')} `
- ).join('\n');
+ const body = tbl.rows.map((r) => `${r.map((c) => `${tableCell(c)} `).join('')} `).join('\n');
return `
`;
}
@@ -185,59 +219,37 @@ function renderImages(imgs) {
if (imgs.length === 1) {
return `})
`;
}
- const cls = imgs.length === 2 ? 'renders--duo' : 'renders--trio';
+ const cls = imgs.length === 2 ? 'renders--duo' : imgs.length === 4 ? 'renders--quad' : 'renders--trio';
const cells = imgs.map((im) => `})
`).join('');
return `${inline(b)}${small ? `${inline(small)}` : ''} `;
}).join('\n');
- return `${inline(b)}${small ? `${inline(small)}` : ''} `;
- }).join('\n');
return `
})
- `;
+
`;
}
-
function subhead(text, count) {
const c = count != null
? `${count} ${plural(count, 'вариант', 'варианта', 'вариантов')}` : '';
return `${cells}
`;
}
-function renderVariants(items) {
- const li = items.map((it) => {
+function variantItems(items) {
+ return items.map((it) => {
const parts = it.split(/\s+[—–-]\s+/);
const b = parts.shift();
const small = parts.join(' — ');
return `- ${li}
- ${variantItems(items)}
- ${li}
- ${variantItems(items)}
${inline(text)}
${c}${inline(b.text)}
`); } } + return out.join('\n '); +} - const sw = (sec.swatches || []).map((s) => - `${esc(s.name)}`).join(''); +// ─── планировка: разбор таблицы комнат ─────────────────── +function parsePlanRooms() { + const md = fs.readFileSync(path.join(ROOT, cfg.plan.file), 'utf8'); + const tbl = parseFrontmatter(md).body; + const t = parseBlocks(tbl).find((b) => b.t === 'table'); + if (!t) return []; + const iNo = colIndex(t.headers, /^№|^no$|^#$/i); + const iArea = colIndex(t.headers, /площад|м²|area/i); + const iName = t.headers.findIndex((h, idx) => idx !== iNo && idx !== iArea && h); + const iSub = t.headers.findIndex((h, idx) => idx !== iNo && idx !== iArea && idx !== iName && h); + return t.rows.map((r) => ({ + no: r[iNo] || '', name: r[iName] || '', area: r[iArea] || '', sub: iSub >= 0 ? r[iSub] : '', + })); +} +// ─── сбор раздела из заметки ───────────────────────────── +function buildSection(file, rooms) { + const md = fs.readFileSync(path.join(ROOT, file), 'utf8'); + const { data, body } = parseFrontmatter(md); + const blocks = parseBlocks(body); + + const h1 = blocks.find((b) => b.t === 'h' && b.lvl === 1); + const title = data.title || (h1 ? h1.text : file.replace(/\.md$/i, '')); + const room = rooms.find((r) => norm(r.name) === norm(title)); + const order = data.order != null ? Number(data.order) + : (room ? rooms.indexOf(room) : 100 + file.charCodeAt(0)); + + const leadBlock = blocks.find((b) => b.t === 'p'); + const contentBlocks = blocks.filter((b) => b !== h1 && b !== leadBlock); + const hasContent = contentBlocks.some((b) => b.t === 'images' || b.t === 'table' || b.t === 'list'); + + return { + file, title, room, order, hasContent, + id: slug(title), + nav: data.nav || title, + navShort: data.navShort || data.nav || title, + sub: data.sub || (room ? room.sub : ''), + swatches: parseSwatches(data.swatches), + eyebrow: data.eyebrow || (room ? `Комната ${room.no} · ${room.area}` : ''), + lead: leadBlock ? leadBlock.text : '', + contentBlocks, + }; +} + +function renderSection(sec) { + const sw = sec.swatches.map((s) => `${esc(s.name)}`).join(''); + const bodyHtml = sec.hasContent + ? renderBody(sec.contentBlocks) + : `Раздел в работе — скоро добавим рендеры и варианты мебели.
`; return `
- ${esc(sec.eyebrow || '')}
-
-
+
${esc(title)}
- ${lead ? `${inline(lead)}
` : ''} + ${esc(sec.eyebrow)} +${esc(sec.title)}
+ ${sec.lead ? `${inline(sec.lead)}
` : ''} ${sw ? `${sw}
` : ''}
- ${esc(plan.eyebrow)}
-
-
+
${esc(plan.nav)}
-${esc(plan.lead)}
+ ${esc(cfg.plan.eyebrow)} +${esc(cfg.plan.nav)}
+${esc(cfg.plan.lead)}
- ${rooms}
- ${items}
${esc(s.num)}${esc(s.lbl)}
`).join('\n ');
-
- const sections = cfg.sections.map(renderSection).join('\n\n');
+ const doneCount = sections.filter((s) => s.hasContent).length;
+ const nav = [{ id: cfg.plan.id, nav: cfg.plan.nav, navShort: cfg.plan.navShort }, ...sections]
+ .map((s) => `${esc(s.nav)}${esc(s.navShort || s.nav)}`).join('\n ');
+ const materials = h.materials.map((m) => `${esc(m.name)}`).join('\n ');
+ const stats = h.stats.map((s) => {
+ const num = /концепт/i.test(s.lbl) ? String(doneCount) : s.num;
+ return `${esc(num)}${esc(s.lbl)}
`;
+ }).join('\n ');
+ const sectionsHtml = sections.map(renderSection).join('\n\n');
return `
@@ -387,9 +433,9 @@ function buildHtml() {