emdash 0.36.0 → 0.38.0

package/dist/{menus-CNg0QlDt.mjs → menus-D8mC4eaN.mjs}

@@ -1,24 +1,40 @@
 import { t as validateIdentifier } from "./validate-BpwoDOgt.mjs";
-import { n as cachedQuery, t as CacheNamespace } from "./object-cache-71tPfV4A.mjs";
-import { n as chunks, t as SQL_BATCH_SIZE } from "./chunks-bNiX6_DR.mjs";
+import { n as cachedQuery, t as CacheNamespace } from "./object-cache-DVKnyOfy.mjs";
+import { n as chunks, t as SQL_BATCH_SIZE } from "./chunks-VG_tyqnP.mjs";
 import { o as decodeCursor, s as encodeCursor } from "./types-CQPWhPxE.mjs";
-import { t as CommentRepository } from "./comment-DhvLEdhQ.mjs";
-import { t as OptionsRepository } from "./options-BHPeIbBd.mjs";
-import { t as PluginContextFactory } from "./context-BR5hRWiK.mjs";
-import { r as requestCached } from "./request-cache-DH9zdCOD.mjs";
-import { i as resolveLocaleChain, r as resolveLocale } from "./resolve-DxUpTMmE.mjs";
-import { s as getDb } from "./loader-ZsjE4paL.mjs";
-import { a as normalizeCapabilities } from "./types-D6OcIp2P.mjs";
-import { gt as sanitizeHref } from "./redirects-CRIM55KH.mjs";
-import { t as extractRequestMeta } from "./request-meta-DRp5ENd_.mjs";
-import { r as setCronTasksEnabled } from "./cron-CWfWrWKG.mjs";
-import { t as MediaUsageActivationWriteBlockedError } from "./media-usage-write-fence-BwoJVRDC.mjs";
-import { t as CommentReactionRepository } from "./comment-reaction-CRuItEjt.mjs";
+import { t as CommentRepository } from "./comment-vxOzWbZN.mjs";
+import { t as OptionsRepository } from "./options-D1FBiAv1.mjs";
+import { t as PluginContextFactory } from "./context-C9PB8vGd.mjs";
+import { i as resolveLocaleChain, r as resolveLocale, t as interpolateUrlPattern } from "./resolve-Cy0aWSRj.mjs";
+import { r as requestCached } from "./request-cache-DAZZmesc.mjs";
+import { t as menuTag } from "./chrome-tags-DzDQBCjX.mjs";
+import { s as getDb } from "./loader-WJi6GFRn.mjs";
+import { i as normalizeCapabilities } from "./types-A2cN6a4a.mjs";
+import { xt as sanitizeHref } from "./entry-lock-DIYHAaSw.mjs";
+import { t as extractRequestMeta } from "./request-meta-BgjUQLQ-.mjs";
+import { r as setCronTasksEnabled } from "./cron-DHAy9oyq.mjs";
+import { t as MediaUsageActivationWriteBlockedError } from "./media-usage-write-fence-B9anjOSg.mjs";
+import { t as CommentReactionRepository } from "./comment-reaction-CDyvPQRj.mjs";
 import { sql } from "kysely";
 import { ulid } from "ulidx";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { z } from "astro/zod";
+import { z as z$1 } from "zod";
+import { UnsafePortableTextTableError, portableTextTableToProseMirror, proseMirrorTableToPortableText } from "@emdash-cms/admin/portable-text-table";
+import { Extension, Mark, Node } from "@tiptap/core";
 
+//#region src/config/errors.ts
+/** A configuration failure whose message is safe to return from the API. */
+var EmDashConfigurationError = class extends Error {
+	constructor(message, code, cause) {
+		super(message);
+		this.code = code;
+		this.cause = cause;
+		this.name = "EmDashConfigurationError";
+	}
+};
+
+//#endregion
 //#region src/database/repositories/audit.ts
 /**
 * Audit repository for logging system events
@@ -224,7 +240,7 @@ function reference(collection, options) {
 const portableTextBlockSchema = z.object({
 	_type: z.string(),
 	_key: z.string()
-}).passthrough();
+}).loose();
 /**
 * Portable Text field
 * Stores structured content in Portable Text format
@@ -252,10 +268,10 @@ function sanitizeGalleryImages(value, generateKey) {
 	if (!Array.isArray(value)) return [];
 	const images = [];
 	for (const entry of value) {
-		if (!isRecord$2(entry)) continue;
+		if (!isRecord$3(entry)) continue;
 		const record = entry;
 		const asset = record.asset;
-		if (!isRecord$2(asset)) continue;
+		if (!isRecord$3(asset)) continue;
 		const assetRecord = asset;
 		const image = {
 			_type: "image",
@@ -279,7 +295,7 @@ function sanitizeGalleryImages(value, generateKey) {
 	}
 	return images;
 }
-function isRecord$2(value) {
+function isRecord$3(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -305,9 +321,10 @@ const SUPPORTED_PROSEMIRROR_MARKS = new Set([
 	"subscript",
 	"superscript",
 	"code",
-	"link"
+	"link",
+	"emdashPortableTextSpan"
 ]);
-function isRecord$1(value) {
+function isRecord$2(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function collectPortableTextMarks(value, inheritedMarkDefs, unsupported) {
@@ -315,11 +332,11 @@ function collectPortableTextMarks(value, inheritedMarkDefs, unsupported) {
 		for (const item of value) collectPortableTextMarks(item, inheritedMarkDefs, unsupported);
 		return;
 	}
-	if (!isRecord$1(value)) return;
+	if (!isRecord$2(value)) return;
 	let markDefs = inheritedMarkDefs;
 	if (Array.isArray(value.markDefs)) {
 		const localMarkDefs = new Map(inheritedMarkDefs);
-		for (const markDef of value.markDefs) if (isRecord$1(markDef) && typeof markDef._key === "string") localMarkDefs.set(markDef._key, markDef);
+		for (const markDef of value.markDefs) if (isRecord$2(markDef) && typeof markDef._key === "string") localMarkDefs.set(markDef._key, markDef);
 		markDefs = localMarkDefs;
 	}
 	if (value._type === "span" && Array.isArray(value.marks)) for (const mark of value.marks) {
@@ -474,6 +491,125 @@ function normalizeProseMirrorOrderedListJson(doc) {
 	return normalized;
 }
 
+//#endregion
+//#region src/content/converters/portable-text-identity.ts
+const PORTABLE_TEXT_BLOCK_NODE = "emdashPortableTextBlock";
+const PORTABLE_TEXT_BLOCK_ATTR = "emdashPortableTextBlock";
+const PORTABLE_TEXT_KEY_ATTR = "emdashPortableTextKey";
+const PORTABLE_TEXT_SPAN_MARK = "emdashPortableTextSpan";
+function isRecord$1(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function attrsWithPortableTextKey(attrs, key) {
+	return {
+		...attrs,
+		[PORTABLE_TEXT_KEY_ATTR]: key
+	};
+}
+function portableTextKeyFromAttrs(attrs) {
+	const key = attrs?.[PORTABLE_TEXT_KEY_ATTR];
+	return typeof key === "string" && key ? key : void 0;
+}
+function portableTextSpanKeyFromMarks(marks) {
+	for (const mark of marks ?? []) {
+		if (!isRecord$1(mark) || mark.type !== PORTABLE_TEXT_SPAN_MARK || !isRecord$1(mark.attrs)) continue;
+		const key = mark.attrs.key;
+		if (typeof key === "string" && key) return key;
+	}
+}
+function portableTextMarkDefsFromMarks(marks) {
+	const identity = (marks ?? []).find((mark) => isRecord$1(mark) && mark.type === PORTABLE_TEXT_SPAN_MARK && isRecord$1(mark.attrs));
+	if (!isRecord$1(identity) || !isRecord$1(identity.attrs) || !Array.isArray(identity.attrs.markDefs)) return [];
+	return identity.attrs.markDefs.filter((markDef) => isRecord$1(markDef) && typeof markDef._type === "string" && typeof markDef._key === "string");
+}
+function portableTextBlockFromAttrs(attrs) {
+	const block = attrs?.[PORTABLE_TEXT_BLOCK_ATTR];
+	if (!isRecord$1(block) || typeof block._type !== "string" || typeof block._key !== "string") return;
+	return {
+		...block,
+		_type: block._type,
+		_key: block._key
+	};
+}
+const PortableTextIdentityExtension = Extension.create({
+	name: "emdashPortableTextIdentity",
+	addGlobalAttributes() {
+		const hiddenAttribute = {
+			default: null,
+			rendered: false
+		};
+		return [{
+			types: [
+				"paragraph",
+				"heading",
+				"blockquote",
+				"codeBlock",
+				"htmlBlock",
+				"image",
+				"horizontalRule",
+				"gallery",
+				PORTABLE_TEXT_BLOCK_NODE
+			],
+			attributes: { [PORTABLE_TEXT_KEY_ATTR]: hiddenAttribute }
+		}];
+	}
+});
+const PortableTextSpanIdentity = Mark.create({
+	name: PORTABLE_TEXT_SPAN_MARK,
+	inclusive: false,
+	spanning: false,
+	addAttributes() {
+		return {
+			key: {
+				default: null,
+				rendered: false
+			},
+			markDefs: {
+				default: [],
+				rendered: false
+			}
+		};
+	},
+	parseHTML() {
+		return [];
+	},
+	renderHTML() {
+		return ["span", 0];
+	}
+});
+const PortableTextOpaqueBlock = Node.create({
+	name: PORTABLE_TEXT_BLOCK_NODE,
+	group: "block",
+	atom: true,
+	selectable: true,
+	draggable: true,
+	addAttributes() {
+		return { [PORTABLE_TEXT_BLOCK_ATTR]: {
+			default: null,
+			rendered: false
+		} };
+	},
+	parseHTML() {
+		return [{ tag: "div[data-emdash-portable-text-block]" }];
+	},
+	renderHTML({ node }) {
+		const blockType = portableTextBlockFromAttrs(node.attrs)?._type ?? "unknown";
+		return [
+			"div",
+			{
+				"data-emdash-portable-text-block": blockType,
+				contenteditable: "false"
+			},
+			`[Unknown block type: ${blockType}]`
+		];
+	}
+});
+const portableTextIdentityExtensions = [
+	PortableTextIdentityExtension,
+	PortableTextSpanIdentity,
+	PortableTextOpaqueBlock
+];
+
 //#endregion
 //#region src/content/converters/prosemirror-to-portable-text.ts
 /**
@@ -484,7 +620,7 @@ function normalizeProseMirrorOrderedListJson(doc) {
 /**
 * Generate a unique key for Portable Text blocks
 */
-function generateKey() {
+function generateKey$1() {
 	return Math.random().toString(36).substring(2, 11);
 }
 /**
@@ -494,18 +630,33 @@ function prosemirrorToPortableText(doc) {
 	if (!doc || doc.type !== "doc" || !doc.content) return [];
 	assertProseMirrorMarksSupported(doc);
 	const blocks = [];
+	const usedBlockKeys = /* @__PURE__ */ new Set();
 	for (const [i, node] of doc.content.entries()) {
+		if (i === doc.content.length - 1 && isUnkeyedEmptyParagraph(node)) continue;
 		const converted = convertNode(node, `root:${i}`);
-		if (converted) if (Array.isArray(converted)) blocks.push(...converted);
-		else blocks.push(converted);
+		for (const block of converted ? Array.isArray(converted) ? converted : [converted] : []) {
+			let key = block._key;
+			if (usedBlockKeys.has(key)) do
+				key = generateKey$1();
+			while (usedBlockKeys.has(key));
+			usedBlockKeys.add(key);
+			blocks.push(key === block._key ? block : {
+				...block,
+				_key: key
+			});
+		}
 	}
 	return blocks;
 }
+function isUnkeyedEmptyParagraph(node) {
+	return node.type === "paragraph" && (node.content?.length ?? 0) === 0 && portableTextKeyFromAttrs(node.attrs) === void 0;
+}
 /**
 * Convert a single ProseMirror node to Portable Text block(s)
 */
 function convertNode(node, path) {
 	switch (node.type) {
+		case PORTABLE_TEXT_BLOCK_NODE: return portableTextBlockFromAttrs(node.attrs) ?? null;
 		case "paragraph": return convertParagraph(node);
 		case "heading": return convertHeading(node);
 		case "bulletList": return convertList$1(node, "bullet", path);
@@ -515,14 +666,29 @@ function convertNode(node, path) {
 		case "htmlBlock": return convertHtmlBlock(node);
 		case "image": return convertImage$1(node);
 		case "gallery": return convertGallery(node);
+		case "table": {
+			const result = proseMirrorTableToPortableText(node, {
+				path,
+				createKey: generateKey$1,
+				inlineToSpans: (content) => {
+					const { children, markDefs } = convertInlineContent(content, true);
+					return {
+						content: children,
+						markDefs
+					};
+				}
+			});
+			if (!result.ok) throw new UnsafePortableTextTableError(result.reason, result.raw, result.renderFallback);
+			return result.table;
+		}
 		case "horizontalRule": return {
 			_type: "break",
-			_key: generateKey(),
+			_key: portableTextKeyFromAttrs(node.attrs) ?? generateKey$1(),
 			style: "lineBreak"
 		};
 		default: return {
 			_type: node.type,
-			_key: generateKey(),
+			_key: generateKey$1(),
 			...node.attrs,
 			_pmContent: node.content
 		};
@@ -538,10 +704,10 @@ function convertParagraph(node) {
 	const textAlign = ta === "center" || ta === "right" || ta === "justify" ? ta : void 0;
 	return {
 		_type: "block",
-		_key: generateKey(),
+		_key: portableTextKeyFromAttrs(node.attrs) ?? generateKey$1(),
 		style: "normal",
 		children,
-		markDefs: markDefs.length > 0 ? markDefs : void 0,
+		...markDefs.length > 0 ? { markDefs } : {},
 		...textAlign ? { textAlign } : {}
 	};
 }
@@ -568,7 +734,7 @@ function convertHeading(node) {
 	const textAlign = ta === "center" || ta === "right" || ta === "justify" ? ta : void 0;
 	return {
 		_type: "block",
-		_key: generateKey(),
+		_key: portableTextKeyFromAttrs(node.attrs) ?? generateKey$1(),
 		style,
 		children,
 		markDefs: markDefs.length > 0 ? markDefs : void 0,
@@ -596,7 +762,7 @@ function convertListItem$1(item, listItem, level, path, metadata) {
 		const { children, markDefs } = convertInlineContent(child.content || []);
 		if (children.length > 0) blocks.push({
 			_type: "block",
-			_key: generateKey(),
+			_key: portableTextKeyFromAttrs(child.attrs) ?? generateKey$1(),
 			style: "normal",
 			listItem,
 			level,
@@ -626,7 +792,7 @@ function convertBlockquote(node) {
 		const { children, markDefs } = convertInlineContent(child.content || []);
 		if (children.length > 0) blocks.push({
 			_type: "block",
-			_key: generateKey(),
+			_key: portableTextKeyFromAttrs(child.attrs) ?? portableTextKeyFromAttrs(node.attrs) ?? generateKey$1(),
 			style: "blockquote",
 			children,
 			markDefs: markDefs.length > 0 ? markDefs : void 0
@@ -642,7 +808,7 @@ function convertCodeBlock$1(node) {
 	const language = typeof node.attrs?.language === "string" ? node.attrs.language : void 0;
 	return {
 		_type: "code",
-		_key: generateKey(),
+		_key: portableTextKeyFromAttrs(node.attrs) ?? generateKey$1(),
 		code,
 		language: language || void 0
 	};
@@ -654,7 +820,7 @@ function convertHtmlBlock(node) {
 	const rawHtml = node.attrs?.html;
 	return {
 		_type: "htmlBlock",
-		_key: generateKey(),
+		_key: portableTextKeyFromAttrs(node.attrs) ?? generateKey$1(),
 		html: typeof rawHtml === "string" ? rawHtml : ""
 	};
 }
@@ -672,9 +838,10 @@ function convertImage$1(node) {
 	const height = typeof attrs?.height === "number" ? attrs.height : void 0;
 	const displayWidth = typeof attrs?.displayWidth === "number" ? attrs.displayWidth : void 0;
 	const displayHeight = typeof attrs?.displayHeight === "number" ? attrs.displayHeight : void 0;
+	const alignment = attrs?.alignment;
 	return {
 		_type: "image",
-		_key: generateKey(),
+		_key: portableTextKeyFromAttrs(node.attrs) ?? generateKey$1(),
 		asset: {
 			_ref: mediaId || src || "",
 			url: src || "",
@@ -685,7 +852,8 @@ function convertImage$1(node) {
 		width: width || void 0,
 		height: height || void 0,
 		displayWidth: displayWidth || void 0,
-		displayHeight: displayHeight || void 0
+		displayHeight: displayHeight || void 0,
+		alignment: alignment === "left" || alignment === "center" || alignment === "right" || alignment === "wide" || alignment === "full" ? alignment : void 0
 	};
 }
 /**
@@ -695,41 +863,62 @@ function convertGallery(node) {
 	const columns = node.attrs?.columns;
 	return {
 		_type: "gallery",
-		_key: generateKey(),
-		images: sanitizeGalleryImages(node.attrs?.images, generateKey),
+		_key: portableTextKeyFromAttrs(node.attrs) ?? generateKey$1(),
+		images: sanitizeGalleryImages(node.attrs?.images, generateKey$1),
 		...typeof columns === "number" ? { columns } : {}
 	};
 }
 /**
 * Convert inline content (text nodes with marks) to Portable Text spans
 */
-function convertInlineContent(nodes) {
+function convertInlineContent(nodes, preserveHardBreakBoundary = false) {
 	const children = [];
 	const markDefs = [];
 	const markDefMap = /* @__PURE__ */ new Map();
+	const usedSpanKeys = /* @__PURE__ */ new Set();
+	const claimSpanKey = (preferred) => {
+		if (preferred && !usedSpanKeys.has(preferred)) {
+			usedSpanKeys.add(preferred);
+			return preferred;
+		}
+		let key;
+		do
+			key = generateKey$1();
+		while (usedSpanKeys.has(key));
+		usedSpanKeys.add(key);
+		return key;
+	};
 	for (const node of nodes) if (node.type === "text" && node.text) {
 		const marks = [];
+		const originalMarkDefs = portableTextMarkDefsFromMarks(node.marks);
 		for (const mark of node.marks || []) {
-			const markType = convertMark(mark, markDefs, markDefMap);
+			const markType = convertMark(mark, markDefs, markDefMap, originalMarkDefs);
 			if (markType) marks.push(markType);
 		}
+		const preferredKey = portableTextSpanKeyFromMarks(node.marks) ?? portableTextKeyFromAttrs(node.attrs);
+		const normalizedMarks = marks.length > 0 ? marks : void 0;
+		const previous = children.at(-1);
+		if (preferredKey && previous?._key === preferredKey && JSON.stringify(previous.marks) === JSON.stringify(normalizedMarks)) {
+			previous.text += node.text;
+			continue;
+		}
 		children.push({
 			_type: "span",
-			_key: generateKey(),
+			_key: claimSpanKey(preferredKey),
 			text: node.text,
-			marks: marks.length > 0 ? marks : void 0
+			marks: normalizedMarks
 		});
-	} else if (node.type === "hardBreak") if (children.length > 0) {
+	} else if (node.type === "hardBreak") if (children.length > 0 && !preserveHardBreakBoundary) {
 		const lastChild = children.at(-1);
 		lastChild.text += "\n";
 	} else children.push({
 		_type: "span",
-		_key: generateKey(),
+		_key: claimSpanKey(portableTextSpanKeyFromMarks(node.marks) ?? portableTextKeyFromAttrs(node.attrs)),
 		text: "\n"
 	});
 	if (children.length === 0) children.push({
 		_type: "span",
-		_key: generateKey(),
+		_key: claimSpanKey(),
 		text: ""
 	});
 	return {
@@ -740,7 +929,7 @@ function convertInlineContent(nodes) {
 /**
 * Convert a ProseMirror mark to Portable Text mark
 */
-function convertMark(mark, markDefs, markDefMap) {
+function convertMark(mark, markDefs, markDefMap, originalMarkDefs) {
 	switch (mark.type) {
 		case "bold":
 		case "strong": return "strong";
@@ -752,17 +941,22 @@ function convertMark(mark, markDefs, markDefMap) {
 		case "subscript": return "subscript";
 		case "superscript": return "superscript";
 		case "code": return "code";
+		case PORTABLE_TEXT_SPAN_MARK: return null;
 		case "link": {
 			const href = (typeof mark.attrs?.href === "string" ? mark.attrs.href : "") || "";
-			if (markDefMap.has(href)) return markDefMap.get(href);
-			const key = generateKey();
+			const blank = mark.attrs?.target === "_blank";
+			const originalMarkDef = originalMarkDefs.find((markDef) => markDef._type === "link");
+			const mapKey = originalMarkDef ? `key:${originalMarkDef._key}` : `value:${JSON.stringify([href, blank])}`;
+			if (markDefMap.has(mapKey)) return markDefMap.get(mapKey);
+			const key = originalMarkDef?._key || generateKey$1();
 			markDefs.push({
+				...originalMarkDef,
 				_type: "link",
 				_key: key,
 				href,
-				blank: mark.attrs?.target === "_blank"
+				...originalMarkDef ? blank || Object.hasOwn(originalMarkDef, "blank") ? { blank } : {} : { blank }
 			});
-			markDefMap.set(href, key);
+			markDefMap.set(mapKey, key);
 			return key;
 		}
 		default: throw new UnsupportedPortableTextMarksError([mark.type]);
@@ -776,15 +970,17 @@ function convertMark(mark, markDefs, markDefMap) {
 *
 * Converts Portable Text to TipTap's ProseMirror JSON format for editing.
 */
-/**
-* Convert Portable Text to ProseMirror document
-*/
-function portableTextToProsemirror(blocks) {
+function generateKey() {
+	return Math.random().toString(36).substring(2, 11);
+}
+/** Convert Portable Text to a ProseMirror document. */
+function portableTextToProsemirror(blocks, options = {}) {
 	if (!blocks || blocks.length === 0) return {
 		type: "doc",
 		content: [{ type: "paragraph" }]
 	};
 	assertPortableTextMarksSupported(blocks);
+	const preserveIdentity = options.preserveIdentity === true;
 	const content = [];
 	let i = 0;
 	while (i < blocks.length) {
@@ -805,7 +1001,7 @@ function portableTextToProsemirror(blocks) {
 					i++;
 				} else break;
 			}
-			content.push(convertList(listBlocks, listType, `root:${runStart}`));
+			content.push(convertList(listBlocks, listType, `root:${runStart}`, preserveIdentity));
 		} else if (isTextBlock(block) && block.style === "blockquote") {
 			const quoteBlocks = [];
 			while (i < blocks.length) {
@@ -817,15 +1013,16 @@ function portableTextToProsemirror(blocks) {
 			content.push({
 				type: "blockquote",
 				content: quoteBlocks.map((quoteBlock) => {
-					const paragraph = convertSpans(quoteBlock.children, quoteBlock.markDefs || []);
+					const paragraph = convertSpans(quoteBlock.children, quoteBlock.markDefs || [], preserveIdentity);
 					return {
 						type: "paragraph",
+						attrs: identityAttrs(void 0, quoteBlock._key, preserveIdentity),
 						content: paragraph.length > 0 ? paragraph : void 0
 					};
 				})
 			});
 		} else {
-			const converted = convertBlock(block);
+			const converted = convertBlock(block, `root:${i}`, preserveIdentity);
 			if (converted) content.push(converted);
 			i++;
 		}
@@ -835,6 +1032,9 @@ function portableTextToProsemirror(blocks) {
 		content: content.length > 0 ? content : [{ type: "paragraph" }]
 	});
 }
+function identityAttrs(attrs, key, preserveIdentity) {
+	return preserveIdentity ? attrsWithPortableTextKey(attrs, key) : attrs;
+}
 function getListMetadata(item, fallbackSeed) {
 	const listId = normalizeListId(item.listId) ?? deriveLegacyListId(fallbackSeed);
 	const listStart = normalizeListStart(item.listStart);
@@ -866,8 +1066,8 @@ function isImageBlock(block) {
 	return block._type === "image" && "asset" in block && typeof block.asset === "object" && block.asset !== null;
 }
 /**
-* Type guard for gallery blocks. Requires an `images` array — a gallery
-* without one is malformed and falls through to the unknown-block path.
+* Type guard for gallery blocks that carry a usable `images` array.
+* Galleries without one are handled separately in `convertBlock`.
 */
 function isGalleryBlock(block) {
 	return block._type === "gallery" && "images" in block && Array.isArray(block.images);
@@ -881,23 +1081,53 @@ function isCodeBlock(block) {
 /**
 * Convert a single Portable Text block to ProseMirror node
 */
-function convertBlock(block) {
-	if (isTextBlock(block)) return convertTextBlock(block);
-	if (isImageBlock(block)) return convertImage(block);
-	if (block._type === "image") return convertMalformedImage(block);
+function convertBlock(block, path, preserveIdentity) {
+	if (isTextBlock(block)) return convertTextBlock(block, preserveIdentity);
+	if (isImageBlock(block)) return convertImage(block, preserveIdentity);
+	if (block._type === "image") return convertMalformedImage(block, preserveIdentity);
 	if (isGalleryBlock(block)) return {
 		type: "gallery",
-		attrs: {
+		attrs: identityAttrs({
 			images: sanitizeGalleryImages(block.images),
 			columns: typeof block.columns === "number" ? block.columns : void 0
-		}
+		}, block._key, preserveIdentity)
 	};
-	if (isCodeBlock(block)) return convertCodeBlock(block);
+	if (isCodeBlock(block)) return convertCodeBlock(block, preserveIdentity);
 	if (block._type === "htmlBlock") return {
 		type: "htmlBlock",
-		attrs: { html: block.html || "" }
+		attrs: identityAttrs({ html: block.html || "" }, block._key, preserveIdentity)
 	};
-	if (block._type === "break") return { type: "horizontalRule" };
+	if (block._type === "break") return {
+		type: "horizontalRule",
+		attrs: identityAttrs(void 0, block._key, preserveIdentity)
+	};
+	if (block._type === "gallery") {
+		if (preserveIdentity) return {
+			type: PORTABLE_TEXT_BLOCK_NODE,
+			attrs: { [PORTABLE_TEXT_BLOCK_ATTR]: block }
+		};
+		return {
+			type: "paragraph",
+			content: [{
+				type: "text",
+				text: `[Unknown block type: ${block._type}]`,
+				marks: [{ type: "code" }]
+			}]
+		};
+	}
+	if (preserveIdentity) return {
+		type: PORTABLE_TEXT_BLOCK_NODE,
+		attrs: { [PORTABLE_TEXT_BLOCK_ATTR]: block }
+	};
+	if (block._type === "table") {
+		const result = portableTextTableToProseMirror(block, {
+			path,
+			createKey: generateKey,
+			spansToInline: (content, markDefs) => convertSpans(content, markDefs, preserveIdentity)
+		});
+		if (!result.ok) throw new UnsafePortableTextTableError(result.reason, result.raw, result.renderFallback);
+		return result.node;
+	}
 	return {
 		type: "paragraph",
 		content: [{
@@ -910,9 +1140,9 @@ function convertBlock(block) {
 /**
 * Convert text block to ProseMirror paragraph or heading
 */
-function convertTextBlock(block) {
+function convertTextBlock(block, preserveIdentity) {
 	const { style = "normal", children, markDefs = [] } = block;
-	const content = convertSpans(children, markDefs);
+	const content = convertSpans(children, markDefs, preserveIdentity);
 	switch (style) {
 		case "h1":
 		case "h2":
@@ -921,14 +1151,15 @@ function convertTextBlock(block) {
 		case "h5":
 		case "h6": return {
 			type: "heading",
-			attrs: {
+			attrs: identityAttrs({
 				level: parseInt(style.substring(1), 10),
 				...block.textAlign ? { textAlign: block.textAlign } : {}
-			},
+			}, block._key, preserveIdentity),
 			content: content.length > 0 ? content : void 0
 		};
 		case "blockquote": return {
 			type: "blockquote",
+			attrs: identityAttrs(void 0, block._key, preserveIdentity),
 			content: [{
 				type: "paragraph",
 				content: content.length > 0 ? content : void 0
@@ -936,7 +1167,7 @@ function convertTextBlock(block) {
 		};
 		default: return {
 			type: "paragraph",
-			attrs: block.textAlign ? { textAlign: block.textAlign } : void 0,
+			attrs: identityAttrs(block.textAlign ? { textAlign: block.textAlign } : void 0, block._key, preserveIdentity),
 			content: content.length > 0 ? content : void 0
 		};
 	}
@@ -944,7 +1175,7 @@ function convertTextBlock(block) {
 /**
 * Convert list items to ProseMirror list
 */
-function convertList(items, listType, context) {
+function convertList(items, listType, context, preserveIdentity) {
 	const rootItems = [];
 	let i = 0;
 	while (i < items.length) {
@@ -956,9 +1187,9 @@ function convertList(items, listType, context) {
 				nestedItems.push(items[i]);
 				i++;
 			}
-			rootItems.push(convertListItem(item, nestedItems, listType, `${context}:${rootItems.length}`));
+			rootItems.push(convertListItem(item, nestedItems, listType, `${context}:${rootItems.length}`, preserveIdentity));
 		} else {
-			rootItems.push(convertListItem(item, [], listType, `${context}:${rootItems.length}`));
+			rootItems.push(convertListItem(item, [], listType, `${context}:${rootItems.length}`, preserveIdentity));
 			i++;
 		}
 	}
@@ -975,11 +1206,12 @@ function convertList(items, listType, context) {
 /**
 * Convert a single list item to ProseMirror
 */
-function convertListItem(item, nestedItems, parentListType, context) {
+function convertListItem(item, nestedItems, parentListType, context, preserveIdentity) {
 	const content = [];
-	const spans = convertSpans(item.children, item.markDefs || []);
+	const spans = convertSpans(item.children, item.markDefs || [], preserveIdentity);
 	content.push({
 		type: "paragraph",
+		attrs: identityAttrs(void 0, item._key, preserveIdentity),
 		content: spans.length > 0 ? spans : void 0
 	});
 	if (nestedItems.length > 0) {
@@ -1002,7 +1234,7 @@ function convertListItem(item, nestedItems, parentListType, context) {
 					...ni,
 					level: (ni.level || 2) - 1
 				}));
-				content.push(convertList(adjustedGroup, anchorType, `${context}:nested:${j - nestedGroup.length}`));
+				content.push(convertList(adjustedGroup, anchorType, `${context}:nested:${j - nestedGroup.length}`, preserveIdentity));
 			}
 		}
 	}
@@ -1014,16 +1246,24 @@ function convertListItem(item, nestedItems, parentListType, context) {
 /**
 * Convert Portable Text spans to ProseMirror text nodes
 */
-function convertSpans(spans, markDefs) {
+function convertSpans(spans, markDefs, preserveIdentity) {
 	const nodes = [];
 	const markDefsMap = new Map(markDefs.map((md) => [md._key, md]));
 	for (const span of spans) {
 		if (span._type !== "span") continue;
+		const referencedMarkDefs = markDefs.filter((markDef) => span.marks?.includes(markDef._key));
 		const parts = span.text.split("\n");
 		for (let i = 0; i < parts.length; i++) {
 			const text = parts[i];
 			if (text.length > 0) {
 				const marks = convertMarks(span.marks || [], markDefsMap);
+				if (preserveIdentity) marks.push({
+					type: PORTABLE_TEXT_SPAN_MARK,
+					attrs: {
+						key: span._key,
+						markDefs: referencedMarkDefs
+					}
+				});
 				const node = {
 					type: "text",
 					text
@@ -1031,7 +1271,16 @@ function convertSpans(spans, markDefs) {
 				if (marks.length > 0) node.marks = marks;
 				nodes.push(node);
 			}
-			if (i < parts.length - 1) nodes.push({ type: "hardBreak" });
+			if (i < parts.length - 1) nodes.push(preserveIdentity ? {
+				type: "hardBreak",
+				marks: [{
+					type: PORTABLE_TEXT_SPAN_MARK,
+					attrs: {
+						key: span._key,
+						markDefs: referencedMarkDefs
+					}
+				}]
+			} : { type: "hardBreak" });
 		}
 	}
 	return nodes;
@@ -1078,13 +1327,16 @@ function convertMarks(marks, markDefs) {
 	}
 	return pmMarks;
 }
+function imageAlignment(value) {
+	return value === "left" || value === "center" || value === "right" || value === "wide" || value === "full" ? value : void 0;
+}
 /**
 * Convert image block to ProseMirror
 */
-function convertImage(block) {
+function convertImage(block, preserveIdentity) {
 	return {
 		type: "image",
-		attrs: {
+		attrs: identityAttrs({
 			src: block.asset.url || block.asset._ref,
 			alt: block.alt || "",
 			title: block.caption || "",
@@ -1093,8 +1345,9 @@ function convertImage(block) {
 			width: block.width,
 			height: block.height,
 			displayWidth: block.displayWidth,
-			displayHeight: block.displayHeight
-		}
+			displayHeight: block.displayHeight,
+			alignment: imageAlignment(block.alignment)
+		}, block._key, preserveIdentity)
 	};
 }
 /**
@@ -1102,10 +1355,10 @@ function convertImage(block) {
 * Handles blocks like `{ _type: "image", url: "...", alt: "..." }` that may
 * originate from migrations or third-party imports.
 */
-function convertMalformedImage(block) {
+function convertMalformedImage(block, preserveIdentity) {
 	return {
 		type: "image",
-		attrs: {
+		attrs: identityAttrs({
 			src: "url" in block && typeof block.url === "string" ? block.url : "",
 			alt: "alt" in block && typeof block.alt === "string" ? block.alt : "",
 			title: "caption" in block && typeof block.caption === "string" ? block.caption : "",
@@ -1114,17 +1367,18 @@ function convertMalformedImage(block) {
 			width: "width" in block && typeof block.width === "number" ? block.width : void 0,
 			height: "height" in block && typeof block.height === "number" ? block.height : void 0,
 			displayWidth: "displayWidth" in block && typeof block.displayWidth === "number" ? block.displayWidth : void 0,
-			displayHeight: "displayHeight" in block && typeof block.displayHeight === "number" ? block.displayHeight : void 0
-		}
+			displayHeight: "displayHeight" in block && typeof block.displayHeight === "number" ? block.displayHeight : void 0,
+			alignment: imageAlignment("alignment" in block ? block.alignment : void 0)
+		}, block._key, preserveIdentity)
 	};
 }
 /**
 * Convert code block to ProseMirror
 */
-function convertCodeBlock(block) {
+function convertCodeBlock(block, preserveIdentity) {
 	return {
 		type: "codeBlock",
-		attrs: { language: block.language || null },
+		attrs: identityAttrs({ language: block.language || null }, block._key, preserveIdentity),
 		content: block.code ? [{
 			type: "text",
 			text: block.code
@@ -1569,9 +1823,11 @@ var HookPipeline = class HookPipeline {
 	}
 	/**
 	* Run content:beforeSave hooks
-	* Returns modified content from the pipeline
+	* Returns modified content from the pipeline. `id` is the existing item's
+	* ID when updating. `actor` is the authenticated user that triggered the
+	* save, when one is available.
 	*/
-	async runContentBeforeSave(content, collection, isNew) {
+	async runContentBeforeSave(content, collection, isNew, id, actor) {
 		const hooks = this.getTypedHooks("content:beforeSave");
 		const results = [];
 		let currentContent = content;
@@ -1582,6 +1838,8 @@ var HookPipeline = class HookPipeline {
 				collection,
 				isNew
 			};
+			if (id !== void 0) event.id = id;
+			if (actor !== void 0) event.actor = { ...actor };
 			const ctx = this.getContext(hook.pluginId);
 			const start = Date.now();
 			try {
@@ -1611,7 +1869,7 @@ var HookPipeline = class HookPipeline {
 	/**
 	* Run content:afterSave hooks
 	*/
-	async runContentAfterSave(content, collection, isNew) {
+	async runContentAfterSave(content, collection, isNew, actor) {
 		const hooks = this.getTypedHooks("content:afterSave");
 		const results = [];
 		for (const hook of hooks) {
@@ -1621,6 +1879,7 @@ var HookPipeline = class HookPipeline {
 				collection,
 				isNew
 			};
+			if (actor !== void 0) event.actor = { ...actor };
 			const ctx = this.getContext(hook.pluginId);
 			const start = Date.now();
 			try {
@@ -2539,7 +2798,7 @@ var PluginRouteHandler = class {
 				error: {
 					code: "VALIDATION_ERROR",
 					message: "Invalid request body",
-					details: parseResult.error.format()
+					details: z$1.formatError(parseResult.error)
 				},
 				status: 400
 			};
@@ -2846,16 +3105,16 @@ var PluginManager = class {
 	/**
 	* Run content:beforeSave hooks across all active plugins
 	*/
-	async runContentBeforeSave(content, collection, isNew) {
+	async runContentBeforeSave(content, collection, isNew, id, actor) {
 		this.ensureInitialized();
-		return this.hookPipeline.runContentBeforeSave(content, collection, isNew);
+		return this.hookPipeline.runContentBeforeSave(content, collection, isNew, id, actor);
 	}
 	/**
 	* Run content:afterSave hooks across all active plugins
 	*/
-	async runContentAfterSave(content, collection, isNew) {
+	async runContentAfterSave(content, collection, isNew, actor) {
 		this.ensureInitialized();
-		return this.hookPipeline.runContentAfterSave(content, collection, isNew);
+		return this.hookPipeline.runContentAfterSave(content, collection, isNew, actor);
 	}
 	/**
 	* Run content:beforeDelete hooks across all active plugins
@@ -3231,67 +3490,28 @@ function createNoopSandboxRunner(_options) {
 }
 
 //#endregion
-//#region src/plugins/sandbox/types.ts
-const SANDBOX_ROUTE_ERROR_DEFINITIONS = {
-	MEDIA_USAGE_ACTIVATION_IN_PROGRESS: {
-		message: "Media usage activation is in progress",
-		status: 503
-	},
-	MEDIA_USAGE_ACTIVATION_CHECK_FAILED: {
-		message: "Unable to verify media usage activation state",
-		status: 503
-	}
-};
+//#region src/plugins/sandbox/hook-result.ts
+/** Current wire-format version for sandbox hook result envelopes. */
+const SANDBOX_HOOK_RESULT_VERSION = 1;
+/** Maximum editor-facing rejection reason accepted from a sandboxed plugin. */
+const MAX_SANDBOX_SAVE_REJECTION_REASON_LENGTH = 500;
 function isRecord(value) {
-	return typeof value === "object" && value !== null;
-}
-function isSandboxRouteErrorCode(value) {
-	return typeof value === "string" && value in SANDBOX_ROUTE_ERROR_DEFINITIONS;
-}
-function getSandboxRouteErrorDetails(error) {
-	if (!isRecord(error)) return null;
-	const propertyCode = isSandboxRouteErrorCode(error.code) ? error.code : null;
-	const nameCode = error instanceof Error && isSandboxRouteErrorCode(error.name) ? error.name : null;
-	if (propertyCode && nameCode && propertyCode !== nameCode) return null;
-	const code = propertyCode ?? nameCode;
-	if (!code || error.status !== void 0 && error.status !== 503) return null;
-	return {
-		code,
-		...SANDBOX_ROUTE_ERROR_DEFINITIONS[code]
-	};
+	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function createSandboxRouteError(code) {
-	const details = {
-		code,
-		...SANDBOX_ROUTE_ERROR_DEFINITIONS[code]
+/** Validate and normalize an untrusted value returned across the sandbox boundary. */
+function inspectSandboxHookResult(value) {
+	if (!isRecord(value) || !Object.hasOwn(value, "__emdashSandboxHookResult")) return { kind: "value" };
+	if (value.__emdashSandboxHookResult !== true || value.version !== SANDBOX_HOOK_RESULT_VERSION || !isRecord(value.error) || value.error.code !== "SAVE_REJECTED" || typeof value.error.reason !== "string") return { kind: "malformed" };
+	const reason = value.error.reason.trim();
+	if (reason.length === 0 || reason.length > MAX_SANDBOX_SAVE_REJECTION_REASON_LENGTH) return { kind: "malformed" };
+	return {
+		kind: "error",
+		error: {
+			code: "SAVE_REJECTED",
+			reason
+		}
 	};
-	return Object.assign(new Error(details.message), details, { name: code });
 }
-function createSandboxRouteErrorEnvelope(error) {
-	const details = getSandboxRouteErrorDetails(error);
-	return details ? {
-		__emdashSandboxRouteError: true,
-		error: details
-	} : null;
-}
-function getSandboxRouteErrorEnvelope(value) {
-	if (!isRecord(value) || value.__emdashSandboxRouteError !== true) return null;
-	const details = getSandboxRouteErrorDetails(value.error);
-	return details ? {
-		__emdashSandboxRouteError: true,
-		error: details
-	} : null;
-}
-/**
-* Error thrown when the sandbox runtime is unavailable.
-* This happens when the sidecar process has crashed or hasn't started.
-*/
-var SandboxUnavailableError = class extends Error {
-	constructor(pluginId, reason) {
-		super(`Plugin sandbox unavailable for ${pluginId}: ${reason}`);
-		this.name = "SandboxUnavailableError";
-	}
-};
 
 //#endregion
 //#region src/comments/ranking.ts
@@ -3523,6 +3743,18 @@ async function getMenusWithDb(db, options = {}) {
 	return query.execute();
 }
 /**
+* Get a menu by name with a Workers edge-cache hint.
+*
+* Use the returned `cacheHint` with `Astro.cache.set()` so pages that render
+* this menu can be purged automatically when the menu is edited.
+*/
+async function getMenuWithCacheHint(name, options = {}) {
+	return {
+		data: await getMenu(name, options),
+		cacheHint: { tags: [menuTag(name)] }
+	};
+}
+/**
 * Build a hierarchical menu tree from a flat list of items. Items are
 * resolved against the given `locale` so references land on the right
 * per-locale content rows.
@@ -3644,16 +3876,6 @@ function resolveMenuItem(item, urlPatterns, contentLookup, taxonomyLookup) {
 		children: []
 	};
 }
-const SLUG_PLACEHOLDER = /\{slug\}/g;
-const ID_PLACEHOLDER = /\{id\}/g;
-/**
-* Interpolate a URL pattern with entry data
-*
-* Replaces `{slug}` and `{id}` placeholders.
-*/
-function interpolateUrlPattern(pattern, slug, id) {
-	return pattern.replace(SLUG_PLACEHOLDER, slug).replace(ID_PLACEHOLDER, id);
-}
 async function resolveContentReferences(db, references, locale) {
 	const entries = await Promise.all(Array.from(references, async ([collection, referenceGroups]) => {
 		const lookup = /* @__PURE__ */ new Map();
@@ -3662,7 +3884,7 @@ async function resolveContentReferences(db, references, locale) {
 			validateIdentifier(collection, "menu item collection");
 			for (const batch of chunks([...referenceGroups], SQL_BATCH_SIZE)) {
 				const result = await sql`
-						SELECT id, slug, locale, translation_group
+						SELECT id, slug, published_at, locale, translation_group
 						FROM ${sql.ref(`ec_${collection}`)}
 						WHERE translation_group IN (${sql.join(batch)})
 					`.execute(db);
@@ -3670,15 +3892,20 @@ async function resolveContentReferences(db, references, locale) {
 			}
 			for (const [referenceGroup, row] of localized) lookup.set(referenceGroup, {
 				id: row.id,
-				slug: row.slug
+				slug: row.slug,
+				publishedAt: row.published_at
 			});
 			const unresolved = [...referenceGroups].filter((id) => !lookup.has(id));
 			for (const batch of chunks(unresolved, SQL_BATCH_SIZE)) {
 				const result = await sql`
-						SELECT id, slug FROM ${sql.ref(`ec_${collection}`)}
+						SELECT id, slug, published_at FROM ${sql.ref(`ec_${collection}`)}
 						WHERE id IN (${sql.join(batch)})
 					`.execute(db);
-				for (const row of result.rows) lookup.set(row.id, row);
+				for (const row of result.rows) lookup.set(row.id, {
+					id: row.id,
+					slug: row.slug,
+					publishedAt: row.published_at
+				});
 			}
 		} catch (error) {
 			console.error(`Failed to resolve content URLs for ${collection}:`, error);
@@ -3703,9 +3930,13 @@ function resolveContentUrl(collection, referenceGroup, urlPatterns, contentLooku
 	if (!referenceGroup) return null;
 	const row = contentLookup.get(collection)?.get(referenceGroup);
 	if (!row) return null;
-	const pattern = urlPatterns.get(collection);
-	if (pattern) return interpolateUrlPattern(pattern, row.slug, row.id);
-	return `/${collection}/${row.slug}`;
+	return interpolateUrlPattern({
+		pattern: urlPatterns.get(collection) ?? null,
+		collection,
+		slug: row.slug,
+		id: row.id,
+		date: row.publishedAt
+	});
 }
 async function resolveTaxonomyReferences(db, referenceGroups, locale) {
 	const lookup = /* @__PURE__ */ new Map();
@@ -3754,5 +3985,5 @@ function resolveTaxonomyUrl(referenceGroup, taxonomyLookup) {
 }
 
 //#endregion
-export { portableText as A, isContentSaveRejection as C, definePlugin as D, resolveExclusiveHooks as E, file as M, image as N, portableTextToProsemirror as O, AuditRepository as P, ContentSaveRejectedError as S, createHookPipeline as T, PluginRouteRegistry as _, SandboxUnavailableError as a, toRouteCallerInfo as b, getSandboxRouteErrorDetails as c, SandboxNotAvailableError as d, createNoopSandboxRunner as f, PluginRouteError as g, createPluginManager as h, getComments as i, reference as j, prosemirrorToPortableText as k, getSandboxRouteErrorEnvelope as l, PluginManager as m, getMenus as n, createSandboxRouteError as o, NodeCronScheduler as p, getCommentCount as r, createSandboxRouteErrorEnvelope as s, getMenu as t, NoopSandboxRunner as u, buildRouteMeta as v, HookPipeline as w, EmailPipeline as x, parseRouteInput as y };
-//# sourceMappingURL=menus-CNg0QlDt.mjs.map
+export { portableText as A, HookPipeline as C, portableTextToProsemirror as D, definePlugin as E, EmDashConfigurationError as F, file as M, image as N, prosemirrorToPortableText as O, AuditRepository as P, isContentSaveRejection as S, resolveExclusiveHooks as T, buildRouteMeta as _, getComments as a, EmailPipeline as b, inspectSandboxHookResult as c, createNoopSandboxRunner as d, NodeCronScheduler as f, PluginRouteRegistry as g, PluginRouteError as h, getCommentCount as i, reference as j, portableTextIdentityExtensions as k, NoopSandboxRunner as l, createPluginManager as m, getMenuWithCacheHint as n, MAX_SANDBOX_SAVE_REJECTION_REASON_LENGTH as o, PluginManager as p, getMenus as r, SANDBOX_HOOK_RESULT_VERSION as s, getMenu as t, SandboxNotAvailableError as u, parseRouteInput as v, createHookPipeline as w, ContentSaveRejectedError as x, toRouteCallerInfo as y };
+//# sourceMappingURL=menus-D8mC4eaN.mjs.map