${escapeHtml(body.value)}
`; save(); }); - this.dom.blocksList.append(el('div.block-card', {}, - el('div.row', {}, el('strong', {}, 'Text block'), el('span.spacer'), - removeBtn(() => { step.textBlocks = step.textBlocks.filter((b) => b !== tb); })), - el('div.row', {}, level, position), - title, body, - )); + const blocks = orderedStepBlocks(step); + for (const [index, entry] of blocks.entries()) { + const { kind, block } = entry; + const canMoveUp = index > 0; + const canMoveDown = index < blocks.length - 1; + const moveUp = () => moveBlock(entry, blocks[index - 1]); + const moveDown = () => moveBlock(entry, blocks[index + 1]); + + const header = el('div.row', {}, + el('strong', {}, blockLabel(kind)), + el('span.muted', {}, `#${Number.isFinite(block.order) ? block.order : index + 1}`), + el('span.spacer'), + el('button.icon', { type: 'button', title: 'Move block up', disabled: !canMoveUp, onClick: moveUp }, '↑'), + el('button.icon', { type: 'button', title: 'Move block down', disabled: !canMoveDown, onClick: moveDown }, '↓'), + removeBtn(() => { + if (kind === 'text') step.textBlocks = (step.textBlocks || []).filter((b) => b !== block); + else if (kind === 'code') step.codeBlocks = (step.codeBlocks || []).filter((b) => b !== block); + else step.tableBlocks = (step.tableBlocks || []).filter((b) => b !== block); + }), + ); + + const card = el('div.block-card', { + draggable: true, + onDragStart: (e) => { + this.draggedBlock = entry; + if (e.dataTransfer) e.dataTransfer.effectAllowed = 'move'; + }, + onDragOver: (e) => { + if (this.draggedBlock) e.preventDefault(); + }, + onDrop: (e) => { + e.preventDefault(); + if (!this.draggedBlock) return; + moveBlock(this.draggedBlock, entry); + this.draggedBlock = null; + }, + onDragEnd: () => { + this.draggedBlock = null; + }, + }, header); + + if (kind === 'text') { + const position = makeSelect(block.position, [ + { value: 'before-title', label: 'Before title' }, + { value: 'after-title', label: 'After title' }, + { value: 'before-image', label: 'Before image' }, + { value: 'after-image', label: 'After image' }, + { value: 'before-description', label: 'Before description' }, + { value: 'after-description', label: 'After description' }, + ]); + const level = makeSelect(block.level, [ + { value: 'info', label: 'Note' }, + { value: 'warn', label: 'Warning' }, + { value: 'error', label: 'Important' }, + { value: 'success', label: 'Tip' }, + ]); + const title = el('input', { type: 'text', value: block.title || '', placeholder: 'Block title' }); + const body = el('textarea', { rows: 2, placeholder: 'Block text' }); + body.value = (block.descriptionHtml || '').replace(/<[^>]+>/g, ''); + position.addEventListener('change', () => { block.position = position.value; save(); }); + level.addEventListener('change', () => { block.level = level.value; save(); }); + title.addEventListener('input', () => { block.title = title.value; save(); }); + body.addEventListener('input', () => { block.descriptionHtml = `${escapeHtml(body.value)}
`; save(); }); + card.append( + el('div.row', {}, level, position), + title, + body, + ); + } else if (kind === 'code') { + const lang = el('input', { type: 'text', value: block.language || '', placeholder: 'Language (e.g. bash)' }); + const code = el('textarea', { rows: 3, placeholder: 'Code', spellcheck: false }); + code.value = blockText(block); + code.style.fontFamily = 'monospace'; + lang.addEventListener('input', () => { block.language = lang.value; save(); }); + code.addEventListener('input', () => { block.code = code.value; save(); }); + card.append(lang, code); + } else if (kind === 'table') { + const grid = el('textarea', { rows: 3, placeholder: 'One row per line, cells separated by |', spellcheck: false }); + grid.value = (block.rows || []).map((r) => r.join(' | ')).join('\n'); + grid.addEventListener('input', () => { + block.rows = grid.value.split('\n').filter((l) => l.trim() !== '') + .map((line) => line.split('|').map((c) => c.trim())); + save(); + }); + card.append( + el('div.muted', {}, 'First line is the header row.'), + grid, + ); + } + + this.dom.blocksList.append(card); } - for (const cb of step.codeBlocks || []) { - const lang = el('input', { type: 'text', value: cb.language || '', placeholder: 'Language (e.g. bash)' }); - const code = el('textarea', { rows: 3, placeholder: 'Code', spellcheck: false }); - code.value = cb.code || ''; - code.style.fontFamily = 'monospace'; - lang.addEventListener('input', () => { cb.language = lang.value; save(); }); - code.addEventListener('input', () => { cb.code = code.value; save(); }); - this.dom.blocksList.append(el('div.block-card', {}, - el('div.row', {}, el('strong', {}, 'Code block'), el('span.spacer'), - removeBtn(() => { step.codeBlocks = step.codeBlocks.filter((b) => b !== cb); })), - lang, code, - )); - } - - for (const tbl of step.tableBlocks || []) { - const grid = el('textarea', { rows: 3, placeholder: 'One row per line, cells separated by |', spellcheck: false }); - grid.value = (tbl.rows || []).map((r) => r.join(' | ')).join('\n'); - grid.addEventListener('input', () => { - tbl.rows = grid.value.split('\n').filter((l) => l.trim() !== '') - .map((line) => line.split('|').map((c) => c.trim())); - save(); - }); - this.dom.blocksList.append(el('div.block-card', {}, - el('div.row', {}, el('strong', {}, 'Table'), el('span.spacer'), - removeBtn(() => { step.tableBlocks = step.tableBlocks.filter((b) => b !== tbl); })), - el('div.muted', {}, 'First line is the header row.'), - grid, - )); - } - - if (!(step.textBlocks || []).length && !(step.codeBlocks || []).length && !(step.tableBlocks || []).length) { - this.dom.blocksList.append(el('div.muted', {}, 'Informational text, code, and table blocks render in every export.')); + if (!blocks.length) { + this.dom.blocksList.append(el('div.muted', {}, 'Informational text, code, and table blocks can be reordered with drag handles or arrows.')); } } @@ -906,27 +977,60 @@ class GuideEditor { if (mode === 1.5) this.dom.zoom150Btn.classList.add('active'); } - pushCanvasHistory(label = 'change') { + pushCanvasHistory(recordOrLabel = 'change') { if (!this.currentStep) return; - this.canvasHistory.push(clone(this.currentStep)); + const record = recordOrLabel && typeof recordOrLabel === 'object' && recordOrLabel.step + ? recordOrLabel + : { step: clone(this.currentStep) }; + this.canvasHistory.push(record); if (this.canvasHistory.length > 40) this.canvasHistory.shift(); this.canvasFuture.length = 0; this.beforeCanvasSnapshot = null; } + async snapshotCurrentStep(includeImage = false) { + if (!this.currentStep) return null; + const record = { step: clone(this.currentStep) }; + if (includeImage && this.currentStep.image) { + const image = await this.currentStepImageToBase64(this.currentStep); + if (image) record.image = image; + } + return record; + } + + async restoreHistoryRecord(record) { + if (!record || !record.step) return; + const step = clone(record.step); + this.selectedStepId = step.stepId; + this.beforeCanvasSnapshot = null; + this.saveStepDebounced.cancel(); + this.pendingSave = false; + if (record.image && step.image) { + const saved = await api.step.setWorkingImage({ + guideId: this.guideId, + stepId: step.stepId, + pngBase64: record.image.base64, + size: record.image.size, + step, + }); + this.stepMap.set(saved.stepId, saved); + const idx = this.steps.findIndex((s) => s.stepId === saved.stepId); + if (idx >= 0) this.steps[idx] = saved; + } else { + await this.flushStep(step); + } + } + async undo() { if (!this.currentStep) return; if (!this.canvasHistory.length) { this.onToast('Nothing to undo.'); return; } - this.canvasFuture.push(clone(this.currentStep)); + const current = await this.snapshotCurrentStep(true); + if (current) this.canvasFuture.push(current); const previous = this.canvasHistory.pop(); - this.stepMap.set(previous.stepId, previous); - const prevIdx = this.steps.findIndex((s) => s.stepId === previous.stepId); - if (prevIdx >= 0) this.steps[prevIdx] = previous; - this.selectedStepId = previous.stepId; - await this.flushStep(previous); + await this.restoreHistoryRecord(previous); this.renderAll(); } @@ -936,13 +1040,10 @@ class GuideEditor { this.onToast('Nothing to redo.'); return; } - this.canvasHistory.push(clone(this.currentStep)); + const current = await this.snapshotCurrentStep(true); + if (current) this.canvasHistory.push(current); const next = this.canvasFuture.pop(); - this.stepMap.set(next.stepId, next); - const nextIdx = this.steps.findIndex((s) => s.stepId === next.stepId); - if (nextIdx >= 0) this.steps[nextIdx] = next; - this.selectedStepId = next.stepId; - await this.flushStep(next); + await this.restoreHistoryRecord(next); this.renderAll(); } @@ -1388,8 +1489,7 @@ class GuideEditor { } } - async currentStepImageToBase64() { - const step = this.currentStep; + async currentStepImageToBase64(step = this.currentStep) { if (!step || !step.image) return null; const file = await api.step.imagePath({ guideId: this.guideId, stepId: step.stepId, which: 'working' }); if (!file) return null; @@ -1437,6 +1537,13 @@ class GuideEditor { if (!step || !step.image) return; const ok = await confirmDialog('Crop the working image to the selected area?'); if (!ok) return; + this.saveStepDebounced.cancel(); + const snapshot = this.beforeCanvasSnapshot || await this.snapshotCurrentStep(true); + if (snapshot) { + if (!snapshot.image) snapshot.image = await this.currentStepImageToBase64(step); + this.pushCanvasHistory(snapshot); + } + this.beforeCanvasSnapshot = null; const src = await api.step.imagePath({ guideId: this.guideId, stepId: step.stepId, which: 'working' }); if (!src) return; const img = await loadImage(src); diff --git a/app/renderer/style.css b/app/renderer/style.css index 54255c9..04a5457 100644 --- a/app/renderer/style.css +++ b/app/renderer/style.css @@ -430,7 +430,18 @@ kbd { pointer-events: none; } +.pane-props section { + display: flex; + flex-direction: column; + gap: 8px; + padding-bottom: 14px; + border-bottom: 1px solid color-mix(in srgb, var(--border) 75%, transparent); +} .pane-props section + section { margin-top: 16px; } +.pane-props section:last-child { + padding-bottom: 0; + border-bottom: 0; +} .pane-props input[type="text"], .pane-props input[type="number"], .pane-props input[type="color"], @@ -511,6 +522,8 @@ kbd { padding: 10px; background: var(--panel-solid); } +.block-card[draggable="true"] { cursor: grab; } +.block-card[draggable="true"]:active { cursor: grabbing; } .annotation-list { display: flex; flex-direction: column; diff --git a/core/blocks.js b/core/blocks.js new file mode 100644 index 0000000..beae4ea --- /dev/null +++ b/core/blocks.js @@ -0,0 +1,41 @@ +'use strict'; + +const BLOCK_KIND_ORDER = { text: 0, code: 1, table: 2 }; + +function blockText(block) { + if (!block || typeof block !== 'object') return ''; + for (const key of ['code', 'text', 'body', 'value', 'content']) { + const value = block[key]; + if (value != null && value !== '') return String(value); + } + return ''; +} + +function orderedBlocks(step) { + const blocks = []; + for (const tb of step.textBlocks || []) { + blocks.push({ kind: 'text', ...tb }); + } + for (const cb of step.codeBlocks || []) { + blocks.push({ kind: 'code', ...cb, code: blockText(cb) }); + } + for (const tbl of step.tableBlocks || []) { + blocks.push({ kind: 'table', ...tbl }); + } + return blocks.sort((a, b) => ( + (Number.isFinite(a.order) ? a.order : 0) - (Number.isFinite(b.order) ? b.order : 0) + || (BLOCK_KIND_ORDER[a.kind] - BLOCK_KIND_ORDER[b.kind]) + || String(a.id || '').localeCompare(String(b.id || '')) + )); +} + +function nextBlockOrder(step) { + return orderedBlocks(step).reduce((max, block) => Math.max(max, Number.isFinite(block.order) ? block.order : 0), 0) + 1; +} + +module.exports = { + BLOCK_KIND_ORDER, + blockText, + orderedBlocks, + nextBlockOrder, +}; diff --git a/core/renderast.js b/core/renderast.js index 1cdca6d..a7cecef 100644 --- a/core/renderast.js +++ b/core/renderast.js @@ -7,6 +7,7 @@ const { htmlToText, deepClone } = require('./util'); const { systemPlaceholders, resolveScopes, expandPlaceholders } = require('./placeholders'); const { decodePng } = require('./png'); const { renderAnnotations, applyFocusedView } = require('./raster'); +const { orderedBlocks, blockText } = require('./blocks'); /** * The Render AST is the single normalized document model every exporter @@ -75,8 +76,24 @@ function buildRenderAst(store, guideId, { globals = {}, now = new Date(), maxSte descriptionHtml: sanitizeHtml(expand(tb.descriptionHtml || '')), descriptionText: htmlToText(expand(tb.descriptionHtml || '')), })), - codeBlocks: step.codeBlocks || [], - tableBlocks: step.tableBlocks || [], + codeBlocks: (step.codeBlocks || []).map((cb) => ({ ...cb, code: blockText(cb) })), + tableBlocks: (step.tableBlocks || []).map((tb) => ({ + ...tb, + rows: Array.isArray(tb.rows) ? tb.rows.map((row) => [...row]) : [], + })), + blocks: orderedBlocks(step).map((block) => { + if (block.kind === 'text') { + return { + ...block, + title: expand(block.title || ''), + descriptionHtml: sanitizeHtml(expand(block.descriptionHtml || '')), + descriptionText: htmlToText(expand(block.descriptionHtml || '')), + }; + } + if (block.kind === 'code') return { ...block }; + if (block.kind === 'table') return { ...block }; + return { ...block }; + }), links: step.links || [], image: null, }; diff --git a/core/schema.js b/core/schema.js index 907d5fd..84cd151 100644 --- a/core/schema.js +++ b/core/schema.js @@ -1,7 +1,8 @@ 'use strict'; -const { newId, nowIso, deepClone } = require('./util'); +const { newId, nowIso } = require('./util'); const { sanitizeHtml } = require('./sanitize'); +const { blockText } = require('./blocks'); const SCHEMA_VERSION = 1; @@ -49,6 +50,12 @@ function createGuide(fields = {}) { } function createStep(fields = {}) { + let nextOrder = 1; + const takeOrder = (block) => { + const order = Number.isFinite(block && block.order) ? block.order : nextOrder; + nextOrder = Math.max(nextOrder, order + 1); + return order; + }; return { stepId: fields.stepId || newId('step'), parentStepId: fields.parentStepId || null, @@ -69,9 +76,9 @@ function createStep(fields = {}) { image: fields.image || null, // { originalPath, workingPath, size:{width,height} } extraImages: fields.extraImages || [], // multi-image steps annotations: (fields.annotations || []).map(normalizeAnnotation), - textBlocks: (fields.textBlocks || []).map(normalizeTextBlock), - codeBlocks: fields.codeBlocks || [], // { id, language, code } - tableBlocks: fields.tableBlocks || [], // { id, rows: [[cellText,..],..], headerRow } + textBlocks: (fields.textBlocks || []).map((tb) => normalizeTextBlock(tb, takeOrder(tb))), + codeBlocks: (fields.codeBlocks || []).map((cb) => normalizeCodeBlock(cb, takeOrder(cb))), + tableBlocks: (fields.tableBlocks || []).map((tb) => normalizeTableBlock(tb, takeOrder(tb))), links: fields.links || [], // { id, label, targetStepId } }; } @@ -94,16 +101,36 @@ function normalizeAnnotation(a) { return ann; } -function normalizeTextBlock(tb) { +function normalizeTextBlock(tb, order = null) { return { id: tb.id || newId('tb'), position: TEXTBLOCK_POSITIONS.includes(tb.position) ? tb.position : 'after-description', level: TEXTBLOCK_LEVELS.includes(tb.level) ? tb.level : 'info', + order: Number.isFinite(tb.order) ? tb.order : order, title: tb.title || '', descriptionHtml: sanitizeHtml(tb.descriptionHtml || ''), }; } +function normalizeCodeBlock(cb, order = null) { + return { + id: cb.id || newId('cb'), + order: Number.isFinite(cb.order) ? cb.order : order, + language: typeof cb.language === 'string' ? cb.language : '', + code: blockText(cb), + }; +} + +function normalizeTableBlock(tb, order = null) { + return { + id: tb.id || newId('tbl'), + order: Number.isFinite(tb.order) ? tb.order : order, + rows: Array.isArray(tb.rows) + ? tb.rows.map((row) => (Array.isArray(row) ? row.map((cell) => String(cell ?? '')) : [])) + : [], + }; +} + function num(v, fallback) { return Number.isFinite(v) ? v : fallback; } @@ -173,6 +200,8 @@ module.exports = { createStep, normalizeAnnotation, normalizeTextBlock, + normalizeCodeBlock, + normalizeTableBlock, validateGuide, validateStep, normalizeGuide, diff --git a/core/search.js b/core/search.js index 3cf3fd8..21da140 100644 --- a/core/search.js +++ b/core/search.js @@ -2,6 +2,7 @@ const path = require('node:path'); const { writeJsonSync, readJsonIfExists, htmlToText } = require('./util'); +const { blockText } = require('./blocks'); /** * Local full-text search over guide titles, descriptions, step titles/ @@ -57,7 +58,7 @@ class SearchIndex { const parts = [ htmlToText(step.descriptionHtml), ...(step.textBlocks || []).map((tb) => `${tb.title} ${htmlToText(tb.descriptionHtml)}`), - ...(step.codeBlocks || []).map((cb) => cb.code || ''), + ...(step.codeBlocks || []).map((cb) => blockText(cb)), ...(step.annotations || []).map((a) => a.text || ''), ]; this.docs[`s:${guide.guideId}:${step.stepId}`] = { diff --git a/core/store.js b/core/store.js index 8c25661..c66e7da 100644 --- a/core/store.js +++ b/core/store.js @@ -221,9 +221,8 @@ class GuideStore { } saveStep(guideId, step) { - const stored = deepClone(step); + const stored = normalizeStep(deepClone(step)); stored.descriptionHtml = sanitizeHtml(stored.descriptionHtml); - for (const tb of stored.textBlocks || []) tb.descriptionHtml = sanitizeHtml(tb.descriptionHtml); validateStep(stored); writeJsonSync(path.join(this.stepDir(guideId, step.stepId), 'step.json'), stored); const guide = this.getGuide(guideId); @@ -263,8 +262,8 @@ class GuideStore { } /** Replace the working image (crop result). The original is never touched. */ - setWorkingImage(guideId, stepId, pngBuffer, size) { - const step = this.getStep(guideId, stepId); + setWorkingImage(guideId, stepId, pngBuffer, size, stepPatch = null) { + const step = stepPatch ? deepClone(stepPatch) : this.getStep(guideId, stepId); if (!step.image) throw new Error('step has no image'); atomicWriteFileSync(path.join(this.stepDir(guideId, stepId), step.image.workingPath), pngBuffer); step.image.size = size; diff --git a/core/templates.js b/core/templates.js index 87e4c94..1422383 100644 --- a/core/templates.js +++ b/core/templates.js @@ -11,7 +11,7 @@ const { writeJsonSync, readJsonSync, atomicWriteFileSync, nowIso } = require('./ * defaults, shareable as .sfglt zip files. */ -const FORMATS = ['json', 'markdown', 'html-simple', 'html-rich', 'pdf', 'gif', 'image-bundle', 'docx', 'pptx']; +const FORMATS = ['json', 'markdown', 'html-simple', 'html-rich', 'confluence', 'pdf', 'gif', 'image-bundle', 'docx', 'pptx']; class TemplateManager { constructor(templatesDir) { diff --git a/exporters/common.js b/exporters/common.js index 143878b..ee87bf8 100644 --- a/exporters/common.js +++ b/exporters/common.js @@ -5,6 +5,7 @@ const path = require('node:path'); const { slugify } = require('../core/util'); const { encodePng } = require('../core/png'); const { renderStepImage } = require('../core/renderast'); +const { orderedBlocks, blockText } = require('../core/blocks'); /** * Shared exporter helpers: every image-bearing exporter renders annotated @@ -50,6 +51,22 @@ function renderAllImages(ast) { return result; } +function stepBlocks(step) { + return step.blocks || orderedBlocks(step); +} + +function codeBlockText(block) { + return blockText(block); +} + const LEVEL_LABEL = { info: 'Note', warn: 'Warning', error: 'Important', success: 'Tip' }; -module.exports = { guideSlug, imagesDirName, writeStepImages, renderAllImages, LEVEL_LABEL }; +module.exports = { + guideSlug, + imagesDirName, + writeStepImages, + renderAllImages, + stepBlocks, + codeBlockText, + LEVEL_LABEL, +}; diff --git a/exporters/confluence.js b/exporters/confluence.js new file mode 100644 index 0000000..43e2a2b --- /dev/null +++ b/exporters/confluence.js @@ -0,0 +1,130 @@ +'use strict'; + +const fs = require('node:fs'); +const path = require('node:path'); +const { slugify, escapeXml } = require('../core/util'); +const { encodePng } = require('../core/png'); +const { guideSlug, renderAllImages, stepBlocks, codeBlockText } = require('./common'); + +/** + * Confluence storage-format export. Writes a single XHTML document plus a + * sidecar attachments folder containing the rendered screenshots referenced + * by the page. + */ + +const DEFAULT_TEMPLATE = { + includeImages: true, +}; + +const MACRO_FOR_LEVEL = { + info: 'info', + warn: 'warning', + error: 'note', + success: 'tip', +}; + +function anchorFor(step) { + return `step-${step.number.replace(/\./g, '-')}`; +} + +function stepLinkRewrite(html, ast) { + return String(html || '').replace(/href="step:([^"]+)"/g, (m, id) => { + const target = ast.steps.find((s) => s.stepId === id); + return target ? `href="#${anchorFor(target)}"` : 'data-missing-step-link="true"'; + }); +} + +function cdata(text) { + return `/g, ']]]]>')}]]>`; +} + +function blockMacro(tb, ast) { + const macro = MACRO_FOR_LEVEL[tb.level] || 'note'; + const title = tb.title ? `(skipped)
'); + + for (const tb of stepBlocks(step).filter((block) => block.kind === 'text' && block.position === 'before-description')) { + parts.push(blockMacro(tb, ast)); + } + + if (step.descriptionHtml) { + parts.push(`${escapeHtml(cb.code || '')}| ${escapeHtml(c)} | `).join('') + '
|---|
| ${escapeHtml(c)} | `).join('') + '
${escapeHtml(codeBlockText(block))}| ${escapeHtml(c)} | `).join('') + '
|---|
| ${escapeHtml(c)} | `).join('') + '
Text
' }], + codeBlocks: [{ id: 'cb1', order: 1, language: 'bash', text: 'echo hi' }], + tableBlocks: [{ id: 'tbl1', order: 3, rows: [['A', 'B'], ['1', '2']] }], + }); + + assert.equal(step.codeBlocks[0].code, 'echo hi'); + assert.equal(blockText(step.codeBlocks[0]), 'echo hi'); + assert.deepEqual(orderedBlocks(step).map((block) => block.kind), ['code', 'text', 'table']); +}); diff --git a/tests/unit/exporters-binary.test.js b/tests/unit/exporters-binary.test.js index e9060d2..df45d3f 100644 --- a/tests/unit/exporters-binary.test.js +++ b/tests/unit/exporters-binary.test.js @@ -237,6 +237,6 @@ test('a saved template changes exporter behavior through runExport', (t) => { const withTemplate = runExport('pdf', ast, path.join(root, 'out2'), tm.load('pdf', 'no-cover')); assert.ok(withTemplate.pageCount < withDefaults.pageCount, 'dropping cover+toc reduces pages'); - assert.equal(Object.keys(EXPORTERS).length, 9, 'all nine formats wired'); + assert.equal(Object.keys(EXPORTERS).length, 10, 'all ten formats wired'); assert.throws(() => runExport('exe', ast, path.join(root, 'out3'))); }); diff --git a/tests/unit/exporters-text.test.js b/tests/unit/exporters-text.test.js index 8d18da5..45c2dc4 100644 --- a/tests/unit/exporters-text.test.js +++ b/tests/unit/exporters-text.test.js @@ -9,6 +9,7 @@ const { buildRenderAst, renderStepImage } = require('../../core/renderast'); const { exportJson } = require('../../exporters/json'); const { exportMarkdown } = require('../../exporters/markdown'); const { exportHtmlSimple, exportHtmlRich } = require('../../exporters/html'); +const { exportConfluence } = require('../../exporters/confluence'); const { htmlToMarkdown } = require('../../exporters/htmlmd'); const { decodePng } = require('../../core/png'); const { buildFixtureGuide } = require('./fixture-guide'); @@ -114,6 +115,31 @@ test('Markdown export: TOC anchors resolve, images exist, blocks rendered', (t) assert.equal(lines[warnIdx + 1], '> Admins only.'); }); +test('Confluence export writes storage-format XML and image attachments', (t) => { + const root = makeTmpDir('expconf'); + t.after(() => rmrf(root)); + const { store, guide } = buildFixtureGuide(path.join(root, 'data')); + const out = path.join(root, 'out'); + + const ast = buildRenderAst(store, guide.guideId); + const { file, attachmentCount } = exportConfluence(ast, out); + const xml = fs.readFileSync(file, 'utf8'); + + assert.equal(attachmentCount, 2); + assert.ok(xml.includes('