@janga/norna 0.7.17 → 0.7.18

package/scripts/test-documentation.mjs

@@ -9,6 +9,8 @@ const cliPath = path.join(repoRoot, 'bin', 'norna.mjs');
 const tutorialPath = path.join(repoRoot, 'docs', 'getting-started.md');
 const scratchRoot = path.join(repoRoot, 'todos');
 const obsoleteSourceReferences = [
+	'site/content.md',
+	'site/images/',
 	'site/config.md',
 	'site/theme.md',
 	'site/sitewide-content.md',
@@ -149,8 +151,8 @@ try {
 
 	await Promise.all([
 		writeFile(
-			path.join(tutorialSiteRoot, 'site', 'content.md'),
-			extractTutorialFile(tutorial, 'Replace `site/content.md` with:', 'md'),
+			path.join(tutorialSiteRoot, 'site', 'pages', '000-home', 'content.md'),
+			extractTutorialFile(tutorial, 'Replace `site/pages/000-home/content.md` with:', 'md'),
 		),
 		writeFile(
 			path.join(tutorialSiteRoot, 'site', 'sitewide-content.yaml'),

package/scripts/test-editor-language-service.mjs

@@ -18,7 +18,7 @@ import {
 
 const root = await mkdtemp(path.join(os.tmpdir(), 'norna-editor-language-'));
 const siteRoot = path.join(root, 'site');
-const homeContentPath = path.join(siteRoot, 'content.md');
+const homeContentPath = path.join(siteRoot, 'pages', '000-home', 'content.md');
 const pageContentPath = path.join(siteRoot, 'pages', '010-about', 'content.md');
 const pageThemePath = path.join(siteRoot, 'pages', '010-about', 'theme.yaml');
 const nestedPageContentPath = path.join(siteRoot, 'pages', '010-about', 'pages', '020-team', 'content.md');
@@ -63,7 +63,7 @@ Page content.
 
 try {
 	await mkdir(path.join(installedNornaRoot, 'schemas'), { recursive: true });
-	await mkdir(path.join(siteRoot, 'images'), { recursive: true });
+	await mkdir(path.join(siteRoot, 'pages', '000-home', 'images'), { recursive: true });
 	await mkdir(path.join(siteRoot, 'pages', '010-about', 'images'), { recursive: true });
 	await mkdir(path.dirname(nestedPageContentPath), { recursive: true });
 	await mkdir(path.join(siteRoot, 'public'), { recursive: true });
@@ -74,6 +74,7 @@ try {
 		files: {
 			config: 'config.schema.json',
 			contentFrontmatter: 'content-frontmatter.schema.json',
+			pageTheme: 'page-theme.schema.json',
 			sitewideContent: 'sitewide-content.schema.json',
 			theme: 'theme.schema.json',
 		},
@@ -84,7 +85,7 @@ try {
 	await writeFile(path.join(siteRoot, 'sitewide-content.yaml'), `logo:
   height: 2rem
 `);
-	await writeFile(path.join(siteRoot, 'images', 'local.jpg'), 'local');
+	await writeFile(path.join(siteRoot, 'pages', '000-home', 'images', 'local.jpg'), 'local');
 	await writeFile(path.join(siteRoot, 'pages', '010-about', 'images', 'portrait.jpg'), 'portrait');
 	await writeFile(path.join(siteRoot, 'public', 'logo.svg'), '<svg/>');
 	await writeFile(path.join(siteRoot, 'public', 'logo.png'), 'logo');
@@ -94,21 +95,22 @@ try {
 	await writeFile(path.join(siteRoot, 'public', 'favicon-32x32.png'), 'unrecognized');
 	await writeFile(homeContentPath, homeSource);
 	await writeFile(pageContentPath, pageSource);
-	await writeFile(pageThemePath, 'preset: portfolio\n');
+	await writeFile(pageThemePath, 'layout:\n  textWidth: wide\n');
 	await writeFile(nestedPageContentPath, pageSource.replace('# About', '# Team'));
-	await writeFile(nestedPageThemePath, 'preset: documentation\n');
+	await writeFile(nestedPageThemePath, 'layout:\n  contentSpacing: compact\n');
 
 	assert.equal(await findNornaSiteRoot(homeContentPath), siteRoot);
 	assert.equal(getNornaDocumentContext(homeContentPath).schemaKind, 'contentFrontmatter');
+	assert.equal(getNornaDocumentContext(homeContentPath).pageDirectory, '000-home');
 	assert.equal(getNornaDocumentContext(homeContentPath).nornaPackage.root, installedNornaRoot);
 	assert.equal(getNornaDocumentContext(path.join(siteRoot, 'config.yaml')).schemaKind, 'config');
 	assert.equal(getNornaDocumentContext(path.join(siteRoot, 'theme.yaml')).schemaKind, 'theme');
 	assert.equal(getNornaDocumentContext(path.join(siteRoot, 'sitewide-content.yaml')).schemaKind, 'sitewideContent');
 	assert.equal(getNornaDocumentContext(pageContentPath).pageDirectory, '010-about');
-	assert.equal(getNornaDocumentContext(pageThemePath).schemaKind, 'theme');
+	assert.equal(getNornaDocumentContext(pageThemePath).schemaKind, 'pageTheme');
 	assert.equal(getNornaDocumentContext(nestedPageContentPath).pageDirectory, '010-about/pages/020-team');
 	assert.equal(getNornaDocumentContext(nestedPageContentPath).schemaKind, 'contentFrontmatter');
-	assert.equal(getNornaDocumentContext(nestedPageThemePath).schemaKind, 'theme');
+	assert.equal(getNornaDocumentContext(nestedPageThemePath).schemaKind, 'pageTheme');
 	assert.equal(getNornaProjectContext(path.join(siteRoot, 'public', 'logo.svg')).siteRoot, siteRoot);
 	assert.equal(getNornaDocumentContext(path.join(siteRoot, 'public', 'logo.svg')), null);
 	assert.equal(getNornaDocumentContext(path.join(root, 'README.md')), null);
@@ -116,6 +118,7 @@ try {
 	await mkdir(path.join(siteRoot, 'pages', 'about'), { recursive: true });
 	await writeFile(path.join(siteRoot, 'pages', 'about', 'content.md'), pageSource);
 	assert.equal(getNornaDocumentContext(path.join(siteRoot, 'pages', 'about', 'content.md')), null);
+	assert.equal(getNornaDocumentContext(path.join(siteRoot, 'pages', '000-home', 'pages', '010-news', 'content.md')), null);
 	await mkdir(path.join(siteRoot, 'pages', '010-about', 'nested'), { recursive: true });
 	await writeFile(path.join(siteRoot, 'pages', '010-about', 'nested', 'content.md'), pageSource);
 	assert.equal(getNornaDocumentContext(path.join(siteRoot, 'pages', '010-about', 'nested', 'content.md')), null);
@@ -244,7 +247,7 @@ try {
 		line: localDefinitionLine,
 		source: homeSource,
 	});
-	assert.deepEqual(localDefinition.files, [path.join(siteRoot, 'images', 'local.jpg')]);
+	assert.deepEqual(localDefinition.files, [path.join(siteRoot, 'pages', '000-home', 'images', 'local.jpg')]);
 
 	const diagnostics = await getMarkdownDiagnostics({ documentPath: homeContentPath, source: homeSource });
 	assert.ok(diagnostics.some(({ code, message }) => code === 'image-needs-sync' && message.includes('Run "norna content:sync"')));

package/scripts/test-engine-commands.mjs

@@ -39,9 +39,9 @@ try {
 	assert.match(deployWatchHelpResult.stdout, /Default: deploy\.yml/);
 
 	const directSiteRoot = path.join(tempRoot, 'current-directory-site');
-	await mkdir(directSiteRoot, { recursive: true });
+	await mkdir(path.join(directSiteRoot, 'pages', '000-home'), { recursive: true });
 	await writeFile(path.join(directSiteRoot, 'config.yaml'), 'url: https://example.com/\n');
-	await writeFile(path.join(directSiteRoot, 'content.md'), '# Direct Site\n\n## Intro {#intro}\n\nText.\n');
+	await writeFile(path.join(directSiteRoot, 'pages', '000-home', 'content.md'), '# Direct Site\n\n## Intro {#intro}\n\nText.\n');
 	const directSiteProjectRoot = await realpath(tempRoot);
 	const directSiteDoctorResult = runCli(['doctor'], {
 		cwd: directSiteRoot,
@@ -99,7 +99,7 @@ try {
 	assert.match(showResult.stdout, /theme:/);
 	assert.match(showResult.stdout, /pages:/);
 	assert.match(showResult.stdout, /\s+\/:/);
-	assert.match(showResult.stdout, /value: restrained/);
+	assert.match(showResult.stdout, /value: reading/);
 	assert.match(showResult.stdout, /source: "site\/theme\.yaml"/);
 	assert.match(showResult.stdout, /intro:/);
 
@@ -116,7 +116,7 @@ try {
 	assert.equal(customStandalonePackageJson.scripts['norna:dev'], 'norna --site-dir presentation dev:local');
 	assert.equal(customStandalonePackageJson.scripts['norna:check'], 'norna --site-dir presentation check');
 	assert.equal(customStandalonePackageJson.scripts['norna:build'], 'norna --site-dir presentation build');
-	await readFile(path.join(customStandaloneSiteRoot, 'presentation', 'content.md'));
+	await readFile(path.join(customStandaloneSiteRoot, 'presentation', 'pages', '000-home', 'content.md'));
 	await readFile(path.join(customStandaloneSiteRoot, 'presentation', 'config.yaml'));
 	await readFile(path.join(customStandaloneSiteRoot, 'presentation', 'theme.yaml'));
 
@@ -143,7 +143,7 @@ try {
 	assert.equal(mixedPackageJson.scripts['norna:check'], 'norna --site-dir presentation check');
 	assert.equal(mixedPackageJson.scripts['norna:engine:update'], 'norna --site-dir presentation engine:update');
 	assert.equal(mixedPackageJson.scripts['norna:engine:version'], 'norna --site-dir presentation engine:version');
-	await readFile(path.join(mixedProjectRoot, 'presentation', 'content.md'));
+	await readFile(path.join(mixedProjectRoot, 'presentation', 'pages', '000-home', 'content.md'));
 	await readFile(path.join(mixedProjectRoot, 'presentation', 'config.yaml'));
 	await readFile(path.join(mixedProjectRoot, 'presentation', 'theme.yaml'));
 

package/scripts/test-examples.mjs

@@ -1,5 +1,7 @@
+import assert from 'node:assert/strict';
 import { existsSync } from 'node:fs';
-import { readFile } from 'node:fs/promises';
+import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { getExampleSites } from './lib/example-sites.mjs';
@@ -9,6 +11,33 @@ const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
 const cliPath = path.join(root, 'bin', 'norna.mjs');
 const examples = await getExampleSites(root);
 
+const discoveryRoot = await mkdtemp(path.join(tmpdir(), 'norna-example-discovery-'));
+try {
+	for (const category of ['complete-sites', 'feature-demos']) {
+		await mkdir(path.join(discoveryRoot, 'examples', category), { recursive: true });
+	}
+	const validSite = path.join(discoveryRoot, 'examples', 'complete-sites', 'valid', 'site');
+	await mkdir(path.join(validSite, 'pages', '000-home'), { recursive: true });
+	await writeFile(path.join(validSite, 'config.yaml'), 'url: https://example.com/\n');
+	await writeFile(path.join(validSite, 'pages', '000-home', 'content.md'), '# Example\n');
+	await mkdir(path.join(
+		discoveryRoot,
+		'examples',
+		'feature-demos',
+		'removed-example',
+		'site',
+		'.norna',
+		'public',
+		'images',
+		'generated',
+	), { recursive: true });
+
+	const discovered = await getExampleSites(discoveryRoot);
+	assert.deepEqual(discovered.map(({ name }) => name), ['valid']);
+} finally {
+	await rm(discoveryRoot, { recursive: true, force: true });
+}
+
 for (const example of examples) {
 	console.log(`\nBuilding ${example.siteLabel}`);
 	await runInherit(process.execPath, [cliPath, '--site-dir', example.siteLabel, 'build'], { cwd: root });

package/scripts/test-heading-ids.mjs

@@ -43,9 +43,9 @@ const collision = await getMarkdownHeadings(`# Page
 `);
 assert.equal(getHeadingIdentifierIssues(collision.headings)[0]?.code, 'duplicate-heading-id');
 assert.equal(
-	formatHeadingIdentifierIssue(getHeadingIdentifierIssues(collision.headings)[0], 'site/content.md'),
+	formatHeadingIdentifierIssue(getHeadingIdentifierIssues(collision.headings)[0], 'site/pages/000-home/content.md'),
 	[
-		'site/content.md: Two headings resolve to id "forsta".',
+		'site/pages/000-home/content.md: Two headings resolve to id "forsta".',
 		'- line 3: "Förstå"',
 		'- line 5: "Forsta"',
 		'Add a unique explicit id to at least one heading, for example {#forsta-details}.',

package/scripts/test-navigation.mjs

@@ -5,10 +5,19 @@ import { fileURLToPath } from 'node:url';
 
 const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
 const cliPath = path.join(root, 'bin', 'norna.mjs');
-const navigationDemoSiteDir = path.join(root, 'examples', 'feature-demos', 'media-and-surfaces', 'site');
 const host = '127.0.0.1';
 const npmBin = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-const testTargets = process.argv.slice(2);
+const cliArguments = process.argv.slice(2);
+const siteDirOptionIndex = cliArguments.indexOf('--site-dir');
+const configuredSiteDir = siteDirOptionIndex === -1
+	? path.join('examples', 'feature-demos', 'media-and-surfaces', 'site')
+	: cliArguments[siteDirOptionIndex + 1];
+if (!configuredSiteDir || configuredSiteDir.startsWith('--')) {
+	throw new Error('Use --site-dir <path> to select a navigation test site.');
+}
+if (siteDirOptionIndex !== -1) cliArguments.splice(siteDirOptionIndex, 2);
+const navigationDemoSiteDir = path.resolve(root, configuredSiteDir);
+const testTargets = cliArguments;
 const playwrightTargets = testTargets.length > 0 ? testTargets : ['tests/navigation.spec.ts'];
 
 const sleep = (milliseconds) => new Promise((resolve) => {

package/scripts/test-nested-pages.mjs

@@ -46,6 +46,7 @@ try {
 		'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',
 	];
@@ -57,20 +58,34 @@ try {
 	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');
-	assert.match(rootHtml, /--color-page: #000000/);
-	assert.match(guidesHtml, /--color-page: #ffffff/);
-	assert.match(installationHtml, /--color-page: #ffffff/);
-	assert.match(macosHtml, /--color-page: #ffffff/);
+	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, /class="site-nav-item site-nav-item-has-submenu site-nav-item-current-branch"/);
+	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, /<details class="mobile-navigation-branch" open>/);
+	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>/);
-	for (const submenuMatch of macosHtml.matchAll(/<div class="site-nav-submenu">([\s\S]*?)<\/div>/g)) {
-		assert.doesNotMatch(submenuMatch[1], /href="[^"#]*#[^"]+"/);
-	}
-	assert.match(macosHtml, /<nav class="mobile-nav-view" aria-label="On this page">/);
+	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.',

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', '.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(
@@ -204,7 +204,7 @@ try {
 		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'), `---
+	await writeFile(path.join(siteProjectRoot, 'site', 'pages', '000-home', 'content.md'), `---
 page:
   description: Site used by package checks.
 ---
@@ -248,12 +248,14 @@ This page verifies that packaged norna sites can build additional 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'), env: npmEnv });
-	await runInherit(npxBin, ['norna', 'doctor'], { cwd: path.join(siteProjectRoot, 'site', 'images'), env: npmEnv });
-	await runInherit(npxBin, ['norna', 'config:check'], { cwd: path.join(siteProjectRoot, 'site', 'images'), 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 });
@@ -275,19 +277,19 @@ This page verifies that packaged norna sites can build additional 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'),
@@ -323,7 +325,7 @@ This page verifies that packaged norna sites can build additional pages.
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'<nav class="page-nav" aria-label="On this page">',
+		'<nav class="page-nav" aria-label="Page contents">',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
@@ -335,7 +337,7 @@ This page verifies that packaged norna sites can build additional 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'),
@@ -347,15 +349,15 @@ This page verifies that packaged norna sites can build additional 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'),
@@ -375,35 +377,31 @@ This page verifies that packaged norna sites can build additional pages.
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--section-background-color: #000000',
+		'--section-background-color: #ffffff',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--section-background-color: #171717',
+		'--section-background-color: #f1f4f2',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--section-background-color: #252525',
+		'--site-top-background-color: #ffffff',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--site-top-background-color: #000000',
+		'--site-top-text-color: #17201d',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--site-top-text-color: #f2eee6',
+		'--site-footer-background-color: #ffffff',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--site-footer-background-color: #000000',
+		'--site-footer-text-color: #17201d',
 	);
 	await assertFileIncludes(
 		path.join(siteProjectRoot, 'dist', 'index.html'),
-		'--site-footer-text-color: #f2eee6',
-	);
-	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 });
@@ -416,47 +414,24 @@ This page verifies that packaged norna sites can build additional 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,
@@ -498,13 +473,7 @@ This page verifies that packaged norna sites can build additional pages.
 		{ cwd: siteProjectRoot, env: npmEnv },
 		'defines "sections" at the top level, but it is not a valid top-level content field',
 	);
-	await writeFile(
-		siteThemePath,
-		siteTheme.replace(
-			'fontFamily: "Arial, \'Helvetica Neue\', Helvetica, sans-serif"',
-			'fontFamily: "Arial; color: red"',
-		),
-	);
+	await writeFile(siteThemePath, `${siteTheme.trim()}\ntypography:\n  fontFamily: "Arial; color: red"\n`);
 	await runExpectFailure(
 		npxBin,
 		['norna', 'config:check'],

package/scripts/test-page-model.mjs

@@ -19,6 +19,29 @@ assert.deepEqual(parsePageDirectory('120-api-reference'), {
 	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'],
@@ -62,7 +85,7 @@ for (const pageDirectoryPath of [
 }
 
 for (const pageDirectory of [
-	'000-home',
+	'000-about',
 	'10-about',
 	'010_About',
 	'010-About',
@@ -72,9 +95,14 @@ for (const pageDirectory of [
 ]) {
 	assert.throws(
 		() => parsePageDirectory(pageDirectory),
-		/Page directories must use the form NNN-page-id/,
+		/(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

@@ -24,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'), '# Config test\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 };
 };
@@ -69,11 +69,10 @@ try {
 			dismissBanner: 'Dismiss notice',
 			built: 'Built',
 			images: 'Images',
-			navigationBack: 'Back to pages',
+			navigationChildren: 'Child pages',
 			navigationMenu: 'Menu',
-			navigationOverview: 'Overview',
 			note: 'Note',
-			pageNavigation: 'On this page',
+			pageNavigation: 'Page contents',
 			siteBanners: 'Site notices',
 			siteNavigation: 'Pages',
 			skipToContent: 'Skip to content',
@@ -92,11 +91,7 @@ try {
 	assert.equal(localizedConfig.labels.skipToContent, 'Hoppa till innehållet');
 	assert.equal(localizedConfig.scrollBehavior, 'smooth');
 
-	const treeNavigationSite = await createSite('tree-navigation', 'url: https://example.com/\n');
-	await writeFile(path.join(treeNavigationSite.siteDir, 'theme.yaml'), `preset: documentation
-navigation:
-  mode: tree
-`);
+	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');

package/scripts/test-schemas.mjs

@@ -10,18 +10,21 @@ const expectedDocumentationRef = `v${packageJson.version}`;
 const filenames = [
 	'config.schema.json',
 	'theme.schema.json',
+	'page-theme.schema.json',
 	'sitewide-content.schema.json',
 	'content-frontmatter.schema.json',
 ];
 const requiredRichHelp = {
-	'config.schema.json': ['url', 'language', 'scrollBehavior'],
-	'theme.schema.json': ['preset', 'navigation', 'layout', 'images', 'typography', 'palette', 'sectionSurfaces'],
+	'config.schema.json': ['url', 'language', 'navigation', 'scrollBehavior'],
+	'theme.schema.json': ['preset', 'shape', 'layout', 'images', 'typography', 'palette', 'sections'],
+	'page-theme.schema.json': ['layout', 'images', 'sections'],
 	'sitewide-content.schema.json': ['logo', 'banners', 'footer'],
 	'content-frontmatter.schema.json': ['page', 'navigation'],
 };
 const manifest = JSON.parse(await readFile(path.join(root, 'schemas', 'manifest.json'), 'utf8'));
 assert.equal(manifest.editorApiVersion, 1);
-assert.equal(manifest.schemaVersion, 1);
+assert.equal(manifest.schemaVersion, 2);
+assert.equal(manifest.files.pageTheme, 'page-theme.schema.json');
 
 const githubHeadingAnchor = (heading) => heading
 	.toLowerCase()
@@ -143,6 +146,18 @@ assert.equal(
 	theme.properties.images.properties.maxAvailableWidthPercent.defaultSnippets[0].label,
 	'Responsive image limit',
 );
+assert.equal(theme.properties.navigation, undefined);
+assert.equal(theme.properties.layout.properties.density, undefined);
+assert.ok(theme.properties.layout.properties.contentSpacing);
+assert.ok(theme.properties.layout.properties.textWidth);
+assert.ok(theme.properties.sections.properties.backgroundPattern);
+
+const pageTheme = JSON.parse(await readFile(path.join(root, 'schemas', 'page-theme.schema.json'), 'utf8'));
+assert.deepEqual(Object.keys(pageTheme.properties), ['layout', 'images', 'sections']);
+assert.deepEqual(Object.keys(pageTheme.properties.layout.properties), ['contentSpacing', 'textWidth']);
+assert.equal(pageTheme.properties.preset, undefined);
+assert.equal(pageTheme.properties.palette, undefined);
+assert.equal(pageTheme.properties.typography, undefined);
 
 const content = JSON.parse(await readFile(path.join(root, 'schemas', 'content-frontmatter.schema.json'), 'utf8'));
 assert.deepEqual(Object.keys(content.properties), ['page', 'navigation']);