@janga/norna 0.7.27 → 0.7.29

package/scripts/generate-images.mjs

@@ -1,6 +1,7 @@
+import { getPageImageSourceKey } from './lib/site-conventions.mjs';
 import { execFile } from 'node:child_process';
 import { createHash } from 'node:crypto';
-import { copyFile, mkdir, readdir, readFile, rm, stat, writeFile } from 'node:fs/promises';
+import { copyFile, mkdir, readdir, readFile, rm, stat, lstat, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 import { promisify } from 'node:util';
 import {
@@ -23,7 +24,7 @@ import {
 
 const execFileAsync = promisify(execFile);
 
-const imageOutputVersion = 2;
+const imageOutputVersion = 3;
 const sourceHashSlugLength = 8;
 const widths = [480, 768, 1080, 1440, 1920];
 
@@ -84,12 +85,12 @@ const getFilePathFromPublicPath = (publicPath) => path.join(astroPublicDir, publ
 const getSourceHashSlug = (sourceHash) => sourceHash.slice(0, sourceHashSlugLength);
 
 const getGeneratedPath = (sourceKey, sourceHash, width) => {
-	const parsed = path.parse(sourceKey);
-	return path.join(generatedImagesDir, parsed.dir, `${parsed.name}-${getSourceHashSlug(sourceHash)}-${width}.webp`);
+	const parsed = path.parse(sourceKey.replace(/^root\//, ''));
+	return path.join(generatedImagesDir, parsed.dir, `${parsed.base}-${getSourceHashSlug(sourceHash)}-${width}.webp`);
 };
 
 const getOriginalPath = (sourceKey, sourceHash) => {
-	const parsed = path.parse(sourceKey);
+	const parsed = path.parse(sourceKey.replace(/^root\//, ''));
 	return path.join(originalImagesDir, parsed.dir, `${parsed.name}-${getSourceHashSlug(sourceHash)}${parsed.ext}`);
 };
 
@@ -97,11 +98,13 @@ const fail = (message) => {
 	throw new Error(message);
 };
 
-const getImageSourceKey = (contentFile, image) => `pages/${contentFile.pageDirectory}/images/${image}`;
+const getImageSourceKey = (contentFile, image) => getPageImageSourceKey(contentFile.pageDirectory, image);
 
 const getReferencedImages = async (contentFile) => {
 	const { body } = await readSiteFile(contentFile.contentPath, contentFile.contentLabel);
 	const page = await parsePageMarkdown(body, { label: contentFile.contentLabel });
+	const imageError = page.diagnostics.find((issue) => issue.code === 'invalid-markdown-image');
+	if (imageError) throw new Error(imageError.message + ' ' + imageError.fix);
 	const references = [];
 
 	for (const region of page.regions) {
@@ -137,6 +140,7 @@ const getContentSourcePath = ({ image, sourceKey }) => {
 const getReferencedSources = async () => {
 	const contentFiles = await getContentFiles();
 	const seen = new Set();
+	const normalizedSources = new Map();
 	const sources = [];
 
 	for (const contentFile of contentFiles) {
@@ -151,7 +155,9 @@ const getReferencedSources = async () => {
 				continue;
 			}
 
-			const fileStat = await stat(sourcePath).catch(() => null);
+			const fileStat = await lstat(sourcePath).catch(() => null);
+			const directoryStat = await lstat(contentFile.imagesDir).catch(() => null);
+			if (fileStat?.isSymbolicLink() || directoryStat?.isSymbolicLink()) fail(`Image ${sourcePath} must belong to a regular images/ directory; symbolic links are not supported.`);
 			if (!fileStat?.isFile()) {
 				fail(`Image file does not exist: ${contentFile.imagesLabel}/${siteImagePath}`);
 			}
@@ -160,6 +166,10 @@ const getReferencedSources = async () => {
 				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.`);
 			}
 
+			const normalizedKey = reference.sourceKey.normalize('NFC').toLowerCase();
+			const previous = normalizedSources.get(normalizedKey);
+			if (previous) fail(`Image sources ${previous} and ${sourcePath} conflict after case/Unicode normalization. Rename one image.`);
+			normalizedSources.set(normalizedKey, sourcePath);
 			seen.add(reference.sourceKey);
 			sources.push({ sourcePath, sourceKey: reference.sourceKey, reference });
 		}
@@ -202,13 +212,13 @@ const validateCarouselOrientations = async (manifest) => {
 	}
 };
 
-const identify = async (sourcePath) => {
+const identify = async (sourcePath, imageMagick) => {
 	const output = await imageMagick.identify(sourcePath);
 	const [width, height] = output.split(' ').map(Number);
 	return { width, height };
 };
 
-const convert = async (sourcePath, outputPath, width) => {
+const convert = async (sourcePath, outputPath, width, imageMagick) => {
 	await mkdir(path.dirname(outputPath), { recursive: true });
 	await imageMagick.convert(sourcePath, outputPath, width);
 };
@@ -262,7 +272,7 @@ const hasGeneratedVariants = async (variants) => {
 	return true;
 };
 
-const getReusableEntry = async (sourcePath, previousEntry, sourceHash) => {
+const getReusableEntry = async (sourceKey, previousEntry, sourceHash) => {
 	if (
 		previousEntry?.sourceHash !== sourceHash
 		|| previousEntry?.outputVersion !== imageOutputVersion
@@ -272,7 +282,7 @@ const getReusableEntry = async (sourcePath, previousEntry, sourceHash) => {
 		return null;
 	}
 
-	const variants = getVariants(sourcePath, sourceHash, getVariantWidths(previousEntry));
+	const variants = getVariants(sourceKey, sourceHash, getVariantWidths(previousEntry));
 
 	if (!(await hasGeneratedVariants(variants))) {
 		return null;
@@ -287,12 +297,12 @@ const getReusableEntry = async (sourcePath, previousEntry, sourceHash) => {
 	};
 };
 
-const getReusableStaticEntry = async (previousEntry, sourceHash) => {
+const getReusableStaticEntry = async (previousEntry, sourceHash, sourceKey) => {
 	if (
 		previousEntry?.kind !== 'static'
 		|| previousEntry?.sourceHash !== sourceHash
 		|| previousEntry?.outputVersion !== imageOutputVersion
-		|| typeof previousEntry?.src !== 'string'
+		|| previousEntry?.src !== getPublicPath(getOriginalPath(sourceKey, sourceHash))
 		|| !(await fileExists(getFilePathFromPublicPath(previousEntry.src)))
 	) {
 		return null;
@@ -348,80 +358,89 @@ const removeUnreferencedGeneratedFiles = async (manifest) => {
 	}
 };
 
-await mkdir(generatedImagesDir, { recursive: true });
+const main = async () => {
+	await mkdir(generatedImagesDir, { recursive: true });
 
-const previousManifest = await readManifest();
-const sources = await getReferencedSources();
-const manifest = {};
-const isStaticSource = (sourcePath) => staticImageExtensions.has(path.extname(sourcePath).toLowerCase());
-const isRasterSource = (sourcePath) => rasterImageExtensions.has(path.extname(sourcePath).toLowerCase());
+	const previousManifest = await readManifest();
+	const sources = await getReferencedSources();
+	const manifest = {};
+	const isStaticSource = (sourcePath) => staticImageExtensions.has(path.extname(sourcePath).toLowerCase());
+	const isRasterSource = (sourcePath) => rasterImageExtensions.has(path.extname(sourcePath).toLowerCase());
 
-if (sources.length === 0) {
-	await removeUnreferencedGeneratedFiles(manifest);
-	await mkdir(path.dirname(generatedImagesManifestPath), { recursive: true });
-	await writeFile(generatedImagesManifestPath, `${JSON.stringify(manifest, null, 2)}\n`);
-	process.exit(0);
-}
+	if (sources.length === 0) {
+		await removeUnreferencedGeneratedFiles(manifest);
+		await mkdir(path.dirname(generatedImagesManifestPath), { recursive: true });
+		await writeFile(generatedImagesManifestPath, `${JSON.stringify(manifest, null, 2)}\n`);
+		return;
+	}
+
+	const imageMagick = sources.some(({ sourcePath }) => isRasterSource(sourcePath))
+		? await getImageMagick()
+		: null;
 
-const imageMagick = sources.some(({ sourcePath }) => isRasterSource(sourcePath))
-	? await getImageMagick()
-	: null;
+	for (const { sourcePath, sourceKey } of sources) {
+		const sourceHash = await getSourceHash(sourcePath);
 
-for (const { sourcePath, sourceKey } of sources) {
-	const sourceHash = await getSourceHash(sourcePath);
+		if (isStaticSource(sourcePath)) {
+			const reusableEntry = await getReusableStaticEntry(previousManifest[sourceKey], sourceHash, sourceKey);
 
-	if (isStaticSource(sourcePath)) {
-		const reusableEntry = await getReusableStaticEntry(previousManifest[sourceKey], sourceHash);
+			if (reusableEntry) {
+				manifest[sourceKey] = reusableEntry;
+				continue;
+			}
+
+			const outputPath = getOriginalPath(sourceKey, sourceHash);
+			await mkdir(path.dirname(outputPath), { recursive: true });
+			await copyFile(sourcePath, outputPath);
+
+			const dimensions = await readImageDimensions(sourcePath).catch(() => null);
+			manifest[sourceKey] = {
+				kind: 'static',
+				outputVersion: imageOutputVersion,
+				sourceHash,
+				src: getPublicPath(outputPath),
+				...(dimensions ? { width: dimensions.width, height: dimensions.height } : {}),
+			};
+			continue;
+		}
+
+		const reusableEntry = await getReusableEntry(sourceKey, previousManifest[sourceKey], sourceHash);
 
 		if (reusableEntry) {
 			manifest[sourceKey] = reusableEntry;
 			continue;
 		}
 
-		const outputPath = getOriginalPath(sourceKey, sourceHash);
-		await mkdir(path.dirname(outputPath), { recursive: true });
-		await copyFile(sourcePath, outputPath);
+		if (!imageMagick) {
+			throw new Error(`ImageMagick is missing for raster image: ${sourcePath}`);
+		}
+
+		const dimensions = await identify(sourcePath, imageMagick);
+		const variantWidths = getVariantWidths(dimensions);
+		const variants = getVariants(sourceKey, sourceHash, variantWidths);
+		for (const width of variantWidths) {
+			const outputPath = getGeneratedPath(sourceKey, sourceHash, width);
+			await convert(sourcePath, outputPath, width, imageMagick);
+		}
 
-		const dimensions = await readImageDimensions(sourcePath).catch(() => null);
 		manifest[sourceKey] = {
-			kind: 'static',
 			outputVersion: imageOutputVersion,
 			sourceHash,
-			src: getPublicPath(outputPath),
-			...(dimensions ? { width: dimensions.width, height: dimensions.height } : {}),
+			width: dimensions.width,
+			height: dimensions.height,
+			variants,
 		};
-		continue;
 	}
 
-	const reusableEntry = await getReusableEntry(sourcePath, previousManifest[sourceKey], sourceHash);
-
-	if (reusableEntry) {
-		manifest[sourceKey] = reusableEntry;
-		continue;
-	}
-
-	if (!imageMagick) {
-		throw new Error(`ImageMagick is missing for raster image: ${sourcePath}`);
-	}
-
-	const dimensions = await identify(sourcePath);
-	const variantWidths = getVariantWidths(dimensions);
-	const variants = getVariants(sourceKey, sourceHash, variantWidths);
-	for (const width of variantWidths) {
-		const outputPath = getGeneratedPath(sourceKey, sourceHash, width);
-		await convert(sourcePath, outputPath, width);
-	}
+	await validateCarouselOrientations(manifest);
+	await removeUnreferencedGeneratedFiles(manifest);
+	await mkdir(path.dirname(generatedImagesManifestPath), { recursive: true });
+	await writeFile(generatedImagesManifestPath, `${JSON.stringify(manifest, null, 2)}\n`);
+};
 
-	manifest[sourceKey] = {
-		outputVersion: imageOutputVersion,
-		sourceHash,
-		width: dimensions.width,
-		height: dimensions.height,
-		variants,
-	};
+try {
+	await main();
+} catch (error) {
+	console.error(error.message);
+	process.exitCode = 1;
 }
-
-await validateCarouselOrientations(manifest);
-await removeUnreferencedGeneratedFiles(manifest);
-await mkdir(path.dirname(generatedImagesManifestPath), { recursive: true });
-await writeFile(generatedImagesManifestPath, `${JSON.stringify(manifest, null, 2)}\n`);

package/scripts/generate-schemas.mjs

@@ -3,22 +3,23 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { z } from 'astro/zod';
 import {
-	categorySchema,
 	configSchema,
+	rootThemeSchema,
 	pageThemeSchema,
 	siteSchema,
 	sitewideSchema,
 	themeVisualSchema,
 } from './lib/schema-definitions.mjs';
 import { applySchemaEditorMetadata } from './lib/schema-editor-metadata.mjs';
+import { sourceFileDefinitions, sourcePageDirectoryPattern } from './lib/source-files.mjs';
 import { getNornaBlockSchema } from './lib/norna-markdown-blocks.mjs';
 
 const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
 const schemaDirectory = path.join(root, 'schemas');
 const definitions = [
-	['category.schema.json', 'Norna page category', categorySchema],
 	['config.schema.json', 'Norna site configuration', configSchema],
-	['theme.schema.json', 'Norna visual theme', themeVisualSchema],
+	['theme.schema.json', 'Norna inherited tree theme', themeVisualSchema],
+	['root-theme.schema.json', 'Norna root tree theme', rootThemeSchema],
 	['page-theme.schema.json', 'Norna page theme', pageThemeSchema],
 	['sitewide-content.schema.json', 'Norna site-wide content', sitewideSchema],
 	['content-frontmatter.schema.json', 'Norna page frontmatter', siteSchema],
@@ -44,15 +45,17 @@ for (const type of blockTypes) {
 }
 
 schemaFiles.set('manifest.json', `${JSON.stringify({
-	editorApiVersion: 2,
-	schemaVersion: 3,
+	editorApiVersion: 3,
+	schemaVersion: 6,
+	sourceFiles: sourceFileDefinitions,
+	pageDirectoryPattern: sourcePageDirectoryPattern,
 	blockSchemas: Object.fromEntries(blockTypes.map((type) => [type, `${type}.schema.json`])),
 	files: {
-		category: 'category.schema.json',
 		config: 'config.schema.json',
 		contentFrontmatter: 'content-frontmatter.schema.json',
 		sitewideContent: 'sitewide-content.schema.json',
 		theme: 'theme.schema.json',
+		rootTheme: 'root-theme.schema.json',
 		pageTheme: 'page-theme.schema.json',
 	},
 }, null, 2)}\n`);

package/scripts/generate-search-index.mjs

@@ -1,3 +1,4 @@
+import { searchOutputDirectory } from './lib/publication-paths.mjs';
 import { cp, mkdir, readdir, rm } from 'node:fs/promises';
 import path from 'node:path';
 import * as pagefind from 'pagefind';
@@ -7,7 +8,7 @@ import {
 	astroPublicDir,
 } from './lib/site-paths.mjs';
 
-const searchDirectoryName = 'pagefind';
+const searchDirectoryName = searchOutputDirectory;
 const distSearchDirectory = path.join(astroDistDir, searchDirectoryName);
 const localSearchDirectory = path.join(astroPublicDir, searchDirectoryName);
 
@@ -44,7 +45,7 @@ if (!projectConfig.search.enabled) {
 		}
 
 		await rm(localSearchDirectory, { force: true, recursive: true });
-		await mkdir(astroPublicDir, { recursive: true });
+		await mkdir(path.dirname(localSearchDirectory), { recursive: true });
 		await cp(distSearchDirectory, localSearchDirectory, { recursive: true });
 
 		console.log(`Generated static search index for ${indexedPageCount} page${indexedPageCount === 1 ? '' : 's'}.`);

package/scripts/lib/attachment-render.mjs

@@ -0,0 +1,23 @@
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { getSourcePageLocation } from './source-files.mjs';
+import { parsePageMarkdownSource } from './page-markdown.mjs';
+import { readPageAttachments, resolveAttachment, attachmentHref } from './page-attachments.mjs';
+
+export const rewriteAttachmentLinks = async (source, fileURL, siteRoot) => {
+	if (!fileURL) return source;
+	const contentPath = fileURLToPath(fileURL);
+	const location = getSourcePageLocation(siteRoot, path.dirname(contentPath));
+	if (!location || path.basename(contentPath) !== 'content.md') return source;
+	const { files } = await readPageAttachments({ ...location, contentPath });
+	if (!files.length) return source;
+	const document = await parsePageMarkdownSource(source);
+	const edits = new Map();
+	for (const link of document.links) {
+		const file = resolveAttachment(link.target, location.isHome ? '/' : `/${location.pagePath}/`, files);
+		if (!file || !link.targetRange) continue;
+		const href = attachmentHref(file, link.target);
+		edits.set(link.targetRange.start, { ...link.targetRange, text: link.yamlScalar ? JSON.stringify(href) : href });
+	}
+	return [...edits.values()].sort((a,b) => b.start-a.start).reduce((text, edit) => text.slice(0, edit.start) + edit.text + text.slice(edit.end), source);
+};

package/scripts/lib/category-destinations.mjs

@@ -9,28 +9,28 @@ export const createCategoryDestinationModel = (nodes) => {
 	const visit = (branch) => {
 		const { node } = branch;
 		if (node.navigation?.listed === false) return false;
-		const children = branch.children.filter(({ node: child }) => child.navigation?.listed !== false);
-		const reachable = children.map(visit).some(Boolean);
+		// Empty child categories retain their URLs but do not become menu choices
+		// or redirect targets for a parent that still has reachable pages.
+		const children = branch.children.filter(visit);
 		if (node.kind !== 'category') return true;
-		if (!reachable) {
+		if (children.length === 0) {
 			const source = node.categorySourceLabel ?? node.nodeLabel ?? node.pageDirectory;
 			diagnostics.push({
 				code: 'category-without-listed-content',
-				severity: 'error',
+				severity: 'warning',
 				message: `${source} has no listed reachable content page.`,
-				fix: 'Add a listed page under this category, or remove the category.',
+				fix: 'Add a listed page to include this category in navigation, or leave it empty while reorganizing.',
 			});
-			return false;
 		}
-		const first = children[0].node;
+		const first = children[0]?.node;
 		destinations.push({
 			category: node,
 			pathname: getSiteNodePathname(node),
-			kind: first.kind === 'page' ? 'redirect' : 'listing',
-			target: first.kind === 'page' ? first : null,
+			kind: first?.kind === 'page' ? 'redirect' : 'listing',
+			target: first?.kind === 'page' ? first : null,
 			children: children.map(({ node: child }) => child),
 		});
-		return true;
+		return children.length > 0;
 	};
 	getSiteNavigationTree(nodes.map((node) => ({ node }))).forEach(visit);
 	return {
@@ -41,8 +41,9 @@ export const createCategoryDestinationModel = (nodes) => {
 };
 
 export const assertCategoryDestinationModel = (model) => {
-	if (model.diagnostics.length) {
-		throw new Error(model.diagnostics.map(({ message, fix }) => `${message}\n${fix}`).join('\n'));
+	const errors = model.diagnostics.filter(({ severity }) => severity === 'error');
+	if (errors.length) {
+		throw new Error(errors.map(({ message, fix }) => `${message}\n${fix}`).join('\n'));
 	}
 	return model;
 };

package/scripts/lib/dev-server-identity.mjs

@@ -0,0 +1,30 @@
+import { realpath } from 'node:fs/promises';
+
+export const identityPath = '/.well-known/norna-dev';
+export const readDevServerIdentity = async (state, siteRoot) => {
+	if (!state?.token || !Number.isInteger(state.port) || state.port < 1 || state.port > 65535) return null;
+	try {
+		const response = await fetch(`http://127.0.0.1:${state.port}${identityPath}`, { signal: AbortSignal.timeout(1500), redirect: 'error' });
+		if (!response.ok) return null;
+		const identity = await response.json();
+		return identity.token === state.token && Number.isInteger(identity.pid) && identity.pid > 0 && identity.siteRoot === await realpath(siteRoot) ? identity : null;
+	} catch { return null; }
+};
+export const verifyDevServer = async (state, siteRoot) => Number.isInteger(state?.pid) && state.pid > 0
+	&& (await readDevServerIdentity(state, siteRoot))?.pid === state.pid;
+
+export const devServerIdentityPlugin = siteRoot => ({
+	name: 'norna-dev-server-identity',
+	async configureServer(server) {
+		const canonicalRoot = await realpath(siteRoot);
+		return () => {
+			server.middlewares.stack.unshift({ route: '', handle(request, response, next) {
+				if (request.url !== identityPath || request.method !== 'GET' || !process.env.NORNA_DEV_TOKEN) return next();
+				if (!['127.0.0.1', '::1', '::ffff:127.0.0.1'].includes(request.socket.remoteAddress)) return next();
+				response.setHeader('Content-Type', 'application/json');
+				response.setHeader('Cache-Control', 'no-store');
+				response.end(JSON.stringify({ siteRoot: canonicalRoot, token: process.env.NORNA_DEV_TOKEN, pid: process.pid }));
+			} });
+		};
+	},
+});

package/scripts/lib/documentation-links.mjs

@@ -27,7 +27,7 @@ export const documentationLinkForVersion = (version, label, file, anchor) => {
 	const reference = version ? `v${version}` : 'main';
 	const source = usesLegacyReference(version)
 		? `docs/${file}${anchor ? `#${anchor}` : ''}`
-		: `${destination.source}${destination.anchor ? `#${destination.anchor}` : ''}`;
+		: `${version === '0.7.27' ? destination.source.replace('site/root/pages/', 'site/pages/') : destination.source}${destination.anchor ? `#${destination.anchor}` : ''}`;
 	const sourceLabel = version ? `Norna ${version} source reference` : 'Reference source';
 	return `[${label} (current)](${destination.url})\n\n[${sourceLabel}](${repositoryRoot}${reference}/${source})`;
 };