@janga/norna 0.7.16 → 0.7.18

package/scripts/test-nested-pages.mjs

@@ -0,0 +1,125 @@
+import assert from 'node:assert/strict';
+import { execFile } from 'node:child_process';
+import { access, cp, mkdtemp, mkdir, readFile, rm, writeFile } from 'node:fs/promises';
+import path from 'node:path';
+import { promisify } from 'node:util';
+
+const execFileAsync = promisify(execFile);
+const repoRoot = path.resolve(import.meta.dirname, '..');
+const fixtureRoot = path.join(repoRoot, 'fixtures', 'nested-pages');
+const tempParent = path.join(repoRoot, 'node_modules', '.cache');
+await mkdir(tempParent, { recursive: true });
+const tempRoot = await mkdtemp(path.join(tempParent, 'norna-nested-pages-'));
+const fixtureCopyRoot = path.join(tempRoot, 'nested-pages');
+const nornaBin = path.join(repoRoot, 'bin', 'norna.mjs');
+const runNorna = (siteDir, ...args) => execFileAsync(process.execPath, [
+	nornaBin,
+	'--site-dir',
+	siteDir,
+	...args,
+], {
+	cwd: repoRoot,
+	maxBuffer: 1024 * 1024 * 10,
+});
+const runGit = (args) => execFileAsync('git', args, {
+	cwd: fixtureCopyRoot,
+	env: {
+		...process.env,
+		GIT_AUTHOR_NAME: 'Norna Test',
+		GIT_AUTHOR_EMAIL: 'norna@example.test',
+		GIT_COMMITTER_NAME: 'Norna Test',
+		GIT_COMMITTER_EMAIL: 'norna@example.test',
+	},
+});
+const fileExists = (filePath) => access(filePath).then(() => true, () => false);
+
+try {
+	await cp(fixtureRoot, fixtureCopyRoot, { recursive: true });
+	const siteDir = path.join(fixtureCopyRoot, 'site');
+	await runNorna(siteDir, 'content:check');
+	await runNorna(siteDir, 'build');
+
+	const distDir = path.join(fixtureCopyRoot, 'dist');
+	const expectedPages = [
+		'index.html',
+		'guides/index.html',
+		'guides/installation/index.html',
+		'guides/installation/macos/index.html',
+		'guides/workflows/index.html',
+		'guides/release-notes/index.html',
+		'reference/index.html',
+		'reference/installation/index.html',
+	];
+	for (const pagePath of expectedPages) {
+		assert.match(await readFile(path.join(distDir, pagePath), 'utf8'), /<main\b[^>]*id="main-content"/);
+	}
+
+	const rootHtml = await readFile(path.join(distDir, 'index.html'), 'utf8');
+	const guidesHtml = await readFile(path.join(distDir, 'guides', 'index.html'), 'utf8');
+	const installationHtml = await readFile(path.join(distDir, 'guides', 'installation', 'index.html'), 'utf8');
+	const macosHtml = await readFile(path.join(distDir, 'guides', 'installation', 'macos', 'index.html'), 'utf8');
+	for (const html of [rootHtml, guidesHtml, installationHtml, macosHtml]) {
+		assert.match(html, /--color-page: #f8f5ee/);
+		assert.match(html, /--font-sans: Georgia, 'Times New Roman', serif/);
+	}
+	assert.match(rootHtml, /--image-width: 920px/);
+	assert.match(rootHtml, /--space-section-to-section-desktop: clamp\(1\.2rem, 2\.4vw, 2\.25rem\)/);
+	assert.match(guidesHtml, /--image-width: 760px/);
+	assert.match(guidesHtml, /--space-section-to-section-desktop: clamp\(2\.25rem, 5vw, 4\.5rem\)/);
+	assert.match(guidesHtml, /--section-body-width-desktop: min\(72ch,/);
+	assert.match(installationHtml, /--image-width: 760px/);
+	assert.match(installationHtml, /--space-section-to-section-desktop: clamp\(2\.25rem, 5vw, 4\.5rem\)/);
+	assert.match(installationHtml, /--section-body-width-desktop: min\(60ch,/);
+	assert.match(macosHtml, /--section-body-width-desktop: min\(60ch,/);
+	assert.match(installationHtml, /Three nested page levels connected in sequence/);
+	assert.match(installationHtml, /\/original\/pages\/010-guides\/pages\/010-installation\/images\/diagram-[a-f0-9]+\.svg/);
+	assert.match(macosHtml, /data-navigation-mode="tree"/);
+	assert.match(macosHtml, /class="site-nav-item site-nav-item-current-branch"/);
+	assert.doesNotMatch(macosHtml, /class="site-nav-submenu"/);
+	assert.match(macosHtml, /href="\/guides\/installation\/macos\/" aria-current="page"/);
+	assert.match(macosHtml, /<aside class="tree-local-navigation" data-navigation-root="\/guides\/">/);
+	assert.match(macosHtml, /<ul class="navigation-page-tree navigation-page-tree-sidebar">/);
+	assert.match(macosHtml, /<details class="navigation-page-branch navigation-page-disclosure navigation-page-disclosure-sidebar" data-page-path="guides" data-current-branch="true"/);
+	assert.match(macosHtml, /<summary class="navigation-page-summary"[^>]*><span class="navigation-page-summary-title">Guides<\/span>/);
+	assert.match(macosHtml, /<nav class="site-breadcrumbs" aria-label="Breadcrumb"><ol><li><a href="\/guides\/">Guides<\/a><\/li><li><a href="\/guides\/installation\/">Installation<\/a><\/li><li><span aria-current="page">macOS<\/span>/);
+	assert.match(macosHtml, /<nav class="navigation-page-sections" aria-label="Page contents: macOS">/);
+	assert.doesNotMatch(macosHtml, /class="tree-page-contents"/);
+	assert.match(macosHtml, /href="#install">Install<\/a><ol><li><a href="#prerequisites">Prerequisites<\/a>/);
+	assert.doesNotMatch(macosHtml, /<nav class="page-nav"/);
+	assert.ok(
+		macosHtml.indexOf('href="/guides/installation/"') < macosHtml.indexOf('href="/guides/workflows/"'),
+		'Nested sibling navigation should follow page directory order.',
+	);
+
+	await runGit(['init']);
+	await runGit(['add', '.']);
+	await runGit(['commit', '-m', 'Initial nested fixture']);
+	const installationContentPath = path.join(
+		siteDir,
+		'pages',
+		'010-guides',
+		'pages',
+		'010-installation',
+		'content.md',
+	);
+	const workflowsContentPath = path.join(siteDir, 'pages', '010-guides', 'pages', '020-workflows', 'content.md');
+	const imageBlockPattern = /\n```norna-image-stack\n[\s\S]*?\n```\n/;
+	const installationContent = await readFile(installationContentPath, 'utf8');
+	const imageBlock = installationContent.match(imageBlockPattern)?.[0];
+	assert.ok(imageBlock, 'The nested fixture needs a managed image block to exercise content:sync.');
+	await writeFile(installationContentPath, installationContent.replace(imageBlockPattern, '\n'));
+	await writeFile(workflowsContentPath, `${await readFile(workflowsContentPath, 'utf8')}${imageBlock}`);
+	await runGit(['add', '.']);
+	await runGit(['commit', '-m', 'Move nested image reference']);
+	await runNorna(siteDir, 'content:sync', '--yes');
+
+	const previousImagePath = path.join(siteDir, 'pages', '010-guides', 'pages', '010-installation', 'images', 'diagram.svg');
+	const nextImagePath = path.join(siteDir, 'pages', '010-guides', 'pages', '020-workflows', 'images', 'diagram.svg');
+	assert.equal(await fileExists(previousImagePath), false);
+	assert.equal(await fileExists(nextImagePath), true);
+	await runNorna(siteDir, 'content:check');
+
+	console.log('Nested pages fixture check passed.');
+} finally {
+	await rm(tempRoot, { recursive: true, force: true });
+}

package/scripts/test-package-check.mjs

@@ -167,8 +167,8 @@ try {
 		assertFileExists(path.join(packagedStarterRoot, 'site', 'config.yaml')),
 		assertFileExists(path.join(packagedStarterRoot, 'site', 'theme.yaml')),
 		assertFileExists(path.join(packagedStarterRoot, 'site', 'sitewide-content.yaml')),
-		assertFileExists(path.join(packagedStarterRoot, 'site', 'content.md')),
-		assertFileExists(path.join(packagedStarterRoot, 'site', 'images', 'work', '.gitkeep')),
+		assertFileExists(path.join(packagedStarterRoot, 'site', 'pages', '000-home', 'content.md')),
+		assertFileExists(path.join(packagedStarterRoot, 'site', 'pages', '000-home', 'images', '.gitkeep')),
 		assertFileExists(path.join(packagedStarterRoot, 'site', 'public', 'robots.txt')),
 	]);
 	await assertFileIncludes(
@@ -198,21 +198,19 @@ try {
 	const packageCheckSitewide = await readFile(packageCheckSitewidePath, 'utf8');
 	await writeFile(
 		packageCheckSitewidePath,
-		packageCheckSitewide.replace('label: Example Site', 'label: Package Check Logo\n  logo:\n    height: 2.6rem'),
+		`logo:\n  height: 2.6rem\n${packageCheckSitewide}`,
 	);
 	await writeFile(
 		path.join(siteProjectRoot, 'site', 'public', 'logo.svg'),
 		'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><rect width="32" height="32" fill="black"/></svg>\n',
 	);
-	await writeFile(path.join(siteProjectRoot, 'site', 'content.md'), `---
-title: Package Check Site
-description: Site used by package checks.
-sections:
-  intro: {}
-  warning: {}
-  work: {}
+	await writeFile(path.join(siteProjectRoot, 'site', 'pages', '000-home', 'content.md'), `---
+page:
+  description: Site used by package checks.
 ---
 
+# Package Check Site
+
 ## Intro {#intro}
 
 This page verifies that **packaged norna sites** can build with the current content model.
@@ -230,19 +228,17 @@ This section verifies styled section headings.
 
 This section keeps the package check independent from user-facing starter copy.
 `);
-	await mkdir(path.join(siteProjectRoot, 'site', 'routes', '010-about'), { recursive: true });
-	await writeFile(path.join(siteProjectRoot, 'site', 'routes', '010-about', 'content.md'), `---
-title: About the site
-description: Route used by package checks.
-navigation:
-  label: About
-sections:
-  about: {}
+	await mkdir(path.join(siteProjectRoot, 'site', 'pages', '010-about'), { recursive: true });
+	await writeFile(path.join(siteProjectRoot, 'site', 'pages', '010-about', 'content.md'), `---
+page:
+  description: Page used by package checks.
 ---
 
+# About the site
+
 ## About {#about}
 
-This route verifies that packaged norna sites can build route pages.
+This page verifies that packaged norna sites can build additional pages.
 `);
 
 	await runInherit(npmBin, ['install', '--no-audit', '--no-fund', '--prefer-offline', '--fetch-retries=0'], { cwd: siteProjectRoot, env: npmEnv });
@@ -252,12 +248,14 @@ This route verifies that packaged norna sites can build route pages.
 		assertFileExists(path.join(initializedSiteRoot, 'package.json')),
 		assertFileExists(path.join(initializedSiteRoot, 'site', 'config.yaml')),
 		assertFileExists(path.join(initializedSiteRoot, 'site', 'theme.yaml')),
+		assertFileExists(path.join(initializedSiteRoot, 'site', 'pages', '000-home', 'content.md')),
 		assertFileMissing(path.join(initializedSiteRoot, '.DS_Store')),
 		assertFileMissing(path.join(initializedSiteRoot, 'site', '.DS_Store')),
 	]);
-	await runInherit(npxBin, ['norna', 'engine:version'], { cwd: path.join(siteProjectRoot, 'site', 'images', 'work'), env: npmEnv });
-	await runInherit(npxBin, ['norna', 'doctor'], { cwd: path.join(siteProjectRoot, 'site', 'images', 'work'), env: npmEnv });
-	await runInherit(npxBin, ['norna', 'config:check'], { cwd: path.join(siteProjectRoot, 'site', 'images', 'work'), env: npmEnv });
+	const homeImagesDir = path.join(siteProjectRoot, 'site', 'pages', '000-home', 'images');
+	await runInherit(npxBin, ['norna', 'engine:version'], { cwd: homeImagesDir, env: npmEnv });
+	await runInherit(npxBin, ['norna', 'doctor'], { cwd: homeImagesDir, env: npmEnv });
+	await runInherit(npxBin, ['norna', 'config:check'], { cwd: homeImagesDir, env: npmEnv });
 	await runInherit(npxBin, ['norna', 'content:check'], { cwd: siteProjectRoot, env: npmEnv });
 	await runInherit(npxBin, ['norna', 'check'], { cwd: siteProjectRoot, env: npmEnv });
 	await runInherit(npxBin, ['norna', 'build'], { cwd: siteProjectRoot, env: npmEnv });
@@ -279,19 +277,19 @@ This route verifies that packaged norna sites can build route pages.
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--section-heading-font-weight: 400',
+		'--section-heading-font-weight: 500',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--section-heading-spacing-after: 0.55em',
+		'--section-heading-spacing-after: 0.45em',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--section-markdown-h3-spacing-before: 1.5em',
+		'--section-markdown-h3-spacing-before: 1.2em',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		"--font-sans: Arial, 'Helvetica Neue', Helvetica, sans-serif",
+		"--font-sans: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif",
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
@@ -315,15 +313,23 @@ This route verifies that packaged norna sites can build route pages.
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'<a class="site-brand" href="/site/"><img class="site-brand-logo" src="/site/logo.svg" alt="Package Check Logo">',
+		'<a class="site-brand" href="/site/"><img class="site-brand-logo" src="/site/logo.svg" alt="Package Check Site">',
 	);
-	await assertFileIncludes(
+	await assertFileExcludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
 		'<div class="site-nav-submenu">',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'href="/site/#intro">Intro</a>',
+		'href="/site/about/">About the site</a>',
+	);
+	await assertFileIncludes(
+		path.join(siteProjectRoot, 'dist', 'index.html'),
+		'<nav class="page-nav" aria-label="Page contents">',
+	);
+	await assertFileIncludes(
+		path.join(siteProjectRoot, 'dist', 'index.html'),
+		'href="#intro">Intro</a>',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
@@ -331,7 +337,7 @@ This route verifies that packaged norna sites can build route pages.
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--section-body-line-height: 1.5',
+		'--section-body-line-height: 1.62',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
@@ -343,15 +349,15 @@ This route verifies that packaged norna sites can build route pages.
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--section-body-paragraph-spacing: 0.85em',
+		'--section-body-paragraph-spacing: 0.65em',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--section-caption-line-height: 1.35',
+		'--section-caption-line-height: 1.4',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--section-caption-spacing-before: 0.5em',
+		'--section-caption-spacing-before: 0.35em',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
@@ -367,39 +373,35 @@ This route verifies that packaged norna sites can build route pages.
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'href="/site/#warning">Warning</a>',
-	);
-	await assertFileIncludes(
-		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--section-background-color: #000000',
+		'href="#warning">Warning</a>',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--section-background-color: #171717',
+		'--section-background-color: #ffffff',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--section-background-color: #252525',
+		'--section-background-color: #f1f4f2',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--site-top-background-color: #000000',
+		'--site-top-background-color: #ffffff',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--site-top-text-color: #f2eee6',
+		'--site-top-text-color: #17201d',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--site-footer-background-color: #000000',
+		'--site-footer-background-color: #ffffff',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--site-footer-text-color: #f2eee6',
+		'--site-footer-text-color: #17201d',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--section-text-color: #f2eee6',
+		'--section-text-color: #17201d',
 	);
 	await writeFile(path.join(siteProjectRoot, 'site', 'public', 'favicon.ico'), 'fake icon');
 	await runInherit(npxBin, ['norna', 'build'], { cwd: siteProjectRoot, env: npmEnv });
@@ -412,47 +414,24 @@ This route verifies that packaged norna sites can build route pages.
 		path.join(siteProjectRoot, 'dist', 'index.html'),
 		'href="/favicon.svg"',
 	);
-	const siteContentPath = path.join(siteProjectRoot, 'site', 'content.md');
+	const siteContentPath = path.join(siteProjectRoot, 'site', 'pages', '000-home', 'content.md');
 	const siteContent = await readFile(siteContentPath, 'utf8');
 	const siteThemePath = path.join(siteProjectRoot, 'site', 'theme.yaml');
 	const siteTheme = await readFile(siteThemePath, 'utf8');
-	await writeFile(siteThemePath, siteTheme.replace('\n  profile: restrained', '\n  profile: noisy'));
+	await writeFile(siteThemePath, `${siteTheme.trim()}\ntypography:\n  profile: noisy\n`);
 	await runExpectFailure(
 		npxBin,
 		['norna', 'build'],
 		{ cwd: siteProjectRoot, env: npmEnv },
-		'Unknown typography profile: noisy',
-	);
-	await writeFile(
-		siteThemePath,
-		siteTheme.replace('\npalette: dark', '\npalette: neon'),
+		'typography.profile',
 	);
+	await writeFile(siteThemePath, `${siteTheme.trim()}\npalette: neon\n`);
 	await runExpectFailure(
 		npxBin,
 		['norna', 'build'],
 		{ cwd: siteProjectRoot, env: npmEnv },
 		'palette',
 	);
-	await writeFile(
-		siteThemePath,
-		siteTheme.replace('\nsectionSurfaces: [base, soft, emphasis]', '\nsectionSurfaces: [base, glowing]'),
-	);
-	await runExpectFailure(
-		npxBin,
-		['norna', 'build'],
-		{ cwd: siteProjectRoot, env: npmEnv },
-		'Unknown section surface "glowing"',
-	);
-	await writeFile(
-		siteThemePath,
-		siteTheme.replace('\nsectionSurfaces: [base, soft, emphasis]', '\nsectionSurfaces: [base, base]'),
-	);
-	await runExpectFailure(
-		npxBin,
-		['norna', 'build'],
-		{ cwd: siteProjectRoot, env: npmEnv },
-		'Each section surface may appear only once',
-	);
 	await writeFile(siteThemePath, siteTheme);
 	await writeFile(
 		siteContentPath,
@@ -484,36 +463,17 @@ This route verifies that packaged norna sites can build route pages.
 	await writeFile(
 		siteContentPath,
 		siteContent.replace(
-			'  intro: {}',
-			'  intro:\n    typography:\n      overrides:\n        caption:\n          spacingBefore: wide',
-		),
-	);
-	await runExpectFailure(
-		npxBin,
-		['norna', 'build'],
-		{ cwd: siteProjectRoot, env: npmEnv },
-		'sections.intro: Unrecognized key: "typography"',
-	);
-	await writeFile(
-		siteContentPath,
-		siteContent.replace(
-			'  intro: {}',
-			'  intro:\n    palette: dark',
+			'description: Site used by package checks.',
+			'description: Site used by package checks.\nsections:\n  intro: {}',
 		),
 	);
 	await runExpectFailure(
 		npxBin,
 		['norna', 'build'],
 		{ cwd: siteProjectRoot, env: npmEnv },
-		'sections.intro: Unrecognized key: "palette"',
-	);
-	await writeFile(
-		siteThemePath,
-		siteTheme.replace(
-			'fontFamily: "Arial, \'Helvetica Neue\', Helvetica, sans-serif"',
-			'fontFamily: "Arial; color: red"',
-		),
+		'defines "sections" at the top level, but it is not a valid top-level content field',
 	);
+	await writeFile(siteThemePath, `${siteTheme.trim()}\ntypography:\n  fontFamily: "Arial; color: red"\n`);
 	await runExpectFailure(
 		npxBin,
 		['norna', 'config:check'],

package/scripts/test-page-model.mjs

@@ -0,0 +1,108 @@
+import assert from 'node:assert/strict';
+import {
+	decodePageDirectoryPath,
+	encodePageDirectoryPath,
+	getPageDirectoryAncestors,
+	parsePageDirectory,
+	parsePageDirectoryPath,
+} from './lib/page-model.mjs';
+
+assert.deepEqual(parsePageDirectory('010-getting-started'), {
+	pageDirectory: '010-getting-started',
+	pageOrder: 10,
+	pageId: 'getting-started',
+});
+
+assert.deepEqual(parsePageDirectory('120-api-reference'), {
+	pageDirectory: '120-api-reference',
+	pageOrder: 120,
+	pageId: 'api-reference',
+});
+
+assert.deepEqual(parsePageDirectory('000-home'), {
+	pageDirectory: '000-home',
+	pageOrder: 0,
+	pageId: 'home',
+});
+
+assert.deepEqual(parsePageDirectoryPath('000-home'), {
+	pageDirectory: '000-home',
+	pageDirectories: ['000-home'],
+	pageId: 'home',
+	pageIds: [],
+	pageOrder: 0,
+	pageOrders: [],
+	pagePath: '',
+	parentPagePath: null,
+	depth: 1,
+});
+
+assert.throws(
+	() => parsePageDirectoryPath('000-home/pages/010-about'),
+	/000-home is the homepage and cannot contain child pages.*beside it under site\/pages\/.*below another non-home page/,
+);
+
+assert.deepEqual(parsePageDirectoryPath('010-guides/pages/020-installation'), {
+	pageDirectory: '010-guides/pages/020-installation',
+	pageDirectories: ['010-guides', '020-installation'],
+	pageId: 'installation',
+	pageIds: ['guides', 'installation'],
+	pageOrder: 20,
+	pageOrders: [10, 20],
+	pagePath: 'guides/installation',
+	parentPagePath: 'guides',
+	depth: 2,
+});
+
+assert.equal(
+	encodePageDirectoryPath('010-guides/pages/020-installation'),
+	'010-guides--020-installation',
+);
+assert.equal(
+	decodePageDirectoryPath('010-guides--020-installation'),
+	'010-guides/pages/020-installation',
+);
+assert.deepEqual(
+	getPageDirectoryAncestors('010-guides/pages/020-installation/pages/030-macos'),
+	[
+		'010-guides',
+		'010-guides/pages/020-installation',
+		'010-guides/pages/020-installation/pages/030-macos',
+	],
+);
+
+for (const pageDirectoryPath of [
+	'010-guides/020-installation',
+	'010-guides/children/020-installation',
+	'pages/010-guides',
+	'010-guides/pages',
+]) {
+	assert.throws(
+		() => parsePageDirectoryPath(pageDirectoryPath),
+		/(Nested pages must use|Use a pages directory)/,
+		`${pageDirectoryPath} should be rejected`,
+	);
+}
+
+for (const pageDirectory of [
+	'000-about',
+	'10-about',
+	'010_About',
+	'010-About',
+	'010-about-',
+	'010-about--team',
+	'010-om-oss!',
+]) {
+	assert.throws(
+		() => parsePageDirectory(pageDirectory),
+		/(Page directories must use the form NNN-page-id|000 prefix is reserved)/,
+		`${pageDirectory} should be rejected`,
+	);
+}
+
+assert.throws(
+	() => parsePageDirectoryPath('010-guides/pages/000-home'),
+	/000-home is allowed only as a top-level page/,
+);
+
+console.log('Page model test passed.');

package/scripts/test-project-config.mjs

@@ -4,6 +4,7 @@ import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import path from 'node:path';
 import { pathToFileURL } from 'node:url';
+import { getBasePathRedirectLocation } from './lib/base-path-redirect.mjs';
 
 const repoRoot = path.resolve(import.meta.dirname, '..');
 const projectConfigUrl = pathToFileURL(path.join(repoRoot, 'scripts', 'lib', 'project-config.mjs')).href;
@@ -14,6 +15,7 @@ const importScript = `
 		basePath: projectConfig.site.basePath,
 		language: projectConfig.locale.lang,
 		labels: projectConfig.locale.labels,
+		navigationMode: projectConfig.navigation.mode,
 		scrollBehavior: projectConfig.navigation.scrollBehavior,
 		url: projectConfig.site.url,
 	}));
@@ -22,9 +24,9 @@ const importScript = `
 const createSite = async (name, config) => {
 	const projectRoot = path.join(tempRoot, name);
 	const siteDir = path.join(projectRoot, 'site');
-	await mkdir(siteDir, { recursive: true });
+	await mkdir(path.join(siteDir, 'pages', '000-home'), { recursive: true });
 	await writeFile(path.join(siteDir, 'config.yaml'), config);
-	await writeFile(path.join(siteDir, 'content.md'), '---\ntitle: Config test\ndescription: Config test.\n---\n\n## Intro {#intro}\n\nText.\n');
+	await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), '# Config test\n\n## Intro {#intro}\n\nText.\n');
 	await writeFile(path.join(siteDir, 'theme.yaml'), 'preset: documentation\n');
 	return { projectRoot, siteDir };
 };
@@ -50,6 +52,12 @@ const assertFailure = (result, expectedPattern) => {
 };
 
 try {
+	assert.equal(getBasePathRedirectLocation('/norna/', '/norna'), '/norna/');
+	assert.equal(getBasePathRedirectLocation('/norna/', '/norna?source=test'), '/norna/?source=test');
+	assert.equal(getBasePathRedirectLocation('/norna/', '/norna/'), undefined);
+	assert.equal(getBasePathRedirectLocation('/norna/', '/norna/concepts/'), undefined);
+	assert.equal(getBasePathRedirectLocation('/', '/'), undefined);
+
 	const minimalSite = await createSite('minimal', 'url: https://example.com/docs\n');
 	const minimalResult = loadConfig(minimalSite);
 	assert.equal(minimalResult.status, 0, minimalResult.stderr);
@@ -57,14 +65,19 @@ try {
 		basePath: '/docs/',
 		language: 'en',
 		labels: {
+			breadcrumb: 'Breadcrumb',
 			dismissBanner: 'Dismiss notice',
+			built: 'Built',
 			images: 'Images',
+			navigationChildren: 'Child pages',
+			navigationMenu: 'Menu',
 			note: 'Note',
-			pageNavigation: 'On this page',
+			pageNavigation: 'Page contents',
 			siteBanners: 'Site notices',
 			siteNavigation: 'Pages',
 			skipToContent: 'Skip to content',
 		},
+		navigationMode: 'automatic',
 		scrollBehavior: 'instant',
 		url: 'https://example.com/docs/',
 	});
@@ -74,9 +87,15 @@ try {
 	assert.equal(localizedResult.status, 0, localizedResult.stderr);
 	const localizedConfig = JSON.parse(localizedResult.stdout);
 	assert.equal(localizedConfig.language, 'sv-SE');
+	assert.equal(localizedConfig.labels.built, 'Byggd');
 	assert.equal(localizedConfig.labels.skipToContent, 'Hoppa till innehållet');
 	assert.equal(localizedConfig.scrollBehavior, 'smooth');
 
+	const treeNavigationSite = await createSite('tree-navigation', 'url: https://example.com/\nnavigation:\n  mode: tree\n');
+	const treeNavigationResult = loadConfig(treeNavigationSite);
+	assert.equal(treeNavigationResult.status, 0, treeNavigationResult.stderr);
+	assert.equal(JSON.parse(treeNavigationResult.stdout).navigationMode, 'tree');
+
 	const overrideResult = loadConfig(minimalSite, {
 		NORNA_SITE_URL: 'http://127.0.0.1:4567/preview',
 	});