@janga/norna 0.7.23 → 0.7.24

package/scripts/lib/page-aliases.mjs

@@ -1,14 +1,21 @@
 import { getSiteNodePathname } from './site-page-urls.mjs';
 import { sitemapFilename } from './sitemap.mjs';
 
-export const generatedSiteRoutes = Object.freeze([
+export const getGeneratedSiteRoutes = ({ searchEnabled = false } = {}) => Object.freeze([
 	Object.freeze({
 		kind: 'generated-route',
 		label: `Norna generated ${sitemapFilename}`,
 		pathname: `/${sitemapFilename}`,
 	}),
+	...(searchEnabled ? [Object.freeze({
+		kind: 'generated-route',
+		label: 'Norna generated search page',
+		pathname: '/search/',
+	})] : []),
 ]);
 
+export const generatedSiteRoutes = getGeneratedSiteRoutes();
+
 const getPagePathname = (page) => page.pathname ?? getSiteNodePathname(page.contentFile ?? page);
 const getPageLabel = (page) => page.contentLabel ?? page.contentFile?.contentLabel ?? page.entry?.id ?? getPagePathname(page);
 const getPageAliases = (page) => page.aliases ?? page.data?.page?.aliases ?? [];
@@ -99,6 +106,19 @@ export const createPageAliasModel = ({
 		for (const identity of getPublicFileIdentities(file)) addIdentity(identity);
 	}
 	for (const route of generatedRoutes) {
+		const conflict = identitiesByPathname.get(route.pathname);
+		if (conflict) {
+			diagnostics.push({
+				code: 'generated-route-collision',
+				contentFile: conflict.kind === 'page'
+					? conflict.source.contentFile ?? conflict.source
+					: undefined,
+				fix: `Move or rename the conflicting source. ${route.label} owns ${route.pathname} while the feature is enabled.`,
+				message: `Generated route "${route.pathname}" from ${route.label} conflicts with ${describeIdentity(conflict)}.`,
+				severity: 'error',
+			});
+			continue;
+		}
 		addIdentity(createIdentity({ ...route, source: route }));
 	}
 

package/scripts/lib/page-markdown.mjs

@@ -1,3 +1,4 @@
+import { getCodeFenceMetadataDiagnostics } from './code-fence-metadata.mjs';
 import {
 	getHeadingIdentifierIssues,
 	getMarkdownHeadings,
@@ -11,7 +12,9 @@ import {
 	extractMarkdownImageReferences,
 	extractNornaMarkdownBlockDiagnostics,
 	getNornaBlockImageReferences,
+	nornaBlockTypes,
 } from './norna-markdown-blocks.mjs';
+import { getSemanticCalloutDiagnostics } from './semantic-callouts.mjs';
 
 const normalizeMarkdownWithOffsets = (source) => {
 	const input = String(source);
@@ -172,7 +175,7 @@ const getRegionContent = (regionMarkdown, blocks, regionOffset) => {
 	return content.filter((item) => item.kind !== 'markdown' || item.markdown.length > 0);
 };
 
-const createRegion = ({ heading, nextHeading, headings, source, label, lineOffset }) => {
+const createRegion = ({ calloutErrors, codeFenceErrors, heading, nextHeading, headings, source, label, lineOffset }) => {
 	const endOffset = nextHeading?.index ?? source.length;
 	const markdown = source.slice(heading.index, endOffset).trimEnd();
 	const regionLineOffset = lineOffset + heading.line - 1;
@@ -197,6 +200,8 @@ const createRegion = ({ heading, nextHeading, headings, source, label, lineOffse
 		bodyMarkdown: source.slice(heading.index + heading.source.length, endOffset).trimEnd(),
 		blocks: blockResult.blocks,
 		blockErrors: blockResult.errors,
+		calloutErrors: calloutErrors.filter((error) => error.offset >= heading.index && error.offset < endOffset),
+		codeFenceErrors: codeFenceErrors.filter((error) => error.offset >= heading.index && error.offset < endOffset),
 		content: getRegionContent(markdown, blockResult.blocks, heading.index),
 		endOffset,
 		heading,
@@ -220,12 +225,20 @@ export const parsePageMarkdown = async (markdown, options = {}) => {
 	const label = options.label ?? 'Markdown';
 	const lineOffset = options.lineOffset ?? 0;
 	const { headings, tree } = await getMarkdownHeadings(source);
+	const calloutErrors = getSemanticCalloutDiagnostics(tree, { label, lineOffset });
+	const codeFenceErrors = getCodeFenceMetadataDiagnostics(tree, {
+		excludedLanguages: nornaBlockTypes,
+		label,
+		lineOffset,
+	});
 	const structuralHeadings = headings.filter((heading) => heading.depth <= 2);
 	const prelude = structuralHeadings.length > 0
 		? source.slice(0, structuralHeadings[0].index)
 		: source;
 	const pageHeadings = structuralHeadings.filter((heading) => heading.depth === 1);
 	const regions = structuralHeadings.map((heading, index) => createRegion({
+		calloutErrors,
+		codeFenceErrors,
 		heading,
 		nextHeading: structuralHeadings[index + 1],
 		headings,
@@ -250,6 +263,22 @@ export const parsePageMarkdown = async (markdown, options = {}) => {
 		regionId: region.id,
 		severity: 'error',
 	})));
+	const calloutDiagnostics = regions.flatMap((region) => region.calloutErrors.map((error) => ({
+		code: error.code,
+		fix: error.fix,
+		line: error.line,
+		message: error.message,
+		regionId: region.id,
+		severity: 'error',
+	})));
+	const codeFenceDiagnostics = regions.flatMap((region) => region.codeFenceErrors.map((error) => ({
+		code: error.code,
+		fix: error.fix,
+		line: error.line,
+		message: error.message,
+		regionId: region.id,
+		severity: 'error',
+	})));
 	const blocks = regions.flatMap((region) => region.blocks);
 	const links = [
 		...extractMarkdownLinks({ source, tree, lineOffset }),
@@ -279,6 +308,8 @@ export const parsePageMarkdown = async (markdown, options = {}) => {
 			...headingDiagnostics,
 			...blockDiagnostics,
 			...noteDiagnostics,
+			...calloutDiagnostics,
+			...codeFenceDiagnostics,
 		],
 		headings,
 		headingIssues,