@janga/norna 0.7.7 → 0.7.9

package/examples/typography-presets/site/content.md

@@ -0,0 +1,134 @@
+---
+title: Typography Presets
+description: A Norna example page showing every built-in typography preset.
+navigation:
+  label: Presets
+sections:
+  quiet-gallery:
+    presentation:
+      typography:
+        preset: quiet-gallery
+  compact-gallery:
+    presentation:
+      typography:
+        preset: compact-gallery
+  text-forward:
+    presentation:
+      typography:
+        preset: text-forward
+  statement:
+    presentation:
+      typography:
+        preset: statement
+---
+
+## Quiet Gallery {#quiet-gallery}
+
+This section uses the `quiet-gallery` preset. Its purpose is to keep text
+restrained so images can carry much of the page without the typography
+competing for attention.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a
+ante venenatis dapibus posuere velit aliquet. Maecenas faucibus mollis
+interdum. Donec ullamcorper nulla non metus auctor fringilla.
+
+### Reading rhythm
+
+Curabitur blandit tempus porttitor. Praesent commodo cursus magna, vel
+scelerisque nisl consectetur et. Vestibulum id ligula porta felis euismod
+semper.
+
+```norna-image-stack
+- image: puppy-portrait.jpg
+  alt: A puppy sitting outdoors and looking toward the camera.
+  caption: Puppy portrait. Photo by Bicanski, CC0, via Pixnio.
+- image: shepherd-portrait.jpg
+  alt: A shepherd dog standing outdoors and looking toward the camera.
+  caption: Shepherd dog portrait. Photo by Bicanski, CC0, via Pixnio.
+- image: white-puppy.jpg
+  alt: A white puppy outdoors in winter.
+  caption: White puppy outdoors. Photo by Bicanski, CC0, via Pixnio.
+```
+
+## Compact Gallery {#compact-gallery}
+
+This section uses the `compact-gallery` preset. Its purpose is to make denser
+image-led pages easier to scan when a site contains many sections, many images
+or short information blocks.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean lacinia
+bibendum nulla sed consectetur. Etiam porta sem malesuada magna mollis euismod.
+
+### Dense sections
+
+Nullam id dolor id nibh ultricies vehicula ut id elit. Fusce dapibus, tellus ac
+cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit
+amet risus.
+
+```norna-image-stack
+- image: schnauzer-portrait.jpg
+  alt: A schnauzer-type dog sitting outdoors.
+  caption: Schnauzer portrait. Photo by Bicanski, CC0, via Pixnio.
+- image: black-schnauzer.jpg
+  alt: A black schnauzer-type dog standing on grass.
+  caption: Black hunting dog portrait. Photo by Bicanski, CC0, via Pixnio.
+- image: retriever-portrait.jpg
+  alt: A retriever-type dog sitting outdoors.
+  caption: Retriever portrait. Photo by Bicanski, CC0, via Pixnio.
+```
+
+## Text Forward {#text-forward}
+
+This section uses the `text-forward` preset. Its purpose is to give longer
+explanatory text more presence while still supporting image captions and
+image-led sections.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed posuere
+consectetur est at lobortis. Cras mattis consectetur purus sit amet fermentum.
+Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.
+
+### Longer explanations
+
+Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Donec sed odio
+dui. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget
+lacinia odio sem nec elit.
+
+```norna-image-stack
+- image: grass-puppy.jpg
+  alt: A puppy standing in green grass.
+  caption: Puppy in grass. Photo by Bicanski, CC0, via Pixnio.
+- image: grey-street-dog.jpg
+  alt: A grey dog standing on a paved street.
+  caption: Grey dog on pavement. Photo by Bicanski, CC0, via Pixnio.
+- image: boxer-portrait.jpg
+  alt: A brown boxer-type dog looking at the camera.
+  caption: Brown dog portrait. Photo by Bicanski, CC0, via Pixnio.
+```
+
+## Statement {#statement}
+
+This section uses the `statement` preset. Its purpose is to make short,
+declarative sections feel more direct and programmatic. It is intentionally
+stronger than the other presets and should usually be used sparingly.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec id elit non mi
+porta gravida at eget metus. Integer posuere erat a ante venenatis dapibus
+posuere velit aliquet.
+
+### Short emphasis
+
+Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Aenean
+lacinia bibendum nulla sed consectetur. Maecenas sed diam eget risus varius
+blandit sit amet non magna.
+
+```norna-image-stack
+- image: sheepdog-grass.jpg
+  alt: A sheepdog puppy sitting in green grass.
+  caption: Sheepdog puppy in grass. Photo by Bicanski, CC0, via Pixnio.
+- image: sheepdog-wide.jpg
+  alt: A sheepdog puppy lying outdoors.
+  caption: Sheepdog puppy outdoors. Photo by Bicanski, CC0, via Pixnio.
+- image: black-pedigree.jpg
+  alt: A black dog standing in grass.
+  caption: Black pedigree dog portrait. Photo by Bicanski, CC0, via Pixnio.
+```

package/examples/typography-presets/site/public/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow:

package/examples/typography-presets/site/theme.md

@@ -0,0 +1,43 @@
+---
+navigation:
+  brand: Typography Presets
+layout:
+  density: normal
+  pageWidth: 1320px
+  gutter:
+    desktop: clamp(1.25rem, 4vw, 3rem)
+    mobile: 1rem
+  spacing:
+    firstSectionTop:
+      desktop: clamp(1.5rem, 3vw, 2.5rem)
+      mobile: 1rem
+    sectionGap:
+      desktop: clamp(2rem, 4vw, 3.5rem)
+      mobile: 2rem
+    finalSectionBottom:
+      desktop: clamp(2rem, 4vw, 3.5rem)
+      mobile: 2rem
+    bodyToImages:
+      desktop: 1.25rem
+      mobile: 1rem
+    imageGap:
+      desktop: clamp(1.25rem, 3vw, 2.25rem)
+      mobile: 1.5rem
+gallery:
+  width: 70vw
+  maxAvailableWidthPercent:
+    desktop: 100
+    mobile: 100
+  maxAvailableHeightPercent:
+    desktop: 72
+    mobile: 68
+typography:
+  fontFamily: "Arial, 'Helvetica Neue', Helvetica, sans-serif"
+  preset: quiet-gallery
+  rhythm: normal
+presentation:
+  backgroundColor: "#f8f5ee"
+  textColor: "#17201d"
+frame:
+  colors: presentation
+---

package/package.json

@@ -2,7 +2,7 @@
   "name": "@janga/norna",
   "description": "A command-line publishing workflow for simple static sites.",
   "type": "module",
-  "version": "0.7.7",
+  "version": "0.7.9",
   "license": "GPL-3.0-only",
   "repository": {
     "type": "git",

package/scripts/lib/site-content.mjs

@@ -22,6 +22,9 @@ const inlineStyleReferenceRegex = /\[[^\]\n]+\]\{\.([a-z][a-z0-9-]*)\}/g;
 const frontmatterDelimiterRegex = /^---\s*$/;
 const knownContentTopLevelFrontmatterKeys = new Set(['title', 'description', 'navigation', 'presentation', 'frame', 'sections']);
 const knownThemeTopLevelFrontmatterKeys = new Set(['navigation', 'layout', 'gallery', 'typography', 'presentation', 'frame']);
+const frontmatterColorKeys = new Set(['backgroundColor', 'textColor', 'color']);
+const quotedHexColorRegex = /^["']#(?:[0-9a-fA-F]{3}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})["']$/;
+const unquotedHexColorRegex = /^#(?:[0-9a-fA-F]{3}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})$/;
 const knownNestedFrontmatterKeys = new Set([
 	'align',
 	'alt',
@@ -261,6 +264,79 @@ export const validateFrontmatterStructure = (frontmatter, addIssue, {
 	}
 };
 
+const stripInlineYamlComment = (value) => {
+	let quote = null;
+
+	for (let index = 0; index < value.length; index += 1) {
+		const character = value[index];
+		const previous = value[index - 1];
+
+		if ((character === '"' || character === "'") && previous !== '\\') {
+			quote = quote === character ? null : quote ?? character;
+			continue;
+		}
+
+		if (character === '#' && quote === null && /\s/.test(previous ?? '')) {
+			return value.slice(0, index).trimEnd();
+		}
+	}
+
+	return value.trim();
+};
+
+export const validateFrontmatterColorValues = (frontmatter, addIssue, label = 'Frontmatter') => {
+	const lines = frontmatter.split(/\r?\n/);
+	const pathStack = [];
+
+	for (const [index, line] of lines.entries()) {
+		const lineNumber = index + 1;
+		const trimmed = line.trim();
+
+		if (!trimmed || trimmed.startsWith('#') || frontmatterDelimiterRegex.test(line)) {
+			continue;
+		}
+
+		const match = line.match(/^(\s*)([A-Za-z][A-Za-z0-9-]*):\s*(.*?)\s*$/);
+		if (!match) continue;
+
+		const indent = match[1].length;
+		const key = match[2];
+		const rawValue = match[3].trim();
+
+		while (pathStack.length > 0 && pathStack[pathStack.length - 1].indent >= indent) {
+			pathStack.pop();
+		}
+
+		const pathLabel = [...pathStack.map((entry) => entry.key), key].join('.');
+
+		if (!frontmatterColorKeys.has(key)) {
+			if (!rawValue) {
+				pathStack.push({ indent, key });
+			}
+			continue;
+		}
+
+		const value = stripInlineYamlComment(rawValue);
+
+		if (quotedHexColorRegex.test(value)) continue;
+
+		if (unquotedHexColorRegex.test(rawValue)) {
+			addIssue({
+				severity: 'error',
+				message: `${label} line ${lineNumber} defines ${pathLabel} as an unquoted hex color. YAML treats "#" as the start of a comment unless the value is quoted.`,
+				fix: `Write it as ${key}: "#ffd84d" or another quoted hex color.`,
+			});
+			continue;
+		}
+
+		addIssue({
+			severity: 'error',
+			message: `${label} line ${lineNumber} defines ${pathLabel} with invalid color value ${rawValue || '(empty)'}.`,
+			fix: `Use a quoted hex color in #rgb, #rrggbb, or #rrggbbaa form, for example ${key}: "#ffd84d".`,
+		});
+	}
+};
+
 export const validateContentFrontmatterStructure = (frontmatter, addIssue) =>
 	validateFrontmatterStructure(frontmatter, addIssue, {
 		knownTopLevelFrontmatterKeys: knownContentTopLevelFrontmatterKeys,

package/scripts/lib/theme-config.mjs

@@ -2,6 +2,7 @@ import { readFile } from 'node:fs/promises';
 import { parseYamlMapping } from './frontmatter-yaml.mjs';
 import {
 	splitSiteFile,
+	validateFrontmatterColorValues,
 	validateFrontmatterIndentation,
 	validateThemeFrontmatterStructure,
 } from './site-content.mjs';
@@ -22,6 +23,7 @@ export const readThemeConfig = async () => {
 
 	validateFrontmatterIndentation(frontmatter, (issue) => issues.push(issue));
 	validateThemeFrontmatterStructure(frontmatter, (issue) => issues.push(issue));
+	validateFrontmatterColorValues(frontmatter, (issue) => issues.push(issue), siteThemeLabel);
 
 	if (issues.length > 0) {
 		throw new Error([

package/scripts/sync-content-sections.mjs

@@ -1,7 +1,9 @@
+import { execFile } from 'node:child_process';
 import { mkdir, rename, stat } from 'node:fs/promises';
 import { createInterface } from 'node:readline/promises';
 import { stdin as input, stdout as output } from 'node:process';
 import path from 'node:path';
+import { promisify } from 'node:util';
 import {
 	extractMarkdownImageReferences,
 	extractNornaMarkdownBlockDiagnostics,
@@ -18,6 +20,7 @@ import {
 	readThemeFile,
 	toPosixPath,
 	validateContentFrontmatterStructure,
+	validateFrontmatterColorValues,
 	validateFrontmatterIndentation,
 	validateThemeFrontmatterStructure,
 } from './lib/site-content.mjs';
@@ -25,8 +28,11 @@ import { readImageDimensions } from './lib/image-dimensions.mjs';
 import {
 	siteThemeLabel,
 	siteThemePath,
+	siteProjectRoot,
 } from './lib/site-paths.mjs';
 
+const execFileAsync = promisify(execFile);
+
 const args = new Set(process.argv.slice(2));
 const shouldWrite = args.has('--write');
 const shouldCheck = args.has('--check') || !shouldWrite;
@@ -60,7 +66,7 @@ const promptForWrite = async () => {
 	if (!process.stdin.isTTY) return false;
 
 	const rl = createInterface({ input, output });
-	const answer = await rl.question('This will move image files inside their current page or route image root if needed. Continue? [y/N] ');
+	const answer = await rl.question('This will move image files into the page or route image roots where Norna references them. Continue? [y/N] ');
 	rl.close();
 
 	return answer.trim().toLowerCase() === 'y';
@@ -172,16 +178,110 @@ const getExpectedImagePath = (contentFile, sectionId, imageName) =>
 const getExpectedImageLabel = (contentFile, sectionId, imageName) =>
 	`${contentFile.imagesLabel}/${sectionId}/${imageName}`;
 
-const getImageCandidates = (imageCandidatesByName, imageName, expectedPath) =>
-	(imageCandidatesByName.get(imageName) ?? []).filter((candidate) => candidate !== expectedPath);
+const getGlobalImageCandidates = (globalImageCandidatesByName, imageName, expectedPath) =>
+	(globalImageCandidatesByName.get(imageName) ?? []).filter(({ imagePath }) => imagePath !== expectedPath);
 
 const getReferenceLabel = (contentFile, section) => `${contentFile.contentLabel} [${section.id}]`;
 
+const getRootLabel = (contentFile) => contentFile.isHome
+	? contentFile.imagesLabel
+	: contentFile.imagesLabel.replace(/\/images$/, '');
+
+const getCandidateLabel = ({ contentFile, imagePath }) =>
+	`${contentFile.imagesLabel}/${toPosixPath(path.relative(contentFile.imagesDir, imagePath))}`;
+
+const addExpectedReference = (expectedReferencesByPath, expectedPath, expectedReference) => {
+	if (!expectedReferencesByPath.has(expectedPath)) {
+		expectedReferencesByPath.set(expectedPath, []);
+	}
+
+	expectedReferencesByPath.get(expectedPath).push(expectedReference);
+};
+
+const addGlobalImageCandidate = (globalImageCandidatesByName, imageName, candidate) => {
+	if (!globalImageCandidatesByName.has(imageName)) {
+		globalImageCandidatesByName.set(imageName, []);
+	}
+
+	globalImageCandidatesByName.get(imageName).push(candidate);
+};
+
+const assertCleanGitForCrossRootSync = async (moves) => {
+	if (!moves.some((move) => move.crossRoot)) return;
+
+	let stdout = '';
+	try {
+		({ stdout } = await execFileAsync('git', ['status', '--short'], {
+			cwd: siteProjectRoot,
+			maxBuffer: 1024 * 1024,
+		}));
+	} catch (error) {
+		addIssue({
+			severity: 'error',
+			message: 'Cross-route content sync requires a clean git working tree, but git status could not be checked.',
+			fix: 'Run content:sync inside a Git worktree, or move cross-route image files manually.',
+		});
+		return;
+	}
+
+	if (!stdout.trim()) return;
+
+	addIssue({
+		severity: 'error',
+		message: 'Cross-route content sync requires a clean git working tree before moving files between page or route image roots.',
+		fix: `Commit or stash your current changes, then run content:sync again. Current changes:\n${stdout.trim()}`,
+	});
+};
+
+const addConflictingMoveIssues = () => {
+	const movesBySource = new Map();
+	const movesByDestination = new Map();
+
+	for (const move of imageMoves) {
+		const sourceKey = move.from;
+		const destinationKey = move.to;
+
+		if (!movesBySource.has(sourceKey)) {
+			movesBySource.set(sourceKey, []);
+		}
+		movesBySource.get(sourceKey).push(move);
+
+		if (!movesByDestination.has(destinationKey)) {
+			movesByDestination.set(destinationKey, []);
+		}
+		movesByDestination.get(destinationKey).push(move);
+	}
+
+	for (const moves of movesBySource.values()) {
+		const destinations = new Set(moves.map((move) => move.to));
+		if (destinations.size <= 1) continue;
+
+		const firstMove = moves[0];
+		addSectionIssue(firstMove.contentFile, { id: firstMove.sectionId, heading: firstMove.sectionId }, {
+			severity: 'error',
+			message: `Cannot relocate "${firstMove.imageName}" because the same source file is referenced from multiple destinations: ${moves.map((move) => getExpectedImageLabel(move.contentFile, move.sectionId, move.imageName)).join(', ')}.`,
+			fix: 'Duplicate the image manually or rename one of the image files so each move has a single destination.',
+		});
+	}
+
+	for (const moves of movesByDestination.values()) {
+		const sources = new Set(moves.map((move) => move.from));
+		if (sources.size <= 1) continue;
+
+		const firstMove = moves[0];
+		addSectionIssue(firstMove.contentFile, { id: firstMove.sectionId, heading: firstMove.sectionId }, {
+			severity: 'error',
+			message: `Cannot relocate "${firstMove.imageName}" because multiple source files would move to ${getExpectedImageLabel(firstMove.contentFile, firstMove.sectionId, firstMove.imageName)}: ${moves.map((move) => getCandidateLabel(move.sourceContentFile ? { contentFile: move.sourceContentFile, imagePath: move.from } : move)).join(', ')}.`,
+			fix: 'Move the intended file manually or rename files so the destination is unambiguous.',
+		});
+	}
+};
+
 const validateImageReference = async (
 	contentFile,
 	section,
 	reference,
-	imageCandidatesByName,
+	globalImageCandidatesByName,
 	expectedReferencesByPath,
 ) => {
 	const imageName = reference.image;
@@ -194,11 +294,11 @@ const validateImageReference = async (
 		return expectedPath;
 	}
 
-	const candidates = getImageCandidates(imageCandidatesByName, imageName, expectedPath);
+	const candidates = getGlobalImageCandidates(globalImageCandidatesByName, imageName, expectedPath);
 	if (candidates.length === 0) {
 		addSectionIssue(contentFile, section, {
 			severity: 'error',
-			message: `Image "${imageName}" does not exist at ${expectedLabel} or anywhere under ${contentFile.imagesLabel}/.`,
+			message: `Image "${imageName}" does not exist at ${expectedLabel} or anywhere under any page or route image root.`,
 			fix: `Add the source image to ${contentFile.imagesLabel}/${section.id}/ or remove the Norna-managed image reference.`,
 		});
 		return null;
@@ -207,20 +307,21 @@ const validateImageReference = async (
 	if (candidates.length > 1) {
 		addSectionIssue(contentFile, section, {
 			severity: 'error',
-			message: `Cannot relocate "${imageName}". Multiple files with this filename were found: ${candidates.map((candidate) => `${contentFile.imagesLabel}/${toPosixPath(path.relative(contentFile.imagesDir, candidate))}`).join(', ')}.`,
-			fix: 'Move the intended file manually or rename files so the local move is unambiguous.',
+			message: `Cannot relocate "${imageName}". Multiple files with this filename were found: ${candidates.map(getCandidateLabel).join(', ')}.`,
+			fix: 'Move the intended file manually or rename files so the move is unambiguous.',
 		});
 		return null;
 	}
 
-	const sourcePath = candidates[0];
+	const sourceCandidate = candidates[0];
+	const sourcePath = sourceCandidate.imagePath;
 	const referencesAtCurrentLocation = (expectedReferencesByPath.get(sourcePath) ?? [])
-		.filter((expectedReference) => expectedReference.section.id !== section.id);
+		.filter((expectedReference) => expectedReference.contentFile !== contentFile || expectedReference.section.id !== section.id);
 
 	if (referencesAtCurrentLocation.length > 0) {
 		addSectionIssue(contentFile, section, {
 			severity: 'error',
-			message: `Cannot relocate "${imageName}" from ${contentFile.imagesLabel}/${toPosixPath(path.relative(contentFile.imagesDir, sourcePath))} because it is still referenced from ${referencesAtCurrentLocation.map((expectedReference) => getReferenceLabel(contentFile, expectedReference.section)).join(', ')}.`,
+			message: `Cannot relocate "${imageName}" from ${getCandidateLabel(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.',
 		});
 		return null;
@@ -231,15 +332,19 @@ const validateImageReference = async (
 		from: sourcePath,
 		to: expectedPath,
 		contentFile,
+		sourceContentFile: sourceCandidate.contentFile,
 		sectionId: section.id,
+		crossRoot: sourceCandidate.contentFile !== contentFile,
 	});
 	referencedImagePaths.add(sourcePath);
 
 	if (!shouldWrite) {
 		addSectionIssue(contentFile, section, {
 			severity: 'error',
-			message: `Image "${imageName}" is used here but is located in ${contentFile.imagesLabel}/${toPosixPath(path.relative(contentFile.imagesDir, sourcePath))}.`,
-			fix: 'Run norna content:sync to move it inside the current page or route image root.',
+			message: `Image "${imageName}" is used here but is located in ${getCandidateLabel(sourceCandidate)}.`,
+			fix: sourceCandidate.contentFile === contentFile
+				? 'Run norna content:sync to move it inside the current page or route image root.'
+				: `Run norna content:sync to move it from ${getRootLabel(sourceCandidate.contentFile)} to ${getRootLabel(contentFile)}. Cross-route sync requires a clean git working tree when files are moved.`,
 		});
 	}
 
@@ -290,6 +395,7 @@ try {
 	themeFrontmatter = (await readThemeFile(siteThemePath)).frontmatter;
 	validateFrontmatterIndentation(themeFrontmatter, addIssue);
 	validateThemeFrontmatterStructure(themeFrontmatter, addIssue);
+	validateFrontmatterColorValues(themeFrontmatter, addIssue, siteThemeLabel);
 } catch (error) {
 	if (error?.code !== 'ENOENT') {
 		throw error;
@@ -302,23 +408,30 @@ const themeInlineStyleNames = themeFrontmatter
 
 const contentFiles = await getContentFiles();
 const allImageFiles = [];
+const contentFileContexts = [];
+const globalImageCandidatesByName = new Map();
+const globalExpectedReferencesByPath = new Map();
 
 for (const contentFile of contentFiles) {
 	const { frontmatter, body } = await readSiteFile(contentFile.contentPath, contentFile.contentLabel);
 	const bodyLineOffset = frontmatter.split(/\r?\n/).length - 1;
 	validateFrontmatterIndentation(frontmatter, addIssue);
 	validateContentFrontmatterStructure(frontmatter, addIssue);
+	validateFrontmatterColorValues(frontmatter, addIssue, contentFile.contentLabel);
 
 	const frontmatterSections = getFrontmatterSections(frontmatter);
 	const frontmatterIds = new Set(frontmatterSections.map((section) => section.id));
 	const { sections } = getBodySections(body);
 	const sectionsById = new Map();
 	const blockResultsBySectionId = new Map();
-	const expectedReferencesByPath = new Map();
 	const imageCandidatesByName = await getImageCandidatesByName(contentFile.imagesDir);
 
-	for (const candidates of imageCandidatesByName.values()) {
-		allImageFiles.push(...candidates.map((imagePath) => ({ contentFile, imagePath })));
+	for (const [imageName, candidates] of imageCandidatesByName) {
+		for (const imagePath of candidates) {
+			const candidate = { contentFile, imagePath };
+			allImageFiles.push(candidate);
+			addGlobalImageCandidate(globalImageCandidatesByName, imageName, candidate);
+		}
 	}
 
 	for (const section of sections) {
@@ -354,13 +467,30 @@ for (const contentFile of contentFiles) {
 
 		for (const reference of getNornaBlockImageReferences(blockResults.blocks)) {
 			const expectedPath = getExpectedImagePath(contentFile, section.id, reference.image);
-			if (!expectedReferencesByPath.has(expectedPath)) {
-				expectedReferencesByPath.set(expectedPath, []);
-			}
-			expectedReferencesByPath.get(expectedPath).push({ section, reference });
+			addExpectedReference(globalExpectedReferencesByPath, expectedPath, { contentFile, section, reference });
 		}
 	}
 
+	contentFileContexts.push({
+		contentFile,
+		frontmatterIds,
+		sections,
+		sectionsById,
+		blockResultsBySectionId,
+		body,
+	});
+}
+
+for (const context of contentFileContexts) {
+	const {
+		contentFile,
+		frontmatterIds,
+		sections,
+		sectionsById,
+		blockResultsBySectionId,
+		body,
+	} = context;
+
 	for (const id of frontmatterIds) {
 		if (!sectionsById.has(id)) {
 			addContentIssue(contentFile, {
@@ -417,8 +547,8 @@ for (const contentFile of contentFiles) {
 				contentFile,
 				section,
 				reference,
-				imageCandidatesByName,
-				expectedReferencesByPath,
+				globalImageCandidatesByName,
+				globalExpectedReferencesByPath,
 			);
 			if (sourcePath) {
 				sourcePathsByImage.set(reference.image, sourcePath);
@@ -436,6 +566,12 @@ const unreferencedImages = allImageFiles
 	.map(({ contentFile, imagePath }) => `${contentFile.imagesLabel}/${toPosixPath(path.relative(contentFile.imagesDir, imagePath))}`)
 	.sort((left, right) => left.localeCompare(right, 'sv'));
 
+addConflictingMoveIssues();
+
+if (shouldWrite) {
+	await assertCleanGitForCrossRootSync(imageMoves);
+}
+
 if (hasErrors()) {
 	printReport(shouldWrite ? 'Content sync failed.' : 'Content check failed.', unreferencedImages);
 	process.exit(1);