@janga/norna 0.7.25 → 0.7.26

package/scripts/lib/page-markdown.mjs

@@ -1,4 +1,6 @@
 import { getCodeFenceMetadataDiagnostics } from './code-fence-metadata.mjs';
+import { parseContentTabs } from './content-tabs.mjs';
+import { getDetailsHeadingDiagnostics } from './details-headings.mjs';
 import {
 	getHeadingIdentifierIssues,
 	getMarkdownHeadings,
@@ -15,6 +17,8 @@ import {
 	nornaBlockTypes,
 } from './norna-markdown-blocks.mjs';
 import { getSemanticCalloutDiagnostics } from './semantic-callouts.mjs';
+import { getTableRowHeaderDiagnostics } from './table-row-headers.mjs';
+import { getStructuredSidenoteDiagnostics } from './markdown-notes.mjs';
 
 const normalizeMarkdownWithOffsets = (source) => {
 	const input = String(source);
@@ -175,7 +179,19 @@ const getRegionContent = (regionMarkdown, blocks, regionOffset) => {
 	return content.filter((item) => item.kind !== 'markdown' || item.markdown.length > 0);
 };
 
-const createRegion = ({ calloutErrors, codeFenceErrors, heading, nextHeading, headings, source, label, lineOffset }) => {
+const createRegion = ({
+	calloutErrors,
+	codeFenceErrors,
+	heading,
+	nextHeading,
+	headings,
+	source,
+	label,
+	lineOffset,
+	tableErrors,
+	tabResult,
+	pageNotes,
+}) => {
 	const endOffset = nextHeading?.index ?? source.length;
 	const markdown = source.slice(heading.index, endOffset).trimEnd();
 	const regionLineOffset = lineOffset + heading.line - 1;
@@ -183,10 +199,8 @@ const createRegion = ({ calloutErrors, codeFenceErrors, heading, nextHeading, he
 		label,
 		lineOffset: regionLineOffset,
 	});
-	const noteResult = extractInlineNoteDiagnostics(markdown, {
-		label,
-		lineOffset: regionLineOffset,
-	});
+	const inRegion = (offset) => offset >= heading.index && offset < endOffset;
+	const fieldNoteErrors = getStructuredSidenoteDiagnostics(blockResult.blocks, { label, regionOffset: heading.index });
 	const markdownImages = extractMarkdownImageReferences(markdown).map((reference) => ({
 		...reference,
 		line: regionLineOffset + reference.line,
@@ -202,6 +216,8 @@ const createRegion = ({ calloutErrors, codeFenceErrors, heading, nextHeading, he
 		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),
+		tabErrors: tabResult.diagnostics.filter((error) => error.offset >= heading.index && error.offset < endOffset),
+		tabGroups: tabResult.groups.filter((group) => group.start >= heading.index && group.start < endOffset),
 		content: getRegionContent(markdown, blockResult.blocks, heading.index),
 		endOffset,
 		heading,
@@ -213,9 +229,12 @@ const createRegion = ({ calloutErrors, codeFenceErrors, heading, nextHeading, he
 		managedImages: getNornaBlockImageReferences(blockResult.blocks),
 		markdown,
 		markdownImages,
-		notes: noteResult.notes,
-		noteErrors: noteResult.errors,
+		notes: pageNotes.notes.filter((note) => inRegion(note.referenceOffset)),
+		noteErrors: [...pageNotes.errors.filter((error) => inRegion(error.offset)), ...fieldNoteErrors],
+		fieldNoteErrors,
+		noteWarnings: pageNotes.warnings.filter((warning) => inRegion(warning.offset)),
 		startOffset: heading.index,
+		tableErrors: tableErrors.filter((error) => error.offset >= heading.index && error.offset < endOffset),
 		title: heading.title,
 	};
 };
@@ -224,13 +243,17 @@ export const parsePageMarkdown = async (markdown, options = {}) => {
 	const source = normalizeMarkdown(markdown);
 	const label = options.label ?? 'Markdown';
 	const lineOffset = options.lineOffset ?? 0;
-	const { headings, tree } = await getMarkdownHeadings(source);
+	const tabResult = parseContentTabs(source, { label, lineOffset });
+	const pageNotes = extractInlineNoteDiagnostics(source, { label, lineOffset, tabResult });
+	const { headings, tree } = await getMarkdownHeadings(tabResult.maskedSource);
+	const detailsDiagnostics = getDetailsHeadingDiagnostics(tree, { source: tabResult.maskedSource, label, lineOffset });
 	const calloutErrors = getSemanticCalloutDiagnostics(tree, { label, lineOffset });
 	const codeFenceErrors = getCodeFenceMetadataDiagnostics(tree, {
 		excludedLanguages: nornaBlockTypes,
 		label,
 		lineOffset,
 	});
+	const tableErrors = getTableRowHeaderDiagnostics(tree, { label, lineOffset, source });
 	const structuralHeadings = headings.filter((heading) => heading.depth <= 2);
 	const prelude = structuralHeadings.length > 0
 		? source.slice(0, structuralHeadings[0].index)
@@ -245,10 +268,17 @@ export const parsePageMarkdown = async (markdown, options = {}) => {
 		label,
 		lineOffset,
 		source,
+		pageNotes,
+		tableErrors,
+		tabResult,
 	}));
 	const headingIssues = getHeadingIdentifierIssues(headings);
 	const headingDiagnostics = getHeadingDiagnostics(headings, lineOffset);
-	const structureDiagnostics = getPageStructureDiagnostics({ headings, pageHeadings, prelude }, lineOffset);
+	let contentPrelude = prelude;
+	for (const definition of [...pageNotes.definitions].reverse()) {
+		if (definition.position.end.offset <= prelude.length) contentPrelude = contentPrelude.slice(0, definition.position.start.offset) + contentPrelude.slice(definition.position.end.offset);
+	}
+	const structureDiagnostics = getPageStructureDiagnostics({ headings, pageHeadings, prelude: contentPrelude }, lineOffset);
 	const blockDiagnostics = regions.flatMap((region) => region.blockErrors.map((error) => ({
 		code: error.code ?? 'invalid-norna-block',
 		line: error.line,
@@ -256,14 +286,19 @@ export const parsePageMarkdown = async (markdown, options = {}) => {
 		regionId: region.id,
 		severity: 'error',
 	})));
-	const noteDiagnostics = regions.flatMap((region) => region.noteErrors.map((error) => ({
-		code: 'invalid-inline-note',
+	const noteDiagnostics = [...pageNotes.diagnostics, ...regions.flatMap((region) => region.fieldNoteErrors)].map((issue) => ({
+		...issue,
+		regionId: regions.find((region) => issue.offset >= region.startOffset && issue.offset < region.endOffset)?.id ?? null,
+	}));
+	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',
+		severity: error.severity ?? 'error',
 	})));
-	const calloutDiagnostics = regions.flatMap((region) => region.calloutErrors.map((error) => ({
+	const codeFenceDiagnostics = regions.flatMap((region) => region.codeFenceErrors.map((error) => ({
 		code: error.code,
 		fix: error.fix,
 		line: error.line,
@@ -271,7 +306,7 @@ export const parsePageMarkdown = async (markdown, options = {}) => {
 		regionId: region.id,
 		severity: 'error',
 	})));
-	const codeFenceDiagnostics = regions.flatMap((region) => region.codeFenceErrors.map((error) => ({
+	const tableDiagnostics = regions.flatMap((region) => region.tableErrors.map((error) => ({
 		code: error.code,
 		fix: error.fix,
 		line: error.line,
@@ -282,7 +317,14 @@ export const parsePageMarkdown = async (markdown, options = {}) => {
 	const blocks = regions.flatMap((region) => region.blocks);
 	const links = [
 		...extractMarkdownLinks({ source, tree, lineOffset }),
-		...extractNornaBlockLinks({ source, blocks, lineOffset }),
+		...extractNornaBlockLinks({
+			source,
+			blocks: regions.flatMap((region) => region.blocks.map((block) => ({
+				...block,
+				sourceStartOffset: region.startOffset + block.sourceStartOffset,
+			}))),
+			lineOffset,
+		}),
 	].sort((left, right) => (
 		left.line - right.line
 		|| (left.range?.start ?? 0) - (right.range?.start ?? 0)
@@ -304,12 +346,15 @@ export const parsePageMarkdown = async (markdown, options = {}) => {
 	return {
 		blocks,
 		diagnostics: [
+			...detailsDiagnostics,
 			...structureDiagnostics,
 			...headingDiagnostics,
 			...blockDiagnostics,
 			...noteDiagnostics,
 			...calloutDiagnostics,
 			...codeFenceDiagnostics,
+			...tableDiagnostics,
+			...tabResult.diagnostics,
 		],
 		headings,
 		headingIssues,
@@ -321,12 +366,14 @@ export const parsePageMarkdown = async (markdown, options = {}) => {
 		markdownImages: regions.flatMap((region) => region.markdownImages),
 		navigationHeadings,
 		notes: regions.flatMap((region) => region.notes),
+		noteDiagnostics,
 		pageTitle: pageHeadings[0] ?? null,
 		pageHeadings,
-		prelude,
+		prelude: contentPrelude,
 		regions,
 		sections: regions.filter((region) => region.kind === 'section'),
 		source,
+		tabGroups: tabResult.groups,
 	};
 };
 

package/scripts/lib/page-move-plan.mjs

@@ -210,6 +210,9 @@ const getResolvedReferenceIntent = ({
 	reference,
 }) => {
 	const { resolution, target } = reference;
+	if (resolution?.kind === 'category') {
+		return { kind: 'category', lookupPathname: movedCurrentToNew.get(resolution.pathname) ?? resolution.pathname };
+	}
 	if (resolution?.kind === 'page') {
 		const currentPathname = resolution.page.pathname;
 		const pathname = movedCurrentToNew.get(currentPathname) ?? currentPathname;
@@ -244,7 +247,7 @@ const getResolvedReferenceIntent = ({
 		const movedPathname = movedOldToNew.get(target.pageLookupPathname);
 		if (movedPathname) {
 			return {
-				kind: 'page',
+				kind: pagesByNewPathname.get(movedPathname)?.kind === 'category' ? 'category' : 'page',
 				lookupPathname: movedPathname,
 				page: pagesByNewPathname.get(movedPathname),
 			};
@@ -259,7 +262,8 @@ const getTargetIntent = ({ graph, movedCurrentToNew, movedOldToNew, pagesByNewPa
 	if (target.pageLookupPathname) {
 		const pathname = movedOldToNew.get(target.pageLookupPathname) ?? target.pageLookupPathname;
 		const page = pagesByNewPathname.get(pathname) ?? graph.pagesByPathname.get(pathname);
-		if (page) return { kind: 'page', lookupPathname: pathname, page };
+		if (page) return { kind: page.kind === 'category' ? 'category' : 'page', lookupPathname: pathname, page };
+		if (graph.categoryModel.byPathname.has(pathname)) return { kind: 'category', lookupPathname: pathname };
 		const alias = graph.aliasesByPathname.get(target.pageLookupPathname);
 		if (alias) {
 			const aliasTarget = movedCurrentToNew.get(alias.targetPathname) ?? alias.targetPathname;
@@ -361,7 +365,7 @@ const createReferenceChanges = ({ graph, mappings }) => {
 		const value = `${intent.lookupPathname}${getTargetSuffix(reference.targetSource)}`;
 		const key = `${reference.sourceContentFile.contentPath}:${reference.targetRange.start}:${reference.targetRange.end}`;
 		const existing = changeKeys.get(key);
-		if (existing && existing.value !== value) {
+		if (existing && existing.to !== value) {
 			throw new Error(`One link target in ${reference.sourceContentFile.contentLabel} produced conflicting page-move edits.`);
 		}
 		if (existing) continue;
@@ -372,7 +376,7 @@ const createReferenceChanges = ({ graph, mappings }) => {
 			line: reference.definitionLine ?? reference.line,
 			start: reference.targetRange.start,
 			to: value,
-			value,
+			value: reference.yamlScalar ? JSON.stringify(value) : value,
 		};
 		changeKeys.set(key, change);
 		if (!changesByPath.has(reference.sourceContentFile.contentPath)) {
@@ -525,7 +529,20 @@ export const createPageMovePlan = async ({
 		};
 	});
 
-	const referenceChangesByPath = createReferenceChanges({ graph, mappings });
+	const categoryMappings = nodeMappings.filter(({ originalNode }) => originalNode.kind === 'category'
+		&& isPathInSubtree(originalNode.pagePath, mode === 'move' ? source.pagePath : destination.pagePath))
+		.map(({ originalNode, virtualNode }) => {
+			const currentPathname = getSiteNodePathname(originalNode);
+			const newPathname = getSiteNodePathname(virtualNode);
+			return {
+				currentPathname,
+				newPathname,
+				oldPathname: mode === 'move' ? currentPathname
+					: `/${replacePagePathPrefix(originalNode.pagePath, destination.pagePath, source.pagePath)}/`,
+				page: { kind: 'category' },
+			};
+		});
+	const referenceChangesByPath = createReferenceChanges({ graph, mappings: [...mappings, ...categoryMappings] });
 	const mappingByContentPath = new Map(mappings.map((mapping) => [mapping.node.contentPath, mapping]));
 	const fileChanges = [];
 	const updatedSources = new Map();