@janga/norna 0.7.1 → 0.7.3

package/scripts/init-site.mjs

@@ -13,12 +13,12 @@ const cliExecutableName = 'norna';
 const usage = `
 Usage: norna init <target-dir> [--type pure|embedded] [--site-dir <path>]
 
-Creates a new site project or adds a gallery source directory to an existing
+Creates a new site project or adds a Norna site directory to an existing
 project.
 
 Examples:
-  norna init my-gallery
-  norna init my-gallery --type pure
+  norna init my-site
+  norna init my-site --type pure
   norna init . --type embedded --site-dir presentation
 `.trim();
 
@@ -133,8 +133,8 @@ const galleryScripts = {
 	'norna:config:check': cliCommand('config:check'),
 	'norna:content:check': cliCommand('content:check'),
 	'norna:sync': cliCommand('content:sync'),
-	'norna:typography:presets': cliCommand('typography:presets'),
-	'norna:typography:show': cliCommand('typography:show'),
+	'norna:typography:presets': cliCommand('typography presets'),
+	'norna:typography:show': cliCommand('typography show'),
 	'norna:public': cliCommand('site:public'),
 	'norna:images': cliCommand('images'),
 	'norna:build': cliCommand('build'),
@@ -156,7 +156,7 @@ const addGalleryDependency = (packageJson, version) => {
 const addGalleryScripts = (packageJson, scripts, { includePureAliases }) => {
 	packageJson.scripts ??= {};
 	const wantedScripts = {
-		...(includePureAliases ? { dev: 'npm run norna:dev' } : {}),
+		...(includePureAliases ? { dev: 'npm run norna:dev --' } : {}),
 		...scripts,
 		...(includePureAliases ? { build: 'npm run norna:build' } : {}),
 	};
@@ -180,7 +180,7 @@ const existingEntries = await readDirectoryEntries(targetRoot);
 if (type === 'pure') {
 	if (existingEntries && existingEntries.length > 0) {
 		const existingPackageJson = existingEntries.includes('package.json')
-			? ' The target already contains package.json; use --type embedded to add a gallery to an existing project.'
+			? ' The target already contains package.json; use --type embedded to add a Norna site to an existing project.'
 			: '';
 		throw new Error(`Target directory must be empty for --type pure: ${targetRoot}.${existingPackageJson}`);
 	}
@@ -218,7 +218,7 @@ if (type === 'pure') {
 	const existingSiteEntries = await readDirectoryEntries(targetSiteDir);
 
 	if (existingSiteEntries && existingSiteEntries.length > 0) {
-		throw new Error(`Gallery site directory must be empty for --type embedded: ${targetSiteDir}`);
+		throw new Error(`Norna site directory must be empty for --type embedded: ${targetSiteDir}`);
 	}
 
 	addGalleryDependency(targetPackageJson, enginePackageJson.version);
@@ -246,4 +246,6 @@ console.log(`  cd ${targetRoot}`);
 console.log(type === 'embedded'
 	? '  npm install'
 	: '  npm install');
-console.log('  npm run norna:dev');
+console.log(type === 'embedded'
+	? '  npm run norna:dev'
+	: '  npm run dev');

package/scripts/lib/frontmatter-yaml.mjs

@@ -0,0 +1,85 @@
+const countIndent = (line) => line.match(/^\s*/)?.[0].length ?? 0;
+
+const stripInlineComment = (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;
+};
+
+const parseScalar = (rawValue) => {
+	const value = stripInlineComment(rawValue.trim());
+
+	if (value === 'true') return true;
+	if (value === 'false') return false;
+	if (/^-?\d+(?:\.\d+)?$/.test(value)) return Number(value);
+	if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'"))) {
+		return value.slice(1, -1);
+	}
+
+	return value;
+};
+
+export const parseMapping = (lines, startIndex = 0, baseIndent = -1) => {
+	const value = {};
+	let index = startIndex;
+
+	while (index < lines.length) {
+		const line = lines[index];
+		if (!line.trim() || line.trim().startsWith('#')) {
+			index += 1;
+			continue;
+		}
+
+		const indent = countIndent(line);
+		if (indent <= baseIndent) break;
+		if (line.trim().startsWith('- ')) break;
+
+		const match = line.trim().match(/^([a-zA-Z][a-zA-Z0-9-]*):(?:\s+(.*))?$/);
+		if (!match) break;
+
+		const [, key, rawValue] = match;
+		if (rawValue === undefined) {
+			const parsed = parseMapping(lines, index + 1, indent);
+			value[key] = parsed.value;
+			index = parsed.nextIndex;
+		} else {
+			value[key] = parseScalar(rawValue);
+			index += 1;
+		}
+	}
+
+	return { value, nextIndex: index };
+};
+
+export const parseYamlMapping = (source) => parseMapping(source.split(/\r?\n/)).value;
+
+export const findMap = (lines, label, parentStart = 0, parentEnd = lines.length, requiredIndent = null) => {
+	for (let index = parentStart; index < parentEnd; index += 1) {
+		const line = lines[index];
+		const match = line.match(/^(\s*)([a-zA-Z][a-zA-Z0-9-]*):\s*$/);
+		if (!match || match[2] !== label) continue;
+		if (requiredIndent !== null && match[1].length !== requiredIndent) continue;
+
+		return {
+			index,
+			indent: match[1].length,
+			...parseMapping(lines, index + 1, match[1].length),
+		};
+	}
+
+	return null;
+};

package/scripts/lib/presentation.mjs

@@ -11,19 +11,20 @@ export const fallbackPresentationColors = Object.freeze({
 
 const normalizePresentation = (presentation) => presentation ?? {};
 
-export const resolveThemePresentation = (themePresentation) => {
-	const normalizedThemePresentation = normalizePresentation(themePresentation);
+export const resolveThemePresentation = (theme) => {
+	const normalizedTheme = theme ?? {};
+	const normalizedThemePresentation = normalizePresentation(normalizedTheme.presentation);
 
 	return {
 		backgroundColor: normalizedThemePresentation.backgroundColor ?? fallbackPresentationColors.backgroundColor,
 		textColor: normalizedThemePresentation.textColor ?? fallbackPresentationColors.textColor,
 		inlineStyles: normalizedThemePresentation.inlineStyles ?? {},
-		typography: resolveTypographyConfig(normalizedThemePresentation.typography ?? defaultTypography),
+		typography: resolveTypographyConfig(normalizedTheme.typography ?? defaultTypography),
 	};
 };
 
-export const resolvePagePresentation = (themePresentation, pagePresentation) => {
-	const resolvedThemePresentation = resolveThemePresentation(themePresentation);
+export const resolvePagePresentation = (theme, pagePresentation) => {
+	const resolvedThemePresentation = resolveThemePresentation(theme);
 	const normalizedPagePresentation = normalizePresentation(pagePresentation);
 
 	return {
@@ -42,7 +43,7 @@ const getColorsFromPresentation = (presentation) => ({
 	textColor: presentation.textColor,
 });
 
-const resolveColorSource = ({ colors, themePresentation, themeFrameColors, pagePresentation }) => {
+const resolveColorSource = ({ colors, themeFrameColors, pagePresentation }) => {
 	if (!colors || colors === 'theme') {
 		return themeFrameColors;
 	}
@@ -54,18 +55,16 @@ const resolveColorSource = ({ colors, themePresentation, themeFrameColors, pageP
 	return colors;
 };
 
-export const resolveFrameColors = ({ themePresentation, themeFrame, pagePresentation, pageFrame }) => {
-	const resolvedThemePresentation = resolveThemePresentation(themePresentation);
+export const resolveFrameColors = ({ theme, pagePresentation, pageFrame }) => {
+	const resolvedThemePresentation = resolveThemePresentation(theme);
 	const themeFrameColors = resolveColorSource({
-		colors: themeFrame?.colors ?? 'presentation',
-		themePresentation: resolvedThemePresentation,
+		colors: theme?.frame?.colors ?? 'presentation',
 		themeFrameColors: getColorsFromPresentation(resolvedThemePresentation),
 		pagePresentation: resolvedThemePresentation,
 	});
 
 	return resolveColorSource({
 		colors: pageFrame?.colors ?? 'theme',
-		themePresentation: resolvedThemePresentation,
 		themeFrameColors,
 		pagePresentation,
 	});

package/scripts/lib/project-config.mjs

@@ -1,31 +1,33 @@
 import { pathToFileURL } from 'node:url';
-import { siteConfigLabel, siteConfigPath } from './site-paths.mjs';
+import { siteConfigLabel, siteConfigPath, siteThemeLabel } from './site-paths.mjs';
+import { readThemeConfig } from './theme-config.mjs';
 
 const { default: siteConfig } = await import(/* @vite-ignore */ pathToFileURL(siteConfigPath).href);
+const themeConfig = await readThemeConfig();
 
 const cssLengthPattern = String.raw`(?:\d+|\d*\.\d+)(?:px|rem|em|vw|vh|vmin|vmax|ch|%)`;
 const simpleCssLengthPattern = new RegExp(`^${cssLengthPattern}$`);
 const clampCssLengthPattern = new RegExp(`^clamp\\(\\s*${cssLengthPattern}\\s*,\\s*${cssLengthPattern}\\s*,\\s*${cssLengthPattern}\\s*\\)$`);
 
-const assertObject = (value, path) => {
+const assertObject = (value, path, sourceLabel = siteConfigLabel) => {
 	if (!value || typeof value !== 'object' || Array.isArray(value)) {
-		throw new Error(`${path} must be an object in ${siteConfigLabel}.`);
+		throw new Error(`${path} must be an object in ${sourceLabel}.`);
 	}
 
 	return value;
 };
 
-const readString = (object, key, path) => {
+const readString = (object, key, path, sourceLabel = siteConfigLabel) => {
 	const value = object[key];
 
 	if (typeof value !== 'string' || value.trim() === '') {
-		throw new Error(`${path}.${key} must be a non-empty string in ${siteConfigLabel}.`);
+		throw new Error(`${path}.${key} must be a non-empty string in ${sourceLabel}.`);
 	}
 
 	return value.trim();
 };
 
-const readOptionalString = (object, key, path) => {
+const readOptionalString = (object, key, path, sourceLabel = siteConfigLabel) => {
 	const value = object[key];
 
 	if (value === undefined || value === null || value === '') {
@@ -33,66 +35,69 @@ const readOptionalString = (object, key, path) => {
 	}
 
 	if (typeof value !== 'string' || value.trim() === '') {
-		throw new Error(`${path}.${key} must be a non-empty string when set in ${siteConfigLabel}.`);
+		throw new Error(`${path}.${key} must be a non-empty string when set in ${sourceLabel}.`);
 	}
 
 	return value.trim();
 };
 
-const readFontFamily = (object, key, path, fallback) => {
+const readFontFamily = (object, key, path, fallback, sourceLabel = siteConfigLabel) => {
 	const value = object[key] ?? fallback;
 
 	if (typeof value !== 'string' || value.trim() === '') {
-		throw new Error(`${path}.${key} must be a non-empty CSS font-family value in ${siteConfigLabel}.`);
+		throw new Error(`${path}.${key} must be a non-empty CSS font-family value in ${sourceLabel}.`);
 	}
 
 	const normalizedValue = value.trim();
 
 	if (/[\n\r;{}]/.test(normalizedValue)) {
-		throw new Error(`${path}.${key} must not contain semicolons, braces, or line breaks in ${siteConfigLabel}.`);
+		throw new Error(`${path}.${key} must not contain semicolons, braces, or line breaks in ${sourceLabel}.`);
 	}
 
 	return normalizedValue;
 };
 
-const readCssLength = (object, key, path, fallback) => {
+const readCssLength = (object, key, path, fallback, sourceLabel = siteConfigLabel) => {
 	const value = object[key] ?? fallback;
 
 	if (typeof value !== 'string' || value.trim() === '') {
-		throw new Error(`${path}.${key} must be a non-empty CSS length in ${siteConfigLabel}.`);
+		throw new Error(`${path}.${key} must be a non-empty CSS length in ${sourceLabel}.`);
 	}
 
 	const normalizedValue = value.trim();
 
 	if (!simpleCssLengthPattern.test(normalizedValue) || parseFloat(normalizedValue) <= 0) {
-		throw new Error(`${path}.${key} must be a CSS length such as "900px", "56rem", or "90%" in ${siteConfigLabel}.`);
+		throw new Error(`${path}.${key} must be a CSS length such as "900px", "56rem", or "90%" in ${sourceLabel}.`);
 	}
 
 	return normalizedValue;
 };
 
-const readCssLengthValue = (value, path) => {
+const readCssLengthValue = (value, path, sourceLabel = siteConfigLabel) => {
 	if (typeof value !== 'string' || value.trim() === '') {
-		throw new Error(`${path} must be a non-empty CSS length in ${siteConfigLabel}.`);
+		throw new Error(`${path} must be a non-empty CSS length in ${sourceLabel}.`);
 	}
 
 	const normalizedValue = value.trim();
 
 	if (
-		(!simpleCssLengthPattern.test(normalizedValue) && !clampCssLengthPattern.test(normalizedValue))
-		|| parseFloat(normalizedValue) <= 0
+		normalizedValue !== '0'
+		&& (
+			(!simpleCssLengthPattern.test(normalizedValue) && !clampCssLengthPattern.test(normalizedValue))
+			|| parseFloat(normalizedValue) < 0
+		)
 	) {
-		throw new Error(`${path} must be a CSS length such as "48px", "3rem", "4vw", or a clamp() of those lengths in ${siteConfigLabel}.`);
+		throw new Error(`${path} must be a CSS length such as "0", "48px", "3rem", "4vw", or a clamp() of those lengths in ${sourceLabel}.`);
 	}
 
 	return normalizedValue;
 };
 
-const readResponsiveCssLength = (object, key, path, fallback) => {
+const readResponsiveCssLength = (object, key, path, fallback, sourceLabel = siteConfigLabel) => {
 	const value = object[key] ?? fallback;
 
 	if (typeof value === 'string') {
-		const length = readCssLengthValue(value, `${path}.${key}`);
+		const length = readCssLengthValue(value, `${path}.${key}`, sourceLabel);
 
 		return Object.freeze({
 			desktop: length,
@@ -100,27 +105,27 @@ const readResponsiveCssLength = (object, key, path, fallback) => {
 		});
 	}
 
-	const responsiveValue = assertObject(value, `${path}.${key}`);
+	const responsiveValue = assertObject(value, `${path}.${key}`, sourceLabel);
 
 	return Object.freeze({
-		desktop: readCssLengthValue(responsiveValue.desktop ?? fallback.desktop, `${path}.${key}.desktop`),
-		mobile: readCssLengthValue(responsiveValue.mobile ?? fallback.mobile, `${path}.${key}.mobile`),
+		desktop: readCssLengthValue(responsiveValue.desktop ?? fallback.desktop, `${path}.${key}.desktop`, sourceLabel),
+		mobile: readCssLengthValue(responsiveValue.mobile ?? fallback.mobile, `${path}.${key}.mobile`, sourceLabel),
 	});
 };
 
-const readPercentValue = (value, path) => {
+const readPercentValue = (value, path, sourceLabel = siteConfigLabel) => {
 	if (typeof value !== 'number' || !Number.isFinite(value) || value <= 0 || value > 100) {
-		throw new Error(`${path} must be a number greater than 0 and less than or equal to 100 in ${siteConfigLabel}.`);
+		throw new Error(`${path} must be a number greater than 0 and less than or equal to 100 in ${sourceLabel}.`);
 	}
 
 	return value;
 };
 
-const readResponsivePercent = (object, key, path, fallback) => {
+const readResponsivePercent = (object, key, path, fallback, sourceLabel = siteConfigLabel) => {
 	const value = object[key] ?? fallback;
 
 	if (typeof value === 'number') {
-		const percent = readPercentValue(value, `${path}.${key}`);
+		const percent = readPercentValue(value, `${path}.${key}`, sourceLabel);
 
 		return Object.freeze({
 			desktop: percent,
@@ -128,11 +133,11 @@ const readResponsivePercent = (object, key, path, fallback) => {
 		});
 	}
 
-	const responsiveValue = assertObject(value, `${path}.${key}`);
+	const responsiveValue = assertObject(value, `${path}.${key}`, sourceLabel);
 
 	return Object.freeze({
-		desktop: readPercentValue(responsiveValue.desktop ?? fallback.desktop, `${path}.${key}.desktop`),
-		mobile: readPercentValue(responsiveValue.mobile ?? fallback.mobile, `${path}.${key}.mobile`),
+		desktop: readPercentValue(responsiveValue.desktop ?? fallback.desktop, `${path}.${key}.desktop`, sourceLabel),
+		mobile: readPercentValue(responsiveValue.mobile ?? fallback.mobile, `${path}.${key}.mobile`, sourceLabel),
 	});
 };
 
@@ -176,6 +181,27 @@ const readUrl = (object, key, path) => {
 	}
 };
 
+const readBasePath = (object, key, path) => {
+	const value = object[key] ?? '/';
+
+	if (typeof value !== 'string' || value.trim() === '') {
+		throw new Error(`${path}.${key} must be a non-empty URL path in ${siteConfigLabel}.`);
+	}
+
+	const normalizedValue = value.trim();
+
+	if (
+		!normalizedValue.startsWith('/')
+		|| !normalizedValue.endsWith('/')
+		|| normalizedValue.includes('//')
+		|| /[\s?#]/.test(normalizedValue)
+	) {
+		throw new Error(`${path}.${key} must start and end with "/" and must not contain whitespace, "?", "#", or "//" in ${siteConfigLabel}.`);
+	}
+
+	return normalizedValue;
+};
+
 const readSmoothScroll = (navigation) => {
 	const rawSmoothScroll = assertObject(navigation.smoothScroll ?? {}, 'navigation.smoothScroll');
 	const minimumDurationMs = readPositiveInteger(rawSmoothScroll, 'minimumDurationMs', 'navigation.smoothScroll', 2_000);
@@ -208,7 +234,7 @@ const readLocale = (rawLocale) => {
 			closeMenu: readString({ closeMenu: labels.closeMenu ?? 'Close menu' }, 'closeMenu', '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 ?? 'Gallery' }, 'gallery', 'locale.labels'),
+			gallery: readString({ gallery: labels.gallery ?? 'Images' }, 'gallery', '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'),
@@ -259,10 +285,17 @@ const readBuildInfo = (footer) => {
 };
 
 const rawConfig = assertObject(siteConfig, 'default export');
+const misplacedThemeKeys = ['layout', 'gallery', 'typography'].filter((key) => key in rawConfig);
+if (misplacedThemeKeys.length > 0) {
+	throw new Error(`${misplacedThemeKeys.join(', ')} belong in ${siteThemeLabel}, not ${siteConfigLabel}.`);
+}
+
+const rawTheme = assertObject(themeConfig, 'theme frontmatter', siteThemeLabel);
 const rawSite = assertObject(rawConfig.site, 'site');
-const rawLayout = assertObject(rawConfig.layout ?? {}, 'layout');
-const rawGallery = assertObject(rawConfig.gallery ?? {}, 'gallery');
-const rawTypography = assertObject(rawConfig.typography ?? {}, 'typography');
+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');
@@ -274,34 +307,69 @@ const defaultFontFamily = "Arial, 'Helvetica Neue', Helvetica, sans-serif";
 
 export const projectConfig = Object.freeze({
 	site: Object.freeze({
+		basePath: readBasePath(rawSite, 'basePath', 'site'),
 		url: readUrl(rawSite, 'url', 'site'),
 	}),
 	layout: Object.freeze({
 		gutter: readResponsiveCssLength(rawLayout, 'gutter', 'layout', Object.freeze({
 			desktop: 'clamp(1.25rem, 4vw, 3rem)',
 			mobile: '1rem',
-		})),
-		pageWidth: readCssLength(rawLayout, 'pageWidth', 'layout', '1180px'),
+		}), siteThemeLabel),
+		pageWidth: readCssLength(rawLayout, 'pageWidth', 'layout', '1180px', siteThemeLabel),
+		spacing: Object.freeze({
+			bodyToImages: readResponsiveCssLength(rawLayoutSpacing, 'bodyToImages', 'layout.spacing', Object.freeze({
+				desktop: 'clamp(1.25rem, 2.5vw, 2rem)',
+				mobile: '1.25rem',
+			}), siteThemeLabel),
+			finalSectionBottom: readResponsiveCssLength(rawLayoutSpacing, 'finalSectionBottom', 'layout.spacing', Object.freeze({
+				desktop: 'clamp(2.55rem, 4.2vw, 3.9rem)',
+				mobile: '2.25rem',
+			}), siteThemeLabel),
+			firstSectionTop: readResponsiveCssLength(rawLayoutSpacing, 'firstSectionTop', 'layout.spacing', Object.freeze({
+				desktop: 'clamp(1.875rem, 3vw, 2.75rem)',
+				mobile: '1.375rem',
+			}), siteThemeLabel),
+			imageGap: readResponsiveCssLength(rawLayoutSpacing, 'imageGap', 'layout.spacing', Object.freeze({
+				desktop: 'clamp(1.5rem, 3.5vw, 2.75rem)',
+				mobile: '2.75rem',
+			}), siteThemeLabel),
+			sectionGap: readResponsiveCssLength(rawLayoutSpacing, 'sectionGap', 'layout.spacing', Object.freeze({
+				desktop: 'clamp(2.55rem, 4.2vw, 3.9rem)',
+				mobile: '2.25rem',
+			}), siteThemeLabel),
+			sectionHeadingToBody: readResponsiveCssLength(rawLayoutSpacing, 'sectionHeadingToBody', 'layout.spacing', Object.freeze({
+				desktop: 'clamp(0.5625rem, 1.25vw, 0.75rem)',
+				mobile: '0.4375rem',
+			}), siteThemeLabel),
+			subheadingRuleTop: readResponsiveCssLength(rawLayoutSpacing, 'subheadingRuleTop', 'layout.spacing', Object.freeze({
+				desktop: '1rem',
+				mobile: '0.8rem',
+			}), siteThemeLabel),
+			subheadingTop: readResponsiveCssLength(rawLayoutSpacing, 'subheadingTop', 'layout.spacing', Object.freeze({
+				desktop: '2rem',
+				mobile: '1.6rem',
+			}), 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,
-		})),
-		width: readCssLength(rawGallery, 'width', 'gallery', '900px'),
+		}), siteThemeLabel),
+		width: readCssLength(rawGallery, 'width', 'gallery', '900px', siteThemeLabel),
 	}),
 	typography: Object.freeze({
-		fontFamily: readFontFamily(rawTypography, 'fontFamily', 'typography', defaultFontFamily),
+		fontFamily: readFontFamily(rawTypography, 'fontFamily', 'typography', defaultFontFamily, siteThemeLabel),
 	}),
-		navigation: Object.freeze({
-			smoothScroll: readSmoothScroll(rawNavigation),
-		}),
-		locale: readLocale(rawLocale),
-		footer: Object.freeze({
+	navigation: Object.freeze({
+		smoothScroll: readSmoothScroll(rawNavigation),
+	}),
+	locale: readLocale(rawLocale),
+	footer: Object.freeze({
 		buildInfo: readBuildInfo(rawFooter),
 		copyrightMessage: readOptionalString(rawFooter, 'copyrightMessage', 'footer'),
 	}),

package/scripts/lib/site-content.mjs

@@ -18,41 +18,60 @@ const explicitHeadingIdRegex = /\s*\{#([a-z0-9-]+)\}\s*$/;
 const inlineStyleReferenceRegex = /\[[^\]\n]+\]\{\.([a-z][a-z0-9-]*)\}/g;
 const frontmatterDelimiterRegex = /^---\s*$/;
 const knownContentTopLevelFrontmatterKeys = new Set(['title', 'description', 'slug', 'navigation', 'presentation', 'frame', 'sections']);
-const knownThemeTopLevelFrontmatterKeys = new Set(['presentation', 'frame']);
+const knownThemeTopLevelFrontmatterKeys = new Set(['navigation', 'layout', 'gallery', 'typography', 'presentation', 'frame']);
 const knownNestedFrontmatterKeys = new Set([
 	'align',
 	'alt',
 	'backgroundColor',
 	'body',
+	'bodyToImages',
+	'brand',
 	'caption',
 	'carousel',
 	'color',
 	'colors',
 	'desktop',
+	'fontFamily',
 	'from',
+	'finalSectionBottom',
 	'gallery',
+	'gutter',
+	'h1',
+	'h2',
+	'h3',
+	'h4',
 	'heading',
+	'headings',
 	'id',
 	'include',
 	'image',
+	'imageGap',
 	'inlineStyles',
 	'label',
 	'lineHeight',
+	'maxAvailableHeightPercent',
+	'maxAvailableWidthPercent',
 	'mobile',
 	'navigation',
 	'overrides',
 	'order',
 	'paragraphSpacing',
+	'pageWidth',
 	'preset',
 	'presentation',
 	'sections',
+	'sectionGap',
+	'sectionHeadingToBody',
 	'size',
 	'spacing',
+	'subheadingRuleTop',
+	'subheadingTop',
 	'textColor',
 	'theme',
 	'typography',
 	'until',
 	'visible',
+	'width',
 ]);
 
 export const toPosixPath = (filePath) => filePath.split(path.sep).join('/');
@@ -223,7 +242,7 @@ export const validateFrontmatterStructure = (frontmatter, addIssue, {
 		if (knownTopLevelFrontmatterKeys.has(key)) continue;
 
 		const fix = knownNestedFrontmatterKeys.has(key)
-			? `Indent "${key}:" under the section or object it belongs to. For gallery rows, "gallery:" normally belongs under a "sections" item.`
+			? `Indent "${key}:" under the section or object it belongs to. For image rows, "gallery:" normally belongs under a "sections" item.`
 			: `Move "${key}:" under the correct parent key, or remove it if it is not part of the ${fileKind} schema.`;
 
 		addIssue({

package/scripts/lib/site-paths.mjs

@@ -20,15 +20,19 @@ export const invocationRoot = configuredInvocationRoot
 	? path.resolve(configuredInvocationRoot)
 	: process.cwd();
 
-const hasSiteFiles = (projectRoot, siteDirectory) => {
-	const siteDir = path.resolve(projectRoot, siteDirectory);
-
+const hasSiteFilesInDirectory = (siteDir) => {
 	return (
 		existsSync(path.join(siteDir, 'config.mjs'))
 		&& existsSync(path.join(siteDir, 'content.md'))
 	);
 };
 
+const hasSiteFiles = (projectRoot, siteDirectory) => {
+	const siteDir = path.resolve(projectRoot, siteDirectory);
+
+	return hasSiteFilesInDirectory(siteDir);
+};
+
 const findSiteProjectRoot = (startDirectory, siteDirectory) => {
 	let current = path.resolve(startDirectory);
 
@@ -67,6 +71,17 @@ const resolveSitePaths = () => {
 		};
 	}
 
+	if (!hasConfiguredSiteDirectory && hasSiteFilesInDirectory(invocationRoot)) {
+		const siteDir = invocationRoot;
+		const siteProjectRoot = path.dirname(siteDir);
+
+		return {
+			siteDirectory: path.relative(siteProjectRoot, siteDir) || path.basename(siteDir),
+			siteDir,
+			siteProjectRoot,
+		};
+	}
+
 	const discoveredRoot = findSiteProjectRoot(invocationRoot, fallbackSiteDirectory);
 	const siteProjectRoot = discoveredRoot ?? invocationRoot;
 

package/scripts/lib/theme-config.mjs

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