@janga/norna 0.7.16 → 0.7.18

package/src/lib/sitePages.ts

@@ -1,5 +1,6 @@
 import type { CollectionEntry } from 'astro:content';
-import { parseRouteDirectory } from '../../scripts/lib/route-model.mjs';
+import { decodePageDirectoryPath, parsePageDirectoryPath } from '../../scripts/lib/page-model.mjs';
+import { homePageDirectory } from '../../scripts/lib/site-conventions.mjs';
 
 type SiteEntry = CollectionEntry<'site'>;
 
@@ -7,66 +8,118 @@ export type SitePage = {
 	entry: SiteEntry;
 	isHome: boolean;
 	navigation: {
-		include: boolean;
-		label: string;
+		listed: boolean;
 		order: number;
 	};
+	depth: number;
+	pageDirectories: string[];
 	pathSegment: string;
 	pathname: string;
-	routeDirectory: string | null;
-	routeId: string;
+	pageDirectory: string;
+	pageId: string;
+	pageIds: string[];
+	pageOrders: number[];
+	pagePath: string;
+	parentPagePath: string | null;
 	title: string;
 };
 
-const routeIdMarker = '-route-';
+const pageIdMarker = '-page-';
 
-const stripRouteIdPrefix = (id: string) => {
-	const markerIndex = id.indexOf(routeIdMarker);
-	return markerIndex === -1 ? null : id.slice(markerIndex + routeIdMarker.length);
+const stripPageIdPrefix = (id: string) => {
+	const markerIndex = id.lastIndexOf(pageIdMarker);
+	if (markerIndex === -1) return null;
+
+	const candidate = id.slice(markerIndex + pageIdMarker.length);
+	try {
+		return parsePageDirectoryPath(decodePageDirectoryPath(candidate)).pageDirectory;
+	} catch {
+		return null;
+	}
 };
 
-export const isHomePageEntry = (entry: SiteEntry) => stripRouteIdPrefix(entry.id) === null;
+export const isHomePageEntry = (entry: SiteEntry) => stripPageIdPrefix(entry.id) === homePageDirectory;
 
-const getRouteDirectory = (entry: SiteEntry) => isHomePageEntry(entry) ? null : stripRouteIdPrefix(entry.id);
+const getPageDirectory = (entry: SiteEntry) => {
+	const pageDirectory = stripPageIdPrefix(entry.id);
+	if (!pageDirectory) throw new Error(`Page entry "${entry.id}" has no valid page directory.`);
+	return pageDirectory;
+};
 
-const getRouteMetadata = (entry: SiteEntry) => {
-	const routeDirectory = getRouteDirectory(entry);
-	return routeDirectory ? parseRouteDirectory(routeDirectory, `route directory ${routeDirectory}`) : null;
+const getPageMetadata = (entry: SiteEntry) => {
+	const pageDirectory = getPageDirectory(entry);
+	return parsePageDirectoryPath(pageDirectory, `page directory ${pageDirectory}`);
 };
 
 const getPagePathname = (pathSegment: string) => pathSegment ? `/${pathSegment}/` : '/';
 
+const compareNumberPaths = (left: number[], right: number[]) => {
+	const sharedLength = Math.min(left.length, right.length);
+	for (let index = 0; index < sharedLength; index += 1) {
+		const difference = left[index] - right[index];
+		if (difference !== 0) return difference;
+	}
+
+	return left.length - right.length;
+};
+
+const decodeHtmlEntities = (value: string) => value
+	.replace(/&amp;/g, '&')
+	.replace(/&lt;/g, '<')
+	.replace(/&gt;/g, '>')
+	.replace(/&quot;/g, '"')
+	.replace(/&#39;/g, "'");
+
+const getPageTitle = (entry: SiteEntry) => {
+	const html = entry.rendered?.html ?? '';
+	const headings = Array.from(html.matchAll(/<h1\b[^>]*>([\s\S]*?)<\/h1>/gi));
+	if (headings.length !== 1) {
+		throw new Error(`Page entry "${entry.id}" must contain exactly one Markdown H1 page title.`);
+	}
+
+	return decodeHtmlEntities((headings[0]?.[1] ?? '').replace(/<[^>]*>/g, '')).trim();
+};
+
 export const getSitePage = (entry: SiteEntry): SitePage => {
 	const isHome = isHomePageEntry(entry);
-	const routeMetadata = getRouteMetadata(entry);
-	const routeDirectory = routeMetadata?.routeDirectory ?? null;
-	const routeId = routeMetadata?.routeId ?? '';
-	const pathSegment = isHome ? '' : routeId;
+	const pageMetadata = getPageMetadata(entry);
+	const pageDirectory = pageMetadata.pageDirectory;
+	const pageId = pageMetadata.pageId;
+	const pagePath = pageMetadata.pagePath;
+	const pathSegment = isHome ? '' : pagePath;
 	const navigation = entry.data.navigation ?? {};
 
 	return {
 		entry,
 		isHome,
+		depth: pageMetadata.depth,
 		navigation: {
-			include: navigation.include ?? true,
-			label: navigation.label ?? entry.data.title,
-			order: isHome ? 0 : routeMetadata?.routeOrder ?? 100,
+		listed: navigation.listed ?? true,
+			order: isHome ? 0 : pageMetadata.pageOrder,
 		},
 		pathSegment,
 		pathname: getPagePathname(pathSegment),
-		routeDirectory,
-		routeId,
-		title: entry.data.title,
+		pageDirectory,
+		pageDirectories: pageMetadata.pageDirectories,
+		pageId,
+		pageIds: pageMetadata.pageIds,
+		pageOrders: pageMetadata.pageOrders,
+		pagePath,
+		parentPagePath: isHome ? null : pageMetadata.parentPagePath,
+		title: getPageTitle(entry),
 	};
 };
 
 export const getSitePages = (entries: SiteEntry[]) => {
 	const pages = entries.map(getSitePage);
 	const pathnames = new Map<string, SitePage>();
-	const routeIds = new Map<string, SitePage>();
-	const routeOrders = new Map<number, SitePage>();
+	const siblingPageIds = new Map<string, SitePage>();
+	const siblingPageOrders = new Map<string, SitePage>();
 
 	for (const page of pages) {
+		if (page.isHome && page.navigation.listed === false) {
+			throw new Error(`${homePageDirectory} is the required homepage and cannot set navigation.listed to false.`);
+		}
 		const existing = pathnames.get(page.pathname);
 		if (existing) {
 			throw new Error(`Duplicate page path "${page.pathname}" from "${existing.entry.id}" and "${page.entry.id}".`);
@@ -76,26 +129,31 @@ export const getSitePages = (entries: SiteEntry[]) => {
 
 		if (page.isHome) continue;
 
-		const existingRouteId = routeIds.get(page.routeId);
-		if (existingRouteId) {
-			throw new Error(`Duplicate route id "${page.routeId}" from "${existingRouteId.entry.id}" and "${page.entry.id}".`);
+		const siblingScope = page.pageDirectories.slice(0, -1).join('/pages/');
+		const pageIdKey = `${siblingScope}\0${page.pageId}`;
+		const existingPageId = siblingPageIds.get(pageIdKey);
+		if (existingPageId) {
+			throw new Error(`Duplicate sibling page id "${page.pageId}" below "${page.parentPagePath ?? '/'}" from "${existingPageId.entry.id}" and "${page.entry.id}".`);
 		}
 
-		routeIds.set(page.routeId, page);
+		siblingPageIds.set(pageIdKey, page);
 
-		const existingRouteOrder = routeOrders.get(page.navigation.order);
-		if (existingRouteOrder) {
-			throw new Error(`Duplicate route order "${String(page.navigation.order).padStart(3, '0')}" from "${existingRouteOrder.entry.id}" and "${page.entry.id}".`);
+		const pageOrderKey = `${siblingScope}\0${page.navigation.order}`;
+		const existingPageOrder = siblingPageOrders.get(pageOrderKey);
+		if (existingPageOrder) {
+			throw new Error(`Duplicate sibling page order "${String(page.navigation.order).padStart(3, '0')}" below "${page.parentPagePath ?? '/'}" from "${existingPageOrder.entry.id}" and "${page.entry.id}".`);
 		}
 
-		routeOrders.set(page.navigation.order, page);
+		siblingPageOrders.set(pageOrderKey, page);
+	}
+	if (!pages.some(({ isHome }) => isHome)) {
+		throw new Error(`Homepage page entry ${homePageDirectory} is missing.`);
 	}
 
 	return pages.sort((left, right) => (
-		left.navigation.order - right.navigation.order ||
-		left.navigation.label.localeCompare(right.navigation.label, 'sv') ||
+		left.isHome ? -1 : right.isHome ? 1 :
+		compareNumberPaths(left.pageOrders, right.pageOrders) ||
+		left.title.localeCompare(right.title, 'sv') ||
 		left.pathname.localeCompare(right.pathname, 'sv')
 	));
 };
-
-export const getNavigationPages = (pages: SitePage[]) => pages.filter((page) => page.navigation.include);

package/src/pages/{[slug].astro → [...slug].astro}

@@ -18,13 +18,13 @@ export async function getStaticPaths() {
 const { entry } = Astro.props;
 
 if (!entry || isHomePageEntry(entry)) {
-	throw new Error('Route page entry is missing.');
+	throw new Error('Page entry is missing.');
 }
 
 const currentPage = getSitePage(entry);
 
 if (!currentPage.pathSegment) {
-	throw new Error(`Route "${entry.id}" needs a route id.`);
+	throw new Error(`Page "${entry.id}" needs a page id.`);
 }
 ---
 

package/src/pages/index.astro

@@ -2,9 +2,10 @@
 import { getCollection } from 'astro:content';
 import SitePage from '../components/SitePage.astro';
 import { isHomePageEntry } from '../lib/sitePages';
+import { homePageDirectory } from '../../scripts/lib/site-conventions.mjs';
 
 const siteDirectory = (process.env.NORNA_SITE_DIR ?? 'site').trim();
-const siteContentLabel = `${siteDirectory || 'site'}/content.md`;
+const siteContentLabel = `${siteDirectory || 'site'}/pages/${homePageDirectory}/content.md`;
 const entries = await getCollection('site');
 const site = entries.find(isHomePageEntry);