@janga/norna 0.7.5 → 0.7.7

package/scripts/lib/site-content.mjs

@@ -10,14 +10,17 @@ import {
 	siteRoutesLabel,
 	siteThemeLabel,
 } from './site-paths.mjs';
+import { parseRouteDirectory } from './route-model.mjs';
 
-export const supportedImageExtensions = new Set(['.jpg', '.jpeg', '.png']);
+export const rasterImageExtensions = new Set(['.jpg', '.jpeg', '.png']);
+export const staticImageExtensions = new Set(['.svg']);
+export const supportedImageExtensions = new Set([...rasterImageExtensions, ...staticImageExtensions]);
 
 const h2Regex = /^##\s+.*$/gm;
 const explicitHeadingIdRegex = /\s*\{#([a-z0-9-]+)\}\s*$/;
 const inlineStyleReferenceRegex = /\[[^\]\n]+\]\{\.([a-z][a-z0-9-]*)\}/g;
 const frontmatterDelimiterRegex = /^---\s*$/;
-const knownContentTopLevelFrontmatterKeys = new Set(['title', 'description', 'slug', 'navigation', 'presentation', 'frame', 'sections']);
+const knownContentTopLevelFrontmatterKeys = new Set(['title', 'description', 'navigation', 'presentation', 'frame', 'sections']);
 const knownThemeTopLevelFrontmatterKeys = new Set(['navigation', 'layout', 'gallery', 'typography', 'presentation', 'frame']);
 const knownNestedFrontmatterKeys = new Set([
 	'align',
@@ -55,7 +58,6 @@ const knownNestedFrontmatterKeys = new Set([
 	'mobile',
 	'navigation',
 	'overrides',
-	'order',
 	'paragraphSpacing',
 	'pageWidth',
 	'preset',
@@ -85,7 +87,9 @@ export const getContentFiles = async () => {
 		imagesDir: siteImagesDir,
 		imagesLabel: siteImagesLabel,
 		isHome: true,
-		routeFolder: null,
+		routeDirectory: null,
+		routeId: null,
+		routeOrder: 0,
 	}];
 	const routeEntries = await readdir(siteRoutesDir, { withFileTypes: true }).catch((error) => {
 		if (error?.code === 'ENOENT') {
@@ -98,19 +102,23 @@ export const getContentFiles = async () => {
 	for (const entry of routeEntries) {
 		if (!entry.isDirectory()) continue;
 
-		const routeFolder = entry.name;
-		const routeDir = path.join(siteRoutesDir, routeFolder);
+		const routeDirectory = entry.name;
+		const routeDir = path.join(siteRoutesDir, routeDirectory);
 		const routeContentPath = path.join(routeDir, 'route-content.md');
 
 		if (!(await fileExists(routeContentPath))) continue;
 
+		const { routeId, routeOrder } = parseRouteDirectory(routeDirectory, `${siteRoutesLabel}/${routeDirectory}`);
+
 		contentFiles.push({
-			contentLabel: `${siteRoutesLabel}/${routeFolder}/route-content.md`,
+			contentLabel: `${siteRoutesLabel}/${routeDirectory}/route-content.md`,
 			contentPath: routeContentPath,
 			imagesDir: path.join(routeDir, 'images'),
-			imagesLabel: `${siteRoutesLabel}/${routeFolder}/images`,
+			imagesLabel: `${siteRoutesLabel}/${routeDirectory}/images`,
 			isHome: false,
-			routeFolder,
+			routeDirectory,
+			routeId,
+			routeOrder,
 		});
 	}
 
@@ -242,7 +250,7 @@ export const validateFrontmatterStructure = (frontmatter, addIssue, {
 		if (knownTopLevelFrontmatterKeys.has(key)) continue;
 
 		const fix = knownNestedFrontmatterKeys.has(key)
-			? `Indent "${key}:" under the section or object it belongs to. For image rows, "gallery:" normally belongs under a "sections" item.`
+			? `Indent "${key}:" under the object it belongs to, or move image content into Norna Markdown blocks.`
 			: `Move "${key}:" under the correct parent key, or remove it if it is not part of the ${fileKind} schema.`;
 
 		addIssue({
@@ -271,7 +279,6 @@ export const getFrontmatterSections = (frontmatter) => {
 	const sections = [];
 	const lines = frontmatter.split(/\r?\n/);
 	let inSections = false;
-	let currentSection = null;
 
 	for (const [index, line] of lines.entries()) {
 		if (/^sections:\s*$/.test(line)) {
@@ -282,30 +289,9 @@ export const getFrontmatterSections = (frontmatter) => {
 		if (!inSections) continue;
 		if (/^[a-zA-Z0-9_-]+:/.test(line)) break;
 
-		const sectionMatch = line.match(/^\s{2}-\s+id:\s*([a-z0-9-]+)\s*$/);
+		const sectionMatch = line.match(/^\s{2}([a-z0-9-]+):(?:\s+.*)?\s*$/);
 		if (sectionMatch) {
-			currentSection = { id: sectionMatch[1], images: [], imageReferences: [], carousels: [] };
-			sections.push(currentSection);
-			continue;
-		}
-
-		const carouselMatch = line.match(/^\s{6}-\s+carousel:\s*$/);
-		if (carouselMatch && currentSection) {
-			currentSection.carousels.push({ images: [], imageReferences: [], line: index + 1 });
-			continue;
-		}
-
-		const imageMatch = line.match(/^\s{6,}-\s+image:\s*["']?([^"'\n]+)["']?\s*$/);
-		if (imageMatch && currentSection) {
-			const image = imageMatch[1].trim();
-			const isCarouselImage = /^\s{10}-\s+image:/.test(line);
-			const carousel = isCarouselImage ? currentSection.carousels.at(-1) : null;
-			currentSection.images.push(image);
-			currentSection.imageReferences.push({ image, line: index + 1 });
-			if (carousel) {
-				carousel.images.push(image);
-				carousel.imageReferences.push({ image, line: index + 1 });
-			}
+			sections.push({ id: sectionMatch[1], line: index + 1 });
 		}
 	}
 
@@ -361,8 +347,9 @@ export const getBodySections = (body) => {
 		const text = body.slice(start, end).trimEnd();
 		const heading = match[0];
 		const id = getHeadingId(heading);
+		const line = body.slice(0, start).split(/\r?\n/).length;
 
-		sections.push({ id, heading, text });
+		sections.push({ id, heading, line, text });
 	}
 
 	return { prelude, sections };
@@ -391,7 +378,7 @@ export const getImageFiles = async (directory) => {
 	return files;
 };
 
-export const getImageIndex = async (contentDir, fail) => {
+export const getImageIndex = async (contentDir, fail, contentLabel = siteImagesLabel) => {
 	const imageFiles = await getImageFiles(contentDir);
 	const imagesByName = new Map();
 
@@ -400,7 +387,7 @@ export const getImageIndex = async (contentDir, fail) => {
 		const existingPath = imagesByName.get(imageName);
 
 		if (existingPath) {
-			fail(`Duplicate image filename "${imageName}" found at ${siteImagesLabel}/${toPosixPath(path.relative(contentDir, existingPath))} and ${siteImagesLabel}/${toPosixPath(path.relative(contentDir, imagePath))}. Image filenames must be globally unique.`);
+			fail(`Duplicate image filename "${imageName}" found at ${contentLabel}/${toPosixPath(path.relative(contentDir, existingPath))} and ${contentLabel}/${toPosixPath(path.relative(contentDir, imagePath))}. The filename is ambiguous within this page image root.`);
 			continue;
 		}
 
@@ -409,3 +396,24 @@ export const getImageIndex = async (contentDir, fail) => {
 
 	return imagesByName;
 };
+
+export const getImageCandidatesByName = async (contentDir) => {
+	const imageFiles = await getImageFiles(contentDir);
+	const imagesByName = new Map();
+
+	for (const imagePath of imageFiles) {
+		const imageName = path.basename(imagePath);
+
+		if (!imagesByName.has(imageName)) {
+			imagesByName.set(imageName, []);
+		}
+
+		imagesByName.get(imageName).push(imagePath);
+	}
+
+	for (const candidates of imagesByName.values()) {
+		candidates.sort((left, right) => left.localeCompare(right, 'sv'));
+	}
+
+	return imagesByName;
+};

package/scripts/show-typography.mjs

@@ -9,6 +9,7 @@ import {
 	typographyRhythms,
 } from './lib/typography.mjs';
 import {
+	getBodySections,
 	getContentFiles,
 	readSiteFile,
 	splitSiteFile,
@@ -268,11 +269,11 @@ const formatAnnotatedTypography = (annotated) => ({
 	resolved: annotateResolvedValues(annotated.resolved, annotated.sources),
 });
 
-const getSectionBlocks = (lines) => {
+const getSectionMetadataBlocks = (lines) => {
 	const sectionsMap = findMap(lines, 'sections');
-	if (!sectionsMap) return [];
+	if (!sectionsMap) return new Map();
 
-	const sections = [];
+	const sections = new Map();
 	let current = null;
 
 	for (let index = sectionsMap.index + 1; index < lines.length; index += 1) {
@@ -282,15 +283,16 @@ const getSectionBlocks = (lines) => {
 		const indent = countIndent(line);
 		if (indent <= sectionsMap.indent) break;
 
-		const sectionMatch = line.match(/^\s{2}-\s+id:\s*([a-z0-9-]+)\s*$/);
+		const sectionMatch = line.match(/^\s{2}([a-z0-9-]+):(?:\s+.*)?\s*$/);
 		if (sectionMatch) {
 			if (current) current.end = index;
 			current = { id: sectionMatch[1], start: index, end: lines.length };
-			sections.push(current);
+			sections.set(current.id, current);
 		}
 	}
 
-	const finalSection = sections.at(-1);
+	const sectionList = Array.from(sections.values());
+	const finalSection = sectionList.at(-1);
 	if (finalSection) {
 		const afterSections = lines.findIndex((line, index) => (
 			index > finalSection.start &&
@@ -328,7 +330,7 @@ const readThemeTypography = async () => {
 };
 
 const readPageTypography = async (contentFile, themeTypography) => {
-	const { frontmatter, frontmatterBody } = await readSiteFile(contentFile.contentPath, contentFile.contentLabel);
+	const { frontmatter, frontmatterBody, body } = await readSiteFile(contentFile.contentPath, contentFile.contentLabel);
 	const indentationIssues = [];
 	validateFrontmatterIndentation(frontmatter, (issue) => indentationIssues.push(issue));
 	validateContentFrontmatterStructure(frontmatter, (issue) => indentationIssues.push(issue));
@@ -345,8 +347,14 @@ const readPageTypography = async (contentFile, themeTypography) => {
 		? findMap(lines, 'typography', pagePresentation.index + 1, pagePresentation.nextIndex)?.value
 		: null;
 	const pageTypography = resolveAnnotatedTypographyOverride(themeTypography, pageTypographyConfig ?? undefined, contentFile.contentLabel);
-	const sections = getSectionBlocks(lines).map((section) => {
-		const presentation = findMap(lines, 'presentation', section.start + 1, section.end);
+	const sectionMetadataBlocks = getSectionMetadataBlocks(lines);
+	const sections = getBodySections(body).sections
+		.filter((section) => section.id)
+		.map((section) => {
+		const metadata = sectionMetadataBlocks.get(section.id);
+		const presentation = metadata
+			? findMap(lines, 'presentation', metadata.start + 1, metadata.end)
+			: null;
 		const typography = presentation
 			? findMap(lines, 'typography', presentation.index + 1, presentation.nextIndex)?.value
 			: null;
@@ -359,7 +367,7 @@ const readPageTypography = async (contentFile, themeTypography) => {
 
 	return {
 		source: contentFile.contentLabel,
-		route: contentFile.isHome ? '/' : `/${contentFile.routeFolder}/`,
+		route: contentFile.isHome ? '/' : `/${contentFile.routeId}/`,
 		pageTypography,
 		sections,
 	};