@janga/norna 0.7.22 → 0.7.24

package/src/lib/sitePages.ts

@@ -10,6 +10,7 @@ import { sitePagesDir, sitePagesLabel } from '../../scripts/lib/site-paths.mjs';
 type SiteEntry = CollectionEntry<'site'>;
 
 type SiteNodeBase = {
+	aliases: string[];
 	kind: 'category' | 'page';
 	isHome: boolean;
 	navigation: {
@@ -106,6 +107,7 @@ const createSitePage = async (entry: SiteEntry): Promise<SitePage> => {
 	const navigation = entry.data.navigation ?? {};
 
 	return {
+		aliases: entry.data.page?.aliases ?? [],
 		kind: 'page',
 		entry,
 		isHome,
@@ -131,6 +133,7 @@ const createSitePage = async (entry: SiteEntry): Promise<SitePage> => {
 };
 
 const createSiteCategory = (category: Awaited<ReturnType<typeof getSiteStructure>>['categories'][number]): SiteCategory => ({
+	aliases: [],
 	kind: 'category',
 	isHome: false,
 	depth: category.depth,
@@ -226,5 +229,3 @@ export const getSiteModel = async (entries: SiteEntry[]) => {
 		warnings: structure.warnings,
 	};
 };
-
-export const getSitePages = async (entries: SiteEntry[]) => (await getSiteModel(entries)).pages;

package/src/lib/sitePublicAssets.ts

@@ -4,6 +4,7 @@ import { sitePublicDir } from '../../scripts/lib/site-paths.mjs';
 import { browserIconAssetDefinitions } from '../../scripts/lib/public-asset-conventions.mjs';
 import projectConfig from '../../scripts/lib/project-config.mjs';
 export { getLogoAsset } from '../../scripts/lib/logo-assets.mjs';
+export { getSocialImageAsset } from '../../scripts/lib/social-image-assets.mjs';
 import { withBasePath } from './basePath';
 
 type IconLink = {

package/src/pages/404.astro

@@ -0,0 +1,110 @@
+---
+import { getCollection } from 'astro:content';
+import { resolveNavigationModel } from '../../scripts/lib/navigation-model.mjs';
+import { getTextWidthCssValue, resolveFrameColors, resolvePagePresentation } from '../../scripts/lib/presentation.mjs';
+import { projectConfig, resolveThemeVisualConfig } from '../../scripts/lib/project-config.mjs';
+import SiteBanners from '../components/SiteBanners.astro';
+import SiteNavigation from '../components/SiteNavigation.astro';
+import SiteSection from '../components/SiteSection.astro';
+import BaseLayout from '../layouts/BaseLayout.astro';
+import type { ResolvedSection } from '../lib/sectionContent';
+import { flattenSiteNavigationTree, getListedSiteNavigationTree } from '../lib/siteNavigation';
+import { getSiteModel, type SitePage } from '../lib/sitePages';
+import { getLogoAsset } from '../lib/sitePublicAssets';
+import { getToday, isVisibleToday } from '../lib/visibility';
+
+const siteDirectory = (process.env.NORNA_SITE_DIR ?? 'site').trim();
+const siteModel = await getSiteModel(await getCollection('site'));
+const { nodes: siteNodes, pages: sitePages } = siteModel;
+const homePage = sitePages.find((page) => page.isHome);
+if (!homePage) throw new Error('The required homepage is missing from the site page model.');
+
+const [siteTheme] = await getCollection('theme');
+if (!siteTheme) throw new Error('site/theme.yaml is required. Add a root theme before building the site.');
+const [sitewide] = await getCollection('sitewide');
+const sitewideData = sitewide?.data ?? {};
+const siteThemeData = siteTheme.data;
+const themeLabel = `${siteDirectory || 'site'}/${siteTheme.id}`;
+const visualTheme = resolveThemeVisualConfig(siteThemeData, themeLabel);
+const getPageContent = (page: SitePage) => page.markdownDocument.navigationHeadings.map((heading) => ({ ...heading }));
+const siteNavigation = siteNodes.map((node) => {
+	const headings = node.kind === 'page' ? getPageContent(node) : [];
+	return {
+		node,
+		headings,
+		sections: headings
+			.filter((heading) => heading.depth === 2)
+			.map(({ id, title }) => ({ id, title })),
+	};
+});
+const renderedNavigationEntries = flattenSiteNavigationTree(getListedSiteNavigationTree(siteNavigation));
+const navigationModel = resolveNavigationModel({
+	mode: projectConfig.navigation.mode,
+	nodes: renderedNavigationEntries.map(({ node, headings }) => ({
+		depth: Math.max(1, node.depth),
+		headings,
+		isHome: node.isHome,
+		kind: node.kind,
+		listed: node.navigation.listed,
+		pagePath: node.pagePath,
+	})),
+});
+const pagePresentation = resolvePagePresentation(siteThemeData, themeLabel, {
+	navigationMode: navigationModel.mode,
+});
+const pageTextWidth = getTextWidthCssValue(pagePresentation.typography.values.body.width);
+const frameColors = resolveFrameColors({ theme: siteThemeData, sourceLabel: themeLabel });
+const logoAsset = getLogoAsset();
+const logo = logoAsset
+	? {
+		src: logoAsset.href,
+		alt: homePage.title,
+		height: sitewideData.logo?.height,
+	}
+	: undefined;
+const today = getToday();
+const siteBanners = (sitewideData.banners ?? []).filter((banner) => isVisibleToday(banner.visible, today));
+const notFoundSection: ResolvedSection = {
+	id: null,
+	title: projectConfig.locale.labels.notFound,
+	titleHtml: projectConfig.locale.labels.notFound,
+	headingLevel: 1,
+	contentBlocks: [{
+		type: 'html',
+		html: `<p>${projectConfig.locale.labels.notFoundText}</p><p><a href="${projectConfig.site.basePath}">${projectConfig.locale.labels.returnHome}</a></p>`,
+	}],
+};
+const hasNavigationRailFrame = navigationModel.requestedMode === 'tree'
+	|| (
+		navigationModel.requestedMode === 'automatic'
+		&& (navigationModel.hasNestedPages || navigationModel.hasCategories)
+	);
+---
+
+<BaseLayout
+	title={projectConfig.locale.labels.notFound}
+	presentation={pagePresentation}
+	visualTheme={visualTheme}
+	frameColors={frameColors}
+	footer={sitewideData.footer}
+	indexable={false}
+>
+	<SiteNavigation
+		logo={logo}
+		navigationEntries={siteNavigation}
+		navigationMode={navigationModel.mode}
+		showTopNavigationSubmenus={navigationModel.requestedMode !== 'automatic' && navigationModel.mode !== 'tree'}
+		hasNavigationRailFrame={hasNavigationRailFrame}
+		frameColors={frameColors}
+		readerPreferences={pagePresentation.readerPreferences}
+	/>
+	{siteBanners.length > 0 && <SiteBanners banners={siteBanners} />}
+	<main class="site-content" id="main-content" style={`--page-text-width: ${pageTextWidth}`}>
+		<SiteSection
+			section={notFoundSection}
+			pagePresentation={pagePresentation}
+			visualTheme={visualTheme}
+			sectionIndex={0}
+		/>
+	</main>
+</BaseLayout>

package/src/pages/[...slug].astro

@@ -1,31 +1,68 @@
 ---
 import { getCollection } from 'astro:content';
+import { assertPageAliasModel, createPageAliasModel } from '../../scripts/lib/page-aliases.mjs';
+import { getGeneratedSiteRoutes } from '../../scripts/lib/page-aliases.mjs';
+import { getSitePublicFiles } from '../../scripts/lib/site-link-graph.mjs';
+import projectConfig from '../../scripts/lib/project-config.mjs';
+import PageAliasRedirect from '../components/PageAliasRedirect.astro';
+import SearchPage from '../components/SearchPage.astro';
 import SitePage from '../components/SitePage.astro';
-import { getSitePage, getSitePages, isHomePageEntry } from '../lib/sitePages';
+import { getSiteModel, getSitePage, isHomePageEntry } from '../lib/sitePages';
 
 export async function getStaticPaths() {
 	const entries = await getCollection('site');
-	const pages = await getSitePages(entries);
+	const siteModel = await getSiteModel(entries);
+	const aliasModel = assertPageAliasModel(createPageAliasModel({
+		categories: siteModel.categories,
+		pages: siteModel.pages,
+		publicFiles: await getSitePublicFiles(),
+		generatedRoutes: getGeneratedSiteRoutes({ searchEnabled: projectConfig.search.enabled }),
+	}));
+	const pagesByPathname = new Map(siteModel.pages.map((page) => [page.pathname, page]));
 
-	return pages
+	const pagePaths = siteModel.pages
 		.filter((page) => !page.isHome)
 		.map((page) => ({
 			params: { slug: page.pathSegment },
 			props: { entry: page.entry },
 		}));
+	const aliasPaths = aliasModel.aliases.map((alias) => {
+		const page = pagesByPathname.get(alias.targetPathname);
+		if (!page) throw new Error(`Page alias "${alias.pathname}" has no target page ${alias.targetPathname}.`);
+
+		return {
+			params: { slug: alias.pathname.slice(1, -1) },
+			props: {
+				alias: {
+					targetPathname: page.pathname,
+					targetTitle: page.title,
+				},
+			},
+		};
+	});
+
+	const searchPath = projectConfig.search.enabled
+		? [{ params: { slug: 'search' }, props: { searchPage: true } }]
+		: [];
+
+	return [...pagePaths, ...aliasPaths, ...searchPath];
 }
 
-const { entry } = Astro.props;
+const { alias, entry, searchPage } = Astro.props;
 
-if (!entry || isHomePageEntry(entry)) {
+if (!searchPage && !alias && (!entry || isHomePageEntry(entry))) {
 	throw new Error('Page entry is missing.');
 }
 
-const currentPage = await getSitePage(entry);
+const currentPage = entry ? await getSitePage(entry) : null;
 
-if (!currentPage.pathSegment) {
+if (!searchPage && !alias && !currentPage?.pathSegment) {
 	throw new Error(`Page "${entry.id}" needs a page id.`);
 }
 ---
 
-<SitePage entry={entry} />
+{searchPage
+	? <SearchPage />
+	: alias
+	? <PageAliasRedirect targetPathname={alias.targetPathname} targetTitle={alias.targetTitle} />
+	: <SitePage entry={entry} />}