@janga/norna 0.7.16 → 0.7.17

package/scripts/check-config.mjs

@@ -2,7 +2,7 @@ import { siteConfigLabel, sitePublicLabel } from './lib/site-paths.mjs';
 import { getLogoAssets, getPublicAssetInspection } from './lib/logo-assets.mjs';
 import { logoAssetFilenames } from './lib/public-asset-conventions.mjs';
 import { readSitewideContent } from './lib/sitewide-content.mjs';
-import { readThemeConfig, validateRouteThemeFiles } from './lib/theme-config.mjs';
+import { readThemeConfig, validatePageThemeFiles } from './lib/theme-config.mjs';
 
 const formatErrorMessage = (error) => {
 	if (error instanceof Error) {
@@ -16,7 +16,7 @@ try {
 	const { projectConfig } = await import('./lib/project-config.mjs');
 	const themeConfig = await readThemeConfig();
 	const sitewideContent = await readSitewideContent();
-	await validateRouteThemeFiles();
+	await validatePageThemeFiles();
 	const logoAssets = getLogoAssets();
 	const publicAssetInspection = getPublicAssetInspection();
 	const logoAssetPaths = logoAssetFilenames.map((filename) => `${sitePublicLabel}/${filename}`);
@@ -32,10 +32,10 @@ try {
 	}
 
 	if (logoAssets.length === 0) {
-		if (sitewideContent.navigation?.logo) {
-			throw new Error(`Site-wide navigation.logo is configured, but no logo file was found. Add exactly one of ${logoAssetPaths.join(', ')}, or remove navigation.logo.`);
+		if (sitewideContent.logo) {
+			throw new Error(`Site-wide logo is configured, but no logo file was found. Add exactly one of ${logoAssetPaths.join(', ')}, or remove logo.`);
 		}
-		console.warn(`Warning: No logo file found in ${sitePublicLabel}. Norna will use sitewide navigation.label or the homepage title as the navigation label.`);
+		console.warn(`Warning: No logo file found in ${sitePublicLabel}. Norna will use page titles for navigation.`);
 		console.warn(`Add exactly one of ${logoAssetPaths.join(', ')} when the site should have a logo.`);
 	}
 
@@ -51,6 +51,7 @@ try {
 	console.log(`Image max available height: desktop ${projectConfig.images.maxAvailableHeightPercent.desktop}%, mobile ${projectConfig.images.maxAvailableHeightPercent.mobile}%`);
 	console.log(`Font family: ${projectConfig.typography.fontFamily}`);
 	console.log(`Language: ${projectConfig.locale.lang}`);
+	console.log(`Navigation mode: ${projectConfig.navigation.mode}`);
 	console.log(`Scroll behavior: ${projectConfig.navigation.scrollBehavior}`);
 } catch (error) {
 	console.error('Config check failed.');

package/scripts/deploy-site.mjs

@@ -21,7 +21,7 @@ import {
 	siteContentLabel,
 	siteImagesLabel,
 	sitePublicLabel,
-	siteRoutesLabel,
+	sitePagesLabel,
 	siteThemeLabel,
 } from './lib/site-paths.mjs';
 
@@ -150,15 +150,13 @@ const getExpectedImagePaths = async () => {
 	for (const contentFile of contentFiles) {
 		const { body } = await readSiteFile(contentFile.contentPath, contentFile.contentLabel);
 
-		for (const section of getBodySections(body).sections) {
-			if (!section.id) continue;
-
+		for (const section of (await getBodySections(body)).sections) {
 			const blocks = extractNornaMarkdownBlocks(section.text, { label: contentFile.contentLabel });
 			for (const { image } of getNornaBlockImageReferences(blocks)) {
 				if (image.includes('/') || image.includes('\\')) continue;
 				if (!supportedImageExtensions.has(path.extname(image).toLowerCase())) continue;
 
-				imagePaths.add(toPosixPath(path.join(contentFile.imagesLabel, section.id, image)));
+				imagePaths.add(toPosixPath(path.join(contentFile.imagesLabel, image)));
 			}
 		}
 	}
@@ -174,7 +172,7 @@ const isExpectedUntracked = (entry, expectedImagePaths) => (
 		expectedImagePaths.has(entry.path)
 		|| entry.path === generatedImagesManifestLabel
 		|| entry.path.startsWith(`${sitePublicLabel}/`)
-		|| entry.path.startsWith(`${siteRoutesLabel}/`)
+		|| entry.path.startsWith(`${sitePagesLabel}/`)
 	)
 );
 
@@ -182,7 +180,7 @@ const isAllowedPath = (entry, filePath, expectedImagePaths) => (
 	filePath === siteContentLabel
 	|| filePath === siteThemeLabel
 	|| (!isUntracked(entry) && filePath.startsWith(`${siteImagesLabel}/`))
-	|| filePath.startsWith(`${siteRoutesLabel}/`)
+	|| filePath.startsWith(`${sitePagesLabel}/`)
 	|| filePath.startsWith(`${sitePublicLabel}/`)
 	|| expectedImagePaths.has(filePath)
 	|| filePath.startsWith('src/')
@@ -213,7 +211,7 @@ const assertDeployableStatus = async (entries, expectedImagePaths) => {
 	if (unexpectedUntracked.length > 0) {
 		fail([
 			'Refusing to deploy: unexpected untracked files are present.',
-			`Only new referenced images under ${siteImagesLabel}/<section-id>/ or ${siteRoutesLabel}/<NNN-route-id>/images/<section-id>/ are staged automatically.`,
+			`Only new referenced images directly under ${siteImagesLabel}/ or ${sitePagesLabel}/<NNN-page-id>/images/ are staged automatically.`,
 			...unexpectedUntracked.map((entry) => `- ${formatEntry(entry)}`),
 		].join('\n'));
 	}

package/scripts/doctor.mjs

@@ -12,7 +12,7 @@ import {
 	siteImagesDir,
 	siteProjectRoot,
 	sitePublicDir,
-	siteRoutesDir,
+	sitePagesDir,
 	siteThemePath,
 } from './lib/site-paths.mjs';
 
@@ -26,7 +26,7 @@ const lines = [
 	`Site theme: ${siteThemePath}`,
 	`Site content: ${siteContentPath}`,
 	`Site images: ${siteImagesDir}`,
-	`Site routes: ${siteRoutesDir}`,
+	`Site pages: ${sitePagesDir}`,
 	`Site public source: ${sitePublicDir}`,
 	`Generated image manifest: ${generatedImagesManifestPath}`,
 	`Astro public output: ${astroPublicDir}`,

package/scripts/generate-images.mjs

@@ -104,22 +104,18 @@ const fail = (message) => {
 	throw new Error(message);
 };
 
-const getImageSourceKey = (contentFile, sectionId, image) => (
+const getImageSourceKey = (contentFile, image) => (
 	contentFile.isHome
-		? `images/${sectionId}/${image}`
-		: `routes/${contentFile.routeDirectory}/images/${sectionId}/${image}`
+		? `images/${image}`
+		: `pages/${contentFile.pageDirectory}/images/${image}`
 );
 
 const getReferencedImages = async (contentFile) => {
 	const { body } = await readSiteFile(contentFile.contentPath, contentFile.contentLabel);
-	const { sections } = getBodySections(body);
+	const { sections } = await getBodySections(body);
 	const references = [];
 
 	for (const section of sections) {
-		if (!section.id) {
-			fail(`${contentFile.contentLabel}: section heading "${section.heading}" is missing an explicit id.`);
-		}
-
 		const blocks = extractNornaMarkdownBlocks(section.text, { label: contentFile.contentLabel });
 		for (const { image, line, blockDisplayType } of getNornaBlockImageReferences(blocks)) {
 			references.push({
@@ -127,8 +123,8 @@ const getReferencedImages = async (contentFile) => {
 				image,
 				line,
 				blockDisplayType,
-				sectionId: section.id,
-				sourceKey: getImageSourceKey(contentFile, section.id, image),
+				sectionLabel: section.id ?? 'page title',
+				sourceKey: getImageSourceKey(contentFile, image),
 			});
 		}
 	}
@@ -171,9 +167,8 @@ const getReferencedSources = async () => {
 				fail(`Image file does not exist: ${contentFile.imagesLabel}/${siteImagePath}`);
 			}
 
-			const currentDirectory = path.basename(path.dirname(sourcePath));
-			if (reference.sectionId && currentDirectory !== reference.sectionId) {
-				fail(`Image "${imageName}" is used in section "${reference.sectionId}" but is located in ${contentFile.imagesLabel}/${currentDirectory}/. Run norna content:sync, or npm run norna:sync in starter-style repositories, to move it.`);
+			if (path.dirname(sourcePath) !== contentFile.imagesDir) {
+				fail(`Image "${imageName}" is used in ${reference.sectionLabel} but is not stored directly in ${contentFile.imagesLabel}/. Run norna content:sync, or npm run norna:sync in starter-style repositories, to move it.`);
 			}
 
 			seen.add(reference.sourceKey);
@@ -194,16 +189,14 @@ const validateCarouselOrientations = async (manifest) => {
 
 	for (const contentFile of contentFiles) {
 		const { body } = await readSiteFile(contentFile.contentPath, contentFile.contentLabel);
-		const { sections } = getBodySections(body);
+		const { sections } = await getBodySections(body);
 
 		for (const section of sections) {
-			if (!section.id) continue;
-
 			const blocks = extractNornaMarkdownBlocks(section.text, { label: contentFile.contentLabel });
 			for (const block of blocks.filter((candidate) => candidate.type === 'image-carousel')) {
 				const orientations = new Set(
 					block.images
-						.map((image) => manifest[getImageSourceKey(contentFile, section.id, image.image)])
+						.map((image) => manifest[getImageSourceKey(contentFile, image.image)])
 						.filter(Boolean)
 						.filter((entry) => Number.isFinite(entry.width) && Number.isFinite(entry.height))
 						.map(getOrientation)
@@ -212,7 +205,7 @@ const validateCarouselOrientations = async (manifest) => {
 				orientations.delete('square');
 				if (orientations.size > 1) {
 					throw new Error(
-						`Carousel in section "${section.id}" on line ${block.line} mixes landscape and portrait images. Use landscape images with optional square images, or portrait images with optional square images.`,
+						`Carousel in ${section.id ? `section "${section.id}"` : 'the page introduction'} on line ${block.line} mixes landscape and portrait images. Use landscape images with optional square images, or portrait images with optional square images.`,
 					);
 				}
 			}

package/scripts/generate-schemas.mjs

@@ -8,8 +8,7 @@ import {
 	sitewideSchema,
 	themeVisualSchema,
 } from './lib/schema-definitions.mjs';
-import { documentationLink } from './lib/documentation-links.mjs';
-import { getSchemaValueDefinition } from './lib/schema-value-definitions.mjs';
+import { applySchemaEditorMetadata } from './lib/schema-editor-metadata.mjs';
 
 const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
 const schemaDirectory = path.join(root, 'schemas');
@@ -19,231 +18,18 @@ const definitions = [
 	['sitewide-content.schema.json', 'Norna site-wide content', sitewideSchema],
 	['content-frontmatter.schema.json', 'Norna page frontmatter', siteSchema],
 ];
-const yamlExample = (source) => `\`\`\`yaml\n${source}\n\`\`\``;
-
-const schemaProperty = (schema, propertyPath) => {
-	let current = schema;
-	for (const name of propertyPath.split('.')) {
-		current = current?.properties?.[name];
-		if (!current) throw new Error(`Generated schema has no property at ${propertyPath}.`);
-	}
-	return current;
-};
-
-const addHelp = (schema, propertyPath, paragraphs, examples = []) => {
-	const property = schemaProperty(schema, propertyPath);
-	property.markdownDescription = paragraphs.join('\n\n');
-	if (examples.length > 0) property.examples = examples;
-};
-
-const getLiteralValues = (schema) => {
-	if (Array.isArray(schema.enum)) return schema.enum;
-	if (
-		Array.isArray(schema.anyOf)
-		&& schema.anyOf.length > 0
-		&& schema.anyOf.every((candidate) => Object.hasOwn(candidate, 'const'))
-	) {
-		return schema.anyOf.map((candidate) => candidate.const);
-	}
-	return null;
-};
-
-const addValueDescriptions = (schema) => {
-	if (!schema || typeof schema !== 'object') return;
-	if (Array.isArray(schema)) {
-		for (const value of schema) addValueDescriptions(value);
-		return;
-	}
-
-	const values = getLiteralValues(schema);
-	const definition = values ? getSchemaValueDefinition(values) : null;
-	if (definition) {
-		delete schema.enum;
-		delete schema.anyOf;
-		schema.oneOf = values.map((value) => ({
-			const: value,
-			title: definition.options[value].title,
-			description: definition.options[value].description,
-		}));
-	}
-
-	for (const value of Object.values(schema)) addValueDescriptions(value);
-};
-
-const addLanguageSuggestions = (jsonSchema) => {
-	const language = jsonSchema.properties?.language;
-	if (!language) throw new Error('Generated config schema has no language property.');
-	const definition = getSchemaValueDefinition(['en', 'sv']);
-	language.default = 'en';
-	language.examples = ['en', 'sv', 'en-GB', 'sv-SE'];
-	language.oneOf = [
-		...definition.values.map((value) => ({
-			const: value,
-			title: definition.options[value].title,
-			description: definition.options[value].description,
-		})),
-		{
-			type: 'string',
-			pattern: '^(?:en|sv)-[a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*$',
-			title: 'Regional language tag',
-			description: 'Use an English or Swedish regional language tag such as en-GB or sv-SE.',
-		},
-	];
-};
-
-const addSitewideNavigationHelp = (jsonSchema) => {
-	const navigation = jsonSchema.properties?.navigation;
-	const label = navigation?.properties?.label;
-	const logo = navigation?.properties?.logo;
-	if (!navigation || !label || !logo) throw new Error('Generated site-wide schema has no navigation label/logo properties.');
-
-	navigation.markdownDescription = [
-		yamlExample('navigation:\n  label: Example Site'),
-		'`navigation` defines the identity shared by the homepage and every route. Routes cannot replace it.',
-		documentationLink('Navigation identity reference', 'sitewide-content.md', 'navigation-identity'),
-	].join('\n\n');
-	label.markdownDescription = [
-		yamlExample('navigation:\n  label: Example Site'),
-		'- Without a logo, this text is shown in the navigation.',
-		'- With a logo, this text becomes the image alternative text.',
-		'- When omitted, Norna uses the homepage title.',
-		documentationLink('Navigation identity reference', 'sitewide-content.md', 'navigation-identity'),
-	].join('\n\n');
-	label.examples = ['Example Site'];
-	logo.markdownDescription = [
-		yamlExample('navigation:\n  label: Example Site\n  logo:\n    height: 2rem'),
-		'`logo` optionally overrides the displayed height of the logo file that Norna discovers automatically. It does not enable or select the file.',
-		documentationLink('Navigation logo filenames and placement', 'public-files.md', 'navigation-logo'),
-	].join('\n\n');
-	logo.properties.height.examples = ['2rem'];
-};
-
-const addConfigHelp = (jsonSchema) => {
-	jsonSchema.markdownDescription = [
-		yamlExample('url: https://example.com/'),
-		'`config.yaml` contains the few technical settings shared by the complete site.',
-		documentationLink('Configuration reference', 'configuration.md'),
-	].join('\n\n');
-	addHelp(jsonSchema, 'url', [
-		yamlExample('url: https://example.com/'),
-		'The absolute public URL. Its path also determines the base path for generated links and assets.',
-		documentationLink('Public URL reference', 'configuration.md', 'url'),
-	], ['https://example.com/', 'https://owner.github.io/repository-name/']);
-	addHelp(jsonSchema, 'language', [
-		yamlExample('language: en-GB'),
-		'Sets the page language and selects Norna\'s built-in English or Swedish interface text. The default is `en`.',
-		documentationLink('Language reference', 'configuration.md', 'language'),
-	], ['en', 'sv', 'en-GB', 'sv-SE']);
-	addHelp(jsonSchema, 'scrollBehavior', [
-		yamlExample('scrollBehavior: smooth'),
-		'Controls same-page anchor movement. `instant` is the default; `smooth` uses the browser\'s native smooth scrolling.',
-		documentationLink('Scroll behavior reference', 'configuration.md', 'scrollbehavior'),
-	], ['instant', 'smooth']);
-};
-
-const addThemeHelp = (jsonSchema) => {
-	jsonSchema.markdownDescription = [
-		yamlExample('preset: documentation'),
-		'Choose one complete preset first. Add focused overrides only when the site needs to differ from it.',
-		documentationLink('Theme reference', 'theme.md'),
-	].join('\n\n');
-	addHelp(jsonSchema, 'preset', [
-		yamlExample('preset: documentation'),
-		'Selects coordinated layout, image sizing, typography, palette and section surfaces. This is the normal starting point for a theme.',
-		documentationLink('Compare theme presets', 'theme.md', 'theme-presets'),
-	]);
-	addHelp(jsonSchema, 'layout', [
-		yamlExample('layout:\n  density: compact\n  pageWidth: 72rem'),
-		'Overrides page width, gutters and structural spacing after the selected preset.',
-		documentationLink('Layout reference', 'theme.md', 'layout'),
-	]);
-	addHelp(jsonSchema, 'images', [
-		yamlExample('images:\n  width: 900px\n  maxAvailableHeightPercent: 74'),
-		'Overrides the available width and height used by Norna-managed images.',
-		documentationLink('Image sizing reference', 'theme.md', 'image-sizing'),
-	]);
-	addHelp(jsonSchema, 'typography', [
-		yamlExample('typography:\n  profile: reading\n  rhythm: normal'),
-		'Overrides the preset\'s font stack, typography profile, rhythm or individual text settings.',
-		documentationLink('Typography configuration reference', 'typography.md', 'configuration-shape'),
-	]);
-	addHelp(jsonSchema, 'palette', [
-		yamlExample('palette: paper'),
-		'Chooses a coordinated color system for the page frame, navigation, footer and section surfaces.',
-		documentationLink('Palette and section surfaces', 'theme.md', 'palette-and-section-surfaces'),
-	], ['dark', 'light', 'paper']);
-	addHelp(jsonSchema, 'sectionSurfaces', [
-		yamlExample('sectionSurfaces: [base, soft, emphasis]'),
-		'Lists one to three semantic surfaces. Norna cycles through them in section order; omit this field to keep the preset sequence.',
-		documentationLink('Palette and section surfaces', 'theme.md', 'palette-and-section-surfaces'),
-	], [['base'], ['base', 'soft'], ['base', 'soft', 'emphasis']]);
-};
-
-const addSitewideHelp = (jsonSchema) => {
-	jsonSchema.markdownDescription = [
-		yamlExample('navigation:\n  label: Example Site'),
-		'`sitewide-content.yaml` optionally defines editorial content and identity shared by every page.',
-		documentationLink('Site-wide content reference', 'sitewide-content.md'),
-	].join('\n\n');
-	addSitewideNavigationHelp(jsonSchema);
-	addHelp(jsonSchema, 'banners', [
-		yamlExample('banners:\n  - id: project-status\n    tone: warning\n    title: Experimental code\n    text: Not for production use.'),
-		'Adds dismissible notices above page content. List order controls their presentation order; each `id` must be unique.',
-		documentationLink('Banner reference', 'sitewide-content.md', 'banners'),
-	]);
-	addHelp(jsonSchema, 'footer', [
-		yamlExample('footer:\n  copyrightMessage: Copyright Example Owner.'),
-		'Adds shared footer content. Generated build information is optional.',
-		documentationLink('Footer reference', 'sitewide-content.md', 'footer'),
-	]);
-};
-
-const addContentHelp = (jsonSchema) => {
-	jsonSchema.markdownDescription = [
-		yamlExample('---\ntitle: About\ndescription: About this project.\n---'),
-		'Every homepage and route `content.md` starts with page metadata, followed by Markdown sections.',
-		documentationLink('Page frontmatter reference', 'content.md', 'page-frontmatter'),
-	].join('\n\n');
-	addHelp(jsonSchema, 'title', [
-		yamlExample('title: About'),
-		'The page title used in metadata and, by default, route navigation.',
-		documentationLink('Page frontmatter reference', 'content.md', 'page-frontmatter'),
-	], ['About']);
-	addHelp(jsonSchema, 'description', [
-		yamlExample('description: About this project.'),
-		'A concise page description used in metadata.',
-		documentationLink('Page frontmatter reference', 'content.md', 'page-frontmatter'),
-	], ['About this project.']);
-	addHelp(jsonSchema, 'navigation', [
-		yamlExample('navigation:\n  include: true\n  label: About us'),
-		'Controls whether a route appears in site navigation and optionally replaces its visible title there. Homepage navigation is section-based.',
-		documentationLink('Route navigation reference', 'routes.md', 'navigation'),
-	]);
-	addHelp(jsonSchema, 'sections', [
-		yamlExample('sections:\n  announcement:\n    visible:\n      until: "2026-12-01"'),
-		'Adds optional metadata keyed by explicit Markdown section id. Markdown headings remain the source of section content and order.',
-		documentationLink('Section metadata reference', 'content.md', 'section-metadata'),
-	]);
-};
-
 const schemaFiles = new Map();
 
 for (const [filename, title, schema] of definitions) {
 	const jsonSchema = z.toJSONSchema(schema, { target: 'draft-07', io: 'input' });
 	jsonSchema.$id = `https://janga.github.io/norna/schemas/${filename}`;
 	jsonSchema.title = title;
-	addValueDescriptions(jsonSchema);
-	if (filename === 'config.schema.json') {
-		addLanguageSuggestions(jsonSchema);
-		addConfigHelp(jsonSchema);
-	}
-	if (filename === 'theme.schema.json') addThemeHelp(jsonSchema);
-	if (filename === 'sitewide-content.schema.json') addSitewideHelp(jsonSchema);
-	if (filename === 'content-frontmatter.schema.json') addContentHelp(jsonSchema);
+	applySchemaEditorMetadata(filename, jsonSchema);
 	schemaFiles.set(filename, `${JSON.stringify(jsonSchema, null, 2)}\n`);
 }
 
 schemaFiles.set('manifest.json', `${JSON.stringify({
+	editorApiVersion: 1,
 	schemaVersion: 1,
 	files: {
 		config: 'config.schema.json',

package/scripts/lib/base-path-redirect.mjs

@@ -0,0 +1,9 @@
+export const getBasePathRedirectLocation = (basePath, requestUrl) => {
+	if (basePath === '/') return undefined;
+
+	const basePathWithoutTrailingSlash = basePath.replace(/\/$/, '');
+	const parsedRequestUrl = new URL(requestUrl, 'http://localhost');
+	if (parsedRequestUrl.pathname !== basePathWithoutTrailingSlash) return undefined;
+
+	return `${basePathWithoutTrailingSlash}/${parsedRequestUrl.search}`;
+};