@janga/norna 0.7.9 → 0.7.10

package/scripts/lib/project-config.mjs

@@ -37,20 +37,6 @@ const readString = (object, key, path, sourceLabel = siteConfigLabel) => {
 	return value.trim();
 };
 
-const readOptionalString = (object, key, path, sourceLabel = siteConfigLabel) => {
-	const value = object[key];
-
-	if (value === undefined || value === null || value === '') {
-		return null;
-	}
-
-	if (typeof value !== 'string' || value.trim() === '') {
-		throw new Error(`${path}.${key} must be a non-empty string when set in ${sourceLabel}.`);
-	}
-
-	return value.trim();
-};
-
 const readFontFamily = (object, key, path, fallback, sourceLabel = siteConfigLabel) => {
 	const value = object[key] ?? fallback;
 
@@ -242,58 +228,19 @@ const readLocale = (rawLocale) => {
 		lang: lang.trim(),
 		labels: Object.freeze({
 			closeMenu: readString({ closeMenu: labels.closeMenu ?? 'Close menu' }, 'closeMenu', 'locale.labels'),
+			dismissBanner: readString({ dismissBanner: labels.dismissBanner ?? 'Dismiss notice' }, 'dismissBanner', 'locale.labels'),
 			skipToContent: readString({ skipToContent: labels.skipToContent ?? 'Skip to content' }, 'skipToContent', 'locale.labels'),
 			sectionNavigation: readString({ sectionNavigation: labels.sectionNavigation ?? 'Sections' }, 'sectionNavigation', 'locale.labels'),
 			gallery: readString({ gallery: labels.gallery ?? 'Images' }, 'gallery', 'locale.labels'),
+			note: readString({ note: labels.note ?? 'Note' }, 'note', 'locale.labels'),
 			menu: readString({ menu: labels.menu ?? 'Menu' }, 'menu', 'locale.labels'),
 			pageNavigation: readString({ pageNavigation: labels.pageNavigation ?? 'On this page' }, 'pageNavigation', 'locale.labels'),
 			siteNavigation: readString({ siteNavigation: labels.siteNavigation ?? 'Pages' }, 'siteNavigation', 'locale.labels'),
+			siteBanners: readString({ siteBanners: labels.siteBanners ?? 'Site notices' }, 'siteBanners', 'locale.labels'),
 		}),
 	});
 };
 
-const readDateTimeFormat = (object, path) => {
-	const dateTimeFormat = assertObject(object, path);
-	const locale = readString(dateTimeFormat, 'locale', path);
-	const timeZone = readString(dateTimeFormat, 'timeZone', path);
-	const dateStyle = readString(dateTimeFormat, 'dateStyle', path);
-	const timeStyle = readString(dateTimeFormat, 'timeStyle', path);
-
-	try {
-		new Intl.DateTimeFormat(locale, {
-			dateStyle,
-			timeStyle,
-			timeZone,
-		});
-	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		throw new Error(`${path} must be a valid Intl.DateTimeFormat configuration in ${siteConfigLabel}: ${message}`);
-	}
-
-	return Object.freeze({
-		dateStyle,
-		locale,
-		timeStyle,
-		timeZone,
-	});
-};
-
-const readBuildInfo = (footer) => {
-	const value = footer.buildInfo;
-
-	if (value === undefined || value === null || value === false) {
-		return null;
-	}
-
-	const buildInfo = assertObject(value, 'footer.buildInfo');
-
-	return Object.freeze({
-		enabled: readBoolean(buildInfo, 'enabled', 'footer.buildInfo', true),
-		text: readString(buildInfo, 'text', 'footer.buildInfo'),
-		dateTimeFormat: readDateTimeFormat(buildInfo.dateTimeFormat, 'footer.buildInfo.dateTimeFormat'),
-	});
-};
-
 const rawConfig = assertObject(siteConfig, 'default export');
 const misplacedThemeKeys = ['layout', 'gallery', 'typography'].filter((key) => key in rawConfig);
 if (misplacedThemeKeys.length > 0) {
@@ -302,13 +249,8 @@ if (misplacedThemeKeys.length > 0) {
 
 const rawTheme = assertObject(themeConfig, 'theme frontmatter', siteThemeLabel);
 const rawSite = assertObject(rawConfig.site, 'site');
-const rawLayout = assertObject(rawTheme.layout ?? {}, 'layout', siteThemeLabel);
-const rawLayoutSpacing = assertObject(rawLayout.spacing ?? {}, 'layout.spacing', siteThemeLabel);
-const rawGallery = assertObject(rawTheme.gallery ?? {}, 'gallery', siteThemeLabel);
-const rawTypography = assertObject(rawTheme.typography ?? {}, 'typography', siteThemeLabel);
 const rawNavigation = assertObject(rawConfig.navigation ?? {}, 'navigation');
 const rawLocale = rawConfig.locale ?? {};
-const rawFooter = assertObject(rawConfig.footer ?? {}, 'footer');
 const rawGithub = assertObject(rawConfig.github, 'github');
 const rawDeploy = assertObject(rawConfig.deploy ?? {}, 'deploy');
 const rawDeployWatch = assertObject(rawDeploy.watch ?? {}, 'deploy.watch');
@@ -317,9 +259,9 @@ const defaultFontFamily = "Arial, 'Helvetica Neue', Helvetica, sans-serif";
 const layoutDensityNames = ['compact', 'normal', 'airy'];
 const layoutDensityProfiles = Object.freeze({
 	compact: Object.freeze({
-		bodyToImages: Object.freeze({
-			desktop: '1rem',
-			mobile: '0.9rem',
+		blockGap: Object.freeze({
+			desktop: '1.25em',
+			mobile: '1.1em',
 		}),
 		finalSectionBottom: Object.freeze({
 			desktop: 'clamp(1.2rem, 2.4vw, 2.25rem)',
@@ -329,6 +271,10 @@ const layoutDensityProfiles = Object.freeze({
 			desktop: 'clamp(1rem, 2vw, 1.75rem)',
 			mobile: '1rem',
 		}),
+		headingToBlock: Object.freeze({
+			desktop: '0.65em',
+			mobile: '0.6em',
+		}),
 		imageGap: Object.freeze({
 			desktop: 'clamp(1rem, 2vw, 1.5rem)',
 			mobile: '1.25rem',
@@ -339,9 +285,9 @@ const layoutDensityProfiles = Object.freeze({
 		}),
 	}),
 	normal: Object.freeze({
-		bodyToImages: Object.freeze({
-			desktop: '1.25rem',
-			mobile: '1rem',
+		blockGap: Object.freeze({
+			desktop: '1.5em',
+			mobile: '1.25em',
 		}),
 		finalSectionBottom: Object.freeze({
 			desktop: 'clamp(1.4rem, 3vw, 2.75rem)',
@@ -351,6 +297,10 @@ const layoutDensityProfiles = Object.freeze({
 			desktop: 'clamp(1.25rem, 3vw, 2.5rem)',
 			mobile: '1.25rem',
 		}),
+		headingToBlock: Object.freeze({
+			desktop: '0.75em',
+			mobile: '0.7em',
+		}),
 		imageGap: Object.freeze({
 			desktop: 'clamp(1.25rem, 2.8vw, 2rem)',
 			mobile: '1.5rem',
@@ -361,9 +311,9 @@ const layoutDensityProfiles = Object.freeze({
 		}),
 	}),
 	airy: Object.freeze({
-		bodyToImages: Object.freeze({
-			desktop: '1.5rem',
-			mobile: '1.25rem',
+		blockGap: Object.freeze({
+			desktop: '1.75em',
+			mobile: '1.5em',
 		}),
 		finalSectionBottom: Object.freeze({
 			desktop: 'clamp(2.25rem, 5vw, 4.5rem)',
@@ -373,6 +323,10 @@ const layoutDensityProfiles = Object.freeze({
 			desktop: 'clamp(2rem, 5vw, 4rem)',
 			mobile: '1.5rem',
 		}),
+		headingToBlock: Object.freeze({
+			desktop: '0.9em',
+			mobile: '0.8em',
+		}),
 		imageGap: Object.freeze({
 			desktop: 'clamp(1.5rem, 3.5vw, 2.75rem)',
 			mobile: '2rem',
@@ -383,51 +337,59 @@ const layoutDensityProfiles = Object.freeze({
 		}),
 	}),
 });
-const layoutDensity = readEnum(rawLayout, 'density', 'layout', layoutDensityNames, 'normal', siteThemeLabel);
-const layoutSpacingDefaults = layoutDensityProfiles[layoutDensity];
+export const resolveThemeVisualConfig = (theme, sourceLabel = siteThemeLabel) => {
+	const rawThemeConfig = assertObject(theme ?? {}, 'theme frontmatter', sourceLabel);
+	const rawLayoutConfig = assertObject(rawThemeConfig.layout ?? {}, 'layout', sourceLabel);
+	const rawLayoutSpacingConfig = assertObject(rawLayoutConfig.spacing ?? {}, 'layout.spacing', sourceLabel);
+	const rawGalleryConfig = assertObject(rawThemeConfig.gallery ?? {}, 'gallery', sourceLabel);
+	const rawTypographyConfig = assertObject(rawThemeConfig.typography ?? {}, 'typography', sourceLabel);
+	const resolvedLayoutDensity = readEnum(rawLayoutConfig, 'density', 'layout', layoutDensityNames, 'normal', sourceLabel);
+	const resolvedLayoutSpacingDefaults = layoutDensityProfiles[resolvedLayoutDensity];
+
+	return Object.freeze({
+		layout: Object.freeze({
+			density: resolvedLayoutDensity,
+			gutter: readResponsiveCssLength(rawLayoutConfig, 'gutter', 'layout', Object.freeze({
+				desktop: 'clamp(1.25rem, 4vw, 3rem)',
+				mobile: '1rem',
+			}), sourceLabel),
+			pageWidth: readCssLength(rawLayoutConfig, 'pageWidth', 'layout', '1180px', sourceLabel),
+			spacing: Object.freeze({
+				blockGap: readResponsiveCssLength(rawLayoutSpacingConfig, 'blockGap', 'layout.spacing', resolvedLayoutSpacingDefaults.blockGap, sourceLabel),
+				finalSectionBottom: readResponsiveCssLength(rawLayoutSpacingConfig, 'finalSectionBottom', 'layout.spacing', resolvedLayoutSpacingDefaults.finalSectionBottom, sourceLabel),
+				firstSectionTop: readResponsiveCssLength(rawLayoutSpacingConfig, 'firstSectionTop', 'layout.spacing', resolvedLayoutSpacingDefaults.firstSectionTop, sourceLabel),
+				headingToBlock: readResponsiveCssLength(rawLayoutSpacingConfig, 'headingToBlock', 'layout.spacing', resolvedLayoutSpacingDefaults.headingToBlock, sourceLabel),
+				imageGap: readResponsiveCssLength(rawLayoutSpacingConfig, 'imageGap', 'layout.spacing', resolvedLayoutSpacingDefaults.imageGap, sourceLabel),
+				sectionGap: readResponsiveCssLength(rawLayoutSpacingConfig, 'sectionGap', 'layout.spacing', resolvedLayoutSpacingDefaults.sectionGap, sourceLabel),
+			}),
+		}),
+		gallery: Object.freeze({
+			maxAvailableHeightPercent: readResponsivePercent(rawGalleryConfig, 'maxAvailableHeightPercent', 'gallery', Object.freeze({
+				desktop: 74,
+				mobile: 68,
+			}), sourceLabel),
+			maxAvailableWidthPercent: readResponsivePercent(rawGalleryConfig, 'maxAvailableWidthPercent', 'gallery', Object.freeze({
+				desktop: 100,
+				mobile: 100,
+			}), sourceLabel),
+			width: readCssLength(rawGalleryConfig, 'width', 'gallery', '900px', sourceLabel),
+		}),
+		typography: Object.freeze({
+			fontFamily: readFontFamily(rawTypographyConfig, 'fontFamily', 'typography', defaultFontFamily, sourceLabel),
+		}),
+	});
+};
 
 export const projectConfig = Object.freeze({
 	site: Object.freeze({
 		basePath: readBasePath(rawSite, 'basePath', 'site'),
 		url: readUrl(rawSite, 'url', 'site'),
 	}),
-	layout: Object.freeze({
-		density: layoutDensity,
-		gutter: readResponsiveCssLength(rawLayout, 'gutter', 'layout', Object.freeze({
-			desktop: 'clamp(1.25rem, 4vw, 3rem)',
-			mobile: '1rem',
-		}), siteThemeLabel),
-		pageWidth: readCssLength(rawLayout, 'pageWidth', 'layout', '1180px', siteThemeLabel),
-		spacing: Object.freeze({
-			bodyToImages: readResponsiveCssLength(rawLayoutSpacing, 'bodyToImages', 'layout.spacing', layoutSpacingDefaults.bodyToImages, siteThemeLabel),
-			finalSectionBottom: readResponsiveCssLength(rawLayoutSpacing, 'finalSectionBottom', 'layout.spacing', layoutSpacingDefaults.finalSectionBottom, siteThemeLabel),
-			firstSectionTop: readResponsiveCssLength(rawLayoutSpacing, 'firstSectionTop', 'layout.spacing', layoutSpacingDefaults.firstSectionTop, siteThemeLabel),
-			imageGap: readResponsiveCssLength(rawLayoutSpacing, 'imageGap', 'layout.spacing', layoutSpacingDefaults.imageGap, siteThemeLabel),
-			sectionGap: readResponsiveCssLength(rawLayoutSpacing, 'sectionGap', 'layout.spacing', layoutSpacingDefaults.sectionGap, siteThemeLabel),
-		}),
-	}),
-	gallery: Object.freeze({
-		maxAvailableHeightPercent: readResponsivePercent(rawGallery, 'maxAvailableHeightPercent', 'gallery', Object.freeze({
-			desktop: 74,
-			mobile: 68,
-		}), siteThemeLabel),
-		maxAvailableWidthPercent: readResponsivePercent(rawGallery, 'maxAvailableWidthPercent', 'gallery', Object.freeze({
-			desktop: 100,
-			mobile: 100,
-		}), siteThemeLabel),
-		width: readCssLength(rawGallery, 'width', 'gallery', '900px', siteThemeLabel),
-	}),
-	typography: Object.freeze({
-		fontFamily: readFontFamily(rawTypography, 'fontFamily', 'typography', defaultFontFamily, siteThemeLabel),
-	}),
+	...resolveThemeVisualConfig(rawTheme, siteThemeLabel),
 	navigation: Object.freeze({
 		smoothScroll: readSmoothScroll(rawNavigation),
 	}),
 	locale: readLocale(rawLocale),
-	footer: Object.freeze({
-		buildInfo: readBuildInfo(rawFooter),
-		copyrightMessage: readOptionalString(rawFooter, 'copyrightMessage', 'footer'),
-	}),
 	github: Object.freeze({
 		repo: readString(rawGithub, 'repo', 'github'),
 		branch: readString(rawGithub, 'branch', 'github'),

package/scripts/lib/site-content.mjs

@@ -18,24 +18,20 @@ export const supportedImageExtensions = new Set([...rasterImageExtensions, ...st
 
 const h2Regex = /^##\s+.*$/gm;
 const explicitHeadingIdRegex = /\s*\{#([a-z0-9-]+)\}\s*$/;
-const inlineStyleReferenceRegex = /\[[^\]\n]+\]\{\.([a-z][a-z0-9-]*)\}/g;
+const deprecatedInlineStyleReferenceRegex = /\[[^\]\n]+\]\{\.([a-z][a-z0-9-]*)\}/g;
 const frontmatterDelimiterRegex = /^---\s*$/;
-const knownContentTopLevelFrontmatterKeys = new Set(['title', 'description', 'navigation', 'presentation', 'frame', 'sections']);
-const knownThemeTopLevelFrontmatterKeys = new Set(['navigation', 'layout', 'gallery', 'typography', 'presentation', 'frame']);
-const frontmatterColorKeys = new Set(['backgroundColor', 'textColor', 'color']);
-const quotedHexColorRegex = /^["']#(?:[0-9a-fA-F]{3}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})["']$/;
-const unquotedHexColorRegex = /^#(?:[0-9a-fA-F]{3}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})$/;
+const knownContentTopLevelFrontmatterKeys = new Set(['title', 'description', 'navigation', 'sections']);
+const knownThemeTopLevelFrontmatterKeys = new Set(['navigation', 'layout', 'gallery', 'typography', 'presentation']);
+const knownRouteThemeTopLevelFrontmatterKeys = new Set(['navigation', 'layout', 'gallery', 'typography', 'presentation']);
+const knownSitewideTopLevelFrontmatterKeys = new Set(['navigation', 'banners', 'footer']);
 const knownNestedFrontmatterKeys = new Set([
 	'align',
 	'alt',
-	'backgroundColor',
 	'body',
-	'bodyToImages',
+	'blockGap',
 	'brand',
 	'caption',
 	'carousel',
-	'color',
-	'colors',
 	'density',
 	'desktop',
 	'fontFamily',
@@ -43,6 +39,7 @@ const knownNestedFrontmatterKeys = new Set([
 	'finalSectionBottom',
 	'gallery',
 	'gutter',
+	'headingToBlock',
 	'h1',
 	'h2',
 	'h3',
@@ -53,8 +50,8 @@ const knownNestedFrontmatterKeys = new Set([
 	'include',
 	'image',
 	'imageGap',
-	'inlineStyles',
 	'label',
+	'logo',
 	'lineHeight',
 	'maxAvailableHeightPercent',
 	'maxAvailableWidthPercent',
@@ -63,15 +60,18 @@ const knownNestedFrontmatterKeys = new Set([
 	'overrides',
 	'paragraphSpacing',
 	'pageWidth',
+	'palette',
 	'preset',
 	'presentation',
 	'rhythm',
+	'sequence',
 	'sections',
 	'sectionGap',
+	'sectionSurfaces',
 	'size',
 	'spacingAfter',
 	'spacingBefore',
-	'textColor',
+	'surface',
 	'theme',
 	'typography',
 	'until',
@@ -264,79 +264,6 @@ export const validateFrontmatterStructure = (frontmatter, addIssue, {
 	}
 };
 
-const stripInlineYamlComment = (value) => {
-	let quote = null;
-
-	for (let index = 0; index < value.length; index += 1) {
-		const character = value[index];
-		const previous = value[index - 1];
-
-		if ((character === '"' || character === "'") && previous !== '\\') {
-			quote = quote === character ? null : quote ?? character;
-			continue;
-		}
-
-		if (character === '#' && quote === null && /\s/.test(previous ?? '')) {
-			return value.slice(0, index).trimEnd();
-		}
-	}
-
-	return value.trim();
-};
-
-export const validateFrontmatterColorValues = (frontmatter, addIssue, label = 'Frontmatter') => {
-	const lines = frontmatter.split(/\r?\n/);
-	const pathStack = [];
-
-	for (const [index, line] of lines.entries()) {
-		const lineNumber = index + 1;
-		const trimmed = line.trim();
-
-		if (!trimmed || trimmed.startsWith('#') || frontmatterDelimiterRegex.test(line)) {
-			continue;
-		}
-
-		const match = line.match(/^(\s*)([A-Za-z][A-Za-z0-9-]*):\s*(.*?)\s*$/);
-		if (!match) continue;
-
-		const indent = match[1].length;
-		const key = match[2];
-		const rawValue = match[3].trim();
-
-		while (pathStack.length > 0 && pathStack[pathStack.length - 1].indent >= indent) {
-			pathStack.pop();
-		}
-
-		const pathLabel = [...pathStack.map((entry) => entry.key), key].join('.');
-
-		if (!frontmatterColorKeys.has(key)) {
-			if (!rawValue) {
-				pathStack.push({ indent, key });
-			}
-			continue;
-		}
-
-		const value = stripInlineYamlComment(rawValue);
-
-		if (quotedHexColorRegex.test(value)) continue;
-
-		if (unquotedHexColorRegex.test(rawValue)) {
-			addIssue({
-				severity: 'error',
-				message: `${label} line ${lineNumber} defines ${pathLabel} as an unquoted hex color. YAML treats "#" as the start of a comment unless the value is quoted.`,
-				fix: `Write it as ${key}: "#ffd84d" or another quoted hex color.`,
-			});
-			continue;
-		}
-
-		addIssue({
-			severity: 'error',
-			message: `${label} line ${lineNumber} defines ${pathLabel} with invalid color value ${rawValue || '(empty)'}.`,
-			fix: `Use a quoted hex color in #rgb, #rrggbb, or #rrggbbaa form, for example ${key}: "#ffd84d".`,
-		});
-	}
-};
-
 export const validateContentFrontmatterStructure = (frontmatter, addIssue) =>
 	validateFrontmatterStructure(frontmatter, addIssue, {
 		knownTopLevelFrontmatterKeys: knownContentTopLevelFrontmatterKeys,
@@ -349,6 +276,18 @@ export const validateThemeFrontmatterStructure = (frontmatter, addIssue) =>
 		fileKind: 'theme',
 	});
 
+export const validateRouteThemeFrontmatterStructure = (frontmatter, addIssue) =>
+	validateFrontmatterStructure(frontmatter, addIssue, {
+		knownTopLevelFrontmatterKeys: knownRouteThemeTopLevelFrontmatterKeys,
+		fileKind: 'route theme',
+	});
+
+export const validateSitewideFrontmatterStructure = (frontmatter, addIssue) =>
+	validateFrontmatterStructure(frontmatter, addIssue, {
+		knownTopLevelFrontmatterKeys: knownSitewideTopLevelFrontmatterKeys,
+		fileKind: 'sitewide content',
+	});
+
 export const readThemeFile = async (sitePath) => readSiteFile(sitePath, siteThemeLabel);
 
 export const getFrontmatterSections = (frontmatter) => {
@@ -374,42 +313,11 @@ export const getFrontmatterSections = (frontmatter) => {
 	return sections;
 };
 
-export const getFrontmatterInlineStyleNames = (frontmatter) => {
-	const names = new Set();
-	const lines = frontmatter.split(/\r?\n/);
-	let inlineStylesIndent = null;
-
-	for (const line of lines) {
-		const inlineStylesMatch = line.match(/^(\s*)inlineStyles:\s*$/);
-
-		if (inlineStylesMatch) {
-			inlineStylesIndent = inlineStylesMatch[1].length;
-			continue;
-		}
-
-		if (inlineStylesIndent === null) continue;
-		if (!line.trim() || line.trim().startsWith('#')) continue;
-
-		const indent = line.match(/^\s*/)?.[0].length ?? 0;
-		if (indent <= inlineStylesIndent) {
-			inlineStylesIndent = null;
-			continue;
-		}
-
-		const nameMatch = line.match(new RegExp(`^\\s{${inlineStylesIndent + 2}}([a-z][a-z0-9-]*):\\s*$`));
-		if (nameMatch) {
-			names.add(nameMatch[1]);
-		}
-	}
-
-	return names;
-};
+export const getHeadingId = (heading) => heading.match(explicitHeadingIdRegex)?.[1];
 
-export const getInlineStyleReferences = (body) => Array.from(body.matchAll(inlineStyleReferenceRegex))
+export const getDeprecatedInlineStyleReferences = (body) => Array.from(body.matchAll(deprecatedInlineStyleReferenceRegex))
 	.map((match) => match[1]);
 
-export const getHeadingId = (heading) => heading.match(explicitHeadingIdRegex)?.[1];
-
 export const getBodySections = (body) => {
 	const matches = Array.from(body.matchAll(h2Regex));
 	const prelude = matches.length > 0 ? body.slice(0, matches[0].index) : body;

package/scripts/lib/site-paths.mjs

@@ -117,6 +117,7 @@ export const siteDir = resolvedSitePaths.siteDir;
 export const siteConfigPath = path.join(siteDir, 'config.mjs');
 export const siteThemePath = path.join(siteDir, 'theme.md');
 export const siteContentPath = path.join(siteDir, 'content.md');
+export const sitewideContentPath = path.join(siteDir, 'sitewide-content.md');
 export const siteImagesDir = path.join(siteDir, 'images');
 export const siteRoutesDir = path.join(siteDir, 'routes');
 export const sitePublicDir = path.join(siteDir, 'public');
@@ -135,6 +136,7 @@ export const siteDirLabel = getPathLabel(siteDir);
 export const siteConfigLabel = getPathLabel(siteConfigPath);
 export const siteThemeLabel = getPathLabel(siteThemePath);
 export const siteContentLabel = getPathLabel(siteContentPath);
+export const sitewideContentLabel = getPathLabel(sitewideContentPath);
 export const siteImagesLabel = getPathLabel(siteImagesDir);
 export const siteRoutesLabel = getPathLabel(siteRoutesDir);
 export const sitePublicLabel = getPathLabel(sitePublicDir);

package/scripts/lib/sitewide-config.mjs

@@ -0,0 +1,34 @@
+import { readFile } from 'node:fs/promises';
+import { parseYamlMapping } from './frontmatter-yaml.mjs';
+import {
+	sitewideContentLabel,
+	sitewideContentPath,
+} from './site-paths.mjs';
+import {
+	splitSiteFile,
+	validateFrontmatterIndentation,
+	validateSitewideFrontmatterStructure,
+} from './site-content.mjs';
+
+export const readSitewideConfig = async () => {
+	const source = await readFile(sitewideContentPath, 'utf8').catch((error) => {
+		if (error?.code === 'ENOENT') return null;
+		throw error;
+	});
+
+	if (!source) return {};
+
+	const { frontmatter, frontmatterBody } = splitSiteFile(source, sitewideContentLabel);
+	const issues = [];
+	validateFrontmatterIndentation(frontmatter, (issue) => issues.push(issue));
+	validateSitewideFrontmatterStructure(frontmatter, (issue) => issues.push(issue));
+
+	if (issues.length > 0) {
+		throw new Error([
+			`${sitewideContentLabel} has invalid frontmatter.`,
+			...issues.map((issue) => `- ${issue.message}`),
+		].join('\n'));
+	}
+
+	return parseYamlMapping(frontmatterBody);
+};

package/scripts/lib/theme-config.mjs

@@ -1,19 +1,24 @@
-import { readFile } from 'node:fs/promises';
+import { readFile, readdir } from 'node:fs/promises';
+import path from 'node:path';
 import { parseYamlMapping } from './frontmatter-yaml.mjs';
 import {
 	splitSiteFile,
-	validateFrontmatterColorValues,
 	validateFrontmatterIndentation,
+	validateRouteThemeFrontmatterStructure,
 	validateThemeFrontmatterStructure,
 } from './site-content.mjs';
-import { siteThemeLabel, siteThemePath } from './site-paths.mjs';
-
-const emptyThemeFile = '---\n---\n';
+import {
+	siteRoutesDir,
+	siteRoutesLabel,
+	siteThemeLabel,
+	siteThemePath,
+	sitewideContentLabel,
+} from './site-paths.mjs';
 
 export const readThemeConfig = async () => {
 	const themeFile = await readFile(siteThemePath, 'utf8').catch((error) => {
 		if (error?.code === 'ENOENT') {
-			return emptyThemeFile;
+			throw new Error(`${siteThemeLabel} is required. Create it before running Norna.`);
 		}
 
 		throw error;
@@ -23,7 +28,6 @@ export const readThemeConfig = async () => {
 
 	validateFrontmatterIndentation(frontmatter, (issue) => issues.push(issue));
 	validateThemeFrontmatterStructure(frontmatter, (issue) => issues.push(issue));
-	validateFrontmatterColorValues(frontmatter, (issue) => issues.push(issue), siteThemeLabel);
 
 	if (issues.length > 0) {
 		throw new Error([
@@ -32,5 +36,65 @@ export const readThemeConfig = async () => {
 		].join('\n'));
 	}
 
-	return parseYamlMapping(frontmatterBody);
+	const config = parseYamlMapping(frontmatterBody);
+	if (Object.hasOwn(config, 'navigation')) {
+		throw new Error(`${siteThemeLabel} may not define navigation. Brand and logo belong in ${sitewideContentLabel}.`);
+	}
+
+	return config;
+};
+
+const getRouteThemeFiles = async (directory, relativeDirectory = '') => {
+	const entries = await readdir(directory, { withFileTypes: true }).catch((error) => {
+		if (error?.code === 'ENOENT') return [];
+		throw error;
+	});
+	const files = [];
+
+	for (const entry of entries) {
+		const relativePath = path.join(relativeDirectory, entry.name);
+		const absolutePath = path.join(directory, entry.name);
+		if (entry.isDirectory()) {
+			files.push(...await getRouteThemeFiles(absolutePath, relativePath));
+			continue;
+		}
+
+		if (entry.name === 'theme.md') {
+			files.push({
+				path: absolutePath,
+				label: `${siteRoutesLabel}/${relativePath.split(path.sep).join('/')}`,
+			});
+		}
+	}
+
+	return files;
+};
+
+export const validateRouteThemeFiles = async () => {
+	const files = await getRouteThemeFiles(siteRoutesDir);
+	const configs = [];
+
+	for (const file of files) {
+		const source = await readFile(file.path, 'utf8');
+		const { frontmatter, frontmatterBody } = splitSiteFile(source, file.label);
+		const issues = [];
+		validateFrontmatterIndentation(frontmatter, (issue) => issues.push(issue));
+		validateRouteThemeFrontmatterStructure(frontmatter, (issue) => issues.push(issue));
+
+		if (issues.length > 0) {
+			throw new Error([
+				`${file.label} has invalid frontmatter.`,
+				...issues.map((issue) => `- ${issue.message}`),
+			].join('\n'));
+		}
+
+		const config = parseYamlMapping(frontmatterBody);
+		if (Object.hasOwn(config, 'navigation')) {
+			throw new Error(`${file.label} may not define navigation. Brand and logo belong in ${sitewideContentLabel}.`);
+		}
+
+		configs.push({ ...file, config });
+	}
+
+	return configs;
 };