@janga/norna 0.7.27 → 0.7.29

package/scripts/lib/yaml-source-edit.mjs

@@ -0,0 +1,94 @@
+import { isMap, isScalar, isSeq, parseDocument } from 'yaml';
+
+const collectComments = (token, start, end, comments = []) => {
+	if (!token || typeof token !== 'object') return comments;
+	if (token.type === 'comment' && token.offset >= start && token.offset < end) comments.push(token.source);
+	for (const value of Object.values(token)) {
+		if (Array.isArray(value)) for (const item of value) collectComments(item, start, end, comments);
+		else if (value && typeof value === 'object') collectComments(value, start, end, comments);
+	}
+	return comments;
+};
+
+export const changeYamlField = (yaml, keys, value, eol) => {
+	const document = parseDocument(yaml, { keepSourceTokens: true });
+	if (document.errors.length) throw new Error('Repair the YAML before editing it automatically.');
+	if (document.contents && !isMap(document.contents)) throw new Error('This YAML document requires a mapping.');
+	const scalar = (data) => JSON.stringify(data);
+	const entryText = (key, data, indent) => {
+		const prefix = ' '.repeat(indent);
+		if (Array.isArray(data)) return `${prefix}${key}:${eol}${data.map((entry) => `${prefix}  - ${scalar(entry)}${eol}`).join('')}`;
+		return data && typeof data === 'object' && !Array.isArray(data)
+			? `${prefix}${key}:${eol}${Object.entries(data).map(([child, value]) => entryText(child, value, indent + 2)).join('')}`
+			: `${prefix}${key}: ${scalar(data)}${eol}`;
+	};
+	const edit = (start, end, text) => yaml.slice(0, start) + text + yaml.slice(end);
+	const insert = (map, key, data) => {
+		if (!map) return yaml + (yaml && !yaml.endsWith('\n') ? eol : '') + entryText(key, data, 0);
+		if (map.flow) {
+			const position = map.range[1] - 1;
+			const separator = map.items.length && !yaml.slice(0, position).trimEnd().endsWith(',') ? ', ' : '';
+			return edit(position, position, `${separator}${key}: ${scalar(data)}`);
+		}
+		const indent = map.items[0]?.key.srcToken.indent ?? 0;
+		const position = map.range[2];
+		return edit(position, position, `${position && yaml[position - 1] !== '\n' ? eol : ''}${entryText(key, data, indent)}`);
+	};
+	const visit = (map, remaining, ancestors = []) => {
+		const [key, ...rest] = remaining;
+		const pair = map?.items.find((item) => item.key.value === key);
+		if (!pair) {
+			if (value === undefined) return yaml;
+			return insert(map, key, rest.reduceRight((child, part) => ({ [part]: child }), value));
+		}
+		if (rest.length) {
+			if (!isMap(pair.value)) throw new Error(`Edit ${key} as a YAML mapping in the source before editing it automatically.`);
+			return visit(pair.value, rest, [...ancestors, { map, pair }]);
+		}
+		if (value !== undefined) {
+			if ((!isScalar(pair.value) && !(Array.isArray(value) && isSeq(pair.value))) || pair.value.anchor || pair.value.tag
+				|| (isSeq(pair.value) && pair.value.items.some((item) => !isScalar(item) || item.anchor || item.tag))) {
+				throw new Error(`Edit ${keys.join('.')} in the source; this field uses YAML anchors, tags or values that cannot be changed automatically.`);
+			}
+			if (Array.isArray(value) && !map.flow) {
+				// Keep aliases in block form so a later page:move can preserve
+				// old addresses without asking the author to reformat our output.
+				const start = yaml.lastIndexOf('\n', pair.key.range[0] - 1) + 1;
+				const end = pair.value.range[2];
+				const indent = pair.key.srcToken.indent ?? 0;
+				const comments = collectComments(pair.srcToken, start, end);
+				return edit(start, end, comments.map((comment) => `${' '.repeat(indent)}${comment}${eol}`).join('')
+					+ entryText(pair.key.value, value, indent));
+			}
+			const start = pair.value.range[0];
+			const end = pair.value.range[1];
+			const comments = collectComments(pair.value.srcToken, start, end);
+			const trailing = yaml.slice(start, end).endsWith('\n') ? eol : '';
+			return edit(start, end, scalar(value) + comments.map((comment) => ` ${comment}`).join('') + trailing);
+		}
+		return remove(map, pair, ancestors);
+	};
+	const remove = (map, pair, ancestors) => {
+		if (!map.flow && map.items.length === 1 && ancestors.length) {
+			const parent = ancestors.pop();
+			return remove(parent.map, parent.pair, ancestors);
+		}
+		let start = pair.key.range[0];
+		let end = pair.value?.range[2] ?? pair.key.range[2];
+		if (map.flow) {
+			end = pair.value?.range[1] ?? pair.key.range[1];
+			const index = map.items.indexOf(pair);
+			const previousComma = pair.srcToken?.start.find((token) => token.type === 'comma');
+			const nextComma = map.items[index + 1]?.srcToken?.start.find((token) => token.type === 'comma');
+			if (previousComma) start = previousComma.offset;
+			else if (nextComma) end = nextComma.offset + 1;
+		} else {
+			start = yaml.lastIndexOf('\n', start - 1) + 1;
+		}
+		const comments = collectComments(pair.srcToken, start, end);
+		const indent = pair.key.srcToken.indent ?? 0;
+		const replacement = comments.map((comment) => `${' '.repeat(indent)}${comment}${eol}`).join('');
+		return edit(start, end, replacement);
+	};
+	return visit(document.contents, keys);
+};

package/scripts/move-site-page.mjs

@@ -1,256 +1,48 @@
-import { randomUUID } from 'node:crypto';
-import {
-	access,
-	mkdir,
-	readFile,
-	rename,
-	rm,
-	rmdir,
-	writeFile,
-} from 'node:fs/promises';
 import path from 'node:path';
-import {
-	createPageMovePlan,
-	formatPageMovePlan,
-} from './lib/page-move-plan.mjs';
-import {
-	getSiteLinkGraph,
-	getSitePublicFiles,
-} from './lib/site-link-graph.mjs';
-import {
-	sitePagesDir,
-	sitePagesLabel,
-	siteProjectRoot,
-} from './lib/site-paths.mjs';
-import { getSiteStructure } from './lib/site-structure.mjs';
-
-const usage = `
-Usage:
-  norna page:move <old-url> <new-url> [--order <NNN>] [--no-aliases] [--write]
-
-Examples:
-  norna page:move /guides/install/ /guides/installation/
-  norna page:move /guides/install/ /reference/install/ --write
-
-The command is a dry run unless --write is present. If the old page has
-already been moved by hand, the same command reconciles its links and aliases.
-`.trim();
-
-const parseOrder = (value) => {
-	if (!/^\d{1,3}$/.test(value ?? '')) {
-		throw new Error(`Invalid --order "${value ?? ''}". Use an integer from 1 to 999.\n${usage}`);
-	}
-	const order = Number.parseInt(value, 10);
-	if (order < 1 || order > 999) {
-		throw new Error(`Invalid --order "${value}". Use an integer from 1 to 999.\n${usage}`);
-	}
-	return order;
-};
-
-const parseArgs = (rawArgs) => {
-	const options = {
-		help: false,
-		order: null,
-		preserveAliases: true,
-		urls: [],
-		write: false,
-	};
-	const seen = new Set();
-
-	for (let index = 0; index < rawArgs.length; index += 1) {
-		const arg = rawArgs[index];
-		if (arg === '-h' || arg === '--help') {
-			options.help = true;
-			continue;
-		}
-		if (arg === '--write') {
-			if (seen.has('write')) throw new Error(`--write may be specified only once.\n${usage}`);
-			seen.add('write');
-			options.write = true;
-			continue;
-		}
-		if (arg === '--no-aliases') {
-			if (seen.has('aliases')) throw new Error(`--no-aliases may be specified only once.\n${usage}`);
-			seen.add('aliases');
-			options.preserveAliases = false;
-			continue;
-		}
-		if (arg === '--order' || arg.startsWith('--order=')) {
-			if (seen.has('order')) throw new Error(`--order may be specified only once.\n${usage}`);
-			seen.add('order');
-			const inlineValue = arg.startsWith('--order=') ? arg.slice('--order='.length) : null;
-			const value = inlineValue ?? rawArgs[index + 1];
-			if (inlineValue === null) index += 1;
-			options.order = parseOrder(value);
-			continue;
-		}
-		if (arg.startsWith('-')) throw new Error(`Unknown option: ${arg}\n${usage}`);
-		options.urls.push(arg);
-	}
-
-	if (!options.help && options.urls.length !== 2) {
-		throw new Error(`page:move requires an old URL and a new URL.\n${usage}`);
-	}
-	return options;
-};
-
-const toDisplayPath = (filePath) => {
-	const relativePath = path.relative(siteProjectRoot, filePath);
-	return (relativePath && !relativePath.startsWith('..') && !path.isAbsolute(relativePath)
-		? relativePath
-		: filePath).split(path.sep).join('/');
-};
-
-const fileExists = async (filePath) => access(filePath).then(() => true, () => false);
-
-const writeFileAtomically = async (filePath, source, mode) => {
-	const temporaryPath = path.join(
-		path.dirname(filePath),
-		`.${path.basename(filePath)}.norna-${process.pid}-${randomUUID()}.tmp`,
-	);
-	try {
-		await writeFile(temporaryPath, source, { mode: mode & 0o777 });
-		await rename(temporaryPath, filePath);
-	} finally {
-		await rm(temporaryPath, { force: true });
-	}
-};
-
-const assertSourcesUnchanged = async (plan) => {
-	for (const file of plan.sourceFiles) {
-		const currentSource = await readFile(file.contentPath, 'utf8');
-		if (currentSource !== file.source) {
-			throw new Error([
-				`Page move stopped because ${file.contentLabel} changed after the plan was created.`,
-				'Run the command again to build a fresh plan. No file was changed.',
-			].join('\n'));
-		}
-	}
-};
-
-const assertFinalSite = async () => {
-	const structure = await getSiteStructure();
-	const graph = await getSiteLinkGraph({ siteStructure: structure });
-	if (graph.diagnostics.length === 0) return;
-	throw new Error([
-		'Post-move link validation failed.',
-		...graph.diagnostics.flatMap((diagnostic) => [
-			`- ${diagnostic.message}`,
-			...(diagnostic.fix ? [`  Fix: ${diagnostic.fix}`] : []),
-		]),
-	].join('\n'));
-};
-
-const applyPlan = async (plan) => {
-	await assertSourcesUnchanged(plan);
-	let collectionCreated = false;
-	let directoryMoved = false;
-	let fileWritten = false;
-
-	try {
-		if (plan.mode === 'move') {
-			if (!plan.destinationCollectionExists) {
-				await mkdir(plan.destinationCollectionDirectory);
-				collectionCreated = true;
-			}
-			try {
-				await rename(plan.sourceDirectory, plan.destinationDirectory);
-				directoryMoved = true;
-			} catch (error) {
-				if (error?.code === 'EXDEV') {
-					throw new Error('Page directories must stay on one filesystem so Norna can move the complete subtree atomically.');
-				}
-				throw error;
-			}
-		}
-
-		for (const change of plan.fileChanges) {
-			await writeFileAtomically(change.finalPath, change.updatedSource, change.mode);
-			fileWritten = true;
-		}
-		await assertFinalSite();
-	} catch (error) {
-		const changesStarted = directoryMoved || fileWritten;
-		const rollbackErrors = [];
-		if (directoryMoved) {
-			try {
-				await rename(plan.destinationDirectory, plan.sourceDirectory);
-				directoryMoved = false;
-			} catch (rollbackError) {
-				rollbackErrors.push(`Could not restore the page directory: ${rollbackError.message}`);
-			}
-		}
-
-		for (const change of plan.fileChanges) {
-			try {
-				const restorePath = directoryMoved && change.finalPath !== change.originalPath
-					? change.finalPath
-					: change.originalPath;
-				await writeFileAtomically(restorePath, change.originalSource, change.mode);
-			} catch (rollbackError) {
-				rollbackErrors.push(`Could not restore ${change.contentLabel}: ${rollbackError.message}`);
-			}
-		}
-
-		if (collectionCreated && !directoryMoved) {
-			try {
-				await rmdir(plan.destinationCollectionDirectory);
-			} catch (rollbackError) {
-				if (rollbackError?.code !== 'ENOENT' && rollbackError?.code !== 'ENOTEMPTY') {
-					rollbackErrors.push(`Could not remove the newly created pages directory: ${rollbackError.message}`);
-				}
-			}
-		}
-
-		throw new Error([
-			error instanceof Error ? error.message : String(error),
-			rollbackErrors.length === 0
-				? (changesStarted
-					? 'The original page directory and content files were restored.'
-					: 'No source file was changed.')
-				: 'Rollback was incomplete. Inspect these paths before running page:move again:',
-			...rollbackErrors.map((message) => `- ${message}`),
-		].join('\n'));
-	}
-};
-
-const main = async () => {
-	const options = parseArgs(process.argv.slice(2));
-	if (options.help) {
-		console.log(usage);
-		return;
-	}
-
-	const siteStructure = await getSiteStructure();
-	const [graph, publicFiles] = await Promise.all([
-		getSiteLinkGraph({ siteStructure }),
-		getSitePublicFiles(),
-	]);
-	const plan = await createPageMovePlan({
-		from: options.urls[0],
-		graph,
-		order: options.order,
-		preserveAliases: options.preserveAliases,
-		publicFiles,
-		sitePagesDir,
-		sitePagesLabel,
-		siteStructure,
-		to: options.urls[1],
-	});
-
-	console.log(formatPageMovePlan(plan, toDisplayPath).join('\n'));
-	if (!options.write) {
-		console.log('\nDry run only. Run the same command with --write to apply this plan.');
-		return;
-	}
-
-	await applyPlan(plan);
-	console.log(`\nPage move completed: ${plan.from} -> ${plan.to}`);
-};
-
+import { applyPageMovePlan } from './lib/page-move-apply.mjs';
+import { createPageMovePlan, formatPageMovePlan } from './lib/page-move-plan.mjs';
+import { planEditorPagePlacement, applyEditorPagePlacement } from './lib/editor-page-placement.mjs';
+import { parsePlacementArguments, confirmCliRenumbering, describeRenumbering } from './lib/page-placement-cli.mjs';
+import { readEditorLinkState } from './lib/editor-site-links.mjs';
+import { sitePagesDir, sitePagesLabel, siteProjectRoot, siteDir } from './lib/site-paths.mjs';
+
+const usage = `Usage:
+  norna page:move <old-url> <new-url> [--order <integer>]
+  norna page:move <page-url> --before <target-url> | --after <target-url>
+  norna page:move <page-url> --parent <parent-url> [--first | --last]
+
+Options: --no-aliases, --write, --dry-run, --allow-renumber
+Dry run unless --write is present. The URL-to-URL form also reconciles a page
+already moved by hand. Renumbering other pages requires confirmation.`;
+const display = filename => path.relative(siteProjectRoot, filename) || filename;
 try {
-	await main();
-} catch (error) {
-	console.error(error instanceof Error ? error.message : String(error));
-	process.exit(1);
-}
+ const options = parsePlacementArguments(process.argv.slice(2));
+ if (options.help) { console.log(usage); process.exit(0); }
+ if (options.slug !== null) throw new Error('Use the new URL to change a slug with page:move.');
+ const relative = options.placement !== null;
+ if (options.positionals.length !== (relative ? 1 : 2)) throw new Error(usage);
+ if (relative && options.order !== null) throw new Error('Do not combine --order with a placement selector.');
+ const state = await readEditorLinkState({ siteRoot: siteDir });
+ if (state.incomplete.length) throw new Error(state.incomplete.join('\n'));
+ let plan;
+ if (relative) {
+  const find = url => state.structure.nodes.find(node => (node.isHome ? '/' : `/${node.pagePath}/`) === url);
+  const source = find(options.positionals[0]), target = find(options.target);
+  if (!source || !target) throw new Error('Choose existing source and target page URLs.');
+  plan = await planEditorPagePlacement({ siteRoot: siteDir, sourcePath: source.contentPath, targetPath: target.contentPath,
+   placement: options.placement, preserveAliases: options.preserveAliases });
+  console.log(`Page placement: ${plan.sourceUrl} ${options.placement} ${options.target}\nOrder: ${plan.sourceOrder}`);
+  if (plan.movePreview) console.log(formatPageMovePlan(plan.movePreview, display).join('\n'));
+  else if (plan.orderChanges.length) console.log(describeRenumbering(plan.orderChanges, display));
+ } else {
+  plan = await createPageMovePlan({ from: options.positionals[0], to: options.positionals[1], order: options.order,
+   preserveAliases: options.preserveAliases, graph: state.graph, publicFiles: state.publicFiles,
+   siteStructure: state.structure, sitePagesDir, sitePagesLabel, generatedRoutes: state.generatedRoutes });
+  console.log(formatPageMovePlan(plan, display).join('\n'));
+ }
+ if (!options.write) { console.log('\nDry run only. Run with --write to apply this plan.'); process.exit(0); }
+ if (!await confirmCliRenumbering(plan.orderChanges, options)) { console.log('Cancelled. No files changed.'); process.exit(0); }
+ if (relative) await applyEditorPagePlacement(plan, { allowRenumber: true });
+ else await applyPageMovePlan(plan, { siteRoot: siteDir, generatedRoutes: state.generatedRoutes, allowRenumber: true });
+ console.log(`Page move completed: ${plan.sourceUrl ?? plan.from} -> ${plan.destinationUrl ?? plan.to}. ${plan.orderChanges.length} existing sibling page(s) renumbered.`);
+} catch (error) { console.error(error.message); process.exitCode = 1; }

package/scripts/show-typography.mjs

@@ -1,6 +1,4 @@
 import {
-	defaultTypography,
-	resolveTypographyConfig,
 	toYamlLines,
 	typographyProfiles,
 	typographyRhythms,
@@ -13,10 +11,13 @@ import {
 } from './lib/site-content.mjs';
 import { parsePageMarkdown } from './lib/page-markdown.mjs';
 import {
+	siteDir,
 	siteThemeLabel,
 } from './lib/site-paths.mjs';
 import { readThemeConfig } from './lib/theme-config.mjs';
 import { resolveThemeConfig } from './lib/theme-presets.mjs';
+import { selectPageTheme } from './lib/theme-packages.mjs';
+import { resolveThemePresentation } from './lib/presentation.mjs';
 
 const mode = process.argv[2] ?? 'show';
 
@@ -137,14 +138,14 @@ const defaultSources = (profileName, rhythmName) => {
 	return sources;
 };
 
-const applyOverrideSources = (sources, typographyConfig, sourceLabel) => {
+const applyOverrideSources = (sources, typographyConfig, sourceFor) => {
 	const overrides = typographyConfig?.overrides;
 	if (!overrides) return sources;
 
 	for (const path of typographyValuePaths) {
 		if (hasPath(overrides, path)) {
 			setPath(sources, path, {
-				source: `${sourceLabel} override`,
+				source: `${sourceFor(['typography', 'overrides', ...path])} override`,
 				inherited: false,
 			});
 		}
@@ -153,25 +154,38 @@ const applyOverrideSources = (sources, typographyConfig, sourceLabel) => {
 	return sources;
 };
 
-const resolveAnnotatedTypographyConfig = (typographyConfig, sourceLabel) => {
-	const resolved = resolveTypographyConfig(typographyConfig ?? defaultTypography);
+const resolveAnnotatedTypographyConfig = (theme, sourceLabel, sourceFiles) => {
+	const normalized = resolveThemeConfig(theme, sourceLabel);
+	const typographyConfig = normalized.typography;
+	const resolved = resolveThemePresentation(theme, sourceLabel).typography;
+	// Attribute a value to its last authored setting, stopping at the preset
+	// that replaced its base. The resolver still determines all effective values.
+	const sourceFor = (propertyPath) => {
+		for (const file of sourceFiles.toReversed()) {
+			if (hasPath(file.config, propertyPath)) return file.label;
+			if (file.config.preset !== undefined) return `preset:${file.config.preset} (${file.label})`;
+		}
+		return 'engine default';
+	};
 	const sources = applyOverrideSources(
 		defaultSources(resolved.profile, resolved.rhythm),
 		typographyConfig,
-		sourceLabel,
+		sourceFor,
 	);
+	if (normalized.layout?.textWidth !== undefined) {
+		setPath(sources, ['body', 'width'], { source: sourceFor(['layout', 'textWidth']), inherited: false });
+	}
 
 	return {
 		profile: {
 			value: resolved.profile,
-			source: typographyConfig?.profile ? sourceLabel : 'engine default',
-			...(typographyConfig?.profile ? {} : { inherited: true }),
+			source: sourceFor(['typography', 'profile']),
 		},
 		rhythm: {
 			value: resolved.rhythm,
-			source: typographyConfig?.rhythm ? sourceLabel : 'engine default',
-			...(typographyConfig?.rhythm ? {} : { inherited: true }),
+			source: sourceFor(['typography', 'rhythm']),
 		},
+		fontFamily: { value: typographyConfig.fontFamily, source: sourceFor(['typography', 'fontFamily']) },
 		resolved,
 		sources,
 	};
@@ -180,16 +194,16 @@ const resolveAnnotatedTypographyConfig = (typographyConfig, sourceLabel) => {
 const formatAnnotatedTypography = (annotated) => ({
 	profile: annotated.profile,
 	rhythm: annotated.rhythm,
+	fontFamily: annotated.fontFamily,
 	resolved: annotateResolvedValues(annotated.resolved, annotated.sources),
 });
 
 const readThemeTypography = async () => {
-	const themeConfig = resolveThemeConfig(await readThemeConfig(), siteThemeLabel);
-	const themeTypographyConfig = themeConfig.typography;
-	return resolveAnnotatedTypographyConfig(themeTypographyConfig ?? defaultTypography, siteThemeLabel);
+	const config = await readThemeConfig();
+	return resolveAnnotatedTypographyConfig(config, siteThemeLabel, [{ config, label: siteThemeLabel }]);
 };
 
-const readPageTypography = async (contentFile, siteThemeTypography) => {
+const readPageTypography = async (contentFile) => {
 	const { frontmatter, body } = await readSiteFile(contentFile.contentPath, contentFile.contentLabel);
 	const indentationIssues = [];
 	validateFrontmatterIndentation(frontmatter, (issue) => indentationIssues.push(issue));
@@ -201,7 +215,8 @@ const readPageTypography = async (contentFile, siteThemeTypography) => {
 		].join('\n'));
 	}
 
-	const pageTypography = siteThemeTypography;
+	const { selected, sourceFiles } = await selectPageTheme({ siteRoot: siteDir, pageDirectory: contentFile.pageDirectory });
+	const pageTypography = resolveAnnotatedTypographyConfig(selected.config, selected.label, sourceFiles);
 	const sections = (await parsePageMarkdown(body, { label: contentFile.contentLabel })).sections
 		.map((section) => {
 		return {
@@ -225,7 +240,7 @@ if (mode === 'profiles') {
 	}).join('\n'));
 } else if (mode === 'show') {
 	const themeTypography = await readThemeTypography();
-	const pages = await Promise.all((await getContentFiles()).map((contentFile) => readPageTypography(contentFile, themeTypography)));
+	const pages = await Promise.all((await getContentFiles()).map(readPageTypography));
 	const output = {
 		theme: {
 			source: siteThemeLabel,

package/scripts/sync-content-sections.mjs

@@ -1,3 +1,4 @@
+import { getSiteAttachments } from './lib/page-attachments.mjs';
 import { createInterface } from 'node:readline/promises';
 import { stdin as input, stdout as output } from 'node:process';
 import path from 'node:path';
@@ -233,7 +234,6 @@ try {
 const siteStructure = await getSiteStructure();
 const contentFiles = siteStructure.contentFiles;
 for (const warning of siteStructure.warnings) {
-	if (warning.code === 'empty-category') continue;
 	addIssue({
 		severity: 'warning',
 		message: warning.message,
@@ -273,7 +273,7 @@ for (const contentFile of contentFiles) {
 		prelude,
 		regions: sections,
 	} = page;
-	for (const issue of page.diagnostics.filter((candidate) => candidate.code === 'heading-inside-details')) {
+	for (const issue of page.diagnostics.filter((candidate) => ['heading-inside-details', 'invalid-markdown-image'].includes(candidate.code))) {
 		addContentIssue(contentFile, issue);
 	}
 	for (const issue of page.noteDiagnostics) {
@@ -424,17 +424,20 @@ const listedNavigationTree = getListedSiteNavigationTree(siteStructure.nodes.map
 	return {
 		node: {
 			...node,
-			navigation: {
-				listed: node.kind === 'category'
-					? true
-					: context?.frontmatterData.navigation?.listed ?? true,
-			},
+			navigation: { listed: context?.frontmatterData.navigation?.listed ?? true },
 		},
 	};
 }));
 
 for (const context of contentFileContexts) {
 	const childPages = getDirectChildPages(listedNavigationTree, context.contentFile.pagePath);
+	if (context.frontmatterData.page?.listChildren && childPages.length === 0) {
+		addContentIssue(context.contentFile, {
+			severity: 'warning',
+			message: 'page.listChildren has no listed direct child pages to display.',
+			fix: 'Add a listed direct child page, or remove page.listChildren while this page has no children.',
+		});
+	}
 	const warnedChildren = new Set();
 
 	for (const section of context.sections) {
@@ -444,7 +447,7 @@ for (const context of contentFileContexts) {
 			if (childPages.length === 0) {
 				addSectionIssue(context.contentFile, section, {
 					severity: 'error',
-					message: `page-list on line ${block.line} has no listed direct child pages to display. Navigation categories are not pages.`,
+					message: `page-list on line ${block.line} has no listed direct child pages to display.`,
 					fix: 'Add a listed direct child page or remove the block.',
 				});
 				continue;
@@ -466,12 +469,17 @@ for (const context of contentFileContexts) {
 }
 
 const siteLinkGraph = createSiteLinkGraph({
+	siteUrl: projectConfig.site.url,
+	attachments: await getSiteAttachments(siteStructure),
 	pageDocuments: contentFileContexts.map(({ contentFile, frontmatterData, page }) => ({
 		contentFile,
 		data: frontmatterData,
 		document: page,
 	})),
-	publicFiles: await getSitePublicFiles(),
+	publicFiles: await getSitePublicFiles(undefined, projectConfig).catch(error => {
+		addIssue({ severity: 'error', message: error.message, fix: 'Use the supported public-file locations and verificationFiles settings.' });
+		return [];
+	}),
 	siteStructure,
 	generatedRoutes: getGeneratedSiteRoutes({ searchEnabled: projectConfig.search.enabled }),
 });
@@ -529,14 +537,6 @@ for (const context of contentFileContexts) {
 	for (const section of sections) {
 		if (!validSections.has(section)) continue;
 
-		for (const reference of section.markdownImages) {
-			addSectionIssue(contentFile, section, {
-				severity: 'warning',
-				message: `Markdown image "${reference.target}" references a local image that is not managed by Norna.`,
-				fix: 'Use an image-stack, image-carousel, or card-list block for site images that should be validated, processed and synced.',
-			});
-		}
-
 		const { blocks, errors: blockErrors } = blockResultsBySection.get(section) ?? { blocks: [], errors: [] };
 		for (const error of blockErrors) {
 			addSectionIssue(contentFile, section, {