@janga/norna 0.7.18 → 0.7.23

package/scripts/lib/content-sync-plan.mjs

@@ -0,0 +1,179 @@
+import path from 'node:path';
+
+import { toPosixPath } from './site-content.mjs';
+
+export const getExpectedImagePath = (contentFile, imageName) =>
+	path.join(contentFile.imagesDir, imageName);
+
+export const getExpectedImageLabel = (contentFile, imageName) =>
+	`${contentFile.imagesLabel}/${imageName}`;
+
+export const getImageRootLabel = (contentFile) => contentFile.imagesLabel.replace(/\/images$/, '');
+
+export const getImageCandidateLabel = ({ contentFile, imagePath }) =>
+	`${contentFile.imagesLabel}/${toPosixPath(path.relative(contentFile.imagesDir, imagePath))}`;
+
+const getReferenceLabel = (contentFile, section) =>
+	`${contentFile.contentLabel} [${section.id ?? 'page title'}]`;
+
+const addMapEntry = (map, key, value) => {
+	if (!map.has(key)) map.set(key, []);
+	map.get(key).push(value);
+};
+
+const addReferenceIssue = (issues, entry, issue) => {
+	issues.push({ ...entry, issue, phase: 'reference' });
+};
+
+const addConflictIssue = (issues, move, issue) => {
+	issues.push({
+		contentFile: move.contentFile,
+		section: move.section,
+		reference: move.reference,
+		issue,
+		phase: 'conflict',
+	});
+};
+
+const addMoveConflicts = (moves, issues) => {
+	const movesBySource = new Map();
+	const movesByDestination = new Map();
+
+	for (const move of moves) {
+		addMapEntry(movesBySource, move.from, move);
+		addMapEntry(movesByDestination, move.to, move);
+	}
+
+	for (const sourceMoves of movesBySource.values()) {
+		const destinations = new Set(sourceMoves.map((move) => move.to));
+		if (destinations.size <= 1) continue;
+
+		const firstMove = sourceMoves[0];
+		addConflictIssue(issues, firstMove, {
+			severity: 'error',
+			message: `Cannot relocate "${firstMove.imageName}" because the same source file is referenced from multiple destinations: ${sourceMoves.map((move) => getExpectedImageLabel(move.contentFile, move.imageName)).join(', ')}.`,
+			fix: 'Duplicate the image manually or rename one of the image files so each move has a single destination.',
+		});
+	}
+
+	for (const destinationMoves of movesByDestination.values()) {
+		const sources = new Set(destinationMoves.map((move) => move.from));
+		if (sources.size <= 1) continue;
+
+		const firstMove = destinationMoves[0];
+		addConflictIssue(issues, firstMove, {
+			severity: 'error',
+			message: `Cannot relocate "${firstMove.imageName}" because multiple source files would move to ${getExpectedImageLabel(firstMove.contentFile, firstMove.imageName)}: ${destinationMoves.map((move) => getImageCandidateLabel({ contentFile: move.sourceContentFile, imagePath: move.from })).join(', ')}.`,
+			fix: 'Move the intended file manually or rename files so the destination is unambiguous.',
+		});
+	}
+};
+
+export const createImageSyncPlan = ({
+	imageCandidates,
+	references,
+	reportMisplaced,
+}) => {
+	const candidatesByName = new Map();
+	const expectedReferencesByPath = new Map();
+	const issues = [];
+	const moves = [];
+	const referencedImagePaths = new Set();
+	const resolvedPathByReference = new Map();
+
+	for (const candidate of imageCandidates) {
+		addMapEntry(candidatesByName, candidate.imageName, candidate);
+	}
+
+	for (const candidates of candidatesByName.values()) {
+		candidates.sort((left, right) => left.imagePath.localeCompare(right.imagePath, 'sv'));
+	}
+
+	for (const entry of references) {
+		const expectedPath = getExpectedImagePath(entry.contentFile, entry.reference.image);
+		addMapEntry(expectedReferencesByPath, expectedPath, entry);
+	}
+
+	for (const entry of references) {
+		const { contentFile, reference, section } = entry;
+		const imageName = reference.image;
+		const expectedPath = getExpectedImagePath(contentFile, imageName);
+		const expectedLabel = getExpectedImageLabel(contentFile, imageName);
+		const candidates = (candidatesByName.get(imageName) ?? [])
+			.filter(({ imagePath }) => imagePath !== expectedPath);
+		const expectedCandidate = (candidatesByName.get(imageName) ?? [])
+			.find(({ imagePath }) => imagePath === expectedPath);
+
+		if (expectedCandidate) {
+			referencedImagePaths.add(expectedPath);
+			resolvedPathByReference.set(reference, expectedPath);
+			continue;
+		}
+
+		if (candidates.length === 0) {
+			addReferenceIssue(issues, entry, {
+				severity: 'error',
+				message: `Image "${imageName}" does not exist at ${expectedLabel} or anywhere under any page image root.`,
+				fix: `Add the source image directly to ${contentFile.imagesLabel}/ or remove the Norna-managed image reference.`,
+			});
+			continue;
+		}
+
+		if (candidates.length > 1) {
+			addReferenceIssue(issues, entry, {
+				severity: 'error',
+				message: `Cannot relocate "${imageName}". Multiple files with this filename were found: ${candidates.map(getImageCandidateLabel).join(', ')}.`,
+				fix: 'Move the intended file manually or rename files so the move is unambiguous.',
+			});
+			continue;
+		}
+
+		const sourceCandidate = candidates[0];
+		const sourcePath = sourceCandidate.imagePath;
+		const referencesAtCurrentLocation = (expectedReferencesByPath.get(sourcePath) ?? [])
+			.filter((expectedReference) => expectedReference.contentFile !== contentFile);
+
+		if (referencesAtCurrentLocation.length > 0) {
+			addReferenceIssue(issues, entry, {
+				severity: 'error',
+				message: `Cannot relocate "${imageName}" from ${getImageCandidateLabel(sourceCandidate)} because it is still referenced from ${referencesAtCurrentLocation.map((expectedReference) => getReferenceLabel(expectedReference.contentFile, expectedReference.section)).join(', ')}.`,
+				fix: 'Remove the extra reference, duplicate the image file manually, or rename one of the image files so the intended move is unambiguous.',
+			});
+			continue;
+		}
+
+		if (!moves.some((move) => move.from === sourcePath && move.to === expectedPath)) {
+			moves.push({
+				imageName,
+				from: sourcePath,
+				to: expectedPath,
+				contentFile,
+				sourceContentFile: sourceCandidate.contentFile,
+				section,
+				reference,
+			});
+		}
+
+		referencedImagePaths.add(sourcePath);
+		resolvedPathByReference.set(reference, sourcePath);
+
+		if (reportMisplaced) {
+			addReferenceIssue(issues, entry, {
+				severity: 'error',
+				message: `Image "${imageName}" is used here but is located in ${getImageCandidateLabel(sourceCandidate)}.`,
+				fix: sourceCandidate.contentFile === contentFile
+					? 'Run norna content:sync to move it directly into the current page image root.'
+					: `Run norna content:sync to move it from ${getImageRootLabel(sourceCandidate.contentFile)} to ${getImageRootLabel(contentFile)}.`,
+			});
+		}
+	}
+
+	addMoveConflicts(moves, issues);
+
+	return {
+		issues,
+		moves,
+		referencedImagePaths,
+		resolvedPathByReference,
+	};
+};

package/scripts/lib/editor-language-service.mjs

@@ -2,15 +2,14 @@ import { access, readdir, readFile } from 'node:fs/promises';
 import path from 'node:path';
 import { load } from 'js-yaml';
 import {
-	extractInlineNoteDiagnostics,
-	extractMarkdownImageReferences,
-	extractNornaMarkdownBlockDiagnostics,
-	getNornaBlockImageReferences,
+	getOpenMarkdownFenceAtLine,
 	nornaMarkdownBlockDefinitions,
 } from './norna-markdown-blocks.mjs';
+import { resolveNavigationModel } from './navigation-model.mjs';
 import { inspectPublicAssetFilenames, logoAssetFilenames } from './public-asset-conventions.mjs';
-import { getHeadingIdentifierIssues, getMarkdownHeadings } from './heading-ids.mjs';
+import { parsePageMarkdownSource } from './page-markdown.mjs';
 import { siteSchema } from './schema-definitions.mjs';
+import { homePageDirectory } from './site-conventions.mjs';
 
 const supportedImageExtensions = new Set(['.jpg', '.jpeg', '.png', '.svg']);
 const siteConfigNames = ['config.yaml'];
@@ -36,6 +35,132 @@ export const findNornaSiteRoot = async (documentPath) => {
 	}
 };
 
+const readEditorYaml = async (filePath) => {
+	try {
+		const source = await readFile(filePath, 'utf8');
+		const data = load(source) ?? {};
+		return data && typeof data === 'object' && !Array.isArray(data) ? data : {};
+	} catch {
+		return null;
+	}
+};
+
+const readContentFrontmatterForEditor = (source) => {
+	const match = source.match(/^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n|$)/);
+	if (!match) return {};
+	try {
+		const data = load(match[1]) ?? {};
+		return data && typeof data === 'object' && !Array.isArray(data) ? data : {};
+	} catch {
+		return {};
+	}
+};
+
+const getNavigationNodesForEditor = async (siteRoot) => {
+	const nodes = [];
+
+	const visit = async (pagesDirectory, depth = 1) => {
+		const entries = (await readdir(pagesDirectory, { withFileTypes: true }).catch((error) => {
+			if (error?.code === 'ENOENT') return [];
+			throw error;
+		}))
+			.filter((entry) => entry.isDirectory())
+			.sort((left, right) => left.name.localeCompare(right.name, 'en'));
+
+		for (const entry of entries) {
+			const nodeDirectory = path.join(pagesDirectory, entry.name);
+			const contentPath = path.join(nodeDirectory, 'content.md');
+			const categoryPath = path.join(nodeDirectory, 'category.yaml');
+			const [hasContent, hasCategory] = await Promise.all([
+				fileExists(contentPath),
+				fileExists(categoryPath),
+			]);
+
+			if (hasContent !== hasCategory) {
+				if (hasCategory) {
+					nodes.push({
+						depth,
+						headings: [],
+						isHome: false,
+						kind: 'category',
+						listed: true,
+					});
+				} else {
+					const source = await readFile(contentPath, 'utf8');
+					const data = readContentFrontmatterForEditor(source);
+					const document = await parsePageMarkdownSource(source, { label: contentPath });
+					nodes.push({
+						depth,
+						headings: document.navigationHeadings,
+						isHome: depth === 1 && entry.name === homePageDirectory,
+						kind: 'page',
+						listed: data.navigation?.listed !== false,
+					});
+				}
+			}
+
+			await visit(path.join(nodeDirectory, 'pages'), depth + 1);
+		}
+	};
+
+	await visit(path.join(siteRoot, 'pages'));
+	return nodes;
+};
+
+const getNavigationModeForEditor = async (siteRoot) => {
+	const config = await readEditorYaml(path.join(siteRoot, 'config.yaml'));
+	if (!config) return null;
+	const requestedMode = config.navigation?.mode ?? 'automatic';
+	if (requestedMode !== 'automatic') return requestedMode;
+
+	try {
+		return resolveNavigationModel({
+			mode: requestedMode,
+			nodes: await getNavigationNodesForEditor(siteRoot),
+		}).mode;
+	} catch {
+		return null;
+	}
+};
+
+const findNestedYamlPropertyLine = (source, parentKey, propertyKey) => {
+	const lines = source.replace(/\r\n?/g, '\n').split('\n');
+	let insideParent = false;
+	for (let index = 0; index < lines.length; index += 1) {
+		const line = lines[index];
+		if (new RegExp(`^${parentKey}:\\s*(?:#.*)?$`).test(line)) {
+			insideParent = true;
+			continue;
+		}
+		if (!insideParent) continue;
+		if (/^[A-Za-z][A-Za-z0-9-]*:/.test(line)) return 1;
+		if (new RegExp(`^  ${propertyKey}:`).test(line)) return index + 1;
+	}
+	return 1;
+};
+
+export const getThemeDiagnostics = async ({ documentPath, source }) => {
+	let theme;
+	try {
+		theme = load(source) ?? {};
+	} catch {
+		return [];
+	}
+	if (!theme || typeof theme !== 'object' || Array.isArray(theme)) return [];
+
+	const backgroundPattern = theme.sections?.backgroundPattern;
+	if (backgroundPattern === undefined || backgroundPattern === 'uniform') return [];
+	const siteRoot = await findNornaSiteRoot(documentPath);
+	if (!siteRoot || await getNavigationModeForEditor(siteRoot) !== 'tree') return [];
+
+	return [{
+		code: 'tree-section-background-pattern',
+		line: findNestedYamlPropertyLine(source, 'sections', 'backgroundPattern'),
+		message: `sections.backgroundPattern "${backgroundPattern}" cannot be used because this site resolves to tree navigation. Tree navigation uses one uniform reading surface so the navigation rail and page content remain distinct. Remove sections.backgroundPattern or set it to uniform.`,
+		severity: 'error',
+	}];
+};
+
 const readSitewideLogoForEditor = async (siteRoot) => {
 	const filename = await findFile(siteRoot, ['sitewide-content.yaml']);
 	if (!filename) return null;
@@ -128,32 +253,6 @@ const getPageContext = (siteRoot, documentPath) => {
 	};
 };
 
-const getOpenFenceAtLine = (source, lineIndex) => {
-	const lines = source.replace(/\r\n?/g, '\n').split('\n');
-	let open = null;
-
-	for (let index = 0; index <= Math.min(lineIndex, lines.length - 1); index += 1) {
-		const match = lines[index].match(/^ {0,3}(`{3,}|~{3,})([^\r\n]*)$/);
-		if (!match) continue;
-
-		if (!open) {
-			open = {
-				character: match[1][0],
-				length: match[1].length,
-				line: index,
-				type: match[2].trim().split(/\s+/)[0] ?? '',
-			};
-			continue;
-		}
-
-		if (match[1][0] === open.character && match[1].length >= open.length && !match[2].trim()) {
-			open = null;
-		}
-	}
-
-	return open;
-};
-
 const getBlockField = (definition, key, itemField = false) => (
 	itemField ? definition.item?.fields?.[key] : definition.options?.[key]
 );
@@ -185,7 +284,7 @@ const fieldCandidate = (key, fieldDefinition, options = {}) => ({
 
 export const getNornaBlockCompletionContext = ({ source, line }) => {
 	const lines = source.replace(/\r\n?/g, '\n').split('\n');
-	const fence = getOpenFenceAtLine(source, line);
+	const fence = getOpenMarkdownFenceAtLine(source, line);
 	const definition = fence ? nornaMarkdownBlockDefinitions[fence.type] : null;
 	if (!fence || !definition) return null;
 
@@ -249,7 +348,7 @@ export const getNornaBlockCompletionContext = ({ source, line }) => {
 
 export const getNornaBlockFieldContext = ({ source, line }) => {
 	const lines = source.replace(/\r\n?/g, '\n').split('\n');
-	const fence = getOpenFenceAtLine(source, line);
+	const fence = getOpenMarkdownFenceAtLine(source, line);
 	const definition = fence ? nornaMarkdownBlockDefinitions[fence.type] : null;
 	if (!fence || !definition) return null;
 	const currentLine = lines[line] ?? '';
@@ -328,8 +427,8 @@ const getReferencesByFilename = async (siteRoot) => {
 	const references = new Map();
 	for (const contentPath of await getContentFiles(siteRoot)) {
 		const source = await readFile(contentPath, 'utf8');
-		const { blocks } = extractNornaMarkdownBlockDiagnostics(source, { label: toPosixPath(path.relative(siteRoot, contentPath)) });
-		for (const reference of getNornaBlockImageReferences(blocks)) {
+		const page = await parsePageMarkdownSource(source, { label: toPosixPath(path.relative(siteRoot, contentPath)) });
+		for (const reference of page.managedImages) {
 			if (!references.has(reference.image)) references.set(reference.image, []);
 			references.get(reference.image).push(toPosixPath(path.relative(siteRoot, contentPath)));
 		}
@@ -364,7 +463,7 @@ export const getImageCompletionContext = async ({ documentPath, source, line })
 	if (!siteRoot) return null;
 	const page = getPageContext(siteRoot, documentPath);
 	if (!page) return null;
-	const fence = getOpenFenceAtLine(source, line);
+	const fence = getOpenMarkdownFenceAtLine(source, line);
 	if (!fence || !['norna-image-stack', 'norna-image-carousel', 'norna-card-list'].includes(fence.type)) return null;
 
 	const currentLine = source.replace(/\r\n?/g, '\n').split('\n')[line] ?? '';
@@ -417,35 +516,6 @@ export const getImageDefinitionContext = async ({ documentPath, source, line })
 	};
 };
 
-const getLineFromMessage = (message, fallback = 1) => {
-	const match = String(message).match(/\bline\s+(\d+)\b/i);
-	return match ? Number.parseInt(match[1], 10) : fallback;
-};
-
-const getImageReferenceLines = (source) => {
-	const lines = source.replace(/\r\n?/g, '\n').split('\n');
-	const references = [];
-	let fence = null;
-
-	for (const [index, line] of lines.entries()) {
-		const fenceMatch = line.match(/^ {0,3}(`{3,}|~{3,})([^\r\n]*)$/);
-		if (fenceMatch) {
-			if (!fence) {
-				fence = { character: fenceMatch[1][0], length: fenceMatch[1].length, type: fenceMatch[2].trim().split(/\s+/)[0] ?? '' };
-			} else if (fenceMatch[1][0] === fence.character && fenceMatch[1].length >= fence.length && !fenceMatch[2].trim()) {
-				fence = null;
-			}
-			continue;
-		}
-		if (!fence || !fence.type.startsWith('norna-')) continue;
-
-		const match = line.match(/^\s*(?:-\s+)?image:\s*([^\s#]+)\s*(?:#.*)?$/);
-		if (match) references.push({ filename: match[1].replace(/^['"]|['"]$/g, ''), line: index + 1 });
-	}
-
-	return references;
-};
-
 const getContentFrontmatterDiagnostics = (source) => {
 	const match = source.match(/^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n|$)/);
 	if (!match) {
@@ -475,112 +545,20 @@ const getContentFrontmatterDiagnostics = (source) => {
 	}));
 };
 
-const getMarkdownStructure = (source) => {
-	const lines = source.replace(/\r\n?/g, '\n').split('\n');
-	let bodyStart = 0;
-	if (lines[0]?.trim() === '---') {
-		const closingIndex = lines.findIndex((line, index) => index > 0 && line.trim() === '---');
-		if (closingIndex < 0) return { bodyStart: lines.length, headings: [], lines };
-		bodyStart = closingIndex + 1;
-	}
-
-	const headings = [];
-	let fence = null;
-	for (let index = bodyStart; index < lines.length; index += 1) {
-		const line = lines[index];
-		const fenceMatch = line.match(/^ {0,3}(`{3,}|~{3,})([^\r\n]*)$/);
-		if (fenceMatch) {
-			if (!fence) {
-				fence = { character: fenceMatch[1][0], length: fenceMatch[1].length };
-			} else if (
-				fenceMatch[1][0] === fence.character
-				&& fenceMatch[1].length >= fence.length
-				&& !fenceMatch[2].trim()
-			) {
-				fence = null;
-			}
-			continue;
-		}
-		if (fence) continue;
-
-		const match = line.match(/^(#{1,2})\s+(.+?)\s*$/);
-		if (match) headings.push({ level: match[1].length, line: index + 1, source: line });
-	}
-
-	return { bodyStart, headings, lines };
-};
-
-const getPageTitleDiagnostics = (structure) => {
-	const { bodyStart, headings, lines } = structure;
-	const pageHeadings = headings.filter((heading) => heading.level === 1);
-	const diagnostics = [];
-
-	if (pageHeadings.length === 0) {
-		diagnostics.push({
-			code: 'missing-page-title',
-			severity: 'error',
-			line: 1,
-			message: 'Norna pages require exactly one Markdown H1 page title, for example "# About".',
-		});
-	} else if (pageHeadings.length > 1) {
-		for (const heading of pageHeadings.slice(1)) {
-			diagnostics.push({
-				code: 'duplicate-page-title',
-				severity: 'error',
-				line: heading.line,
-				message: 'A Norna page can contain only one Markdown H1. Use a level 2 heading with an explicit id for a section.',
-			});
-		}
-	}
-
-	if (headings[0] && headings[0].level !== 1) {
-		diagnostics.push({
-			code: 'page-title-order',
-			severity: 'error',
-			line: headings[0].line,
-			message: 'The Markdown H1 page title must come before every level 2 section.',
-		});
-	}
-
-	const firstHeadingLineIndex = (headings[0]?.line ?? lines.length + 1) - 1;
-	if (lines.slice(bodyStart, firstHeadingLineIndex).some((line) => line.trim())) {
-		diagnostics.push({
-			code: 'page-title-order',
-			severity: 'error',
-			line: bodyStart + 1,
-			message: 'The Markdown H1 page title must be the first content after optional frontmatter.',
-		});
-	}
-
-	return diagnostics;
-};
-
 export const getMarkdownDiagnostics = async ({ documentPath, source }) => {
-	const markdownStructure = getMarkdownStructure(source);
-	const { headings } = await getMarkdownHeadings(source);
+	const document = await parsePageMarkdownSource(source, { label: path.basename(documentPath) });
 	const diagnostics = [
 		...getContentFrontmatterDiagnostics(source),
-		...getPageTitleDiagnostics(markdownStructure),
-		...getHeadingIdentifierIssues(headings).map((issue) => ({
-			code: issue.code,
-			severity: 'error',
-			line: issue.heading.line,
-			message: `${issue.message} ${issue.fix}`,
+		...document.diagnostics.map((diagnostic) => ({
+			code: diagnostic.code,
+			severity: diagnostic.severity,
+			line: diagnostic.line,
+			message: diagnostic.fix
+				? `${diagnostic.message} ${diagnostic.fix}`
+				: diagnostic.message,
 		})),
 	];
-	const blockResult = extractNornaMarkdownBlockDiagnostics(source, { label: path.basename(documentPath) });
-	for (const error of blockResult.errors) {
-		diagnostics.push({
-			code: error.message.includes('but not closed') ? 'unclosed-norna-block' : 'invalid-norna-block',
-			severity: 'error',
-			line: getLineFromMessage(error.message, error.line),
-			message: error.message,
-		});
-	}
-	for (const error of extractInlineNoteDiagnostics(source, { label: path.basename(documentPath) }).errors) {
-		diagnostics.push({ severity: 'error', line: error.line ?? getLineFromMessage(error.message), message: error.message });
-	}
-	for (const reference of extractMarkdownImageReferences(source)) {
+	for (const reference of document.markdownImages) {
 		diagnostics.push({
 			code: 'local-markdown-image',
 			severity: 'warning',
@@ -590,21 +568,22 @@ export const getMarkdownDiagnostics = async ({ documentPath, source }) => {
 	}
 
 	const siteRoot = await findNornaSiteRoot(documentPath);
-	const page = siteRoot ? getPageContext(siteRoot, documentPath) : null;
-	if (!siteRoot || !page) return diagnostics;
+	const pageContext = siteRoot ? getPageContext(siteRoot, documentPath) : null;
+	if (!siteRoot || !pageContext) return diagnostics;
 
 	const index = await createSiteImageIndex(siteRoot);
-	for (const reference of getImageReferenceLines(source)) {
-		const expectedPath = path.join(page.imagesRoot, reference.filename);
+	for (const reference of document.managedImages) {
+		const filename = reference.image;
+		const expectedPath = path.join(pageContext.imagesRoot, filename);
 		if (await fileExists(expectedPath)) continue;
 
-		const candidates = index.filesByName.get(reference.filename) ?? [];
+		const candidates = index.filesByName.get(filename) ?? [];
 		if (candidates.length === 0) {
 			diagnostics.push({
 				code: 'missing-image',
 				severity: 'error',
 				line: reference.line,
-				message: `Image "${reference.filename}" was not found in this page's images folder or elsewhere in this Norna site.`,
+				message: `Image "${filename}" was not found in this page's images folder or elsewhere in this Norna site.`,
 			});
 			continue;
 		}
@@ -613,13 +592,13 @@ export const getMarkdownDiagnostics = async ({ documentPath, source }) => {
 				code: 'ambiguous-image',
 				severity: 'warning',
 				line: reference.line,
-				message: `Image "${reference.filename}" is ambiguous. Found: ${candidates.map((candidate) => toPosixPath(path.relative(siteRoot, candidate.absolutePath))).join(', ')}.`,
+				message: `Image "${filename}" is ambiguous. Found: ${candidates.map((candidate) => toPosixPath(path.relative(siteRoot, candidate.absolutePath))).join(', ')}.`,
 			});
 			continue;
 		}
 
 		const candidate = candidates[0];
-		const referencedBy = index.referencesByFilename.get(reference.filename) ?? [];
+		const referencedBy = index.referencesByFilename.get(filename) ?? [];
 		const currentRelativePath = toPosixPath(path.relative(siteRoot, documentPath));
 		const otherReferences = referencedBy.filter((contentPath) => contentPath !== currentRelativePath);
 		diagnostics.push({
@@ -631,8 +610,8 @@ export const getMarkdownDiagnostics = async ({ documentPath, source }) => {
 			severity: 'warning',
 			line: reference.line,
 			message: otherReferences.length > 0
-				? `Image "${reference.filename}" is stored at ${toPosixPath(path.relative(siteRoot, candidate.absolutePath))} and is still referenced by ${otherReferences.join(', ')}. Norna cannot relocate it safely.`
-				: `Image "${reference.filename}" is stored at ${toPosixPath(path.relative(siteRoot, candidate.absolutePath))}. Run "norna content:sync" to relocate it to this page's images folder.`,
+				? `Image "${filename}" is stored at ${toPosixPath(path.relative(siteRoot, candidate.absolutePath))} and is still referenced by ${otherReferences.join(', ')}. Norna cannot relocate it safely.`
+				: `Image "${filename}" is stored at ${toPosixPath(path.relative(siteRoot, candidate.absolutePath))}. Run "norna content:sync" to relocate it to this page's images folder.`,
 		});
 	}
 
@@ -650,6 +629,6 @@ export const nornaBlockDefinitions = Object.freeze({
 	}),
 	'norna-card-list': Object.freeze({
 		...nornaMarkdownBlockDefinitions['norna-card-list'],
-		snippet: '```norna-card-list\nlayout: ${1|image-top,image-left,image-right|}\nflow: ${2|grid,stack|}\nsize: ${3|s,m,l,xl|}\nwidth: ${4|text,narrow,normal,wide|}\n\n- title: ${5:Card title}\n  text: ${6:Card text}\n  image: ${7:filename.jpg}\n```',
+		snippet: '```norna-card-list\nlayout: ${1|image-top,image-left,image-right|}\nflow: ${2|grid,stack|}\nsize: ${3|s,m,l,xl|}\n\n- title: ${4:Card title}\n  text: ${5:Card text}\n  image: ${6:filename.jpg}\n```',
 	}),
 });

package/scripts/lib/heading-ids.mjs

@@ -21,7 +21,7 @@ const transliterateToAscii = (value) => Array.from(value)
 	.map((character) => transliterations.get(character) ?? character)
 	.join('');
 
-export const slugifyHeadingText = (value) => transliterateToAscii(value
+export const slugifyAsciiIdentifier = (value) => transliterateToAscii(value
 	.normalize('NFKD')
 	.toLowerCase())
 	.replace(/\p{Mark}+/gu, '')
@@ -29,6 +29,8 @@ export const slugifyHeadingText = (value) => transliterateToAscii(value
 	.replace(/[^a-z0-9]+/g, '-')
 	.replace(/^-+|-+$/g, '');
 
+export const slugifyHeadingText = slugifyAsciiIdentifier;
+
 const getNodeText = (node) => {
 	if (!node || typeof node !== 'object') return '';
 	if (node.type === 'text' || node.type === 'inlineCode') return node.value ?? '';
@@ -77,7 +79,7 @@ export const getMarkdownHeadings = async (source) => {
 			),
 		}));
 
-	return { headings, source: normalizedSource };
+	return { headings, source: normalizedSource, tree };
 };
 
 export const getHeadingIdentifierIssues = (headings) => {

package/scripts/lib/image-presentation.mjs

@@ -0,0 +1,2 @@
+export const imagePresentationNames = Object.freeze(['prose-aligned', 'centered-fit']);
+export const defaultImagePresentation = 'prose-aligned';